aboutsummaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
Diffstat (limited to 'databases')
-rw-r--r--databases/Makefile15
-rw-r--r--databases/R-cran-RMySQL/Makefile4
-rw-r--r--databases/R-cran-RPostgreSQL/Makefile2
-rw-r--r--databases/R-cran-RPostgreSQL/distinfo6
-rw-r--r--databases/adminer/Makefile2
-rw-r--r--databases/adodb5/Makefile5
-rw-r--r--databases/adodb5/distinfo6
-rw-r--r--databases/akonadi/Makefile2
-rw-r--r--databases/akonadi/distinfo6
-rw-r--r--databases/apq-mysql/Makefile2
-rw-r--r--databases/apq-odbc/Makefile2
-rw-r--r--databases/apq-pgsql/Makefile2
-rw-r--r--databases/apq/Makefile2
-rw-r--r--databases/arrow/Makefile6
-rw-r--r--databases/bbdb/Makefile2
-rw-r--r--databases/c3p0/Makefile3
-rw-r--r--databases/cassandra3/Makefile3
-rw-r--r--databases/cassandra4/Makefile5
-rw-r--r--databases/caterva/Makefile33
-rw-r--r--databases/caterva/distinfo3
-rw-r--r--databases/caterva/files/patch-CMakeLists.txt11
-rw-r--r--databases/caterva/pkg-descr10
-rw-r--r--databases/caterva/pkg-plist5
-rw-r--r--databases/cego/Makefile2
-rw-r--r--databases/cego/distinfo6
-rw-r--r--databases/clickhouse/Makefile17
-rw-r--r--databases/clickhouse/files/clickhouse.in11
-rw-r--r--databases/clickhouse/files/patch-cmake_find_ldap.cmake10
-rw-r--r--databases/clickhouse/files/patch-contrib_boringssl_crypto_cpu-aarch64-linux.c75
-rw-r--r--databases/clickhouse/files/patch-contrib_jemalloc-cmake_include__freebsd__aarch64_jemalloc_internal_jemalloc__internal__defs.h.in11
-rw-r--r--databases/clickhouse/files/patch-contrib_rocksdb-cmake_CMakeLists.txt14
-rw-r--r--databases/clickhouse/files/patch-contrib_rocksdb_CMakeLists.txt13
-rw-r--r--databases/clickhouse/files/patch-contrib_rocksdb_util_crc32c.cc38
-rw-r--r--databases/clickhouse/files/patch-contrib_rocksdb_util_crc32c__arm64.cc45
-rw-r--r--databases/clickhouse/files/patch-src_Common_StackTrace.cpp11
-rw-r--r--databases/closql/Makefile5
-rw-r--r--databases/closql/distinfo6
-rw-r--r--databases/cockroach/Makefile2
-rw-r--r--databases/couchdb3/Makefile40
-rw-r--r--databases/couchdb3/distinfo6
-rw-r--r--databases/couchdb3/files/patch-src_ibrowse_src_ibrowse__http__client.erl11
-rw-r--r--databases/couchdb3/files/patch-src_jwtf_src_jwtf.app.src11
-rw-r--r--databases/couchdb3/files/patch-src_jwtf_src_jwtf.erl86
-rw-r--r--databases/couchdb3/files/patch-src_jwtf_src_jwtf__keystore.erl28
-rw-r--r--databases/couchdb3/pkg-plist374
-rw-r--r--databases/cutelyst-asql/Makefile2
-rw-r--r--databases/cutelyst-asql/distinfo6
-rw-r--r--databases/cutelyst-asql/pkg-plist7
-rw-r--r--databases/db/Makefile2
-rw-r--r--databases/db/distinfo14
-rw-r--r--databases/db18/Makefile2
-rw-r--r--databases/elixir-calecto/Makefile2
-rw-r--r--databases/emacsql/Makefile3
-rw-r--r--databases/evolution-data-server/Makefile24
-rw-r--r--databases/evolution-data-server/distinfo6
-rw-r--r--databases/evolution-data-server/files/patch-CMakeLists.txt4
-rw-r--r--databases/evolution-data-server/files/patch-icu6110
-rw-r--r--databases/evolution-data-server/files/patch-src_camel_camel-hostname-utils.c10
-rw-r--r--databases/evolution-data-server/pkg-plist42
-rw-r--r--databases/firebird25-server/Makefile1
-rw-r--r--databases/firebird30-server/Makefile3
-rw-r--r--databases/firebird40-server/Makefile4
-rw-r--r--databases/foundationdb-devel/Makefile1
-rw-r--r--databases/foundationdb/Makefile1
-rw-r--r--databases/freetds-devel/Makefile12
-rw-r--r--databases/freetds-devel/distinfo6
-rw-r--r--databases/freetds/Makefile11
-rw-r--r--databases/freetds/distinfo6
-rw-r--r--databases/galera/Makefile2
-rw-r--r--databases/galera/distinfo6
-rw-r--r--databases/galera26/Makefile2
-rw-r--r--databases/galera26/distinfo6
-rw-r--r--databases/galera26/files/patch-asio_asio_ssl_detail_openssl__types.hpp13
-rw-r--r--databases/galera26/files/patch-galerautils_src_gu__asio__stream__engine.cpp11
-rw-r--r--databases/gdbm/Makefile2
-rw-r--r--databases/gdbm/distinfo6
-rw-r--r--databases/geoserver-mysql-plugin/Makefile4
-rw-r--r--databases/geoserver-mysql-plugin/distinfo6
-rw-r--r--databases/gnats4/Makefile1
-rw-r--r--databases/go-pgweb/Makefile14
-rw-r--r--databases/go-pgweb/files/pgweb.in50
-rw-r--r--databases/go-pgweb/files/pkg-message.in22
-rw-r--r--databases/grass7/Makefile15
-rw-r--r--databases/grass7/distinfo6
-rw-r--r--databases/grass7/files/patch-aclocal.m411
-rw-r--r--databases/grass7/files/patch-configure11
-rw-r--r--databases/grass7/files/patch-include_Make_Install.make47
-rw-r--r--databases/grass7/files/patch-include_gis.h24
-rw-r--r--databases/grass7/files/patch-lib_lidar_lidar.h12
-rw-r--r--databases/grass7/files/patch-raster3d_r3.showdspf_Ball.c11
-rw-r--r--databases/grass7/files/patch-raster3d_r3.showdspf_togif.c12
-rw-r--r--databases/grass7/files/patch-raster_r.param.scale_param.h12
-rw-r--r--databases/grass7/files/patch-raster_r.surf.idw_main.h11
-rw-r--r--databases/grass7/files/patch-vector_v.hull_chull.c72
-rw-r--r--databases/grass7/pkg-plist1822
-rw-r--r--databases/hbase/Makefile7
-rw-r--r--databases/influxdb/Makefile37
-rw-r--r--databases/influxdb/distinfo10
-rw-r--r--databases/iowow/files/patch-src_platform_unix_unix.c13
-rw-r--r--databases/jasperreports/Makefile3
-rw-r--r--databases/jetbrains-datagrip/Makefile59
-rw-r--r--databases/jetbrains-datagrip/distinfo3
-rw-r--r--databases/jetbrains-datagrip/files/datagrip.116
-rw-r--r--databases/jetbrains-datagrip/files/datagrip.desktop.in12
-rw-r--r--databases/jetbrains-datagrip/files/datagrip.in3
-rw-r--r--databases/jetbrains-datagrip/files/pkg-message.in12
-rw-r--r--databases/jetbrains-datagrip/pkg-descr12
-rw-r--r--databases/jetbrains-datagrip/pkg-plist893
-rw-r--r--databases/kbibtex/Makefile2
-rw-r--r--databases/kdb/Makefile2
-rw-r--r--databases/ldb20/Makefile1
-rw-r--r--databases/libdrizzle-redux/Makefile2
-rw-r--r--databases/libgda5/Makefile4
-rw-r--r--databases/libodbc++/Makefile2
-rw-r--r--databases/libpbl/Makefile4
-rw-r--r--databases/libpbl/files/patch-pblPerform.c11
-rw-r--r--databases/libpg_query/Makefile3
-rw-r--r--databases/linux-c7-sqlite3/Makefile2
-rw-r--r--databases/litestream/Makefile2
-rw-r--r--databases/litestream/distinfo6
-rw-r--r--databases/mariadb-connector-c/Makefile10
-rw-r--r--databases/mariadb-connector-c/distinfo6
-rw-r--r--databases/mariadb-connector-c/files/patch-libmariadb_cmake_ConnectorName.cmake11
-rw-r--r--databases/mariadb-connector-c/pkg-plist120
-rw-r--r--databases/mariadb-connector-odbc/Makefile7
-rw-r--r--databases/mariadb-connector-odbc/distinfo6
-rw-r--r--databases/mariadb103-client/files/patch-include_my__cpu.h48
-rw-r--r--databases/mariadb103-server/Makefile18
-rw-r--r--databases/mariadb103-server/distinfo6
-rw-r--r--databases/mariadb103-server/files/mysql-server.in14
-rw-r--r--databases/mariadb103-server/files/patch-MDEV-26537126
-rw-r--r--databases/mariadb103-server/files/patch-include_my__cpu.h48
-rw-r--r--databases/mariadb104-server/Makefile22
-rw-r--r--databases/mariadb104-server/distinfo6
-rw-r--r--databases/mariadb104-server/files/mysql-server.in14
-rw-r--r--databases/mariadb104-server/files/patch-MDEV-26537126
-rw-r--r--databases/mariadb104-server/files/patch-include_my__cpu.h48
-rw-r--r--databases/mariadb105-server/Makefile18
-rw-r--r--databases/mariadb105-server/distinfo6
-rw-r--r--databases/mariadb105-server/files/mysql-server.in14
-rw-r--r--databases/mariadb105-server/files/patch-MDEV-26537109
-rw-r--r--databases/mariadb105-server/files/patch-extra_CMakeLists.txt11
-rw-r--r--databases/mariadb105-server/files/patch-include_my__cpu.h48
-rw-r--r--databases/mdbtools/Makefile10
-rw-r--r--databases/mdbtools/distinfo6
-rw-r--r--databases/mdbtools/pkg-plist12
-rw-r--r--databases/memcached/Makefile4
-rw-r--r--databases/memcached/distinfo6
-rw-r--r--databases/mongodb-tools/Makefile2
-rw-r--r--databases/mongodb-tools/distinfo6
-rw-r--r--databases/mongodb36-tools/Makefile3
-rw-r--r--databases/mongodb36/Makefile8
-rw-r--r--databases/mongodb36/files/mongod.in11
-rw-r--r--databases/mongodb40-tools/Makefile2
-rw-r--r--databases/mongodb40-tools/distinfo6
-rw-r--r--databases/mongodb40/Makefile17
-rw-r--r--databases/mongodb40/distinfo6
-rw-r--r--databases/mongodb40/files/mongod.in11
-rw-r--r--databases/mongodb42-tools/Makefile2
-rw-r--r--databases/mongodb42-tools/distinfo6
-rw-r--r--databases/mongodb42/Makefile20
-rw-r--r--databases/mongodb42/distinfo10
-rw-r--r--databases/mongodb42/files/mongod.in11
-rw-r--r--databases/mongodb42/files/patch-SConstruct10
-rw-r--r--databases/mongodb44/Makefile14
-rw-r--r--databases/mongodb44/distinfo6
-rw-r--r--databases/mongodb44/files/mongod.in11
-rw-r--r--databases/mongodb44/files/patch-SConstruct10
-rw-r--r--databases/mongodb50/Makefile59
-rw-r--r--databases/mongodb50/distinfo6
-rw-r--r--databases/mongodb50/files/mongod.in11
-rw-r--r--databases/mongodb50/files/patch-SConstruct10
-rw-r--r--databases/mongodb50/pkg-plist4
-rw-r--r--databases/mroonga/Makefile9
-rw-r--r--databases/mroonga/distinfo6
-rw-r--r--databases/mydumper/Makefile2
-rw-r--r--databases/mydumper/distinfo6
-rw-r--r--databases/mysql-connector-c/Makefile2
-rw-r--r--databases/mysql-connector-java/Makefile4
-rw-r--r--databases/mysql-connector-java/distinfo6
-rw-r--r--databases/mysql-udf/Makefile12
-rw-r--r--databases/mysql55-client/Makefile6
-rw-r--r--databases/mysql55-server/Makefile22
-rw-r--r--databases/mysql55-server/files/mysql-server.in12
-rw-r--r--databases/mysql56-client/Makefile8
-rw-r--r--databases/mysql56-server/Makefile16
-rw-r--r--databases/mysql56-server/files/mysql-server.in12
-rw-r--r--databases/mysql57-client/Makefile10
-rw-r--r--databases/mysql57-server/Makefile18
-rw-r--r--databases/mysql57-server/distinfo6
-rw-r--r--databases/mysql57-server/files/mysql-server.in12
-rw-r--r--databases/mysql57-server/files/patch-sql_binlog.cc24
-rw-r--r--databases/mysql80-client/Makefile18
-rw-r--r--databases/mysql80-client/pkg-plist25
-rw-r--r--databases/mysql80-server/Makefile34
-rw-r--r--databases/mysql80-server/distinfo6
-rw-r--r--databases/mysql80-server/files/mysql-server.in12
-rw-r--r--databases/mysql80-server/files/patch-CMakeLists.txt27
-rw-r--r--databases/mysql80-server/files/patch-client_CMakeLists.txt26
-rw-r--r--databases/mysql80-server/files/patch-include_CMakeLists.txt37
-rw-r--r--databases/mysql80-server/files/patch-mysys_my__default.cc22
-rw-r--r--databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c94
-rw-r--r--databases/mysql80-server/files/patch-router_src_harness_src_tls__context.cc18
-rw-r--r--databases/mysql80-server/files/patch-scripts_CMakeLists.txt31
-rw-r--r--databases/mysql80-server/files/patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h11
-rw-r--r--databases/mysql80-server/files/patch-vio_viosslfactories.cc16
-rw-r--r--databases/mysql80-server/pkg-plist2
-rw-r--r--databases/mysqlsniffer/Makefile30
-rw-r--r--databases/mysqlsniffer/distinfo2
-rw-r--r--databases/mysqlsniffer/files/patch-misc.c10
-rw-r--r--databases/mysqlsniffer/files/patch-mysqlsniffer.c10
-rw-r--r--databases/mysqlsniffer/files/patch-packet_handlers.c10
-rw-r--r--databases/mysqlsniffer/pkg-descr6
-rw-r--r--databases/mysqlwsrep56-server/Makefile16
-rw-r--r--databases/mysqlwsrep56-server/files/mysql-server.in16
-rw-r--r--databases/mysqlwsrep57-server/Makefile24
-rw-r--r--databases/mysqlwsrep57-server/distinfo6
-rw-r--r--databases/mysqlwsrep57-server/files/mysql-server.in12
-rw-r--r--databases/ods2sql/Makefile2
-rw-r--r--databases/ora2pg/Makefile2
-rw-r--r--databases/ora2pg/distinfo6
-rw-r--r--databases/p5-Amon2-DBI/Makefile2
-rw-r--r--databases/p5-AnyEvent-DBD-Pg/Makefile2
-rw-r--r--databases/p5-App-Sqitch/Makefile1
-rw-r--r--databases/p5-CGI-Session-Driver-memcached/Makefile2
-rw-r--r--databases/p5-Class-DBI-Plugin-Iterator/Makefile2
-rw-r--r--databases/p5-Class-DBI-Plugin-Pager/Makefile2
-rw-r--r--databases/p5-Class-DBI-Plugin-Senna/Makefile2
-rw-r--r--databases/p5-DBD-cego/Makefile2
-rw-r--r--databases/p5-DBD-cego/distinfo6
-rw-r--r--databases/p5-DBD-mysql/Makefile2
-rw-r--r--databases/p5-DBIx-Class-AsFdat/Makefile2
-rw-r--r--databases/p5-DBIx-Class-DeploymentHandler/Makefile2
-rw-r--r--databases/p5-DBIx-Class-Fixtures/Makefile2
-rw-r--r--databases/p5-DBIx-Class-InflateColumn-FS/Makefile2
-rw-r--r--databases/p5-DBIx-Class-Migration/Makefile4
-rw-r--r--databases/p5-DBIx-Class-Migration/distinfo6
-rw-r--r--databases/p5-DBIx-Class-Tree-NestedSet/Makefile2
-rw-r--r--databases/p5-DBIx-Class-Tree/Makefile2
-rw-r--r--databases/p5-DBIx-Connector/Makefile6
-rw-r--r--databases/p5-DBIx-Connector/distinfo6
-rw-r--r--databases/p5-DBIx-DBHResolver/Makefile2
-rw-r--r--databases/p5-DBIx-Inspector/Makefile2
-rw-r--r--databases/p5-DBIx-QueryLog/Makefile2
-rw-r--r--databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile2
-rw-r--r--databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile2
-rw-r--r--databases/p5-DBIx-Skinny-Pager/Makefile2
-rw-r--r--databases/p5-DBIx-Skinny-Schema-Loader/Makefile2
-rw-r--r--databases/p5-DBIx-Skinny/Makefile2
-rw-r--r--databases/p5-DBIx-TransactionManager/Makefile2
-rw-r--r--databases/p5-GitDDL-Migrator/Makefile2
-rw-r--r--databases/p5-GitDDL/Makefile2
-rw-r--r--databases/p5-Mojo-Pg/Makefile2
-rw-r--r--databases/p5-Mojo-Pg/distinfo6
-rw-r--r--databases/p5-RedisDB-Parser/Makefile2
-rw-r--r--databases/p5-RedisDB/Makefile2
-rw-r--r--databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile2
-rw-r--r--databases/p5-SQL-Maker/Makefile2
-rw-r--r--databases/p5-Search-Namazu/Makefile2
-rw-r--r--databases/p5-Teng/Makefile2
-rw-r--r--databases/p5-Test-Fixture-DBI/Makefile2
-rw-r--r--databases/p5-Test-mysqld/Makefile2
-rw-r--r--databases/p5-Test-postgresql/Makefile2
-rw-r--r--databases/p5-TokyoCabinet/Makefile2
-rw-r--r--databases/p5-tokyotyrant/Makefile2
-rw-r--r--databases/pear-DB/Makefile2
-rw-r--r--databases/pear-DB/distinfo6
-rw-r--r--databases/pear-Horde_Db/Makefile2
-rw-r--r--databases/pear-Horde_HashTable/Makefile2
-rw-r--r--databases/pear-Horde_Imsp/Makefile2
-rw-r--r--databases/pear-Horde_Mongo/Makefile2
-rw-r--r--databases/pecl-rrd/pkg-descr2
-rw-r--r--databases/percona-pam-for-mysql/Makefile4
-rw-r--r--databases/percona56-client/Makefile6
-rw-r--r--databases/percona56-server/Makefile14
-rw-r--r--databases/percona56-server/files/mysql-server.in12
-rw-r--r--databases/percona57-client/Makefile6
-rw-r--r--databases/percona57-server/Makefile16
-rw-r--r--databases/percona57-server/distinfo6
-rw-r--r--databases/percona57-server/files/mysql-server.in12
-rw-r--r--databases/pg.el/Makefile3
-rw-r--r--databases/pgFormatter/Makefile2
-rw-r--r--databases/pgFormatter/distinfo6
-rw-r--r--databases/pg_activity/Makefile11
-rw-r--r--databases/pg_activity/distinfo6
-rw-r--r--databases/pg_activity/files/patch-setup.py8
-rw-r--r--databases/pg_citus/Makefile2
-rw-r--r--databases/pg_citus/distinfo6
-rw-r--r--databases/pg_citus/pkg-plist3
-rw-r--r--databases/pg_filedump/Makefile23
-rw-r--r--databases/pg_filedump/distinfo3
-rw-r--r--databases/pg_filedump/pkg-descr17
-rw-r--r--databases/pg_partman/Makefile3
-rw-r--r--databases/pg_repack/Makefile2
-rw-r--r--databases/pg_repack/distinfo6
-rw-r--r--databases/pgadmin3/Makefile3
-rw-r--r--databases/pgbackrest/Makefile5
-rw-r--r--databases/pgbackrest/distinfo6
-rw-r--r--databases/pgbouncer/Makefile13
-rw-r--r--databases/pgbouncer/distinfo6
-rw-r--r--databases/pgbouncer/files/patch-src_pooler.c25
-rw-r--r--databases/pglogical/Makefile3
-rw-r--r--databases/pgmetrics/Makefile2
-rw-r--r--databases/pgmetrics/distinfo6
-rw-r--r--databases/pgpool-II-36/Makefile2
-rw-r--r--databases/pgpool-II-37/Makefile2
-rw-r--r--databases/pgpool-II-40/Makefile2
-rw-r--r--databases/pgpool-II-41/Makefile2
-rw-r--r--databases/pgpool-II-42/Makefile2
-rw-r--r--databases/pgroonga/Makefile5
-rw-r--r--databases/pgroonga/distinfo6
-rw-r--r--databases/pgroonga/pkg-plist96
-rw-r--r--databases/php73-dba/Makefile2
-rw-r--r--databases/php73-interbase/Makefile2
-rw-r--r--databases/php73-mysqli/Makefile2
-rw-r--r--databases/php73-odbc/Makefile2
-rw-r--r--databases/php73-pdo/Makefile2
-rw-r--r--databases/php73-pdo_dblib/Makefile2
-rw-r--r--databases/php73-pdo_firebird/Makefile2
-rw-r--r--databases/php73-pdo_mysql/Makefile2
-rw-r--r--databases/php73-pdo_odbc/Makefile2
-rw-r--r--databases/php73-pdo_pgsql/Makefile2
-rw-r--r--databases/php73-pdo_sqlite/Makefile2
-rw-r--r--databases/php73-pgsql/Makefile2
-rw-r--r--databases/php73-sqlite3/Makefile2
-rw-r--r--databases/php74-dba/Makefile2
-rw-r--r--databases/php74-mysqli/Makefile2
-rw-r--r--databases/php74-odbc/Makefile2
-rw-r--r--databases/php74-pdo/Makefile2
-rw-r--r--databases/php74-pdo_dblib/Makefile2
-rw-r--r--databases/php74-pdo_firebird/Makefile2
-rw-r--r--databases/php74-pdo_mysql/Makefile2
-rw-r--r--databases/php74-pdo_odbc/Makefile2
-rw-r--r--databases/php74-pdo_pgsql/Makefile2
-rw-r--r--databases/php74-pdo_sqlite/Makefile2
-rw-r--r--databases/php74-pgsql/Makefile2
-rw-r--r--databases/php74-sqlite3/Makefile2
-rw-r--r--databases/php80-dba/Makefile2
-rw-r--r--databases/php80-mysqli/Makefile2
-rw-r--r--databases/php80-odbc/Makefile2
-rw-r--r--databases/php80-pdo/Makefile2
-rw-r--r--databases/php80-pdo_dblib/Makefile2
-rw-r--r--databases/php80-pdo_firebird/Makefile2
-rw-r--r--databases/php80-pdo_mysql/Makefile2
-rw-r--r--databases/php80-pdo_odbc/Makefile2
-rw-r--r--databases/php80-pdo_pgsql/Makefile2
-rw-r--r--databases/php80-pdo_sqlite/Makefile2
-rw-r--r--databases/php80-pgsql/Makefile2
-rw-r--r--databases/php80-sqlite3/Makefile2
-rw-r--r--databases/phpminiadmin/Makefile3
-rw-r--r--databases/pldebugger/Makefile15
-rw-r--r--databases/pldebugger/distinfo6
-rw-r--r--databases/pldebugger/pkg-descr6
-rw-r--r--databases/plpgsql_check/Makefile2
-rw-r--r--databases/plpgsql_check/distinfo6
-rw-r--r--databases/postgis24/Makefile3
-rw-r--r--databases/postgis25/Makefile3
-rw-r--r--databases/postgresql-cstore_fdw/Makefile3
-rw-r--r--databases/postgresql-cstore_fdw/distinfo4
-rw-r--r--databases/postgresql-jdbc/Makefile3
-rw-r--r--databases/postgresql-jdbc/distinfo6
-rw-r--r--databases/postgresql-odbc/Makefile2
-rw-r--r--databases/postgresql-odbc/distinfo6
-rw-r--r--databases/postgresql-plv8js/Makefile16
-rw-r--r--databases/postgresql-plv8js/distinfo6
-rw-r--r--databases/postgresql-plv8js/files/patch-Makefile11
-rw-r--r--databases/postgresql-plv8js/files/patch-plv8.cc27
-rw-r--r--databases/postgresql-plv8js/files/patch-plv8__type.cc47
-rw-r--r--databases/postgresql-plv8js/files/patch-plv8_func.cc26
-rw-r--r--databases/postgresql-plv8js/files/patch-plv8_type.cc26
-rw-r--r--databases/postgresql-plv8js/pkg-plist26
-rw-r--r--databases/postgresql-semver/Makefile20
-rw-r--r--databases/postgresql-semver/distinfo3
-rw-r--r--databases/postgresql-semver/pkg-descr5
-rw-r--r--databases/postgresql-semver/pkg-message9
-rw-r--r--databases/postgresql-semver/pkg-plist23
-rw-r--r--databases/postgresql-zhparser/pkg-descr10
-rw-r--r--databases/postgresql10-pgtcl/Makefile2
-rw-r--r--databases/postgresql10-server/Makefile2
-rw-r--r--databases/postgresql10-server/distinfo6
-rw-r--r--databases/postgresql10-server/pkg-plist-server1
-rw-r--r--databases/postgresql11-pgtcl/Makefile2
-rw-r--r--databases/postgresql11-server/Makefile2
-rw-r--r--databases/postgresql11-server/distinfo6
-rw-r--r--databases/postgresql11-server/pkg-plist-server1
-rw-r--r--databases/postgresql12-pgtcl/Makefile2
-rw-r--r--databases/postgresql12-server/Makefile2
-rw-r--r--databases/postgresql12-server/distinfo6
-rw-r--r--databases/postgresql12-server/pkg-plist-server1
-rw-r--r--databases/postgresql13-pgtcl/Makefile2
-rw-r--r--databases/postgresql13-server/Makefile2
-rw-r--r--databases/postgresql13-server/distinfo6
-rw-r--r--databases/postgresql13-server/pkg-plist-client1
-rw-r--r--databases/postgresql13-server/pkg-plist-server1
-rw-r--r--databases/postgresql14-pgtcl/Makefile2
-rw-r--r--databases/postgresql14-server/Makefile14
-rw-r--r--databases/postgresql14-server/distinfo6
-rw-r--r--databases/postgresql14-server/pkg-plist-client27
-rw-r--r--databases/postgresql14-server/pkg-plist-server40
-rw-r--r--databases/postgresql96-pgtcl/Makefile2
-rw-r--r--databases/postgresql96-server/Makefile2
-rw-r--r--databases/postgresql96-server/distinfo6
-rw-r--r--databases/postgresql96-server/pkg-plist-server1
-rw-r--r--databases/powa-web/pkg-descr2
-rw-r--r--databases/powerarchitect/Makefile26
-rw-r--r--databases/powerarchitect/distinfo6
-rw-r--r--databases/powerarchitect/pkg-descr2
-rw-r--r--databases/powerarchitect/pkg-plist6
-rw-r--r--databases/puppetdb-terminus6/Makefile4
-rw-r--r--databases/puppetdb-terminus6/distinfo6
-rw-r--r--databases/puppetdb-terminus6/files/patch-Makefile30
-rw-r--r--databases/puppetdb-terminus7/Makefile4
-rw-r--r--databases/puppetdb-terminus7/distinfo6
-rw-r--r--databases/puppetdb6/Makefile7
-rw-r--r--databases/puppetdb6/distinfo6
-rw-r--r--databases/puppetdb6/files/patch-Makefile26
-rw-r--r--databases/puppetdb7/Makefile7
-rw-r--r--databases/puppetdb7/distinfo6
-rw-r--r--databases/py-Pyrseas/Makefile3
-rw-r--r--databases/py-Pyrseas/distinfo6
-rw-r--r--databases/py-Pyrseas/pkg-descr8
-rw-r--r--databases/py-aesqlapius/Makefile1
-rw-r--r--databases/py-agate-sql/Makefile2
-rw-r--r--databases/py-agate-sql/distinfo6
-rw-r--r--databases/py-aiomysql/Makefile2
-rw-r--r--databases/py-aiomysql/distinfo6
-rw-r--r--databases/py-aiopg/Makefile5
-rw-r--r--databases/py-aiopg/distinfo6
-rw-r--r--databases/py-alembic/Makefile12
-rw-r--r--databases/py-alembic/distinfo6
-rw-r--r--databases/py-alembic14/Makefile31
-rw-r--r--databases/py-alembic14/distinfo3
-rw-r--r--databases/py-alembic14/pkg-descr14
-rw-r--r--databases/py-apsw/Makefile7
-rw-r--r--databases/py-asyncmy/Makefile21
-rw-r--r--databases/py-asyncmy/distinfo3
-rw-r--r--databases/py-asyncmy/pkg-descr4
-rw-r--r--databases/py-asyncpg/Makefile11
-rw-r--r--databases/py-asyncpg/distinfo6
-rw-r--r--databases/py-asyncpg/files/patch-setup.py11
-rw-r--r--databases/py-caterva/Makefile32
-rw-r--r--databases/py-caterva/distinfo3
-rw-r--r--databases/py-caterva/files/patch-caterva-CMakeLists.txt22
-rw-r--r--databases/py-caterva/pkg-descr3
-rw-r--r--databases/py-couchdb/Makefile2
-rw-r--r--databases/py-fakeredis/Makefile9
-rw-r--r--databases/py-fakeredis/distinfo6
-rw-r--r--databases/py-firebirdsql/Makefile2
-rw-r--r--databases/py-flask-sqlalchemy/Makefile3
-rw-r--r--databases/py-geoalchemy2/Makefile5
-rw-r--r--databases/py-geoalchemy2/distinfo6
-rw-r--r--databases/py-leveldb/Makefile2
-rw-r--r--databases/py-leveldb/pkg-descr1
-rw-r--r--databases/py-marshmallow-sqlalchemy/Makefile2
-rw-r--r--databases/py-minidb/Makefile2
-rw-r--r--databases/py-minidb/distinfo6
-rw-r--r--databases/py-motor/Makefile2
-rw-r--r--databases/py-mysql-connector-python/Makefile10
-rw-r--r--databases/py-mysql-connector-python/distinfo6
-rw-r--r--databases/py-mysqlclient/Makefile4
-rw-r--r--databases/py-mysqlclient/distinfo6
-rw-r--r--databases/py-pg8000/Makefile2
-rw-r--r--databases/py-pg8000/distinfo6
-rw-r--r--databases/py-pgcli/Makefile2
-rw-r--r--databases/py-pgcli/distinfo6
-rw-r--r--databases/py-pgxnclient/Makefile2
-rw-r--r--databases/py-pgxnclient/distinfo6
-rw-r--r--databases/py-pony/Makefile2
-rw-r--r--databases/py-psycopg-c/Makefile21
-rw-r--r--databases/py-psycopg-c/distinfo3
-rw-r--r--databases/py-psycopg-c/files/patch-setup.cfg11
-rw-r--r--databases/py-psycopg-c/pkg-descr6
-rw-r--r--databases/py-psycopg-pool/Makefile20
-rw-r--r--databases/py-psycopg-pool/distinfo3
-rw-r--r--databases/py-psycopg-pool/pkg-descr8
-rw-r--r--databases/py-psycopg/Makefile38
-rw-r--r--databases/py-psycopg/distinfo3
-rw-r--r--databases/py-psycopg/pkg-descr6
-rw-r--r--databases/py-psycopg2/Makefile4
-rw-r--r--databases/py-psycopg2/distinfo6
-rw-r--r--databases/py-pypuppetdb/Makefile4
-rw-r--r--databases/py-pypuppetdb/distinfo6
-rw-r--r--databases/py-python-arango/Makefile3
-rw-r--r--databases/py-sqlalchemy-migrate/Makefile3
-rw-r--r--databases/py-sqlalchemy-utils/Makefile6
-rw-r--r--databases/py-sqlalchemy-utils/distinfo6
-rw-r--r--databases/py-sqlalchemy11/Makefile2
-rw-r--r--databases/py-sqlalchemy12/Makefile2
-rw-r--r--databases/py-sqlalchemy13/Makefile2
-rw-r--r--databases/py-sqlalchemy14/Makefile4
-rw-r--r--databases/py-sqlalchemy14/distinfo6
-rw-r--r--databases/py-sqlalchemy14/pkg-plist3
-rw-r--r--databases/py-sqlite3/files/setup3.py8
-rw-r--r--databases/py-sqlparse/Makefile2
-rw-r--r--databases/py-sqlparse/distinfo6
-rw-r--r--databases/py-zodbpickle/Makefile5
-rw-r--r--databases/py-zodbpickle/distinfo6
-rw-r--r--databases/qt5-sqldrivers-odbc/Makefile1
-rw-r--r--databases/qt5-sqldrivers-sqlite2/Makefile1
-rw-r--r--databases/qt5-sqldrivers-tds/Makefile1
-rw-r--r--databases/recutils/Makefile3
-rw-r--r--databases/redis-devel/Makefile7
-rw-r--r--databases/redis-devel/distinfo6
-rw-r--r--databases/redis-devel/files/patch-deps-Makefile38
-rw-r--r--databases/redis-devel/files/patch-deps_Makefile18
-rw-r--r--databases/redis/Makefile7
-rw-r--r--databases/redis/distinfo6
-rw-r--r--databases/redis5/Makefile2
-rw-r--r--databases/redis5/distinfo6
-rw-r--r--databases/redis6/Makefile3
-rw-r--r--databases/redis6/distinfo6
-rw-r--r--databases/redis_exporter/Makefile27
-rw-r--r--databases/redis_exporter/distinfo40
-rw-r--r--databases/redisdesktopmanager/Makefile7
-rw-r--r--databases/redisdesktopmanager/distinfo14
-rw-r--r--databases/redisdesktopmanager/files/patch-3rdparty_simdjson_singleheader_simdjson.h23
-rw-r--r--databases/redisjson/Makefile59
-rw-r--r--databases/redisjson/distinfo88
-rw-r--r--databases/redisjson/files/patch-Cargo.toml11
-rw-r--r--databases/retcl/Makefile2
-rw-r--r--databases/retcl/distinfo6
-rw-r--r--databases/rocksdb-lite/Makefile7
-rw-r--r--databases/rocksdb/Makefile30
-rw-r--r--databases/rocksdb/distinfo8
-rw-r--r--databases/rocksdb/files/patch-Makefile16
-rw-r--r--databases/rocksdb/files/patch-aarch6414
-rw-r--r--databases/rocksdb/files/patch-build_tools-build_detect_platform29
-rw-r--r--databases/rocksdb/files/patch-clang10145
-rw-r--r--databases/rocksdb/files/patch-db-db_test_util.cc120
-rw-r--r--databases/rocksdb/files/patch-memory-arena.cc4
-rw-r--r--databases/rocksdb/files/patch-port-stack_trace.cc20
-rw-r--r--databases/rocksdb/files/patch-powerpc6449
-rw-r--r--databases/rocksdb/files/patch-util_crc32c.cc24
-rw-r--r--databases/rocksdb/pkg-plist33
-rw-r--r--databases/rrdtool/Makefile2
-rw-r--r--databases/rrdtool12/Makefile3
-rw-r--r--databases/rubygem-activemodel60/Makefile2
-rw-r--r--databases/rubygem-activemodel60/distinfo6
-rw-r--r--databases/rubygem-activemodel61/Makefile2
-rw-r--r--databases/rubygem-activemodel61/distinfo6
-rw-r--r--databases/rubygem-activerecord-explain-analyze/Makefile4
-rw-r--r--databases/rubygem-activerecord60/Makefile2
-rw-r--r--databases/rubygem-activerecord60/distinfo6
-rw-r--r--databases/rubygem-activerecord61/Makefile2
-rw-r--r--databases/rubygem-activerecord61/distinfo6
-rw-r--r--databases/rubygem-arel-helpers/Makefile3
-rw-r--r--databases/rubygem-dbf/Makefile2
-rw-r--r--databases/rubygem-dbf/distinfo6
-rw-r--r--databases/rubygem-dbm/Makefile2
-rw-r--r--databases/rubygem-flipper-active_record/Makefile2
-rw-r--r--databases/rubygem-flipper-active_record/distinfo6
-rw-r--r--databases/rubygem-globalid-rails5/Makefile4
-rw-r--r--databases/rubygem-globalid-rails5/distinfo6
-rw-r--r--databases/rubygem-globalid-rails50/Makefile4
-rw-r--r--databases/rubygem-globalid-rails50/distinfo6
-rw-r--r--databases/rubygem-globalid-rails52/Makefile4
-rw-r--r--databases/rubygem-globalid-rails52/distinfo6
-rw-r--r--databases/rubygem-globalid-rails60/Makefile4
-rw-r--r--databases/rubygem-globalid-rails60/distinfo6
-rw-r--r--databases/rubygem-globalid-rails61/Makefile4
-rw-r--r--databases/rubygem-globalid-rails61/distinfo6
-rw-r--r--databases/rubygem-marginalia/Makefile3
-rw-r--r--databases/rubygem-pg_query/Makefile2
-rw-r--r--databases/rubygem-pg_query/distinfo6
-rw-r--r--databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb19
-rw-r--r--databases/rubygem-pghero-rails5/Makefile3
-rw-r--r--databases/rubygem-pghero-rails50/Makefile3
-rw-r--r--databases/rubygem-pghero/Makefile3
-rw-r--r--databases/rubygem-puppetdb_cli/Makefile4
-rw-r--r--databases/rubygem-redis/Makefile2
-rw-r--r--databases/rubygem-redis/distinfo6
-rw-r--r--databases/rubygem-redis44/Makefile21
-rw-r--r--databases/rubygem-redis44/distinfo3
-rw-r--r--databases/rubygem-redis44/pkg-descr3
-rw-r--r--databases/rubygem-seed-fu/Makefile6
-rw-r--r--databases/sequeler/Makefile4
-rw-r--r--databases/sequeler/distinfo6
-rw-r--r--databases/sqlcipher/Makefile3
-rw-r--r--databases/sqldeveloper/Makefile1
-rw-r--r--databases/sqlite3/Makefile2
-rw-r--r--databases/sqlitebrowser/Makefile2
-rw-r--r--databases/tarantool/Makefile9
-rw-r--r--databases/tarantool/distinfo18
-rw-r--r--databases/tcl-lmdb/Makefile2
-rw-r--r--databases/tcl-lmdb/distinfo6
-rw-r--r--databases/tdb/Makefile3
-rw-r--r--databases/tdbc/Makefile4
-rw-r--r--databases/tdbc/distinfo22
-rw-r--r--databases/tile38/Makefile2
-rw-r--r--databases/tiledb/Makefile15
-rw-r--r--databases/tiledb/distinfo6
-rw-r--r--databases/tiledb/files/patch-tiledb-common-logger.h10
-rw-r--r--databases/tiledb/pkg-plist5
-rw-r--r--databases/timescaledb-backup/Makefile58
-rw-r--r--databases/timescaledb-backup/distinfo71
-rw-r--r--databases/timescaledb-backup/pkg-descr4
-rw-r--r--databases/timescaledb-tune/Makefile21
-rw-r--r--databases/timescaledb-tune/distinfo5
-rw-r--r--databases/timescaledb-tune/pkg-descr4
-rw-r--r--databases/timescaledb/Makefile4
-rw-r--r--databases/timescaledb/distinfo6
-rw-r--r--databases/timescaledb/pkg-plist3
-rw-r--r--databases/tokyocabinet/Makefile2
-rw-r--r--databases/virtuoso/Makefile2
-rw-r--r--databases/webdis/Makefile2
-rw-r--r--databases/webdis/distinfo6
-rw-r--r--databases/xls2txt/Makefile2
-rw-r--r--databases/xtrabackup8/Makefile2
-rw-r--r--databases/zodb/Makefile26
-rw-r--r--databases/zodb/distinfo3
-rw-r--r--databases/zodb/pkg-descr12
611 files changed, 5446 insertions, 4033 deletions
diff --git a/databases/Makefile b/databases/Makefile
index 2c84d32b33df..a030338bbdca 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -32,6 +32,7 @@
SUBDIR += cassandra3
SUBDIR += cassandra4
SUBDIR += casstcl
+ SUBDIR += caterva
SUBDIR += cayley
SUBDIR += cdb
SUBDIR += cego
@@ -121,6 +122,7 @@
SUBDIR += jasperreports
SUBDIR += jdb
SUBDIR += jdbc-oracle11g
+ SUBDIR += jetbrains-datagrip
SUBDIR += jlog
SUBDIR += jrobin
SUBDIR += jrrd
@@ -228,7 +230,6 @@
SUBDIR += mysqldump-secure
SUBDIR += mysqlreport
SUBDIR += mysqlsla
- SUBDIR += mysqlsniffer
SUBDIR += mysqltcl
SUBDIR += mysqltuner
SUBDIR += mysqlwsrep56-server
@@ -573,6 +574,7 @@
SUBDIR += pg_citus
SUBDIR += pg_dirtyread
SUBDIR += pg_ed25519
+ SUBDIR += pg_filedump
SUBDIR += pg_hashids
SUBDIR += pg_partman
SUBDIR += pg_qualstats
@@ -671,6 +673,7 @@
SUBDIR += postgresql-relay
SUBDIR += postgresql-repmgr
SUBDIR += postgresql-rum
+ SUBDIR += postgresql-semver
SUBDIR += postgresql-tds_fdw
SUBDIR += postgresql-zhparser
SUBDIR += postgresql10-client
@@ -748,12 +751,15 @@
SUBDIR += py-aioredis
SUBDIR += py-aiosqlite
SUBDIR += py-alembic
+ SUBDIR += py-alembic14
SUBDIR += py-apsw
+ SUBDIR += py-asyncmy
SUBDIR += py-asyncpg
SUBDIR += py-berkeleydb
SUBDIR += py-bsddb3
SUBDIR += py-carbon
SUBDIR += py-cassandra-driver
+ SUBDIR += py-caterva
SUBDIR += py-couchdb
SUBDIR += py-dbf
SUBDIR += py-dbutils
@@ -793,6 +799,9 @@
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
@@ -975,6 +984,7 @@
SUBDIR += rubygem-redis-actionpack-rails61
SUBDIR += rubygem-redis-namespace
SUBDIR += rubygem-redis-namespace16
+ SUBDIR += rubygem-redis44
SUBDIR += rubygem-sdbm
SUBDIR += rubygem-seed-fu
SUBDIR += rubygem-sqlite3
@@ -1021,6 +1031,8 @@
SUBDIR += tile38
SUBDIR += tiledb
SUBDIR += timescaledb
+ SUBDIR += timescaledb-backup
+ SUBDIR += timescaledb-tune
SUBDIR += tinycdb
SUBDIR += tokyocabinet
SUBDIR += tokyotyrant
@@ -1044,5 +1056,6 @@
SUBDIR += xtrabackup
SUBDIR += xtrabackup8
SUBDIR += zabbix3-libzbxpgsql
+ SUBDIR += zodb
.include <bsd.port.subdir.mk>
diff --git a/databases/R-cran-RMySQL/Makefile b/databases/R-cran-RMySQL/Makefile
index de1d85c84485..a8a9edbf52dd 100644
--- a/databases/R-cran-RMySQL/Makefile
+++ b/databases/R-cran-RMySQL/Makefile
@@ -14,6 +14,8 @@ CRAN_DEPENDS= R-cran-DBI>=0.4:databases/R-cran-DBI
BUILD_DEPENDS= ${CRAN_DEPENDS}
RUN_DEPENDS= ${CRAN_DEPENDS}
-USES= cran:auto-plist,compiles mysql
+USES= cpe cran:auto-plist,compiles mysql
+
+CPE_VENDOR= r-consortium
.include <bsd.port.mk>
diff --git a/databases/R-cran-RPostgreSQL/Makefile b/databases/R-cran-RPostgreSQL/Makefile
index 0b83c95bf3c9..c94d7e6f1b90 100644
--- a/databases/R-cran-RPostgreSQL/Makefile
+++ b/databases/R-cran-RPostgreSQL/Makefile
@@ -1,5 +1,5 @@
PORTNAME= RPostgreSQL
-DISTVERSION= 0.7
+DISTVERSION= 0.7-3
CATEGORIES= databases
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/databases/R-cran-RPostgreSQL/distinfo b/databases/R-cran-RPostgreSQL/distinfo
index 727d6197e90e..3ec1ccea00f4 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 = 1634909121
+SHA256 (RPostgreSQL_0.7-3.tar.gz) = bdbca10329aeb357f05364772964716dfb5ce2470f7eb4a33770862b6ded71b9
+SIZE (RPostgreSQL_0.7-3.tar.gz) = 580771
diff --git a/databases/adminer/Makefile b/databases/adminer/Makefile
index 9e9cbdd9a4cc..8605fce807dc 100644
--- a/databases/adminer/Makefile
+++ b/databases/adminer/Makefile
@@ -12,7 +12,7 @@ COMMENT= Full-featured database management tool written in PHP
LICENSE= APACHE20
-USES= php
+USES= cpe php
USE_PHP= session
NO_BUILD= yes
diff --git a/databases/adodb5/Makefile b/databases/adodb5/Makefile
index a06d175ca4dd..6e7430723a62 100644
--- a/databases/adodb5/Makefile
+++ b/databases/adodb5/Makefile
@@ -1,7 +1,7 @@
# Created by: mm@FreeBSD.org
PORTNAME= adodb
-PORTVERSION= 5.21.2
+PORTVERSION= 5.21.3
DISTVERSIONPREFIX= v
CATEGORIES= databases www
PKGNAMESUFFIX= 5${PHP_PKGNAMESUFFIX}
@@ -12,7 +12,8 @@ COMMENT= Database library for PHP
LICENSE= BSD3CLAUSE LGPL21+
LICENSE_COMB= dual
-USES= php:flavors
+USES= cpe php:flavors
+CPE_VENDOR= ${PORTNAME}_project
USE_PHP= pcre
USE_GITHUB= yes
diff --git a/databases/adodb5/distinfo b/databases/adodb5/distinfo
index 4a04d180d4a8..35ac00f8e581 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 = 1636372123
+SHA256 (adodb-ADOdb-v5.21.3_GH0.tar.gz) = 182856c8acc326855abf73cf25ddd36a66d5816ad952314d9cf4e6509f82f806
+SIZE (adodb-ADOdb-v5.21.3_GH0.tar.gz) = 434837
diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index 50d1ec3f1e0c..5a1cf9e3056c 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -11,7 +11,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs
# 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
diff --git a/databases/akonadi/distinfo b/databases/akonadi/distinfo
index 6e8371c74498..b44ffddfaeae 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 = 1636032530
+SHA256 (KDE/release-service/21.08.3/akonadi-21.08.3.tar.xz) = 1a6f214b08a651a006972dd78d8f2c8746f21d2f266e2ee6b140ce13ed7f14fb
+SIZE (KDE/release-service/21.08.3/akonadi-21.08.3.tar.xz) = 1607984
diff --git a/databases/apq-mysql/Makefile b/databases/apq-mysql/Makefile
index 24edc6848b86..7b51c46e7498 100644
--- a/databases/apq-mysql/Makefile
+++ b/databases/apq-mysql/Makefile
@@ -22,7 +22,7 @@ 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} \
+CONFIGURE_ARGS= --prefix=${PREFIX} \
--disable-relocatable \
--work-path=${WRKPATH} \
--processors=${MAKE_JOBS_NUMBER}
diff --git a/databases/apq-odbc/Makefile b/databases/apq-odbc/Makefile
index bfca9b4e9322..394a80e9c96f 100644
--- a/databases/apq-odbc/Makefile
+++ b/databases/apq-odbc/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= libodbc.so:databases/unixODBC
USES= ada tar:bzip2
HAS_CONFIGURE= yes
WRKPATH= ${WRKDIR}/build
-CONFIGURE_ARGS= --prefix=${PREFIX} \
+CONFIGURE_ARGS= --prefix=${PREFIX} \
--disable-relocatable \
--work-path=${WRKPATH} \
--processors=${MAKE_JOBS_NUMBER}
diff --git a/databases/apq-pgsql/Makefile b/databases/apq-pgsql/Makefile
index 7f39a33ebaa9..ba5f4913236c 100644
--- a/databases/apq-pgsql/Makefile
+++ b/databases/apq-pgsql/Makefile
@@ -21,7 +21,7 @@ USES= ada tar:bzip2 pgsql
WANT_PGSQL= lib
HAS_CONFIGURE= yes
WRKPATH= ${WRKDIR}/build
-CONFIGURE_ARGS= --prefix=${PREFIX} \
+CONFIGURE_ARGS= --prefix=${PREFIX} \
--disable-relocatable \
--work-path=${WRKPATH} \
--processors=${MAKE_JOBS_NUMBER}
diff --git a/databases/apq/Makefile b/databases/apq/Makefile
index f5ca7876c69d..d0e85dcabc16 100644
--- a/databases/apq/Makefile
+++ b/databases/apq/Makefile
@@ -19,7 +19,7 @@ USES= ada tar:bzip2
PORTDOCS= README HISTORY
HAS_CONFIGURE= yes
WRKPATH= ${WRKDIR}/build
-CONFIGURE_ARGS= --prefix=${PREFIX} \
+CONFIGURE_ARGS= --prefix=${PREFIX} \
--disable-relocatable \
--work-path=${WRKPATH} \
--processors=${MAKE_JOBS_NUMBER}
diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile
index bef6fba557a4..f01367bb29f7 100644
--- a/databases/arrow/Makefile
+++ b/databases/arrow/Makefile
@@ -1,8 +1,8 @@
PORTNAME= arrow
DISTVERSION= 4.0.1
-PORTREVISION= 3
+PORTREVISION= 4
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
@@ -14,8 +14,6 @@ COMMENT= Columnar in-memory analytics layer for big data
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
diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile
index d6c59b3c188e..dd36fa74e370 100644
--- a/databases/bbdb/Makefile
+++ b/databases/bbdb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bbdb
DISTVERSIONPREFIX= v
DISTVERSION= 3.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= databases elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
diff --git a/databases/c3p0/Makefile b/databases/c3p0/Makefile
index 10a735108e07..d1bd05c671c1 100644
--- a/databases/c3p0/Makefile
+++ b/databases/c3p0/Makefile
@@ -10,7 +10,8 @@ COMMENT= Library for augmenting JDBC drivers with JNDI-bindable DataSources
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/cassandra3/Makefile b/databases/cassandra3/Makefile
index 9eb185060312..83ba6013e473 100644
--- a/databases/cassandra3/Makefile
+++ b/databases/cassandra3/Makefile
@@ -16,11 +16,12 @@ 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:3.6+
USE_ANT= yes
USE_JAVA= yes
JAVA_VERSION= 1.8
JAVA_VENDOR= openjdk
+CPE_VENDOR= apache
USE_RC_SUBR= cassandra
diff --git a/databases/cassandra4/Makefile b/databases/cassandra4/Makefile
index e895d061956f..ab6662aafe53 100644
--- a/databases/cassandra4/Makefile
+++ b/databases/cassandra4/Makefile
@@ -1,7 +1,7 @@
PORTNAME= cassandra
DISTVERSION= 4.0-beta2
CATEGORIES= databases java
-MASTER_SITES= APACHE/cassandra/${DISTVERSION}:apache \
+MASTER_SITES= https://archive.apache.org/dist/${PORTNAME}/${DISTVERSION}/:apache \
https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.4.5-4/:maven \
LOCAL/mikael:repo
PKGNAMESUFFIX= 4
@@ -21,11 +21,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= snappyjava>=0:archivers/snappy-java \
netty>0:java/netty
-USES= python:3.7+
+USES= cpe python:3.7+
USE_JAVA= yes
USE_ANT= yes
USE_RC_SUBR= cassandra
TEST_TARGET= test
+CPE_VENDOR= apache
CONFLICTS= cassandra3
diff --git a/databases/caterva/Makefile b/databases/caterva/Makefile
new file mode 100644
index 000000000000..af7e687fdd20
--- /dev/null
+++ b/databases/caterva/Makefile
@@ -0,0 +1,33 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+
+PORTNAME= caterva
+PORTVERSION= 0.5.0
+DISTVERSIONPREFIX= v
+CATEGORIES= databases
+
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= Multidimensional data container on top of Blosc2
+
+LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+LIB_DEPENDS= libblosc2.so:archivers/c-blosc2
+
+USES= cmake pkgconfig
+
+CMAKE_OFF= CATERVA_ENABLE_ASAN CATERVA_ENABLE_COVERAGE
+CMAKE_ON= CATERVA_BUILD_BENCH CATERVA_BUILD_EXAMPLES CATERVA_BUILD_TESTS CATERVA_PREFER_BLOSC2_EXTERNAL CATERVA_SHARED_LIB CATERVA_STATIC_LIB
+USE_LDCONFIG= yes
+
+PLIST_SUB= PORTVERSION=${PORTVERSION}
+
+GH_ACCOUNT= Blosc
+USE_GITHUB= yes
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${WRKSRC}/CMakeLists.txt
+
+do-test:
+ cd ${TEST_WRKSRC} && ctest
+
+.include <bsd.port.mk>
diff --git a/databases/caterva/distinfo b/databases/caterva/distinfo
new file mode 100644
index 000000000000..4edd82c4cfc2
--- /dev/null
+++ b/databases/caterva/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1635730867
+SHA256 (Blosc-caterva-v0.5.0_GH0.tar.gz) = 733449b36e5e3ba8d87e254daae8bde9a3122510da75416743cbfed3003d9d38
+SIZE (Blosc-caterva-v0.5.0_GH0.tar.gz) = 528006
diff --git a/databases/caterva/files/patch-CMakeLists.txt b/databases/caterva/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..a496642fab91
--- /dev/null
+++ b/databases/caterva/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig 2021-07-13 10:42:01 UTC
++++ CMakeLists.txt
+@@ -104,6 +104,8 @@ if(CATERVA_SHARED_LIB)
+ target_link_libraries(caterva_shared ${LIBS})
+ endif()
+ set_target_properties(caterva_shared PROPERTIES OUTPUT_NAME caterva)
++ set_target_properties(caterva_shared PROPERTIES SOVERSION %%PORTVERSION%%)
++ set_target_properties(caterva_shared PROPERTIES VERSION 0)
+ install(TARGETS caterva_shared DESTINATION lib)
+ endif()
+
diff --git a/databases/caterva/pkg-descr b/databases/caterva/pkg-descr
new file mode 100644
index 000000000000..0b4914b37e63
--- /dev/null
+++ b/databases/caterva/pkg-descr
@@ -0,0 +1,10 @@
+Caterva is a C library for handling multi-dimensional, compressed datasets in an
+easy and convenient manner. It implements a thin metalayer on top of C-Blosc2
+for specifying not only the dimensionality of a dataset, but also the
+dimensionality of the chunks inside the dataset. In addition, Caterva adds
+machinery for retrieving arbitrary multi-dimensional slices (aka hyper-slices)
+out of the multi-dimensional containers in the most efficient way. Hence,
+Caterva brings the convenience of multi-dimensional and compressed containers to
+your application very easily.
+
+WWW: https://github.com/Blosc/caterva
diff --git a/databases/caterva/pkg-plist b/databases/caterva/pkg-plist
new file mode 100644
index 000000000000..de3b181a6f4a
--- /dev/null
+++ b/databases/caterva/pkg-plist
@@ -0,0 +1,5 @@
+include/caterva.h
+lib/libcaterva.a
+lib/libcaterva.so
+lib/libcaterva.so.0
+lib/libcaterva.so.%%PORTVERSION%%
diff --git a/databases/cego/Makefile b/databases/cego/Makefile
index a8a6ce79a075..8502c2bf9e5a 100644
--- a/databases/cego/Makefile
+++ b/databases/cego/Makefile
@@ -1,5 +1,5 @@
PORTNAME= cego
-PORTVERSION= 2.47.6
+PORTVERSION= 2.47.7
CATEGORIES= databases
MASTER_SITES= http://www.lemke-it.com/
diff --git a/databases/cego/distinfo b/databases/cego/distinfo
index 280025eb3d18..994c000ce09f 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 = 1633886566
+SHA256 (cego-2.47.7.tar.gz) = f89e9bea93ad084514208b974783d2011a07783950f37e1b364f521e30d20728
+SIZE (cego-2.47.7.tar.gz) = 3166326
diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile
index 0fdec413b8d4..24a07784d476 100644
--- a/databases/clickhouse/Makefile
+++ b/databases/clickhouse/Makefile
@@ -11,13 +11,15 @@ COMMENT= Fast open-source OLAP database management system
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:insource cpe localbase python shebangfix
+
+CPE_VENDOR= yandex
USE_GITHUB= yes
GH_ACCOUNT= yandex
@@ -207,20 +209,13 @@ CC= clang
CXX= clang++
.endif
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+= LEGACY_LIMITS="@comment " \
- MODERN_LIMITS=""
-.else
-SUB_LIST+= LEGACY_LIMITS="" \
- MODERN_LIMITS="@comment "
-.endif
-
SOVERSION= ${PORTVERSION}
.include <bsd.port.pre.mk>
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/files/clickhouse.in b/databases/clickhouse/files/clickhouse.in
index a3ff2098e49b..f058335c875d 100644
--- a/databases/clickhouse/files/clickhouse.in
+++ b/databases/clickhouse/files/clickhouse.in
@@ -8,9 +8,6 @@
#
# clickhouse_enable (bool): Set to "NO" by default
# Set it to "YES" to enable clickhouse server
-%%LEGACY_LIMITS%%# clickhouse_limits (bool): Set to "NO" by default.
-%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U clickhouse`
-%%LEGACY_LIMITS%%# just before clickhouse starts.
# clickhouse_config (str): Path to config file (required).
# (default: %%PREFIX%%/etc/clickhouse-server/config.xml)
# clickhouse_rundir (str): Path to directory holding a pidfile.
@@ -32,7 +29,6 @@ rcvar=clickhouse_enable
load_rc_config ${name}
: ${clickhouse_enable="NO"}
-%%LEGACY_LIMITS%%: ${clickhouse_limits="NO"}
: ${clickhouse_config="%%PREFIX%%/etc/clickhouse-server/config.xml"}
: ${clickhouse_rundir="/var/run/clickhouse"}
: ${clickhouse_user="clickhouse"}
@@ -54,12 +50,7 @@ clickhouse_prestart () {
install -d -o ${clickhouse_user} -g ${clickhouse_group} ${_dir}
done
-%%LEGACY_LIMITS%% if checkyesno clickhouse_limits; then
-%%LEGACY_LIMITS%% eval `/usr/bin/limits -e -U ${clickhouse_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/clickhouse/files/patch-cmake_find_ldap.cmake b/databases/clickhouse/files/patch-cmake_find_ldap.cmake
new file mode 100644
index 000000000000..4ccad4821cf7
--- /dev/null
+++ b/databases/clickhouse/files/patch-cmake_find_ldap.cmake
@@ -0,0 +1,10 @@
+--- cmake/find/ldap.cmake.orig 2021-09-13 15:27:47.655692000 +0200
++++ cmake/find/ldap.cmake 2021-09-13 15:28:02.970539000 +0200
+@@ -64,6 +64,7 @@ if (NOT OPENLDAP_FOUND AND NOT MISSING_INTERNAL_LDAP_L
+ ( "${_system_name}" STREQUAL "linux" AND "${_system_processor}" STREQUAL "aarch64" ) OR
+ ( "${_system_name}" STREQUAL "linux" AND "${_system_processor}" STREQUAL "ppc64le" ) OR
+ ( "${_system_name}" STREQUAL "freebsd" AND "${_system_processor}" STREQUAL "x86_64" ) OR
++ ( "${_system_name}" STREQUAL "freebsd" AND "${_system_processor}" STREQUAL "aarch64" ) OR
+ ( "${_system_name}" STREQUAL "darwin" AND "${_system_processor}" STREQUAL "x86_64" ) OR
+ ( "${_system_name}" STREQUAL "darwin" AND "${_system_processor}" STREQUAL "aarch64" )
+ )
diff --git a/databases/clickhouse/files/patch-contrib_boringssl_crypto_cpu-aarch64-linux.c b/databases/clickhouse/files/patch-contrib_boringssl_crypto_cpu-aarch64-linux.c
new file mode 100644
index 000000000000..50e88deb39e0
--- /dev/null
+++ b/databases/clickhouse/files/patch-contrib_boringssl_crypto_cpu-aarch64-linux.c
@@ -0,0 +1,75 @@
+--- contrib/boringssl/crypto/cpu-aarch64-linux.c.orig 2019-10-21 10:14:54 UTC
++++ contrib/boringssl/crypto/cpu-aarch64-linux.c
+@@ -14,49 +14,47 @@
+
+ #include <openssl/cpu.h>
+
+-#if defined(OPENSSL_AARCH64) && defined(OPENSSL_LINUX) && \
+- !defined(OPENSSL_STATIC_ARMCAP)
++#if defined(OPENSSL_AARCH64)
+
+-#include <sys/auxv.h>
+-
+ #include <openssl/arm_arch.h>
+
+ #include "internal.h"
+
+-
+ extern uint32_t OPENSSL_armcap_P;
+
+-void OPENSSL_cpuid_setup(void) {
+- unsigned long hwcap = getauxval(AT_HWCAP);
++#include <machine/armreg.h>
+
+- // See /usr/include/asm/hwcap.h on an aarch64 installation for the source of
+- // these values.
+- static const unsigned long kNEON = 1 << 1;
+- static const unsigned long kAES = 1 << 3;
+- static const unsigned long kPMULL = 1 << 4;
+- static const unsigned long kSHA1 = 1 << 5;
+- static const unsigned long kSHA256 = 1 << 6;
++#ifndef ID_AA64ISAR0_AES_VAL
++#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES
++#endif
++#ifndef ID_AA64ISAR0_AES_VAL
++#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES
++#endif
++#ifndef ID_AA64ISAR0_SHA1_VAL
++#define ID_AA64ISAR0_SHA1_VAL ID_AA64ISAR0_SHA1
++#endif
++#ifndef ID_AA64ISAR0_SHA2_VAL
++#define ID_AA64ISAR0_SHA2_VAL ID_AA64ISAR0_SHA2
++#endif
+
+- if ((hwcap & kNEON) == 0) {
+- // Matching OpenSSL, if NEON is missing, don't report other features
+- // either.
+- return;
+- }
++void OPENSSL_cpuid_setup(void) {
++ uint64_t id_aa64isar0;
+
++ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1);
++
+ OPENSSL_armcap_P |= ARMV7_NEON;
+
+- if (hwcap & kAES) {
++ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) >= ID_AA64ISAR0_AES_BASE) {
+ OPENSSL_armcap_P |= ARMV8_AES;
+ }
+- if (hwcap & kPMULL) {
++ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) {
+ OPENSSL_armcap_P |= ARMV8_PMULL;
+ }
+- if (hwcap & kSHA1) {
++ if (ID_AA64ISAR0_SHA1_VAL(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE) {
+ OPENSSL_armcap_P |= ARMV8_SHA1;
+ }
+- if (hwcap & kSHA256) {
++ if(ID_AA64ISAR0_SHA2_VAL(id_aa64isar0) >= ID_AA64ISAR0_SHA2_BASE) {
+ OPENSSL_armcap_P |= ARMV8_SHA256;
+ }
+ }
+-
+-#endif // OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP
++#endif // OPENSSL_AARCH64
diff --git a/databases/clickhouse/files/patch-contrib_jemalloc-cmake_include__freebsd__aarch64_jemalloc_internal_jemalloc__internal__defs.h.in b/databases/clickhouse/files/patch-contrib_jemalloc-cmake_include__freebsd__aarch64_jemalloc_internal_jemalloc__internal__defs.h.in
new file mode 100644
index 000000000000..388d9bdec34a
--- /dev/null
+++ b/databases/clickhouse/files/patch-contrib_jemalloc-cmake_include__freebsd__aarch64_jemalloc_internal_jemalloc__internal__defs.h.in
@@ -0,0 +1,11 @@
+--- contrib/jemalloc-cmake/include_freebsd_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in.orig 2021-07-22 13:50:06.073516000 +0200
++++ contrib/jemalloc-cmake/include_freebsd_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in 2021-07-22 13:50:28.909237000 +0200
+@@ -161,7 +161,7 @@
+ * JEMALLOC_DSS enables use of sbrk(2) to allocate extents from the data storage
+ * segment (DSS).
+ */
+-#define JEMALLOC_DSS
++/* #undef JEMALLOC_DSS */
+
+ /* Support memory filling (junk/zero). */
+ #define JEMALLOC_FILL
diff --git a/databases/clickhouse/files/patch-contrib_rocksdb-cmake_CMakeLists.txt b/databases/clickhouse/files/patch-contrib_rocksdb-cmake_CMakeLists.txt
new file mode 100644
index 000000000000..6db0e41ea70d
--- /dev/null
+++ b/databases/clickhouse/files/patch-contrib_rocksdb-cmake_CMakeLists.txt
@@ -0,0 +1,14 @@
+--- contrib/rocksdb-cmake/CMakeLists.txt.orig 2021-09-13 16:50:13.827707000 +0200
++++ contrib/rocksdb-cmake/CMakeLists.txt 2021-09-13 16:51:37.118209000 +0200
+@@ -233,6 +233,11 @@ if(HAVE_AUXV_GETAUXVAL)
+ add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
+ endif()
+
++check_cxx_symbol_exists(elf_aux_info sys/auxv.h HAVE_ELF_AUX_INFO)
++if(HAVE_ELF_AUX_INFO)
++ add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
++endif()
++
+ include_directories(${ROCKSDB_SOURCE_DIR})
+ include_directories("${ROCKSDB_SOURCE_DIR}/include")
+ if(WITH_FOLLY_DISTRIBUTED_MUTEX)
diff --git a/databases/clickhouse/files/patch-contrib_rocksdb_CMakeLists.txt b/databases/clickhouse/files/patch-contrib_rocksdb_CMakeLists.txt
new file mode 100644
index 000000000000..67a092844f6f
--- /dev/null
+++ b/databases/clickhouse/files/patch-contrib_rocksdb_CMakeLists.txt
@@ -0,0 +1,13 @@
+--- contrib/rocksdb/CMakeLists.txt.orig 2021-09-13 16:40:55.686967000 +0200
++++ contrib/rocksdb/CMakeLists.txt 2021-09-13 16:44:42.046383000 +0200
+@@ -553,6 +553,10 @@ check_cxx_symbol_exists(getauxval auvx.h HAVE_AUXV_GET
+ if(HAVE_AUXV_GETAUXVAL)
+ add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
+ endif()
++check_cxx_symbol_exists(elf_aux_info sys/auxv.h HAVE_AUXV_ELF_AUX_INFO)
++if(HAVE_AUXV_ELF_AUX_INFO)
++ add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
++endif()
+
+ include_directories(${PROJECT_SOURCE_DIR})
+ include_directories(${PROJECT_SOURCE_DIR}/include)
diff --git a/databases/clickhouse/files/patch-contrib_rocksdb_util_crc32c.cc b/databases/clickhouse/files/patch-contrib_rocksdb_util_crc32c.cc
new file mode 100644
index 000000000000..1c4a8699b3d2
--- /dev/null
+++ b/databases/clickhouse/files/patch-contrib_rocksdb_util_crc32c.cc
@@ -0,0 +1,38 @@
+--- contrib/rocksdb/util/crc32c.cc.orig 2021-07-21 16:35:20.404459000 +0200
++++ contrib/rocksdb/util/crc32c.cc 2021-07-22 09:48:10.980923000 +0200
+@@ -41,7 +41,7 @@
+
+ #endif
+
+-#if defined(__linux__) && defined(HAVE_ARM64_CRC)
++#if (defined(__FreeBSD__) || defined(__linux__)) && defined(HAVE_ARM64_CRC)
+ bool pmull_runtime_flag = false;
+ #endif
+
+@@ -474,7 +474,7 @@ static bool isAltiVec() {
+ }
+ #endif
+
+-#if defined(__linux__) && defined(HAVE_ARM64_CRC)
++#if (defined(__FreeBSD__) || defined(__linux__)) && defined(HAVE_ARM64_CRC)
+ uint32_t ExtendARMImpl(uint32_t crc, const char *buf, size_t size) {
+ return crc32c_arm64(crc, (const unsigned char *)buf, size);
+ }
+@@ -494,7 +494,7 @@ std::string IsFastCrc32Supported() {
+ has_fast_crc = false;
+ arch = "PPC";
+ #endif
+-#elif defined(__linux__) && defined(HAVE_ARM64_CRC)
++#elif (defined(__FreeBSD__) || defined(__linux__)) && defined(HAVE_ARM64_CRC)
+ if (crc32c_runtime_check()) {
+ has_fast_crc = true;
+ arch = "Arm64";
+@@ -1227,7 +1227,7 @@ uint32_t crc32c_3way(uint32_t crc, const char* buf, si
+ static inline Function Choose_Extend() {
+ #ifdef HAVE_POWER8
+ return isAltiVec() ? ExtendPPCImpl : ExtendImpl<Slow_CRC32>;
+-#elif defined(__linux__) && defined(HAVE_ARM64_CRC)
++#elif (defined(__FreeBSD__) || defined(__linux__)) && defined(HAVE_ARM64_CRC)
+ if(crc32c_runtime_check()) {
+ pmull_runtime_flag = crc32c_pmull_runtime_check();
+ return ExtendARMImpl;
diff --git a/databases/clickhouse/files/patch-contrib_rocksdb_util_crc32c__arm64.cc b/databases/clickhouse/files/patch-contrib_rocksdb_util_crc32c__arm64.cc
new file mode 100644
index 000000000000..1b37e82527ef
--- /dev/null
+++ b/databases/clickhouse/files/patch-contrib_rocksdb_util_crc32c__arm64.cc
@@ -0,0 +1,45 @@
+--- contrib/rocksdb/util/crc32c_arm64.cc.orig 2021-05-13 00:21:57.000000000 +0200
++++ contrib/rocksdb/util/crc32c_arm64.cc 2000-01-01 02:32:56.500264000 +0100
+@@ -5,9 +5,11 @@
+
+ #include "util/crc32c_arm64.h"
+
+-#if defined(__linux__) && defined(HAVE_ARM64_CRC)
++#if (defined(__FreeBSD__) || defined(__linux__)) && defined(HAVE_ARM64_CRC)
+
++#if defined(__linux__)
+ #include <asm/hwcap.h>
++#endif // linux
+ #ifdef ROCKSDB_AUXV_GETAUXVAL_PRESENT
+ #include <sys/auxv.h>
+ #endif
+@@ -42,7 +44,14 @@ extern bool pmull_runtime_flag;
+
+ uint32_t crc32c_runtime_check(void) {
+ #ifdef ROCKSDB_AUXV_GETAUXVAL_PRESENT
++#if defined(__FreeBSD__)
++ uint64_t auxv;
++ int result = elf_aux_info(AT_HWCAP, &auxv, sizeof auxv);
++ if (result != 0)
++ return 0;
++#else
+ uint64_t auxv = getauxval(AT_HWCAP);
++#endif
+ return (auxv & HWCAP_CRC32) != 0;
+ #else
+ return 0;
+@@ -51,7 +60,14 @@ uint32_t crc32c_runtime_check(void) {
+
+ bool crc32c_pmull_runtime_check(void) {
+ #ifdef ROCKSDB_AUXV_GETAUXVAL_PRESENT
++#if defined(__FreeBSD__)
++ uint64_t auxv;
++ int result = elf_aux_info(AT_HWCAP, &auxv, sizeof auxv);
++ if (result != 0)
++ return 0;
++#else
+ uint64_t auxv = getauxval(AT_HWCAP);
++#endif
+ return (auxv & HWCAP_PMULL) != 0;
+ #else
+ return false;
diff --git a/databases/clickhouse/files/patch-src_Common_StackTrace.cpp b/databases/clickhouse/files/patch-src_Common_StackTrace.cpp
new file mode 100644
index 000000000000..bac5c5e25a8d
--- /dev/null
+++ b/databases/clickhouse/files/patch-src_Common_StackTrace.cpp
@@ -0,0 +1,11 @@
+--- src/Common/StackTrace.cpp.orig 2021-09-13 15:30:01.608345000 +0200
++++ src/Common/StackTrace.cpp 2021-09-13 15:30:10.009331000 +0200
+@@ -186,6 +186,8 @@ static void * getCallerAddress(const ucontext_t & context)
+ #elif defined(__APPLE__) && defined(__aarch64__)
+ return reinterpret_cast<void *>(context.uc_mcontext->__ss.__pc);
+
++#elif defined(__FreeBSD__) && defined(__aarch64__)
++ return reinterpret_cast<void *>(context.uc_mcontext.mc_gpregs.gp_elr);
+ #elif defined(__aarch64__)
+ return reinterpret_cast<void *>(context.uc_mcontext.pc);
+ #elif defined(__powerpc64__)
diff --git a/databases/closql/Makefile b/databases/closql/Makefile
index ee9061110df7..0e466c9b07c9 100644
--- a/databases/closql/Makefile
+++ b/databases/closql/Makefile
@@ -1,10 +1,11 @@
PORTNAME= closql
DISTVERSIONPREFIX= v
-DISTVERSION= 1.0.6
+DISTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= databases elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
-MAINTAINER= yasu@utahime.org
+MAINTAINER= yasu@FreeBSD.org
COMMENT= Store EIEIO objects using EmacSQL
LICENSE= GPLv3+
diff --git a/databases/closql/distinfo b/databases/closql/distinfo
index 3b284cc9c6b9..b4259f809ae9 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 = 1632864373
+SHA256 (emacscollective-closql-v1.2.0_GH0.tar.gz) = fd3eb3b8efafebf4438b10966d2a085e8bea758b74a8a68b078b387cc47c8aed
+SIZE (emacscollective-closql-v1.2.0_GH0.tar.gz) = 20814
diff --git a/databases/cockroach/Makefile b/databases/cockroach/Makefile
index c4576b2646ec..641431501730 100644
--- a/databases/cockroach/Makefile
+++ b/databases/cockroach/Makefile
@@ -12,7 +12,7 @@ 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 \
diff --git a/databases/couchdb3/Makefile b/databases/couchdb3/Makefile
index 9483ebc41aff..57c515dc070e 100644
--- a/databases/couchdb3/Makefile
+++ b/databases/couchdb3/Makefile
@@ -1,6 +1,6 @@
PORTNAME= couchdb3
-DISTVERSION= 3.1.1
-PORTREVISION= 4
+DISTVERSION= 3.2.0
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= APACHE/couchdb/source/${DISTVERSION}
DISTNAME= apache-couchdb-${DISTVERSION}
@@ -11,16 +11,13 @@ COMMENT= JSON document database with HTTP API and scalable multi-master sync
LICENSE= APACHE20 BSD3CLAUSE ISCL WTFPL OFL11
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
+ erlang-runtime${ERLVER}>=${ERLVER}.0:lang/erlang-runtime${ERLVER}
LIB_DEPENDS= libicudata.so:devel/icu \
- libmozjs-60.so:lang/spidermonkey60
-RUN_DEPENDS= erlang-runtime22>=22.0:lang/erlang-runtime22
+ libmozjs-78.so:lang/spidermonkey78
+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
USE_RC_SUBR= ${PORTNAME}
CONFLICTS= couchdb[24]*
@@ -33,7 +30,7 @@ GROUPS= couchdb
SUB_FILES= pkg-message
SUB_LIST= APPDIR=${APPDIR} \
- ERL_PATH=${LOCALBASE}/lib/erlang22/bin/erl \
+ ERL_PATH=${LOCALBASE}/lib/erlang${ERLVER}/bin/erl \
PORTNAME=${PORTNAME} \
RELDIR=${RELDIR} \
WWWDIR=${WWWDIR}
@@ -41,19 +38,20 @@ PLIST_SUB= VERSION=${DISTVERSION}
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --skip-deps --user ${USERS} --rebar ${LOCALBASE}/bin/rebar \
- --spidermonkey-version 60
+ --spidermonkey-version 78
ALL_TARGET= release
-MAKE_ENV= PATH=${LOCALBASE}/lib/erlang22/bin:${PATH}
+MAKE_ENV= PATH=${LOCALBASE}/lib/erlang${ERLVER}/bin:${PATH}
OPTIONS_DEFINE= DOCS
OPTIONS_SUB= yes
+APPDIR= ${LOCALBASE}/libexec/${PORTNAME}
DBDIR?= /var/db/${PORTNAME}
+ERLVER?= 24
LOGDIR?= /var/log/${PORTNAME}
LOGFILE?= ${LOGDIR}/couch.log
-APPDIR= ${LOCALBASE}/libexec/${PORTNAME}
RELDIR= ${APPDIR}/releases/${DISTVERSION}
.include <bsd.port.options.mk>
@@ -64,17 +62,18 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_jiffy_c__src_double-conversion_strtod
post-patch:
@${REINPLACE_CMD} \
+ -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
@@ -92,14 +91,17 @@ pre-install:
# prune build artefacts and surplus headers
${FIND} -E ${WRKSRC} -type f \
-regex '.*\.(a|buildinfo|c|cc|cmd|d|o|orig|h|cpp)' -print -delete
+ @${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/var \
+ ${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/
+ ${WRKSRC}/rel/couchdb/share/docs \
+ ${WRKSRC}/rel/couchdb/share/www \
+ ${WRKSRC}/rel/couchdb/var
(cd ${WRKSRC}/rel/couchdb && ${COPYTREE_SHARE} . ${STAGEDIR}${APPDIR})
post-install:
diff --git a/databases/couchdb3/distinfo b/databases/couchdb3/distinfo
index 06b045cc3375..7296be528a8d 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 = 1634040933
+SHA256 (apache-couchdb-3.2.0.tar.gz) = 8bea574faa6bb0926c670542d8318c322268cf7e6614dab318dea734ccf1b00c
+SIZE (apache-couchdb-3.2.0.tar.gz) = 16535264
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/pkg-plist b/databases/couchdb3/pkg-plist
index 108dda00ea8a..04598b35494a 100644
--- a/databases/couchdb3/pkg-plist
+++ b/databases/couchdb3/pkg-plist
@@ -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
@@ -86,7 +90,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
@@ -123,66 +126,8 @@ 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
@@ -255,6 +200,12 @@ 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
@@ -284,6 +235,7 @@ libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_rate_lim
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
@@ -312,6 +273,29 @@ 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_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,9 @@ 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_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 +378,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
@@ -444,11 +442,22 @@ libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3.beam
libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_app.beam
libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_cluster.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 +470,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-2.21.0/ebin/mochifmt.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochifmt_records.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochifmt_std.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiglobal.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochihex.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochijson.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochijson2.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochilists.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochilogfile2.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochinum.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochitemp.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiutf8.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb.app
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_acceptor.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_base64url.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_charref.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_clock.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_cookies.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_cover.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_echo.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_headers.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_html.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_http.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_io.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_mime.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_multipart.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_request.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_response.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_session.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_socket.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_socket_server.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_util.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/mochiweb_websocket.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/ebin/reloader.beam
+libexec/couchdb3/lib/mochiweb-2.21.0/include/internal.hrl
+libexec/couchdb3/lib/recon-2.5.2/ebin/recon.app
+libexec/couchdb3/lib/recon-2.5.2/ebin/recon.beam
+libexec/couchdb3/lib/recon-2.5.2/ebin/recon_alloc.beam
+libexec/couchdb3/lib/recon-2.5.2/ebin/recon_lib.beam
+libexec/couchdb3/lib/recon-2.5.2/ebin/recon_map.beam
+libexec/couchdb3/lib/recon-2.5.2/ebin/recon_rec.beam
+libexec/couchdb3/lib/recon-2.5.2/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 +532,41 @@ 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_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
@@ -541,6 +582,9 @@ libexec/couchdb3/share/server/main-coffee.js
libexec/couchdb3/share/server/main.js
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
@@ -600,6 +644,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 +674,7 @@ 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/index.rst.txt
%%PORTDOCS%%%%WWWDIR%%/docs/_sources/ddocs/ddocs.rst.txt
%%PORTDOCS%%%%WWWDIR%%/docs/_sources/ddocs/index.rst.txt
@@ -697,60 +744,55 @@ 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/index.rst.txt
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/ajax-loader.gif
%%PORTDOCS%%%%WWWDIR%%/docs/_static/basic.css
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/comment-bright.png
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/comment-close.png
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/comment.png
%%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/down-pressed.png
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/down.png
+%%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.2.1.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
%%PORTDOCS%%%%WWWDIR%%/docs/_static/minus.png
%%PORTDOCS%%%%WWWDIR%%/docs/_static/plus.png
%%PORTDOCS%%%%WWWDIR%%/docs/_static/pygments.css
%%PORTDOCS%%%%WWWDIR%%/docs/_static/searchtools.js
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/underscore-1.3.1.js
%%PORTDOCS%%%%WWWDIR%%/docs/_static/underscore.js
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/up-pressed.png
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/up.png
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/websupport.js
%%PORTDOCS%%%%WWWDIR%%/docs/about.html
%%PORTDOCS%%%%WWWDIR%%/docs/api/basics.html
%%PORTDOCS%%%%WWWDIR%%/docs/api/database/bulk-api.html
@@ -791,6 +833,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 +864,7 @@ 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/index.html
%%PORTDOCS%%%%WWWDIR%%/docs/ddocs/ddocs.html
%%PORTDOCS%%%%WWWDIR%%/docs/ddocs/index.html
@@ -894,10 +939,13 @@ 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/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.85efbe9abd87bd8f6f65.css
+%%WWWDIR%%/dashboard.assets/css/styles.bee89075389da7c063d7.css
%%WWWDIR%%/dashboard.assets/fonts/fauxtonicon5.eot
%%WWWDIR%%/dashboard.assets/fonts/fauxtonicon5.ttf
%%WWWDIR%%/dashboard.assets/fonts/fauxtonicon5.woff
@@ -915,8 +963,6 @@ man/man1/apachecouchdb.1.gz
%%WWWDIR%%/dashboard.assets/img/linkedin.png
%%WWWDIR%%/dashboard.assets/img/loader.gif
%%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/bundle.85efbe9abd87bd8f6f65.js
+%%WWWDIR%%/dashboard.assets/js/manifest.9d15b7c24fc8359d2668.js
+%%WWWDIR%%/dashboard.assets/js/vendor.bee89075389da7c063d7.js
diff --git a/databases/cutelyst-asql/Makefile b/databases/cutelyst-asql/Makefile
index 2ac32cb62616..565012cadb19 100644
--- a/databases/cutelyst-asql/Makefile
+++ b/databases/cutelyst-asql/Makefile
@@ -1,6 +1,6 @@
PORTNAME= asql
DISTVERSIONPREFIX= v
-DISTVERSION= 0.43.0
+DISTVERSION= 0.50.0
CATEGORIES= databases
PKGNAMEPREFIX= cutelyst-
diff --git a/databases/cutelyst-asql/distinfo b/databases/cutelyst-asql/distinfo
index 3ac7de9a6e7f..5ba33e67e67e 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 = 1638397248
+SHA256 (cutelyst-asql-v0.50.0_GH0.tar.gz) = 462eab3a49f6b6e5b47d51b5833c8c10f7dd3e666c1c58a912c0db88cd6dc53a
+SIZE (cutelyst-asql-v0.50.0_GH0.tar.gz) = 36726
diff --git a/databases/cutelyst-asql/pkg-plist b/databases/cutelyst-asql/pkg-plist
index 834ae0044267..5d34a4ad60c9 100644
--- a/databases/cutelyst-asql/pkg-plist
+++ b/databases/cutelyst-asql/pkg-plist
@@ -1,8 +1,10 @@
-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
@@ -15,4 +17,7 @@ lib/cmake/ASqlQt5/ASqlQt5ConfigVersion.cmake
lib/libASqlQt5.so
lib/libASqlQt5.so.0
lib/libASqlQt5.so.%%SOVER%%
+lib/libASqlQt5Pg.so
+lib/libASqlQt5Pg.so.0
+lib/libASqlQt5Pg.so.%%SOVER%%
libdata/pkgconfig/ASqlQt5.pc
diff --git a/databases/db/Makefile b/databases/db/Makefile
index 2b815ab56b59..2a3ef51f14eb 100644
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@@ -1,7 +1,7 @@
# 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/
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/db18/Makefile b/databases/db18/Makefile
index 22356cbfd9ca..92d297c91fb3 100644
--- a/databases/db18/Makefile
+++ b/databases/db18/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX?=
DISTNAME= db-${PORTVERSION}
DIST_SUBDIR= bdb
-MAINTAINER= yasu@utahime.org
+MAINTAINER= yasu@FreeBSD.org
COMMENT= Oracle Berkeley DB, Release ${BDBVER}
LICENSE= AGPLv3 BSD3CLAUSE UPL10
diff --git a/databases/elixir-calecto/Makefile b/databases/elixir-calecto/Makefile
index 1ade77101838..9b13c975ee33 100644
--- a/databases/elixir-calecto/Makefile
+++ b/databases/elixir-calecto/Makefile
@@ -13,7 +13,7 @@ USES= elixir
USE_GITHUB= yes
GH_ACCOUNT= lau
-MIX_BUILD_DEPS= databases/elixir-ecto \
+MIX_BUILD_DEPS= databases/elixir-ecto \
devel/elixir-calendar
MIX_RUN_DEPS:= ${MIX_BUILD_DEPS}
diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile
index cbc836e55e49..53399e81cb54 100644
--- a/databases/emacsql/Makefile
+++ b/databases/emacsql/Makefile
@@ -1,9 +1,10 @@
PORTNAME= emacsql
DISTVERSION= 3.0.0
+PORTREVISION= 2
CATEGORIES= databases elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
-MAINTAINER= yasu@utahime.org
+MAINTAINER= yasu@FreeBSD.org
COMMENT= High-level Emacs Lisp RDBMS front-end
LICENSE= UNLICENSE
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 6936a13f5284..5cc639a435bf 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,7 +1,7 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
PORTNAME= evolution-data-server
-DISTVERSION= 3.40.4
+DISTVERSION= 3.42.1
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -12,12 +12,12 @@ COMMENT= Data backends for the Evolution integrated mail/PIM suite
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:3.6+,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 VALA
+OPTIONS_DEFAULT=WEATHER KERBEROS LDAP VALA
KERBEROS_CMAKE_ON= -DWITH_KRB5=/usr
KERBEROS_CMAKE_OFF= -DWITH_KRB5=OFF
@@ -67,16 +67,16 @@ LDAP_CMAKE_ON= -DWITH_OPENLDAP=${LOCALBASE}
LDAP_CMAKE_OFF= -DWITH_OPENLDAP=OFF
LDAP_USE= openldap=yes
+VALA_DESC= Build Vala language bindings
+VALA_BUILD_DEPENDS= vapigen:lang/vala
+VALA_CMAKE_BOOL= ENABLE_VALA_BINDINGS
+
WEATHER_DESC= Weather calendar backend
WEATHER_LIB_DEPENDS= libgweather-3.so:net/libgweather
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..4f78b6cc8452 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 = 1636128836
+SHA256 (gnome/evolution-data-server-3.42.1.tar.xz) = e6e67f2a77d0ff3e6da50b03dc5fa266e716626bcda2ef44144e317e35f2f528
+SIZE (gnome/evolution-data-server-3.42.1.tar.xz) = 4621996
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-hostname-utils.c b/databases/evolution-data-server/files/patch-src_camel_camel-hostname-utils.c
new file mode 100644
index 000000000000..05fa13d55e11
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-src_camel_camel-hostname-utils.c
@@ -0,0 +1,10 @@
+--- src/camel/camel-hostname-utils.c.orig 2021-11-05 17:23:49 UTC
++++ src/camel/camel-hostname-utils.c
+@@ -24,6 +24,7 @@
+
+ #include <unicode/uchar.h>
+ #include <unicode/uscript.h>
++#include <unicode/ustring.h>
+
+ #include "camel-string-utils.h"
+ #include "camel-hostname-utils.h"
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index ed1690a5c9ba..93761941a950 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
@@ -333,7 +334,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 +375,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.63.0.0
lib/libebackend-%%EVO_VERSION%%.so
lib/libebackend-%%EVO_VERSION%%.so.10
lib/libebackend-%%EVO_VERSION%%.so.10.0.0
@@ -547,21 +547,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
+%%VALA%%share/vala/vapi/camel-%%EVO_VERSION%%.deps
+%%VALA%%share/vala/vapi/camel-%%EVO_VERSION%%.vapi
+%%VALA%%share/vala/vapi/libebackend-%%EVO_VERSION%%.deps
+%%VALA%%share/vala/vapi/libebackend-%%EVO_VERSION%%.vapi
+%%VALA%%share/vala/vapi/libebook-%%EVO_VERSION%%.deps
+%%VALA%%share/vala/vapi/libebook-%%EVO_VERSION%%.vapi
+%%VALA%%share/vala/vapi/libebook-contacts-%%EVO_VERSION%%.deps
+%%VALA%%share/vala/vapi/libebook-contacts-%%EVO_VERSION%%.vapi
+%%VALA%%share/vala/vapi/libecal-2.0.deps
+%%VALA%%share/vala/vapi/libecal-2.0.vapi
+%%VALA%%share/vala/vapi/libedata-book-%%EVO_VERSION%%.deps
+%%VALA%%share/vala/vapi/libedata-book-%%EVO_VERSION%%.vapi
+%%VALA%%share/vala/vapi/libedata-cal-2.0.deps
+%%VALA%%share/vala/vapi/libedata-cal-2.0.vapi
+%%VALA%%share/vala/vapi/libedataserver-%%EVO_VERSION%%.deps
+%%VALA%%share/vala/vapi/libedataserver-%%EVO_VERSION%%.vapi
+%%VALA%%share/vala/vapi/libedataserverui-%%EVO_VERSION%%.deps
+%%VALA%%share/vala/vapi/libedataserverui-%%EVO_VERSION%%.vapi
diff --git a/databases/firebird25-server/Makefile b/databases/firebird25-server/Makefile
index ccd911a0d9d0..6cd781cbe6f1 100644
--- a/databases/firebird25-server/Makefile
+++ b/databases/firebird25-server/Makefile
@@ -1,5 +1,6 @@
PORTNAME= firebird
PORTVERSION= 2.5.9
+PORTREVISION= 1
CATEGORIES?= databases
MASTER_SITES= https://github.com/FirebirdSQL/${PORTNAME}/releases/download/R2_5_9/
PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server
diff --git a/databases/firebird30-server/Makefile b/databases/firebird30-server/Makefile
index 2932deb3dd74..45774098c9fa 100644
--- a/databases/firebird30-server/Makefile
+++ b/databases/firebird30-server/Makefile
@@ -1,5 +1,6 @@
PORTNAME= firebird
PORTVERSION= 3.0.7
+PORTREVISION= 1
CATEGORIES?= databases
MASTER_SITES= https://github.com/FirebirdSQL/${PORTNAME}/releases/download/R3_0_7/
PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server
@@ -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= firebird25 firebird40
USES= cpe gmake pkgconfig localbase:ldflags libedit tar:bzip2
USE_CXXSTD= gnu++03
diff --git a/databases/firebird40-server/Makefile b/databases/firebird40-server/Makefile
index 2ad75a3dd7cd..640cf9e0e55e 100644
--- a/databases/firebird40-server/Makefile
+++ b/databases/firebird40-server/Makefile
@@ -1,6 +1,6 @@
PORTNAME= firebird
PORTVERSION= 4.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= databases
MASTER_SITES= https://github.com/FirebirdSQL/${PORTNAME}/releases/download/v${PORTVERSION}/
PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server
@@ -23,7 +23,7 @@ LIB_DEPENDS= libicuuc.so:devel/icu \
libtommath.so:math/libtommath \
libtomcrypt.so:security/libtomcrypt
-CONFLICTS_INSTALL= firebird25-* firebird30-*
+CONFLICTS_INSTALL= firebird25 firebird30
USES= cpe gmake pkgconfig localbase:ldflags libedit tar:xz
USE_CXXSTD= c++11
diff --git a/databases/foundationdb-devel/Makefile b/databases/foundationdb-devel/Makefile
index ddda28966943..fc54585a679e 100644
--- a/databases/foundationdb-devel/Makefile
+++ b/databases/foundationdb-devel/Makefile
@@ -10,7 +10,6 @@ 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
diff --git a/databases/foundationdb/Makefile b/databases/foundationdb/Makefile
index 739120dfc3c8..a959372b3c62 100644
--- a/databases/foundationdb/Makefile
+++ b/databases/foundationdb/Makefile
@@ -8,7 +8,6 @@ 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
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 8fb49155b324..aa5c127917cd 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -1,7 +1,7 @@
# Created by: Domas Mituzas <midom@dammit.lt>
PORTNAME= freetds
-PORTVERSION= 1.2.140
+PORTVERSION= 1.3.7
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= https://www.freetds.org/files/current/ \
@@ -10,7 +10,7 @@ PKGNAMESUFFIX= -devel
DISTNAME= ${PORTNAME}-dev.${PORTVERSION}
MAINTAINER= bofh@FreeBSD.org
-COMMENT= Sybase/Microsoft TDS protocol library
+COMMENT= Sybase/Microsoft TDS protocol library - nightly snapshot
LICENSE= LGPL20
@@ -36,16 +36,16 @@ OPTIONS_DEFAULT= OPENSSL
OPTIONS_RADIO= ODBC
OPTIONS_RADIO_ODBC= IODBC UNIXODBC
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
-UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
-UNIXODBC_CONFIGURE_ON= --with-unixodbc=${LOCALBASE}
ODBCWIDE_CONFIGURE_ON= --enable-odbc-wide
+OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
+OPENSSL_USES= ssl
+UNIXODBC_CONFIGURE_ON= --with-unixodbc=${LOCALBASE}
+UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
PORTDOCS= *
diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo
index 2ed46296a4b3..41398529255e 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 = 1632611019
+SHA256 (freetds-dev.1.3.7.tar.bz2) = cf2ed1914658de537223038f460a2fb3086c3bc4d0e1557cc8a048002daa238d
+SIZE (freetds-dev.1.3.7.tar.bz2) = 2257869
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 9fad2460c26c..6053db9202a5 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,7 +1,7 @@
# Created by: Domas Mituzas <midom@dammit.lt>
PORTNAME= freetds
-PORTVERSION= 1.2.21
+PORTVERSION= 1.3.3
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= https://www.freetds.org/files/stable/ \
@@ -60,11 +60,12 @@ 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 ; \
+ @${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'
+ s| common.h||g' \
+ ${WRKSRC}/Makefile.am
+ @${REINPLACE_CMD} -e 's|/pool.conf|/pool.conf.sample|g' \
+ ${WRKSRC}/src/pool/Makefile.am
@${REINPLACE_CMD} -e 's|\($$with_iodbc/include\)|\1/libiodbc|g' \
${WRKSRC}/configure.ac
diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo
index dc1f004e17a2..45be44987bed 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 = 1632610921
+SHA256 (freetds-1.3.3.tar.bz2) = dba02e7f0661ff42dc289fc41d7cde7e03089fd326f08ee28c872ac9ff4a1c84
+SIZE (freetds-1.3.3.tar.bz2) = 2243425
diff --git a/databases/galera/Makefile b/databases/galera/Makefile
index 1178c3b04061..7b7892c24806 100644
--- a/databases/galera/Makefile
+++ b/databases/galera/Makefile
@@ -1,7 +1,7 @@
# Created by: Horia Racoviceanu <horia@racoviceanu.com>
PORTNAME= galera
-PORTVERSION?= 25.3.34
+PORTVERSION?= 25.3.35
DISTVERSIONPREFIX?= release_
CATEGORIES= databases
diff --git a/databases/galera/distinfo b/databases/galera/distinfo
index 0e1a3cf7b857..563c5eac6d97 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 = 1636993204
+SHA256 (codership-galera-release_25.3.35_GH0.tar.gz) = 2025c80aba0dc23b0e30bd9bb05479f01fae0ff9c50fbbed211c5649e878f9ef
+SIZE (codership-galera-release_25.3.35_GH0.tar.gz) = 3339477
SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
diff --git a/databases/galera26/Makefile b/databases/galera26/Makefile
index 899cdf1bb578..38454313c17c 100644
--- a/databases/galera26/Makefile
+++ b/databases/galera26/Makefile
@@ -1,7 +1,7 @@
# Created by: Nicolas Embriz <nbari@tequila.io>
PORTNAME= galera
-PORTVERSION= 26.4.9
+PORTVERSION= 26.4.10
DISTVERSIONPREFIX= release_
CATEGORIES= databases
PKGNAMESUFFIX= 26
diff --git a/databases/galera26/distinfo b/databases/galera26/distinfo
index 5bc860ff0b05..3b2bbe9fbe2e 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
+TIMESTAMP = 1636993292
+SHA256 (codership-galera-release_26.4.10_GH0.tar.gz) = d8a45f24b6b2e14ea76a41d659d9f3a9cc4cf7eb306c5ee63189e24c30525987
+SIZE (codership-galera-release_26.4.10_GH0.tar.gz) = 3493683
SHA256 (codership-wsrep-API-76cf223c690845bbf561cb820a46e06a18ad80d1_GH0.tar.gz) = 214fb8701ae51bcdf8171475a93f2c28ddd56e642feb172ec5148b4d3c73d4a6
SIZE (codership-wsrep-API-76cf223c690845bbf561cb820a46e06a18ad80d1_GH0.tar.gz) = 90155
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-galerautils_src_gu__asio__stream__engine.cpp b/databases/galera26/files/patch-galerautils_src_gu__asio__stream__engine.cpp
new file mode 100644
index 000000000000..6185cf594e4b
--- /dev/null
+++ b/databases/galera26/files/patch-galerautils_src_gu__asio__stream__engine.cpp
@@ -0,0 +1,11 @@
+--- galerautils/src/gu_asio_stream_engine.cpp.orig 2021-11-15 21:09:11 UTC
++++ galerautils/src/gu_asio_stream_engine.cpp
+@@ -100,7 +100,7 @@ class AsioTcpStreamEngine : public gu::AsioStreamEngin
+
+ #include <openssl/ssl.h>
+
+-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER)
+ #define HAVE_READ_EX
+ #define HAVE_WRITE_EX
+ #endif
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index fffc8e56104f..a7b6747d3e06 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,7 +1,7 @@
# Created by: Brent J. Nordquist <bjn@visi.com>
PORTNAME= gdbm
-PORTVERSION= 1.21
+PORTVERSION= 1.22
CATEGORIES= databases
MASTER_SITES= GNU
diff --git a/databases/gdbm/distinfo b/databases/gdbm/distinfo
index 8886ac57cc56..7db766671557 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 = 1634620561
+SHA256 (gdbm-1.22.tar.gz) = f366c823a6724af313b6bbe975b2809f9a157e5f6a43612a72949138d161d762
+SIZE (gdbm-1.22.tar.gz) = 1090100
diff --git a/databases/geoserver-mysql-plugin/Makefile b/databases/geoserver-mysql-plugin/Makefile
index b842230cebd5..fe275a26c803 100644
--- a/databases/geoserver-mysql-plugin/Makefile
+++ b/databases/geoserver-mysql-plugin/Makefile
@@ -1,7 +1,7 @@
# Created by: Alexander Logvinov <ports@logvinov.com>
PORTNAME= geoserver
-PORTVERSION= 2.19.1
+PORTVERSION= 2.20.1
CATEGORIES= databases geography java
MASTER_SITES= SF/${PORTNAME}/GeoServer/${PORTVERSION}/extensions
PKGNAMESUFFIX= -mysql-plugin
@@ -21,7 +21,7 @@ NO_ARCH= yes
GSLIBDIR= geoserver/webapps/geoserver/WEB-INF/lib
SUB_FILES= pkg-message
-PLIST_FILES= ${GSLIBDIR}/gt-jdbc-mysql-25.1.jar \
+PLIST_FILES= ${GSLIBDIR}/gt-jdbc-mysql-26.1.jar \
${GSLIBDIR}/mysql-connector-java-8.0.23.jar
do-install:
diff --git a/databases/geoserver-mysql-plugin/distinfo b/databases/geoserver-mysql-plugin/distinfo
index df6b1eebef19..8133016cc03b 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 = 1638730977
+SHA256 (geoserver-2.20.1-mysql-plugin.zip) = 738d8609a8a6ee06b5bf6c515aaab2c2983dd875fa94f92262e85f0d736cb46e
+SIZE (geoserver-2.20.1-mysql-plugin.zip) = 2316830
diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile
index 207098da4a06..97d1fda62a36 100644
--- a/databases/gnats4/Makefile
+++ b/databases/gnats4/Makefile
@@ -12,7 +12,6 @@ COMMENT= GNATS, the GNU Problem Report Management System
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
diff --git a/databases/go-pgweb/Makefile b/databases/go-pgweb/Makefile
index b8113f84e8a0..6e751f9fe1f8 100644
--- a/databases/go-pgweb/Makefile
+++ b/databases/go-pgweb/Makefile
@@ -1,10 +1,11 @@
PORTNAME= pgweb
DISTVERSIONPREFIX= v
DISTVERSION= 0.11.7
+PORTREVISION= 1
CATEGORIES= databases www
PKGNAMEPREFIX= go-
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= daniel@morante.net
COMMENT= Web-based database browser for PostgreSQL
LICENSE= MIT
@@ -12,7 +13,18 @@ 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/grass7/Makefile b/databases/grass7/Makefile
index 6833baf7a306..138a7a6dbf18 100644
--- a/databases/grass7/Makefile
+++ b/databases/grass7/Makefile
@@ -1,8 +1,7 @@
# Created by: Mikael URANKAR and Loïc BARTOLETTI
PORTNAME= grass
-PORTVERSION= 7.8.5
-PORTREVISION= 4
+PORTVERSION= 7.8.6
CATEGORIES= databases geography
MASTER_SITES= https://grass.osgeo.org/%SUBDIR%/ \
http://grass.cict.fr/%SUBDIR%/ \
@@ -148,18 +147,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..fb3ed716a141 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 = 1634368600
+SHA256 (grass-7.8.6.tar.gz) = d85e17b0a717e344cdda8f6c5bdeb86763e48d1ee74a62ab471dc8e1293993be
+SIZE (grass-7.8.6.tar.gz) = 66331264
diff --git a/databases/grass7/files/patch-aclocal.m4 b/databases/grass7/files/patch-aclocal.m4
index c3fc06183ca0..393928138bdd 100644
--- a/databases/grass7/files/patch-aclocal.m4
+++ b/databases/grass7/files/patch-aclocal.m4
@@ -1,10 +1,15 @@
---- aclocal.m4.orig 2020-01-25 14:44:25 UTC
+--- aclocal.m4.orig 2020-12-21 18:40:15 UTC
+++ aclocal.m4
-@@ -560,6 +560,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+@@ -560,10 +560,11 @@ 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_LD_FLAGS="-Wl,-soname,\$(notdir \$[@])"
SHLIB_SUFFIX=".so"
- LDFLAGS="-export-dynamic"
+- LDFLAGS="-export-dynamic"
++ LDFLAGS="-Wl,--export-dynamic"
+ #LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS='-Wl,-rpath-link,${LIB_RUNTIME_DIR}'
+ # TODO: add optional pthread support with any combination of:
diff --git a/databases/grass7/files/patch-configure b/databases/grass7/files/patch-configure
index fe7efd87db60..e40bff3e01a3 100644
--- a/databases/grass7/files/patch-configure
+++ b/databases/grass7/files/patch-configure
@@ -1,10 +1,15 @@
---- configure.orig 2020-01-25 14:44:16 UTC
+--- configure.orig 2020-12-21 18:40:15 UTC
+++ configure
-@@ -1591,6 +1591,7 @@ EOF
+@@ -1603,10 +1603,11 @@ 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_LD_FLAGS="-Wl,-soname,\$(notdir \$@)"
SHLIB_SUFFIX=".so"
- LDFLAGS="-export-dynamic"
+- LDFLAGS="-export-dynamic"
++ LDFLAGS="-Wl,--export-dynamic"
+ #LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS='-Wl,-rpath-link,${LIB_RUNTIME_DIR}'
+ # TODO: add optional pthread support with any combination of:
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-plist b/databases/grass7/pkg-plist
index 6d6e16aa8dc5..f3bde86ff134 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,92 @@ 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_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 +1323,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 +1380,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 +1430,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 +1439,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 +1465,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 +1482,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 +1529,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 +1568,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 +1612,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 +1708,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 +1758,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 +1806,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 +1827,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 +1872,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 +1931,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 +1944,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 +1993,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 +2097,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 +2112,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 +2126,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 +2136,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 +2144,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 +2201,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 +2250,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 +2259,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 +2285,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 +2302,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 +2349,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 +2387,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 +2432,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 +2458,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 +2530,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 +2576,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 +2602,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 +2660,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 +2674,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 +2715,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 +2731,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 +2764,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 +2784,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 +2846,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 +2867,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 +2962,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 +2986,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 +3017,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 +3032,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 +3201,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 +3219,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 +3234,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 +3273,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 +3293,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 +3324,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 +3358,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 +3372,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 +3386,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 +3418,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 +3456,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 +3472,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 +3514,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 +3528,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 +3550,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 +3590,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 +3606,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 +3634,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 +3692,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 +3706,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 +3730,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 +3793,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 +3819,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 +3832,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 +3849,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 +3877,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 +3904,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 +4009,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 +4074,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 +4168,150 @@ 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__/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/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
+%%LAS%%%%GRASS_INST_DIR%%/bin/r.in.lidar
+%%LAS%%%%GRASS_INST_DIR%%/bin/r3.in.lidar
+%%LAS%%%%GRASS_INST_DIR%%/bin/v.in.lidar
+%%LAS%%%%GRASS_INST_DIR%%/bin/v.out.lidar
+%%LAS%%%%GRASS_INST_DIR%%/docs/html/r.in.lidar.html
+%%LAS%%%%GRASS_INST_DIR%%/docs/html/r3.in.lidar.html
+%%LAS%%%%GRASS_INST_DIR%%/docs/html/r3_in_lidar.png
+%%LAS%%%%GRASS_INST_DIR%%/docs/html/r_in_lidar.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/v.in.lidar.html
+%%LAS%%%%GRASS_INST_DIR%%/docs/html/v.out.lidar.html
+%%LAS%%%%GRASS_INST_DIR%%/docs/man/man1/r.in.lidar.1.gz
+%%LAS%%%%GRASS_INST_DIR%%/docs/man/man1/r3.in.lidar.1.gz
+%%LAS%%%%GRASS_INST_DIR%%/docs/man/man1/v.in.lidar.1.gz
+%%LAS%%%%GRASS_INST_DIR%%/docs/man/man1/v.out.lidar.1.gz
+%%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 +4322,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/hbase/Makefile b/databases/hbase/Makefile
index 82d418dc3c2c..1591f4fe41e7 100644
--- a/databases/hbase/Makefile
+++ b/databases/hbase/Makefile
@@ -4,7 +4,7 @@ PORTNAME= hbase
PORTVERSION= 1.2.1
PORTREVISION= 1
CATEGORIES= databases java
-MASTER_SITES= APACHE/${PORTNAME}/${PORTVERSION} \
+MASTER_SITES= https://archive.apache.org/dist/${PORTNAME}/${PORTVERSION}/ \
http://kev009.com/freebsd/:maven
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven
DIST_SUBDIR= hadoop
@@ -14,6 +14,9 @@ COMMENT= Hadoop database, a distributed, scalable, big data store
LICENSE= APACHE20
+DEPRECATED= Outdated, unsupported by upstream since June 2019 (upstream is at 2.3 and higher)
+EXPIRATION_DATE=2022-03-31
+
BUILD_DEPENDS= bash:shells/bash \
cmake:devel/cmake \
${LOCALBASE}/share/java/maven3/bin/mvn:devel/maven3
@@ -40,7 +43,7 @@ USERS= ${HBASE_USER}
GROUPS= ${HBASE_GROUP}
SUB_FILES= hbase-env-dist.sh pkg-message
-USE_RC_SUBR= hbase_master hbase_regionserver
+USE_RC_SUBR= hbase_master hbase_regionserver
SUB_LIST= HBASE_USER="${HBASE_USER}" \
JAVA_HOME="${JAVA_HOME}" \
HBASE_LOG_DIR="${HBASE_LOGDIR}" \
diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile
index d51a7d7aecce..1520087c287a 100644
--- a/databases/influxdb/Makefile
+++ b/databases/influxdb/Makefile
@@ -1,48 +1,49 @@
PORTNAME= influxdb
DISTVERSIONPREFIX= v
-DISTVERSION= 1.8.9
+DISTVERSION= 1.8.10
CATEGORIES= databases net-mgmt
-MAINTAINER= driesm.michiels@gmail.com
+MAINTAINER= driesm@FreeBSD.org
COMMENT= Open-source distributed time series database
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= go:modules
+USES= cpe go:modules
+
+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}/
diff --git a/databases/influxdb/distinfo b/databases/influxdb/distinfo
index add1a023d895..278c78f584c7 100644
--- a/databases/influxdb/distinfo
+++ b/databases/influxdb/distinfo
@@ -1,5 +1,5 @@
-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 = 1634312502
+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
diff --git a/databases/iowow/files/patch-src_platform_unix_unix.c b/databases/iowow/files/patch-src_platform_unix_unix.c
index 6910201ce373..7e58d255962b 100644
--- a/databases/iowow/files/patch-src_platform_unix_unix.c
+++ b/databases/iowow/files/patch-src_platform_unix_unix.c
@@ -5,18 +5,7 @@
return iwrc_set_errno(IW_ERROR_IO_ERRNO, errno);
}
-#else
-+#elif defined(__FreeBSD_version) && __FreeBSD_version > 1100501
++#elif defined(__FreeBSD_version)
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/jasperreports/Makefile b/databases/jasperreports/Makefile
index 478a4fa8a04b..16d8f7cc9a78 100644
--- a/databases/jasperreports/Makefile
+++ b/databases/jasperreports/Makefile
@@ -10,6 +10,9 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}-applet-${PORTVERSION}.jar
MAINTAINER= ports@FreeBSD.org
COMMENT= Powerful open source Java reporting tool
+DEPRECATED= Unsupported by upstream, released in 2013
+EXPIRATION_DATE=2022-03-31
+
RUN_DEPENDS= ${JAVALIBDIR}/itext.jar:devel/itext \
${JAVALIBDIR}/xalan.jar:textproc/xalan-j \
${JAVALIBDIR}/crimson.jar:textproc/crimson \
diff --git a/databases/jetbrains-datagrip/Makefile b/databases/jetbrains-datagrip/Makefile
new file mode 100644
index 000000000000..c220c1e08d68
--- /dev/null
+++ b/databases/jetbrains-datagrip/Makefile
@@ -0,0 +1,59 @@
+PORTNAME= datagrip
+PORTVERSION= 2021.3.1
+CATEGORIES= databases java
+MASTER_SITES= https://download-cf.jetbrains.com/datagrip/
+PKGNAMEPREFIX= jetbrains-
+DIST_SUBDIR= jetbrains
+
+MAINTAINER= dch@FreeBSD.org
+COMMENT= JetBrains DataGrip IDE for your Databases
+
+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
+
+RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier \
+ lsof:sysutils/lsof
+
+USES= python:run shebangfix
+
+USE_JAVA= yes
+JAVA_VERSION= 11+
+
+USE_LDCONFIG= yes
+
+SHEBANG_FILES= bin/printenv.py bin/restart.py
+
+NO_ARCH= yes
+NO_BUILD= yes
+SUB_FILES= ${PORTNAME} ${PORTNAME}.desktop pkg-message
+
+WRKSRC= ${WRKDIR}/DataGrip-${PORTVERSION}
+
+do-install:
+# Linux/Windows/OS X only so remove them
+ @${RM} -r \
+ ${WRKSRC}/bin/clang \
+ ${WRKSRC}/bin/cmake \
+ ${WRKSRC}/bin/fsnotifier \
+ ${WRKSRC}/bin/fsnotifier-arm \
+ ${WRKSRC}/bin/fsnotifier64 \
+ ${WRKSRC}/bin/gdb/linux \
+ ${WRKSRC}/bin/lldb/linux \
+ ${WRKSRC}/jbr \
+ ${WRKSRC}/jre64 \
+ ${WRKSRC}/lib/pty4j-native \
+ ${WRKSRC}/plugins/cwm-plugin/quiche-native \
+ ${WRKSRC}/plugins/performanceTesting/bin
+ ${MKDIR} ${STAGEDIR}${DATADIR}
+ @(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \
+ "! -name *\.bak ! -name *\.so ! -name *\.dll ! -name *\.dylib ! -name *\.pdb ! -name *\.sh")
+ @(cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR} "-name *\.sh")
+ ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+ ${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/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}/intellij/bin/fsnotifier" >> ${STAGEDIR}${DATADIR}/bin/idea.properties
+
+.include <bsd.port.mk>
diff --git a/databases/jetbrains-datagrip/distinfo b/databases/jetbrains-datagrip/distinfo
new file mode 100644
index 000000000000..5d04e60d83e4
--- /dev/null
+++ b/databases/jetbrains-datagrip/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1637703919
+SHA256 (jetbrains/datagrip-2021.3.1.tar.gz) = 31d6af619ff311092970d616f840acf134a4683c9e97240d367b2dc95a5bb9a1
+SIZE (jetbrains/datagrip-2021.3.1.tar.gz) = 466032201
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..8befcc74e2fb
--- /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=%%DATADIR%%/bin/datagrip.sh
+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..07226fe07d76
--- /dev/null
+++ b/databases/jetbrains-datagrip/files/datagrip.in
@@ -0,0 +1,3 @@
+#!/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..111326a6c6df
--- /dev/null
+++ b/databases/jetbrains-datagrip/pkg-descr
@@ -0,0 +1,12 @@
+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.
+
+WWW: https://www.jetbrains.com/datagrip/
diff --git a/databases/jetbrains-datagrip/pkg-plist b/databases/jetbrains-datagrip/pkg-plist
new file mode 100644
index 000000000000..3942a9beedd8
--- /dev/null
+++ b/databases/jetbrains-datagrip/pkg-plist
@@ -0,0 +1,893 @@
+bin/datagrip
+man/man1/datagrip.1.gz
+share/applications/datagrip.desktop
+%%DATADIR%%/Install-Linux-tar.txt
+%%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/icons.db
+%%DATADIR%%/bin/idea.properties
+%%DATADIR%%/bin/inspect.sh
+%%DATADIR%%/bin/log.xml
+%%DATADIR%%/bin/ltedit.sh
+%%DATADIR%%/bin/printenv.py
+%%DATADIR%%/bin/remote-dev-server.sh
+%%DATADIR%%/bin/repair
+%%DATADIR%%/bin/restart.py
+%%DATADIR%%/build.txt
+%%DATADIR%%/lib/3rd-party-rt.jar
+%%DATADIR%%/lib/3rd-party.jar
+%%DATADIR%%/lib/annotations-java5.jar
+%%DATADIR%%/lib/asm-7.1.jar
+%%DATADIR%%/lib/asm-analysis-7.1.jar
+%%DATADIR%%/lib/asm-commons-7.1.jar
+%%DATADIR%%/lib/asm-tree-7.1.jar
+%%DATADIR%%/lib/asm-util-7.1.jar
+%%DATADIR%%/lib/async-profiler.jar
+%%DATADIR%%/lib/bootstrap.jar
+%%DATADIR%%/lib/build-marker-DB-213.5744.178
+%%DATADIR%%/lib/byte-buddy-agent.jar
+%%DATADIR%%/lib/cds/classesLogAgent.jar
+%%DATADIR%%/lib/classpath.txt
+%%DATADIR%%/lib/datagrip.jar
+%%DATADIR%%/lib/dbus-java-3.2.1.jar
+%%DATADIR%%/lib/error-prone-annotations.jar
+%%DATADIR%%/lib/external-system-rt.jar
+%%DATADIR%%/lib/forms_rt.jar
+%%DATADIR%%/lib/grpc-netty-shaded.jar
+%%DATADIR%%/lib/intellij-coverage-agent-1.0.613.jar
+%%DATADIR%%/lib/intellij-test-discovery.jar
+%%DATADIR%%/lib/java-utils-1.0.6.jar
+%%DATADIR%%/lib/jetbrains-annotations.jar
+%%DATADIR%%/lib/jffi-1.2.19-native.jar
+%%DATADIR%%/lib/jffi-1.2.19.jar
+%%DATADIR%%/lib/jna.jar
+%%DATADIR%%/lib/jnr-a64asm-1.0.0.jar
+%%DATADIR%%/lib/jnr-constants-0.9.12.jar
+%%DATADIR%%/lib/jnr-enxio-0.21.jar
+%%DATADIR%%/lib/jnr-ffi-2.1.10.jar
+%%DATADIR%%/lib/jnr-posix-3.0.50.jar
+%%DATADIR%%/lib/jnr-unixsocket-0.23.jar
+%%DATADIR%%/lib/jnr-x86asm-1.0.2.jar
+%%DATADIR%%/lib/jps-model.jar
+%%DATADIR%%/lib/jsch-agent-proxy-jsch.jar
+%%DATADIR%%/lib/jsch-agent-proxy-sshj.jar
+%%DATADIR%%/lib/jsch-agent-proxy.jar
+%%DATADIR%%/lib/junixsocket-core.jar
+%%DATADIR%%/lib/kotlin-reflect.jar
+%%DATADIR%%/lib/kotlin-stdlib-jdk8.jar
+%%DATADIR%%/lib/kotlinx.jar
+%%DATADIR%%/lib/openapi.jar
+%%DATADIR%%/lib/org_codehaus_groovy_groovy-json.jar
+%%DATADIR%%/lib/org_codehaus_groovy_groovy-jsr223.jar
+%%DATADIR%%/lib/org_codehaus_groovy_groovy-templates.jar
+%%DATADIR%%/lib/org_codehaus_groovy_groovy-xml.jar
+%%DATADIR%%/lib/org_codehaus_groovy_groovy.jar
+%%DATADIR%%/lib/platform-api.jar
+%%DATADIR%%/lib/platform-impl.jar
+%%DATADIR%%/lib/platform-objectSerializer-annotations.jar
+%%DATADIR%%/lib/platform-statistics-devkit.jar
+%%DATADIR%%/lib/protobuf.jar
+%%DATADIR%%/lib/pty4j.jar
+%%DATADIR%%/lib/rd-core.jar
+%%DATADIR%%/lib/rd-framework.jar
+%%DATADIR%%/lib/rd-swing.jar
+%%DATADIR%%/lib/rd-text.jar
+%%DATADIR%%/lib/stats.jar
+%%DATADIR%%/lib/util.jar
+%%DATADIR%%/lib/winp.jar
+%%DATADIR%%/license/XStream_license.txt
+%%DATADIR%%/license/ant_license.txt
+%%DATADIR%%/license/asm_license.txt
+%%DATADIR%%/license/eclipse_license.txt
+%%DATADIR%%/license/eclipse_license2.txt
+%%DATADIR%%/license/gson_license.txt
+%%DATADIR%%/license/imgscalr_license.txt
+%%DATADIR%%/license/javahelp_license.txt
+%%DATADIR%%/license/javolution_license.txt
+%%DATADIR%%/license/jaxb_license.txt
+%%DATADIR%%/license/jaxen_license.txt
+%%DATADIR%%/license/jdom_license.txt
+%%DATADIR%%/license/jgoodies_forms_license.txt
+%%DATADIR%%/license/junit_license.txt
+%%DATADIR%%/license/kryo-license.txt
+%%DATADIR%%/license/log4j_license.txt
+%%DATADIR%%/license/microba_license.txt
+%%DATADIR%%/license/miglayout_swing_license.txt
+%%DATADIR%%/license/nanoxml_license.txt
+%%DATADIR%%/license/oromatcher_license.txt
+%%DATADIR%%/license/picoContainer_license.txt
+%%DATADIR%%/license/saxon-conditions.html
+%%DATADIR%%/license/swingx_license.txt
+%%DATADIR%%/license/third-party-libraries.html
+%%DATADIR%%/license/trove4j_license.txt
+%%DATADIR%%/license/winp_license.txt
+%%DATADIR%%/license/xerces_license.txt
+%%DATADIR%%/license/xmlrpc_license.txt
+%%DATADIR%%/license/yourkit-license-redist.txt
+%%DATADIR%%/plugins/DataGripHelp/lib/datagrip-assets.jar
+%%DATADIR%%/plugins/DataGripHelp/lib/datagrip-help.jar
+%%DATADIR%%/plugins/DatabaseIDE/lib/database-ide.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/3rd-party.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/aether-dependency-resolver.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/database-dialects.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/database-impl.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/database-minicats.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/database-openapi.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/jdbc-console.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/json-simple-1.1.1.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/jts-core-1.16.1.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/jts-io-common-1.16.1.jar
+%%DATADIR%%/plugins/IntelliLang/lib/IntelliLang.jar
+%%DATADIR%%/plugins/IntelliLang/lib/java-langInjection-jps.jar
+%%DATADIR%%/plugins/git4idea/lib/git4idea-rt.jar
+%%DATADIR%%/plugins/git4idea/lib/git4idea.jar
+%%DATADIR%%/plugins/platform-images/lib/platform-images.jar
+%%DATADIR%%/plugins/remote-dev-server/bin/launcher.sh
+%%DATADIR%%/plugins/remote-dev-server/lib/remote-dev-server.jar
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/README
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/accessx
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/basic
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/caps
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/complete
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/iso9995
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/japan
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/ledcaps
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/lednum
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/ledscroll
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/level5
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/misc
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/mousekeys
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/olpc
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/pc
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/pc98
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/xfree86
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/compat/xtest
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/README
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/amiga
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/ataritt
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/chicony
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/dell
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/digital_vndr/lk
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/digital_vndr/pc
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/digital_vndr/unix
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/everex
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/fujitsu
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/hhk
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/hp
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/keytronic
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/kinesis
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/macintosh
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/microsoft
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/nec
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/nokia
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/northgate
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/pc
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/sanwa
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/sgi_vndr/O2
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/sgi_vndr/indigo
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/sgi_vndr/indy
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/sony
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/steelseries
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/sun
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/teck
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/thinkpad
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/typematrix
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/geometry/winbook
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/README
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/aliases
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/amiga
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/ataritt
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/digital_vndr/lk
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/digital_vndr/pc
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/empty
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/evdev
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/fujitsu
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/hp
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/ibm
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/jolla
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/macintosh
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/olpc
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/sgi_vndr/indigo
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/sgi_vndr/indy
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/sgi_vndr/iris
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/sony
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/sun
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/xfree86
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/keycodes/xfree98
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/rules/README
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/rules/base
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/rules/base.extras.xml
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/rules/base.lst
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/rules/base.xml
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/rules/evdev
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/rules/evdev.extras.xml
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/rules/evdev.lst
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/rules/evdev.xml
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/rules/xfree98
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/rules/xkb.dtd
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/af
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/al
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/altwin
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/am
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/apl
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ara
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/at
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/au
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/az
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ba
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/bd
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/be
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/bg
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/br
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/brai
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/bt
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/bw
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/by
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ca
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/capslock
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/cd
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ch
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/cm
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/cn
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/compose
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ctrl
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/cz
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/de
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/digital_vndr/lk
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/digital_vndr/pc
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/digital_vndr/us
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/digital_vndr/vt
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/dk
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/dz
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ee
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/empty
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/epo
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/es
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/et
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/eu
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/eurosign
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/fi
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/fo
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/fr
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/fujitsu_vndr/jp
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/fujitsu_vndr/us
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/gb
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ge
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/gh
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/gn
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/gr
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/group
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/hp_vndr/us
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/hr
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/hu
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/id
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ie
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/il
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/in
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/inet
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/iq
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ir
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/is
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/it
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/jolla_vndr/sbj
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/jp
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ke
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/keypad
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/kg
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/kh
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/kpdl
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/kr
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/kz
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/la
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/latam
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/latin
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/level3
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/level5
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/lk
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/lt
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/lv
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ma
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/macintosh_vndr/apple
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/macintosh_vndr/ch
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/macintosh_vndr/de
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/macintosh_vndr/dk
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/macintosh_vndr/fi
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/macintosh_vndr/fr
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/macintosh_vndr/gb
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/macintosh_vndr/is
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/macintosh_vndr/it
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/macintosh_vndr/jp
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/macintosh_vndr/latam
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/macintosh_vndr/nl
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/macintosh_vndr/no
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/macintosh_vndr/pt
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/macintosh_vndr/se
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/macintosh_vndr/us
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/mao
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/md
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/me
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/mk
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ml
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/mm
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/mn
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/mt
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/mv
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/my
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/nbsp
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/nec_vndr/jp
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ng
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/nl
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/no
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/nokia_vndr/rx-44
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/nokia_vndr/rx-51
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/nokia_vndr/su-8w
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/np
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/olpc
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/parens
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/pc
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ph
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/pk
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/pl
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/pt
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ro
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/rs
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ru
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/rupeesign
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/se
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sgi_vndr/jp
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sharp_vndr/sl-c3x00
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sharp_vndr/ws003sh
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sharp_vndr/ws007sh
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sharp_vndr/ws011sh
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sharp_vndr/ws020sh
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/shift
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/si
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sk
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sn
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sony_vndr/us
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/srvr_ctrl
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/ara
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/be
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/br
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/ca
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/ch
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/cz
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/de
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/dk
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/ee
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/es
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/fi
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/fr
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/gb
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/gr
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/it
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/jp
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/kr
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/lt
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/lv
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/nl
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/no
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/pl
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/pt
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/ro
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/ru
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/se
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/sk
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/solaris
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/tr
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/tw
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/ua
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sun_vndr/us
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/sy
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/terminate
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/tg
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/th
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/tj
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/tm
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/tr
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/trans
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/tw
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/typo
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/tz
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/ua
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/us
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/uz
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/vn
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/xfree68_vndr/amiga
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/xfree68_vndr/ataritt
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/symbols/za
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/types/README
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/types/basic
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/types/cancel
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/types/caps
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/types/complete
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/types/default
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/types/extra
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/types/iso9995
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/types/level5
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/types/mousekeys
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/types/nokia
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/types/numpad
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/X11/xkb/types/pc
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/bin/Xvfb
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/bin/xkbcomp
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/fontconfig/fonts.conf
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/fontconfig/fonts/DejaVuLGCSans.ttf
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libGL.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libGLX.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libGLdispatch.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libX11-xcb.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libX11.so.6
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libXau.so.6
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libXcomposite.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libXcursor.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libXdamage.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libXdmcp.so.6
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libXext.so.6
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libXfixes.so.3
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libXfont2.so.2
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libXi.so.6
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libXrandr.so.2
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libXrender.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libXtst.so.6
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libXxf86vm.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libasound.so.2
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libatk-1.0.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libatk-bridge-2.0.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libatspi.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libattr.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libavahi-client.so.3
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libavahi-common.so.3
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libbz2.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libcap.so.2
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libcom_err.so.2
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libcrypto.so.10
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libcups.so.2
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libdbus-1.so.3
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libdrm.so.2
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libdw.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libelf.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libexpat.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libffi.so.6
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libfontconfig.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libfontenc.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libfreetype.so.6
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libgbm.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libgcrypt.so.11
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libgio-2.0.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libglapi.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libglib-2.0.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libgmodule-2.0.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libgobject-2.0.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libgpg-error.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libgssapi_krb5.so.2
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libk5crypto.so.3
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libkeyutils.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libkrb5.so.3
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libkrb5support.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/liblz4.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/liblzma.so.5
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libpci.so.3
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libpcre.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libpixman-1.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libpng15.so.15
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libsqlite3.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libssl.so.10
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libstdc++.so.6
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libsystemd.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libuuid.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libwayland-server.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libxcb.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libxkbcommon.so.0
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libxkbfile.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libxshmfence.so.1
+%%DATADIR%%/plugins/remote-dev-server/selfcontained/lib/libz.so.1
+%%DATADIR%%/plugins/searchEverywhereMl/lib/searchEverywhereMl.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/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/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/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/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/git/README.md
+%%DATADIR%%/plugins/textmate/lib/bundles/git/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git/extension.webpack.config.js
+%%DATADIR%%/plugins/textmate/lib/bundles/git/languages/diff.language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git/languages/git-commit.language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git/languages/git-rebase.language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git/languages/ignore.language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/api/api1.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/api/extension.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/api/git.d.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/askpass-empty.sh
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/askpass-main.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/askpass.sh
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/askpass.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/autofetch.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/commands.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/contentProvider.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/decorationProvider.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/decorators.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/emoji.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/encoding.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/fileSystemProvider.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/git.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/ipc/ipcClient.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/ipc/ipcServer.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/log.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/main.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/model.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/protocolHandler.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/pushError.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/remoteProvider.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/remoteSource.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/repository.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/staging.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/statusbar.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/terminal.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/test/git.test.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/test/index.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/test/smoke.test.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/timelineProvider.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/typings/refs.d.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/uri.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/util.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/src/watch.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/git/syntaxes/diff.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git/syntaxes/git-commit.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git/syntaxes/git-rebase.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git/syntaxes/ignore.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git/tsconfig.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git/yarn.lock
+%%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/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/LICENSE
+%%DATADIR%%/plugins/textmate/lib/bundles/jsp/README.md
+%%DATADIR%%/plugins/textmate/lib/bundles/jsp/jsp-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/jsp/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/jsp/syntaxes/jsp.tmLanguage.json
+%%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/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/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/extension-browser.webpack.config.js
+%%DATADIR%%/plugins/textmate/lib/bundles/python/extension.webpack.config.js
+%%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/src/pythonMain.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/python/src/typings/ref.d.ts
+%%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/python/tsconfig.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/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/README.md
+%%DATADIR%%/plugins/textmate/lib/bundles/search-result/extension-browser.webpack.config.js
+%%DATADIR%%/plugins/textmate/lib/bundles/search-result/extension.webpack.config.js
+%%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/src/extension.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/search-result/src/media/refresh-dark.svg
+%%DATADIR%%/plugins/textmate/lib/bundles/search-result/src/media/refresh-light.svg
+%%DATADIR%%/plugins/textmate/lib/bundles/search-result/src/typings/refs.d.ts
+%%DATADIR%%/plugins/textmate/lib/bundles/search-result/syntaxes/generateTMLanguage.js
+%%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/search-result/yarn.lock
+%%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/LICENSE.md
+%%DATADIR%%/plugins/textmate/lib/bundles/swift/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/swift/language-configuration.json
+%%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/toml/Preferences/Comments.tmPreferences
+%%DATADIR%%/plugins/textmate/lib/bundles/toml/Preferences/Folding.tmPreferences
+%%DATADIR%%/plugins/textmate/lib/bundles/toml/Preferences/Indent.tmPreferences
+%%DATADIR%%/plugins/textmate/lib/bundles/toml/Preferences/Symbol List.tmPreferences
+%%DATADIR%%/plugins/textmate/lib/bundles/toml/Preferences/Typing Pairs.tmPreferences
+%%DATADIR%%/plugins/textmate/lib/bundles/toml/README.mdown
+%%DATADIR%%/plugins/textmate/lib/bundles/toml/Syntaxes/TOML.tmLanguage
+%%DATADIR%%/plugins/textmate/lib/bundles/toml/info.plist
+%%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/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/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/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/LICENSE.txt
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/grammars/viml.json
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/tests/basic.vim
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/tests/example-help.txt
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/tests/flavours.of.snippet
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/tests/modeline.md
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/tests/neo.snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/tests/solarized.vim
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/tests/syntax.vim
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/tests/textobj-rubyblock.vmb
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/tests/tpope-characterize.vim
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/tests/tpope-fugitive.vim
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/tests/ulti.snip
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/tests/vim-syntax.vim
+%%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%%/product-info.json
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index 05f420b2dae8..a0471968c716 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kbibtex
DISTVERSION= 0.9.2
-PORTREVISION= 20
+PORTREVISION= 23
CATEGORIES= databases kde
MASTER_SITES= KDE/stable/KBibTeX/${DISTVERSION}
diff --git a/databases/kdb/Makefile b/databases/kdb/Makefile
index 7df4efab58d3..60122c0432ba 100644
--- a/databases/kdb/Makefile
+++ b/databases/kdb/Makefile
@@ -1,6 +1,6 @@
PORTNAME= kdb
DISTVERSION= 3.2.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= databases kde
MASTER_SITES= KDE/stable/${PORTNAME}/src
DIST_SUBDIR= KDE/${PORTNAME}
diff --git a/databases/ldb20/Makefile b/databases/ldb20/Makefile
index a54eec8c0e03..d34231929acb 100644
--- a/databases/ldb20/Makefile
+++ b/databases/ldb20/Makefile
@@ -88,7 +88,6 @@ 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
diff --git a/databases/libdrizzle-redux/Makefile b/databases/libdrizzle-redux/Makefile
index d0782d9e465d..625c8bf34896 100644
--- a/databases/libdrizzle-redux/Makefile
+++ b/databases/libdrizzle-redux/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USES= gmake libtool ssl
USE_LDCONFIG= yes
-CONFLICTS= libdrizzle-[0-9]*
+CONFLICTS= libdrizzle
OPTIONS_DEFINE= DOCS
diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
index d1b7e89a48bf..e316b148a6e1 100644
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@@ -15,7 +15,8 @@ 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 tar:xz
+CPE_VENDOR= gnome
LIBGDA5_SLAVE?= no
SHEBANG_FILES= libgda-report/RML/*/*.py
@@ -50,7 +51,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
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index 43394c9c2f8b..5f84ec7c3064 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -4,7 +4,7 @@ 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
LICENSE= GPLv2
diff --git a/databases/libpbl/Makefile b/databases/libpbl/Makefile
index afc1085adad4..65552877ad2a 100644
--- a/databases/libpbl/Makefile
+++ b/databases/libpbl/Makefile
@@ -14,10 +14,6 @@ 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/libpg_query/Makefile b/databases/libpg_query/Makefile
index cd2d8402bc0b..fed3d6b19e80 100644
--- a/databases/libpg_query/Makefile
+++ b/databases/libpg_query/Makefile
@@ -14,7 +14,8 @@ COMMENT= C library for accessing the PostgreSQL parser outside of the server
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= compiler:c11 gmake pgsql
+USES= compiler:c11 cpe gmake pgsql
+CPE_VENDOR= ${PORTNAME}_project
USE_LDCONFIG= yes
USE_GITHUB= yes
diff --git a/databases/linux-c7-sqlite3/Makefile b/databases/linux-c7-sqlite3/Makefile
index 65105ba32a28..e512abdd22df 100644
--- a/databases/linux-c7-sqlite3/Makefile
+++ b/databases/linux-c7-sqlite3/Makefile
@@ -15,7 +15,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/litestream/Makefile b/databases/litestream/Makefile
index b95fe3aa95d6..cbc068b231cb 100644
--- a/databases/litestream/Makefile
+++ b/databases/litestream/Makefile
@@ -1,6 +1,6 @@
PORTNAME= litestream
DISTVERSIONPREFIX= v
-DISTVERSION= 0.3.5
+DISTVERSION= 0.3.6
CATEGORIES= databases
MAINTAINER= nc@FreeBSD.org
diff --git a/databases/litestream/distinfo b/databases/litestream/distinfo
index dd16c15d4157..0e3cc83a2890 100644
--- a/databases/litestream/distinfo
+++ b/databases/litestream/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1623776373
-SHA256 (benbjohnson-litestream-v0.3.5_GH0.tar.gz) = 53b4c100acd6e5c69457ea251dd3276c6786aa2d1a7e18a2f9518557f66fd209
-SIZE (benbjohnson-litestream-v0.3.5_GH0.tar.gz) = 101545
+TIMESTAMP = 1635268558
+SHA256 (benbjohnson-litestream-v0.3.6_GH0.tar.gz) = 42323c31af2f70891854709dcd56ce7c970ebdb42d563da1bc81d8abc47f434a
+SIZE (benbjohnson-litestream-v0.3.6_GH0.tar.gz) = 101523
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
diff --git a/databases/mariadb-connector-c/Makefile b/databases/mariadb-connector-c/Makefile
index 4767d6110b4d..05518b869eac 100644
--- a/databases/mariadb-connector-c/Makefile
+++ b/databases/mariadb-connector-c/Makefile
@@ -1,5 +1,5 @@
PORTNAME= mariadb-connector-c
-PORTVERSION= 3.1.10
+PORTVERSION= 3.2.4
CATEGORIES= databases
MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
http://mirrors.supportex.net/${SITESDIR}/ \
@@ -19,10 +19,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LIB
LIB_DEPENDS= libcurl.so:ftp/curl
-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
diff --git a/databases/mariadb-connector-c/distinfo b/databases/mariadb-connector-c/distinfo
index 14f8f76ea5c8..09d81f533480 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 = 1636199203
+SHA256 (mariadb-connector-c-3.2.4-src.tar.gz) = 81fd5e7c800d8524d9cc5bcfa037ff5ac154361fe89e8103d406fb8768f3b5d1
+SIZE (mariadb-connector-c-3.2.4-src.tar.gz) = 991053
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-plist b/databases/mariadb-connector-c/pkg-plist
index b1a7b481fc80..5a37ac52edf8 100644
--- a/databases/mariadb-connector-c/pkg-plist
+++ b/databases/mariadb-connector-c/pkg-plist
@@ -26,3 +26,123 @@ lib/mariadb/plugin/mysql_clear_password.so
lib/mariadb/plugin/remote_io.so
lib/mariadb/plugin/sha256_password.so
libdata/pkgconfig/libmariadb.pc
+man/man3/mariadb_cancel.3.gz
+man/man3/mariadb_connection.3.gz
+man/man3/mariadb_dyncol_check.3.gz
+man/man3/mariadb_dyncol_column_cmp_named.3.gz
+man/man3/mariadb_dyncol_column_count.3.gz
+man/man3/mariadb_dyncol_create_many_named.3.gz
+man/man3/mariadb_dyncol_create_many_num.3.gz
+man/man3/mariadb_dyncol_exists_named.3.gz
+man/man3/mariadb_dyncol_exists_num.3.gz
+man/man3/mariadb_dyncol_free.3.gz
+man/man3/mariadb_dyncol_list_named.3.gz
+man/man3/mariadb_dyncol_list_num.3.gz
+man/man3/mariadb_dyncol_unpack.3.gz
+man/man3/mariadb_dyncol_update_many_named.3.gz
+man/man3/mariadb_dyncol_update_many_num.3.gz
+man/man3/mariadb_get_infov.3.gz
+man/man3/mariadb_reconnect.3.gz
+man/man3/mariadb_rpl_close.3.gz
+man/man3/mariadb_rpl_fetch.3.gz
+man/man3/mariadb_rpl_get_optionsv.3.gz
+man/man3/mariadb_rpl_open.3.gz
+man/man3/mariadb_rpl_optionsv.3.gz
+man/man3/mariadb_stmt_execute_direct.3.gz
+man/man3/mariadb_stmt_fetch_fields.3.gz
+man/man3/mysql_affected_rows.3.gz
+man/man3/mysql_autocommit.3.gz
+man/man3/mysql_change_user.3.gz
+man/man3/mysql_close.3.gz
+man/man3/mysql_commit.3.gz
+man/man3/mysql_data_seek.3.gz
+man/man3/mysql_errno.3.gz
+man/man3/mysql_error.3.gz
+man/man3/mysql_fetch_field.3.gz
+man/man3/mysql_fetch_field_direct.3.gz
+man/man3/mysql_fetch_fields.3.gz
+man/man3/mysql_fetch_lengths.3.gz
+man/man3/mysql_fetch_row.3.gz
+man/man3/mysql_field_count.3.gz
+man/man3/mysql_field_seek.3.gz
+man/man3/mysql_field_tell.3.gz
+man/man3/mysql_free_result.3.gz
+man/man3/mysql_get_character_set_info.3.gz
+man/man3/mysql_get_client_info.3.gz
+man/man3/mysql_get_client_version.3.gz
+man/man3/mysql_get_host_info.3.gz
+man/man3/mysql_get_proto_info.3.gz
+man/man3/mysql_get_server_info.3.gz
+man/man3/mysql_get_server_version.3.gz
+man/man3/mysql_get_socket.3.gz
+man/man3/mysql_get_ssl_cipher.3.gz
+man/man3/mysql_hex_string.3.gz
+man/man3/mysql_info.3.gz
+man/man3/mysql_init.3.gz
+man/man3/mysql_kill.3.gz
+man/man3/mysql_more_results.3.gz
+man/man3/mysql_next_result.3.gz
+man/man3/mysql_num_fields.3.gz
+man/man3/mysql_num_rows.3.gz
+man/man3/mysql_options.3.gz
+man/man3/mysql_options4.3.gz
+man/man3/mysql_optionsv.3.gz
+man/man3/mysql_ping.3.gz
+man/man3/mysql_query.3.gz
+man/man3/mysql_read_query_result.3.gz
+man/man3/mysql_real_connect.3.gz
+man/man3/mysql_real_escape_string.3.gz
+man/man3/mysql_real_query.3.gz
+man/man3/mysql_refresh.3.gz
+man/man3/mysql_reset_connection.3.gz
+man/man3/mysql_rollback.3.gz
+man/man3/mysql_row_seek.3.gz
+man/man3/mysql_row_tell.3.gz
+man/man3/mysql_select_db.3.gz
+man/man3/mysql_send_query.3.gz
+man/man3/mysql_server_end.3.gz
+man/man3/mysql_server_init.3.gz
+man/man3/mysql_session_track_get_first.3.gz
+man/man3/mysql_session_track_get_next.3.gz
+man/man3/mysql_set_character_set.3.gz
+man/man3/mysql_set_server_option.3.gz
+man/man3/mysql_shutdown.3.gz
+man/man3/mysql_sqlstate.3.gz
+man/man3/mysql_ssl_set.3.gz
+man/man3/mysql_stat.3.gz
+man/man3/mysql_stmt_affected_rows.3.gz
+man/man3/mysql_stmt_attr_get.3.gz
+man/man3/mysql_stmt_attr_set.3.gz
+man/man3/mysql_stmt_bind_param.3.gz
+man/man3/mysql_stmt_bind_result.3.gz
+man/man3/mysql_stmt_close.3.gz
+man/man3/mysql_stmt_data_seek.3.gz
+man/man3/mysql_stmt_errno.3.gz
+man/man3/mysql_stmt_error.3.gz
+man/man3/mysql_stmt_execute.3.gz
+man/man3/mysql_stmt_fetch.3.gz
+man/man3/mysql_stmt_fetch_column.3.gz
+man/man3/mysql_stmt_field_count.3.gz
+man/man3/mysql_stmt_free_result.3.gz
+man/man3/mysql_stmt_init.3.gz
+man/man3/mysql_stmt_insert_id.3.gz
+man/man3/mysql_stmt_more_results.3.gz
+man/man3/mysql_stmt_next_result.3.gz
+man/man3/mysql_stmt_num_rows.3.gz
+man/man3/mysql_stmt_param_count.3.gz
+man/man3/mysql_stmt_param_metadata.3.gz
+man/man3/mysql_stmt_prepare.3.gz
+man/man3/mysql_stmt_reset.3.gz
+man/man3/mysql_stmt_result_metadata.3.gz
+man/man3/mysql_stmt_row_seek.3.gz
+man/man3/mysql_stmt_row_tell.3.gz
+man/man3/mysql_stmt_send_long_data.3.gz
+man/man3/mysql_stmt_sqlstate.3.gz
+man/man3/mysql_stmt_store_result.3.gz
+man/man3/mysql_stmt_warning_count.3.gz
+man/man3/mysql_store_result.3.gz
+man/man3/mysql_thread_end.3.gz
+man/man3/mysql_thread_id.3.gz
+man/man3/mysql_thread_init.3.gz
+man/man3/mysql_use_result.3.gz
+man/man3/mysql_warning_count.3.gz
diff --git a/databases/mariadb-connector-odbc/Makefile b/databases/mariadb-connector-odbc/Makefile
index 4732487d6149..491d01506592 100644
--- a/databases/mariadb-connector-odbc/Makefile
+++ b/databases/mariadb-connector-odbc/Makefile
@@ -1,5 +1,5 @@
PORTNAME= mariadb
-PORTVERSION= 3.1.11
+PORTVERSION= 3.1.14
CATEGORIES= databases
MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
http://mirrors.supportex.net/${SITESDIR}/ \
@@ -10,7 +10,7 @@ MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
http://mirror.layerjet.com/${SITESDIR}/ \
http://mirror.switch.ch/mirror/${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
@@ -36,7 +36,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..e6e150108634 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 = 1636200693
+SHA256 (mariadb-connector-odbc-3.1.14-src.tar.gz) = 06ed87398f70eb17f15856f961ea26af9f03b2d5615766ce7857f8285c380f68
+SIZE (mariadb-connector-odbc-3.1.14-src.tar.gz) = 549698
diff --git a/databases/mariadb103-client/files/patch-include_my__cpu.h b/databases/mariadb103-client/files/patch-include_my__cpu.h
new file mode 100644
index 000000000000..36a374bb7cc6
--- /dev/null
+++ b/databases/mariadb103-client/files/patch-include_my__cpu.h
@@ -0,0 +1,48 @@
+--- include/my_cpu.h.orig 2021-08-02 10:58:56 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()
+@@ -72,7 +89,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
+ #else
+ int32 var, oldval = 0;
+ my_atomic_cas32_strong_explicit(&var, &oldval, 1, MY_MEMORY_ORDER_RELAXED,
diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile
index 0d2562ab2541..8ae086ab6851 100644
--- a/databases/mariadb103-server/Makefile
+++ b/databases/mariadb103-server/Makefile
@@ -1,8 +1,8 @@
# Created by: Bernard Spil <brnrd@FreeBSD.org>
PORTNAME?= mariadb
-PORTVERSION= 10.3.31
-PORTREVISION?= 1
+PORTVERSION= 10.3.32
+PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
@@ -92,10 +92,10 @@ DISABLED_PLUGINS+= DAEMON_EXAMPLE DIALOG_EXAMPLES EXAMPLE \
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]*-//}-*
+CONFLICTS_INSTALL= mariadb10[0-24-9]-${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
@@ -164,12 +164,6 @@ ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd
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)
diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo
index 31e29a79b9ae..12faf4cdb3be 100644
--- a/databases/mariadb103-server/distinfo
+++ b/databases/mariadb103-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628426460
-SHA256 (mariadb-10.3.31.tar.gz) = 20421dfe5750f510ab0ee23420337332e6799cd38fa31332e2841dfa956eb771
-SIZE (mariadb-10.3.31.tar.gz) = 73298653
+TIMESTAMP = 1636550062
+SHA256 (mariadb-10.3.32.tar.gz) = 948d0cdf2f92c60cff4232af9d724e0a4bbeafbb35762fa429e7ba5c3811c064
+SIZE (mariadb-10.3.32.tar.gz) = 73389214
diff --git a/databases/mariadb103-server/files/mysql-server.in b/databases/mariadb103-server/files/mysql-server.in
index 9da717d5b9a3..356d6bb2f9c0 100644
--- a/databases/mariadb103-server/files/mysql-server.in
+++ b/databases/mariadb103-server/files/mysql-server.in
@@ -7,9 +7,6 @@
# 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
@@ -31,9 +28,7 @@ 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"}
@@ -49,9 +44,7 @@ if [ -n "$2" ]; then
"$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\"}"
;;
@@ -117,12 +110,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/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-include_my__cpu.h b/databases/mariadb103-server/files/patch-include_my__cpu.h
new file mode 100644
index 000000000000..36a374bb7cc6
--- /dev/null
+++ b/databases/mariadb103-server/files/patch-include_my__cpu.h
@@ -0,0 +1,48 @@
+--- include/my_cpu.h.orig 2021-08-02 10:58:56 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()
+@@ -72,7 +89,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
+ #else
+ int32 var, oldval = 0;
+ my_atomic_cas32_strong_explicit(&var, &oldval, 1, MY_MEMORY_ORDER_RELAXED,
diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile
index eef8cc75b7de..eb7cfef65782 100644
--- a/databases/mariadb104-server/Makefile
+++ b/databases/mariadb104-server/Makefile
@@ -1,8 +1,8 @@
# Created by: Bernard Spil <brnrd@FreeBSD.org>
PORTNAME?= mariadb
-PORTVERSION= 10.4.21
-PORTREVISION?= 1
+PORTVERSION= 10.4.22
+PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
@@ -105,10 +105,10 @@ DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
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]*-//}-*
+CONFLICTS_INSTALL= mariadb10[0-24-9]-${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
@@ -190,12 +190,6 @@ 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= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
.endif
@@ -207,8 +201,8 @@ PLIST_SUB+= WSREP="@comment "
.endif
.if ${ARCH} == i386
-USE_GCC= yes
-CFLAGS+= -latomic -fasynchronous-unwind-tables
+USE_GCC= yes
+CFLAGS+= -latomic -fasynchronous-unwind-tables
.endif
.if ${OPSYS} == DragonFly
diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo
index ae780beace2f..6691d74395ca 100644
--- a/databases/mariadb104-server/distinfo
+++ b/databases/mariadb104-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628423421
-SHA256 (mariadb-10.4.21.tar.gz) = 94dd2e6f5d286de8a7dccffe984015d4253a0568281c7440e772cfbe098a291d
-SIZE (mariadb-10.4.21.tar.gz) = 84809537
+TIMESTAMP = 1636537152
+SHA256 (mariadb-10.4.22.tar.gz) = 44bdc36eeb02888296e961718bae808f3faab268ed49160a785248db60500c00
+SIZE (mariadb-10.4.22.tar.gz) = 84916052
diff --git a/databases/mariadb104-server/files/mysql-server.in b/databases/mariadb104-server/files/mysql-server.in
index 4e2753f09ee6..965e81ac025c 100644
--- a/databases/mariadb104-server/files/mysql-server.in
+++ b/databases/mariadb104-server/files/mysql-server.in
@@ -7,9 +7,6 @@
# 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
@@ -34,9 +31,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="/var/db/mysql"}
: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
@@ -52,9 +47,7 @@ if [ -n "$2" ]; then
"$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\"}"
@@ -126,12 +119,7 @@ mysql_prestart()
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
+ return 0
}
mysql_poststart()
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-include_my__cpu.h b/databases/mariadb104-server/files/patch-include_my__cpu.h
new file mode 100644
index 000000000000..e205cbfa05e2
--- /dev/null
+++ b/databases/mariadb104-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/Makefile b/databases/mariadb105-server/Makefile
index 4a3565ff8fb5..a5e8c48668ad 100644
--- a/databases/mariadb105-server/Makefile
+++ b/databases/mariadb105-server/Makefile
@@ -1,8 +1,8 @@
# Created by: Bernard Spil <brnrd@FreeBSD.org>
PORTNAME?= mariadb
-PORTVERSION= 10.5.12
-PORTREVISION?= 1
+PORTVERSION= 10.5.13
+PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
@@ -112,10 +112,10 @@ 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]*-//} \
+ 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
@@ -196,12 +196,6 @@ 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
diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo
index 148012cb3dbe..c5d7eddf1096 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 = 1636446066
+SHA256 (mariadb-10.5.13.tar.gz) = 16f008c66831130e9263b2601265d566ffc4e890d37bacecd4dcecebfd0d1c58
+SIZE (mariadb-10.5.13.tar.gz) = 102047279
diff --git a/databases/mariadb105-server/files/mysql-server.in b/databases/mariadb105-server/files/mysql-server.in
index c4fd7307ca24..8d0b8e7eff4e 100644
--- a/databases/mariadb105-server/files/mysql-server.in
+++ b/databases/mariadb105-server/files/mysql-server.in
@@ -7,9 +7,6 @@
# 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
@@ -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/mdbtools/Makefile b/databases/mdbtools/Makefile
index 1916f2b6ea38..014fd93cf5bd 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -2,7 +2,8 @@
PORTNAME= mdbtools
DISTVERSIONPREFIX= v
-DISTVERSION= 0.9.4
+DISTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= databases
MAINTAINER= rhurlin@FreeBSD.org
@@ -16,7 +17,7 @@ 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= autoreconf bison gnome iconv:wchar_t libtool pathfix \
pkgconfig readline
USE_GITHUB= yes
USE_GNOME= glib20
@@ -29,15 +30,16 @@ 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 TODO.md
diff --git a/databases/mdbtools/distinfo b/databases/mdbtools/distinfo
index 1666db424714..0d8155d3111a 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 = 1635088788
+SHA256 (mdbtools-mdbtools-v1.0.0_GH0.tar.gz) = dc6ce8555f0c08bab6d19dbec767f466a78611974e0ff44261b468b68a7acf85
+SIZE (mdbtools-mdbtools-v1.0.0_GH0.tar.gz) = 220553
diff --git a/databases/mdbtools/pkg-plist b/databases/mdbtools/pkg-plist
index 391699a77aed..bdafcac95f59 100644
--- a/databases/mdbtools/pkg-plist
+++ b/databases/mdbtools/pkg-plist
@@ -16,15 +16,15 @@ include/mdbtools.h
lib/libmdb.a
lib/libmdb.so
lib/libmdb.so.3
-lib/libmdb.so.3.0.4
-lib/libmdbodbc.a
-lib/libmdbodbc.so
-lib/libmdbodbcW.a
-lib/libmdbodbcW.so
+lib/libmdb.so.3.1.0
lib/libmdbsql.a
lib/libmdbsql.so
lib/libmdbsql.so.3
-lib/libmdbsql.so.3.0.4
+lib/libmdbsql.so.3.1.0
+lib/odbc/libmdbodbc.a
+lib/odbc/libmdbodbc.so
+lib/odbc/libmdbodbcW.a
+lib/odbc/libmdbodbcW.so
libdata/pkgconfig/libmdb.pc
libdata/pkgconfig/libmdbsql.pc
%%MANPAGES%%man/man1/mdb-array.1.gz
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 4e13727dd6a9..d76c27058ad2 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -1,7 +1,7 @@
# Created by: Sean Chittenden <seanc@FreeBSD.org>
PORTNAME= memcached
-PORTVERSION= 1.6.10
+PORTVERSION= 1.6.12
CATEGORIES= databases
MASTER_SITES= http://www.memcached.org/files/ \
GENTOO
@@ -61,7 +61,7 @@ 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..13c70fbca48c 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 = 1634646262
+SHA256 (memcached-1.6.12.tar.gz) = f291a35f82ef9756ed1d952879ef5f4be870f932bdfcb2ab61356609abf82346
+SIZE (memcached-1.6.12.tar.gz) = 618614
diff --git a/databases/mongodb-tools/Makefile b/databases/mongodb-tools/Makefile
index 032ec08e7b23..6b1fc7871e9e 100644
--- a/databases/mongodb-tools/Makefile
+++ b/databases/mongodb-tools/Makefile
@@ -1,5 +1,5 @@
PORTNAME= mongodb-tools
-DISTVERSION= 100.4.1
+DISTVERSION= 100.5.1
CATEGORIES= databases
MAINTAINER= ronald-lists@klop.ws
diff --git a/databases/mongodb-tools/distinfo b/databases/mongodb-tools/distinfo
index 8eca0f0f257f..dd46893b031b 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 = 1634148867
+SHA256 (mongodb-mongo-tools-100.5.1_GH0.tar.gz) = 04441784c364caf6d2603307c93c21c3b55808d0a3efae00bd34b4edf37e492d
+SIZE (mongodb-mongo-tools-100.5.1_GH0.tar.gz) = 3796549
diff --git a/databases/mongodb36-tools/Makefile b/databases/mongodb36-tools/Makefile
index 9824ccc54658..7fa53dff7fcc 100644
--- a/databases/mongodb36-tools/Makefile
+++ b/databases/mongodb36-tools/Makefile
@@ -9,7 +9,8 @@ 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"
+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
diff --git a/databases/mongodb36/Makefile b/databases/mongodb36/Makefile
index 08bc75c50f91..4e049e73ba91 100644
--- a/databases/mongodb36/Makefile
+++ b/databases/mongodb36/Makefile
@@ -18,7 +18,7 @@ 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)"
+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}
@@ -55,12 +55,6 @@ 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
diff --git a/databases/mongodb36/files/mongod.in b/databases/mongodb36/files/mongod.in
index e885be83196c..20b0f5c0f43d 100644
--- a/databases/mongodb36/files/mongod.in
+++ b/databases/mongodb36/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/mongodb40-tools/Makefile b/databases/mongodb40-tools/Makefile
index d56a26d0dc93..052c61428767 100644
--- a/databases/mongodb40-tools/Makefile
+++ b/databases/mongodb40-tools/Makefile
@@ -1,6 +1,6 @@
PORTNAME= mongodb40-tools
DISTVERSIONPREFIX= r
-DISTVERSION= 4.0.24
+DISTVERSION= 4.0.27
CATEGORIES= databases
MAINTAINER= dev.ashevchuk@gmail.com
diff --git a/databases/mongodb40-tools/distinfo b/databases/mongodb40-tools/distinfo
index c872d1e1b590..f709385cdcf4 100644
--- a/databases/mongodb40-tools/distinfo
+++ b/databases/mongodb40-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618524070
-SHA256 (mongodb-mongo-tools-r4.0.24_GH0.tar.gz) = 0d8d7e980c5ec6b2e3c7dca9e2eb53ddc092e9f82d983df81d3b012d164f1e51
-SIZE (mongodb-mongo-tools-r4.0.24_GH0.tar.gz) = 11148198
+TIMESTAMP = 1631274026
+SHA256 (mongodb-mongo-tools-r4.0.27_GH0.tar.gz) = abcc69331b0ab6a436108d00108bf1173163e490e8750f8adb7cd1eb3260ee48
+SIZE (mongodb-mongo-tools-r4.0.27_GH0.tar.gz) = 11149442
diff --git a/databases/mongodb40/Makefile b/databases/mongodb40/Makefile
index f56d4fb23ea2..92493dac57f0 100644
--- a/databases/mongodb40/Makefile
+++ b/databases/mongodb40/Makefile
@@ -1,6 +1,6 @@
PORTNAME= mongodb
DISTVERSIONPREFIX= r
-DISTVERSION= 4.0.25
+DISTVERSION= 4.0.27
CATEGORIES= databases net
MASTER_SITES= https://fastdl.mongodb.org/src/ \
http://fastdl.mongodb.org/src/
@@ -17,7 +17,7 @@ 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)
+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} \
@@ -27,10 +27,13 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libcurl.so:ftp/curl \
libsnappy.so:archivers/snappy
-USES= compiler:c++14-lang cpe python:3.5+,build scons
+USES= compiler:c++14-lang cpe python:3.5+,build scons shebangfix
USE_RC_SUBR= mongod
-CONFLICTS_INSTALL= mongodb36 mongodb4[24]
+CONFLICTS_INSTALL= mongodb36 mongodb4[24] mongodb50
+
+SHEBANG_FILES= src/mongo/installer/compass/install_compass
+python_OLD_CMD= @python_interpreter@
MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \
--use-system-pcre --use-system-snappy \
@@ -54,12 +57,6 @@ 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
diff --git a/databases/mongodb40/distinfo b/databases/mongodb40/distinfo
index 766d8f0341c9..c6a65ef1a338 100644
--- a/databases/mongodb40/distinfo
+++ b/databases/mongodb40/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623237574
-SHA256 (mongodb-src-r4.0.25.tar.gz) = c51f1f78bc121a260023e5419dd219456ed4fbb6da3f8954654263a0b260b0fd
-SIZE (mongodb-src-r4.0.25.tar.gz) = 50516290
+TIMESTAMP = 1631386345
+SHA256 (mongodb-src-r4.0.27.tar.gz) = 72ddf79a72b8a6cce160ce08b3b8f4199411ca2f22f109b2d30724972ab92e33
+SIZE (mongodb-src-r4.0.27.tar.gz) = 50548264
diff --git a/databases/mongodb40/files/mongod.in b/databases/mongodb40/files/mongod.in
index e885be83196c..20b0f5c0f43d 100644
--- a/databases/mongodb40/files/mongod.in
+++ b/databases/mongodb40/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/mongodb42-tools/Makefile b/databases/mongodb42-tools/Makefile
index 9b5d877bf8d6..199326181105 100644
--- a/databases/mongodb42-tools/Makefile
+++ b/databases/mongodb42-tools/Makefile
@@ -1,6 +1,6 @@
PORTNAME= mongodb42-tools
DISTVERSIONPREFIX= r
-DISTVERSION= 4.2.14
+DISTVERSION= 4.2.17
CATEGORIES= databases
MAINTAINER= ronald-lists@klop.ws
diff --git a/databases/mongodb42-tools/distinfo b/databases/mongodb42-tools/distinfo
index 39d49cd677a8..280fa750118f 100644
--- a/databases/mongodb42-tools/distinfo
+++ b/databases/mongodb42-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620129017
-SHA256 (mongodb-mongo-tools-r4.2.14_GH0.tar.gz) = 2c2bd94020f40cd0cdebe5fa54a18291fdf13a6a9cf7a2dd08ce4ae8e687997b
-SIZE (mongodb-mongo-tools-r4.2.14_GH0.tar.gz) = 15029404
+TIMESTAMP = 1632392434
+SHA256 (mongodb-mongo-tools-r4.2.17_GH0.tar.gz) = ea7e620f9c445bb70f078910b43819756f6a718abd6d69561b3a62e766faab71
+SIZE (mongodb-mongo-tools-r4.2.17_GH0.tar.gz) = 15028859
diff --git a/databases/mongodb42/Makefile b/databases/mongodb42/Makefile
index 2e91c1936951..77c396b7fea3 100644
--- a/databases/mongodb42/Makefile
+++ b/databases/mongodb42/Makefile
@@ -1,12 +1,16 @@
PORTNAME= mongodb
DISTVERSIONPREFIX= r
-DISTVERSION= 4.2.15
+DISTVERSION= 4.2.17
CATEGORIES= databases net
MASTER_SITES= https://fastdl.mongodb.org/src/ \
http://fastdl.mongodb.org/src/
PKGNAMESUFFIX= ${DISTVERSION:R:S/.//}
DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}
+PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME:S/db//}/commit/
+PATCHFILES+= a0a70c53cc7a.patch:-p1 # https://jira.mongodb.org/browse/SERVER-41827
+PATCHFILES+= edf4ab0f8174.patch:-p1 # https://jira.mongodb.org/browse/SERVER-43979
+
MAINTAINER= ronald-lists@klop.ws
COMMENT= Distributed document-oriented "NoSQL" database (4.2.x Branch)
@@ -17,7 +21,7 @@ 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} \
@@ -31,8 +35,7 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \
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]
+CONFLICTS_INSTALL= mongodb36 mongodb4[04] mongodb50
OPTIONS_DEFINE= LTO SASL SSL
OPTIONS_DEFAULT=LTO SASL SSL
@@ -41,6 +44,7 @@ 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 \
@@ -57,7 +61,6 @@ MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \
USERS= mongodb
GROUPS= mongodb
-LTO_LDFLAGS= -fuse-ld=lld
LTO_MAKE_ARGS= --lto=on
SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
@@ -68,10 +71,9 @@ 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 "
+.if ${OPSYS} == FreeBSD && ((${OSREL:R} >= 14 && ${OSVERSION} < 1400033) \
+ && ${ARCH} == "aarch64")
+BROKEN= Aarch64 needs LSE atomics which was fixed in https://cgit.freebsd.org/src/commit/?id=efe67f33c322265eb303ec0ab40275100795b22a
.endif
.if ${ARCH} == aarch64 || ${ARCH} == powerpc64le
diff --git a/databases/mongodb42/distinfo b/databases/mongodb42/distinfo
index 565217003185..549598a2012f 100644
--- a/databases/mongodb42/distinfo
+++ b/databases/mongodb42/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1626038087
-SHA256 (mongodb-src-r4.2.15.tar.gz) = 22f704dd35c0abe182cfd244ce08f43783c1ece6be23e47a6f1872798c312deb
-SIZE (mongodb-src-r4.2.15.tar.gz) = 62187847
+TIMESTAMP = 1632392379
+SHA256 (mongodb-src-r4.2.17.tar.gz) = e329ef22656337aef855d0ff6c9e79572fc8ace94c37c8996f63c0871c1bbf50
+SIZE (mongodb-src-r4.2.17.tar.gz) = 62216350
+SHA256 (a0a70c53cc7a.patch) = 1435de7b6e6343c996fd58556d721f184b208d90d280996bd0c35dd32339b6b2
+SIZE (a0a70c53cc7a.patch) = 1078
+SHA256 (edf4ab0f8174.patch) = 87be45f996b1b7fc3700407d6d6671ec6b4b6a593de54ca5355bb6daec3d0213
+SIZE (edf4ab0f8174.patch) = 1220
diff --git a/databases/mongodb42/files/mongod.in b/databases/mongodb42/files/mongod.in
index e885be83196c..20b0f5c0f43d 100644
--- a/databases/mongodb42/files/mongod.in
+++ b/databases/mongodb42/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/mongodb42/files/patch-SConstruct b/databases/mongodb42/files/patch-SConstruct
index 47fc2da88d30..1fdba0cc4cd7 100644
--- a/databases/mongodb42/files/patch-SConstruct
+++ b/databases/mongodb42/files/patch-SConstruct
@@ -31,13 +31,3 @@
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/mongodb44/Makefile b/databases/mongodb44/Makefile
index a3720cf9b94f..6a2f9f3926d3 100644
--- a/databases/mongodb44/Makefile
+++ b/databases/mongodb44/Makefile
@@ -1,6 +1,6 @@
PORTNAME= mongodb
DISTVERSIONPREFIX= r
-DISTVERSION= 4.4.8
+DISTVERSION= 4.4.10
CATEGORIES= databases net
MASTER_SITES= https://fastdl.mongodb.org/src/ \
http://fastdl.mongodb.org/src/
@@ -17,7 +17,7 @@ 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} \
@@ -30,9 +30,9 @@ LIB_DEPENDS= libpcre.so:devel/pcre \
USES= compiler:c++17-lang cpe python:3.5+,build scons
USE_RC_SUBR= mongod
-PORTSCOUT= limit:^4\.4\.
+PORTSCOUT= limit:^4\.4\.
-CONFLICTS_INSTALL= mongodb36 mongodb4[02]
+CONFLICTS_INSTALL= mongodb36 mongodb4[02] mongodb50
OPTIONS_DEFINE= LTO SASL SSL
OPTIONS_DEFAULT=LTO SASL SSL
@@ -63,12 +63,6 @@ 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
diff --git a/databases/mongodb44/distinfo b/databases/mongodb44/distinfo
index 3d2b2bc2f004..117633efe035 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 = 1634213164
+SHA256 (mongodb-src-r4.4.10.tar.gz) = dd22cafd4a0ee8bce3a2d0a776e092b8f0ff193beba7d1718f6b8ac5f9e0c9e6
+SIZE (mongodb-src-r4.4.10.tar.gz) = 50636024
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..9fc72edebc07 100644
--- a/databases/mongodb44/files/patch-SConstruct
+++ b/databases/mongodb44/files/patch-SConstruct
@@ -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/mongodb50/Makefile b/databases/mongodb50/Makefile
index 593808b7b8e3..29b5cd451aa1 100644
--- a/databases/mongodb50/Makefile
+++ b/databases/mongodb50/Makefile
@@ -1,6 +1,6 @@
PORTNAME= mongodb
DISTVERSIONPREFIX= r
-DISTVERSION= 5.0.2
+DISTVERSION= 5.0.3
CATEGORIES= databases net
MASTER_SITES= https://fastdl.mongodb.org/src/ \
http://fastdl.mongodb.org/src/
@@ -10,49 +10,49 @@ DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}
MAINTAINER= ronald-lists@klop.ws
COMMENT= Distributed document-oriented "NoSQL" database (5.0.x Branch)
-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} \
+BUILD_DEPENDS= ${LOCALBASE}/bin/ar:devel/binutils \
+ ${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${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 \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+LIB_DEPENDS= libcurl.so:ftp/curl \
+ libpcre.so:devel/pcre \
libsnappy.so:archivers/snappy
USES= compiler:c++17-lang cpe python:3.5+,build scons shebangfix
USE_RC_SUBR= mongod
+SHEBANG_FILES= buildscripts/scons.py
+python_OLD_CMD= @python_interpreter@
+
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.
+USERS= mongodb
+GROUPS= mongodb
-SHEBANG_FILES= buildscripts/scons.py
-python_OLD_CMD= @python_interpreter@
+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.
-MAKE_ARGS= --use-system-zlib \
- --use-system-pcre \
- --use-system-snappy \
+MAKE_ARGS= --cxx-std=17 \
+ --disable-warnings-as-errors \
--libc++ \
- --cxx-std=17 \
--runtime-hardening=on \
+ --use-system-pcre \
+ --use-system-snappy \
+ --use-system-zlib \
-j ${MAKE_JOBS_NUMBER} \
- --disable-warnings-as-errors \
- VERBOSE=on \
- AR=${PREFIX}/bin/ar
-
-USERS= mongodb
-GROUPS= mongodb
+ AR=${PREFIX}/bin/ar \
+ VERBOSE=on
LTO_MAKE_ARGS= --lto=on
@@ -64,10 +64,9 @@ 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 "
+.if ${OPSYS} == FreeBSD && ((${OSREL:R} >= 14 && ${OSVERSION} < 1400033) \
+ && ${ARCH} == "aarch64")
+BROKEN= aarch64 needs LSE atomics which was fixed in https://cgit.freebsd.org/src/commit/?id=efe67f33c322265eb303ec0ab40275100795b22a
.endif
.if ${ARCH} == aarch64 || ${ARCH} == powerpc64le
@@ -91,5 +90,9 @@ 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
.include <bsd.port.post.mk>
diff --git a/databases/mongodb50/distinfo b/databases/mongodb50/distinfo
index dac7de837a73..7aaf686009ac 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 = 1632143674
+SHA256 (mongodb-src-r5.0.3.tar.gz) = e01afa436d0275de79070449837efe343a7271432cdcf2edb69e9ae61ac037dd
+SIZE (mongodb-src-r5.0.3.tar.gz) = 54590513
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..8fc64862a51e 100644
--- a/databases/mongodb50/files/patch-SConstruct
+++ b/databases/mongodb50/files/patch-SConstruct
@@ -36,13 +36,3 @@
"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()
-
- 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/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/mroonga/Makefile b/databases/mroonga/Makefile
index 0daad6e08f31..915238513aca 100644
--- a/databases/mroonga/Makefile
+++ b/databases/mroonga/Makefile
@@ -1,7 +1,7 @@
# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
PORTNAME= mroonga
-PORTVERSION= 11.04
+PORTVERSION= 11.10
CATEGORIES= databases textproc
MASTER_SITES= http://packages.groonga.org/source/mroonga/
@@ -9,6 +9,7 @@ MAINTAINER= bofh@FreeBSD.org
COMMENT= Open-source fulltext search engine for MySQL
LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
IGNORE_WITH_MYSQL= 101m 102m 103m 57p 57w
@@ -18,7 +19,7 @@ LIB_DEPENDS= libgroonga.so:textproc/groonga
USES= compiler:c11 libtool mysql pkgconfig shebangfix
SHEBANG_FILES= data/rpm/post.sh \
- data/rpm/preun.sh
+ data/rpm/preun.sh
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-mysql-source="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V WRKSRC)" \
@@ -27,11 +28,9 @@ CONFIGURE_ARGS= --with-mysql-source="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE}
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..94807695ec0d 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 = 1638663701
+SHA256 (mroonga-11.10.tar.gz) = 822e6e4bca64e3a727b6cab512923510e070cbabd446d7c9f85c5e1e838598da
+SIZE (mroonga-11.10.tar.gz) = 2818118
diff --git a/databases/mydumper/Makefile b/databases/mydumper/Makefile
index 8dcc43211b19..506b782fbf5e 100644
--- a/databases/mydumper/Makefile
+++ b/databases/mydumper/Makefile
@@ -1,7 +1,7 @@
# Created by: Gea-Suan Lin <gslin@gslin.org>
PORTNAME= mydumper
-DISTVERSION= 0.10.7-2
+PORTVERSION= 0.11.3
DISTVERSIONPREFIX= v
CATEGORIES= databases
diff --git a/databases/mydumper/distinfo b/databases/mydumper/distinfo
index 4bc8b082eb0c..f163cc7c5f81 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 = 1635788032
+SHA256 (maxbube-mydumper-v0.11.3_GH0.tar.gz) = ddd0427f572467589cdb024a4ef746d30b4214c804954612f4e07510607cf7a7
+SIZE (maxbube-mydumper-v0.11.3_GH0.tar.gz) = 104825
diff --git a/databases/mysql-connector-c/Makefile b/databases/mysql-connector-c/Makefile
index 31605a38fb0e..64b3243d46c8 100644
--- a/databases/mysql-connector-c/Makefile
+++ b/databases/mysql-connector-c/Makefile
@@ -25,7 +25,7 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION}
CFLAGS+= -march=i586
.endif
-.if (${OPSYS} == FreeBSD && ${OSVERSION} > 1200085 && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl
+.if (${OPSYS} == FreeBSD && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-vio_viosslfactories.c \
${FILESDIR}/extra-patch-mysys__ssl_my__aes__openssl.cc
.endif
diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index 3c0a9403d065..accd60e2e6d0 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@@ -1,7 +1,7 @@
# Created by: Matthew Seaman
PORTNAME= mysql-connector-java
-PORTVERSION= 8.0.26
+PORTVERSION= 8.0.27
CATEGORIES= databases java
MASTER_SITES= MYSQL/Connector-J
@@ -24,7 +24,7 @@ CPE_PRODUCT= mysql_connector_j
NO_ARCH= yes
NO_BUILD= yes
-CONFLICTS_INSTALL= mysql-connector-java51-*
+CONFLICTS_INSTALL= mysql-connector-java51
JAVA_VERSION= 1.8+
EXTRADOCS= CHANGES
diff --git a/databases/mysql-connector-java/distinfo b/databases/mysql-connector-java/distinfo
index 8a45f7cf6694..f4565d906a1f 100644
--- a/databases/mysql-connector-java/distinfo
+++ b/databases/mysql-connector-java/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627272373
-SHA256 (mysql-connector-java-8.0.26.tar.gz) = f3eb0f06cf35657a6cf8128b5c83a2c100e54a76ea801f9064e1dbbaa50ec008
-SIZE (mysql-connector-java-8.0.26.tar.gz) = 4180706
+TIMESTAMP = 1636010313
+SHA256 (mysql-connector-java-8.0.27.tar.gz) = d796f35031fa9df347827ea1ff9e2bac8a2a6478a802d736214e8353546ab19a
+SIZE (mysql-connector-java-8.0.27.tar.gz) = 4216166
diff --git a/databases/mysql-udf/Makefile b/databases/mysql-udf/Makefile
index 56db4c7ccb47..b80cd98ad4a3 100644
--- a/databases/mysql-udf/Makefile
+++ b/databases/mysql-udf/Makefile
@@ -12,12 +12,12 @@ 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
+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 \
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index d4e16fe50ae1..71a2242332c2 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -11,9 +11,9 @@ PKGMESSAGE= ${.CURDIR}/pkg-message
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist
-CONFLICTS_INSTALL= mysql5[0-46-9]-client-* \
- mariadb*-client-* \
- percona*-client-*
+CONFLICTS_INSTALL= mysql5[0-46-9]-client \
+ mariadb*-client \
+ percona*-client
CMAKE_ARGS+= -DWITHOUT_SERVER=1
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 80ec9d48c6f8..516be4ce498a 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -52,17 +52,11 @@ SHEBANG_FILES= scripts/*.pl* scripts/*.sh
.include <bsd.port.options.mk>
.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
-USES+= compiler:gcc-c++11-lib
-USE_CXXSTD= gnu++11
+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 "
+USES+= compiler:c++11-lang
+USE_CXXSTD= gnu++98
.endif
.if ${PORT_OPTIONS:MSSL}
@@ -76,10 +70,10 @@ CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1
.if !defined(CLIENT_ONLY)
USES+= mysql:55
-CONFLICTS_INSTALL= mysql5[0-46-9]-server-* \
- mysqlwsrep* \
- mariadb*-server-* \
- percona*-server-*
+CONFLICTS_INSTALL= mysql5[0-46-9]-server \
+ mysqlwsrep*-server \
+ mariadb*-server \
+ percona*-server
USE_RC_SUBR= mysql-server
diff --git a/databases/mysql55-server/files/mysql-server.in b/databases/mysql55-server/files/mysql-server.in
index 6e9ca18040a6..5bd18d2d68c8 100644
--- a/databases/mysql55-server/files/mysql-server.in
+++ b/databases/mysql55-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 "/var/db/mysql"
# Base database directory.
# mysql_optfile (str): Server-specific option file.
@@ -29,12 +26,10 @@ 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"
@@ -56,12 +51,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/mysql56-client/Makefile b/databases/mysql56-client/Makefile
index 60dfbc74278c..d2bf67d6c183 100644
--- a/databases/mysql56-client/Makefile
+++ b/databases/mysql56-client/Makefile
@@ -16,10 +16,10 @@ 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-*
+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
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index 1805470ec640..ef91646474b7 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -80,11 +80,11 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
.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-*
+CONFLICTS_INSTALL= mysql5[0-57-9]-server \
+ mysql[0-46-9][0-9]-server \
+ mysqlwsrep*-server \
+ mariadb[0-9][0-9]-server \
+ percona[0-9][0-9]-server
USE_RC_SUBR= mysql-server
@@ -146,12 +146,6 @@ 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:
diff --git a/databases/mysql56-server/files/mysql-server.in b/databases/mysql56-server/files/mysql-server.in
index cf0a501c6f46..af1a234269ed 100644
--- a/databases/mysql56-server/files/mysql-server.in
+++ b/databases/mysql56-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%%"
@@ -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"
@@ -68,12 +63,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/mysql57-client/Makefile b/databases/mysql57-client/Makefile
index 0e64409255a9..e1c3afe69b57 100644
--- a/databases/mysql57-client/Makefile
+++ b/databases/mysql57-client/Makefile
@@ -1,7 +1,7 @@
# Created by: "Mahdi Mokhtari <mokhi64@gmail.com>"
PORTNAME= mysql
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= 57-client
COMMENT= Multithreaded SQL database (client)
@@ -14,10 +14,10 @@ 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-*
+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
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index 2ace4c5f7304..3c1db5d83255 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -1,7 +1,7 @@
# Created by: Mahdi Mokhtari <mokhi64@gmail.com>
PORTNAME?= mysql
-PORTVERSION= 5.7.35
+PORTVERSION= 5.7.36
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= MYSQL/MySQL-5.7
@@ -87,11 +87,11 @@ OPTIONS_SUB= YES
.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-*
+CONFLICTS_INSTALL= mysql5[0-68-9]-server \
+ mysql[0-46-9][0-9]-server \
+ mysqlwsrep*-server \
+ mariadb[0-9][0-9]-server \
+ percona[0-9][0-9]-server
USE_RC_SUBR= mysql-server
@@ -149,12 +149,6 @@ CMAKE_ARGS+= -DWITH_AUTHENTICATION_LDAP=0
.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
diff --git a/databases/mysql57-server/distinfo b/databases/mysql57-server/distinfo
index 16aa72c286a0..2556a51b56d1 100644
--- a/databases/mysql57-server/distinfo
+++ b/databases/mysql57-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627053937
-SHA256 (mysql-boost-5.7.35.tar.gz) = 6b30c93e5927857e31769bf5356eb23a5cff59c0a0205e5772b51b09bf3f9e12
-SIZE (mysql-boost-5.7.35.tar.gz) = 52959014
+TIMESTAMP = 1635184799
+SHA256 (mysql-boost-5.7.36.tar.gz) = 99efd49b9bfe44d0ecebedce3db075c5f0e9d4b6fc08cfe0a42b86418e5f06da
+SIZE (mysql-boost-5.7.36.tar.gz) = 52968383
diff --git a/databases/mysql57-server/files/mysql-server.in b/databases/mysql57-server/files/mysql-server.in
index 37022059e2bc..3addbaa92431 100644
--- a/databases/mysql57-server/files/mysql-server.in
+++ b/databases/mysql57-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%%"
@@ -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
@@ -47,7 +43,6 @@ 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"
@@ -68,12 +63,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/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/mysql80-client/Makefile b/databases/mysql80-client/Makefile
index 1d43316113a1..32d382f0c8f9 100644
--- a/databases/mysql80-client/Makefile
+++ b/databases/mysql80-client/Makefile
@@ -14,12 +14,12 @@ 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
+CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0 -DWITH_AUTHENTICATION_FIDO=ON
USE_LDCONFIG+= ${PREFIX}/lib/mysql
@@ -31,11 +31,17 @@ CLIENT_ONLY= yes
OPTIONS_GROUP+= PLUGINS
PLUGINS_DESC= Default Client Plugins
-OPTIONS_GROUP_PLUGINS= SASLCLIENT
+OPTIONS_GROUP_PLUGINS= SASLCLIENT FIDO
SASLCLIENT_DESC= SASL client plugin module
SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP
SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
SASLCLIENT_USE= OPENLDAP=yes
+
+FIDO_DESC= FIDO/U2F support (security/libfido2)
+FIDO_LIB_DEPENDS= libfido2.so:security/libfido2 \
+ libhidapi.so:comms/hidapi
+FIDO_CMAKE_BOOL= WITH_AUTHENTICATION_FIDO
+
OPTIONS_DEFAULT+= SASLCLIENT
OPTIONS_SUB= yes
diff --git a/databases/mysql80-client/pkg-plist b/databases/mysql80-client/pkg-plist
index 1d2f6cfb9268..6766faf79190 100644
--- a/databases/mysql80-client/pkg-plist
+++ b/databases/mysql80-client/pkg-plist
@@ -14,6 +14,25 @@ bin/mysqlshow
bin/mysqlslap
bin/perror
@comment bin/zlib_decompress
+include/mysql/add_with_saturate.h
+include/mysql/caching_sha2_passwordopt-longopts.h
+include/mysql/caching_sha2_passwordopt-vars.h
+include/mysql/compression.h
+include/mysql/keyring_operations_helper.h
+include/mysql/manifest.h
+include/mysql/mem_root_deque.h
+include/mysql/memory_debugging.h
+include/mysql/my_basename.h
+include/mysql/my_checksum.h
+include/mysql/my_getpwnam.h
+include/mysql/my_hostname.h
+include/mysql/my_rcu_lock.h
+include/mysql/mysql_async.h
+include/mysql/pfs_data_lock_provider.h
+include/mysql/pfs_system_provider.h
+include/mysql/pfs_tls_channel_provider.h
+include/mysql/unhex.h
+include/mysql/unsafe_string_append.h
include/mysql/base64.h
include/mysql/big_endian.h
include/mysql/c_string_less.h
@@ -24,7 +43,6 @@ 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
@@ -88,7 +106,6 @@ 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
@@ -139,10 +156,8 @@ 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
@@ -189,6 +204,8 @@ lib/mysql/libmysqlclient_r.a
lib/mysql/libmysqlclient_r.so
lib/mysql/libmysqlclient_r.so.21
%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so
+%%FIDO%%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
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index 771fef19bd1a..6ef5c4eb467b 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -1,7 +1,7 @@
# Created by: Mahdi Mokhtari <mokhi64@gmail.com>
PORTNAME?= mysql
-PORTVERSION= 8.0.26
+PORTVERSION= 8.0.27
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= MYSQL/MySQL-8.0
@@ -21,7 +21,7 @@ USES= bison:build cmake:noninja compiler:c++17-lang cpe \
CPE_VENDOR= oracle
-USE_CXXSTD= c++14
+USE_CXXSTD= c++17
USE_PERL5= run
MY_DBDIR= /var/db/mysql
@@ -84,7 +84,7 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \
-DWITH_ZLIB=system \
-DWITH_ZSTD=system \
-DWITH_PROTOBUF=system \
- -DWITH_SSL=${OPENSSLBASE} \
+ -DWITH_SSL=system \
-DBUILD_BUNDLED_ZLIB=0 \
-DBUILD_BUNDLED_LZ4=0
@@ -115,11 +115,11 @@ 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= mysql8[1-9]-server \
+ mysql[0-79][0-9]-server \
+ mysqlwsrep*-server \
+ mariadb[0-9][0-9]-server \
+ percona[0-9][0-9]-server
USE_RC_SUBR= mysql-server
@@ -180,22 +180,6 @@ FEDERATED_SUB_LIST_OFF+= FEDER=""
CMAKE_ARGS+= -DDISABLE_PSI_MEMORY=1
.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 ${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
@@ -208,4 +192,4 @@ post-install:
${MKDIR} ${STAGEDIR}${MY_TMPDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/mysql80-server/distinfo b/databases/mysql80-server/distinfo
index 6b639dd456da..55029d0a7a90 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 = 1635786797
+SHA256 (mysql-boost-8.0.27.tar.gz) = 74b5bc6ff88fe225560174a24b7d5ff139f4c17271c43000dbcf3dcc9507b3f9
+SIZE (mysql-boost-8.0.27.tar.gz) = 292184025
diff --git a/databases/mysql80-server/files/mysql-server.in b/databases/mysql80-server/files/mysql-server.in
index b0297539a441..271c38c2d2c5 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%%"
@@ -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..0b4f88bfd853 100644
--- a/databases/mysql80-server/files/patch-CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-CMakeLists.txt
@@ -1,6 +1,15 @@
---- CMakeLists.txt.orig 2020-09-23 12:37:48 UTC
+--- CMakeLists.txt.orig 2021-09-28 11:46:34 UTC
+++ CMakeLists.txt
-@@ -1417,10 +1417,10 @@ IF(WITH_AUTHENTICATION_LDAP)
+@@ -1647,7 +1647,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
+@@ -1696,10 +1696,10 @@ IF(WITH_AUTHENTICATION_KERBEROS)
ENDIF()
ENDIF()
@@ -14,9 +23,9 @@
# Add lz4 library
MYSQL_CHECK_LZ4()
# Add icu library
-@@ -1520,7 +1520,9 @@ IF(WITH_UNIT_TESTS)
- INCLUDE(googletest)
- ENDIF()
+@@ -1869,7 +1869,9 @@ OPTION(WITH_HYPERGRAPH_OPTIMIZER
+ ${WITH_HYPERGRAPH_OPTIMIZER_DEFAULT}
+ )
-ADD_SUBDIRECTORY(include)
+IF(NOT WITHOUT_CLIENTLIBS)
@@ -25,7 +34,7 @@
ADD_SUBDIRECTORY(strings)
ADD_SUBDIRECTORY(vio)
ADD_SUBDIRECTORY(mysys)
-@@ -1562,12 +1564,17 @@ IF(WITH_UNIT_TESTS)
+@@ -1913,12 +1915,17 @@ IF(WITH_UNIT_TESTS)
ADD_SUBDIRECTORY(unittest/mytap/t)
ENDIF()
@@ -45,7 +54,7 @@
ADD_SUBDIRECTORY(testclients)
ADD_SUBDIRECTORY(sql)
ENDIF()
-@@ -1590,11 +1597,11 @@ ENDIF()
+@@ -1971,11 +1978,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 +67,7 @@
IF(WITH_INTERNAL)
ADD_SUBDIRECTORY(internal)
ENDIF()
-@@ -1703,6 +1710,7 @@ IF(PACK_SEPARATE_COMPONENTS)
+@@ -2084,6 +2091,7 @@ IF(PACK_SEPARATE_COMPONENTS)
SET(CPACK_COMPONENTS_GROUPING IGNORE)
ENDIF()
@@ -66,7 +75,7 @@
IF(UNIX)
INSTALL(FILES
Docs/mysql.info
-@@ -1737,6 +1745,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -2118,6 +2126,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-client_CMakeLists.txt b/databases/mysql80-server/files/patch-client_CMakeLists.txt
index bbfb4249c799..41b4925911bc 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,18 +49,18 @@
+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
)
+ENDIF()
+
-+IF(NOT WITHOUT_SERVER)
++IF(NOT_WITHOUT_SERVER)
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-include_CMakeLists.txt b/databases/mysql80-server/files/patch-include_CMakeLists.txt
index 11fed601d4f4..96f88d8593aa 100644
--- a/databases/mysql80-server/files/patch-include_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-include_CMakeLists.txt
@@ -1,39 +1,46 @@
---- include/CMakeLists.txt.orig 2019-12-09 19:53:17 UTC
+--- include/CMakeLists.txt.orig 2021-09-28 11:46:34 UTC
+++ include/CMakeLists.txt
-@@ -37,10 +37,173 @@ SET(HEADERS
+@@ -37,10 +37,182 @@ SET(HEADERS
${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h
${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
field_types.h
++ add_with_saturate.h
+ base64.h
+ big_endian.h
+ c_string_less.h
++ caching_sha2_passwordopt-longopts.h
++ caching_sha2_passwordopt-vars.h
++ compression.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
++ keyring_operations_helper.h
+ lex_string.h
+ lf.h
+ little_endian.h
+ m_ctype.h
+ m_string.h
++ manifest.h
+ map_helpers.h
++ mem_root_deque.h
++ memory_debugging.h
+ mf_wcomp.h
+ mutex_lock.h
+ my_aes.h
+ my_alloc.h
+ my_atomic.h
+ my_base.h
++ my_basename.h
+ my_bit.h
+ my_bitmap.h
+ my_byteorder.h
+ my_check_opt.h
-+ my_command.h
++ my_checksum.h
+ my_compare.h
+ my_compiler.h
+ my_dbug.h
@@ -41,19 +48,21 @@
+ my_dir.h
+ my_double2ulonglong.h
+ my_getopt.h
++ my_getpwnam.h
+ my_hash_combine.h
++ my_hostname.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_md5.h
+ my_murmur3.h
+ my_pointer_arithmetic.h
+ my_psi_config.h
+ my_rapidjson_size_t.h
++ my_rcu_lock.h
+ my_rdtsc.h
+ my_rnd.h
+ my_sharedlib.h
@@ -63,9 +72,9 @@
+ my_sys.h
+ my_systime.h
+ my_table_map.h
-+ my_thread.h
+ my_thread_local.h
+ my_thread_os_id.h
++ my_thread.h
+ my_time.h
+ my_timer.h
+ my_tree.h
@@ -75,16 +84,12 @@
+ myisam.h
+ myisammrg.h
+ myisampack.h
-+ mysql.h
-+ mysql.h.pp
-+ mysql_com.h
++ mysql_async.h
+ mysql_com_server.h
-+ mysql_time.h
-+ mysql_version.h.in
+ mysys_err.h
-+ nullable.h
+ password.h
+ pfs_cond_provider.h
++ pfs_data_lock_provider.h
+ pfs_error_provider.h
+ pfs_file_provider.h
+ pfs_idle_provider.h
@@ -95,8 +100,10 @@
+ pfs_socket_provider.h
+ pfs_stage_provider.h
+ pfs_statement_provider.h
++ pfs_system_provider.h
+ pfs_table_provider.h
+ pfs_thread_provider.h
++ pfs_tls_channel_provider.h
+ pfs_transaction_provider.h
+ prealloced_array.h
+ print_version.h
@@ -119,6 +126,8 @@
+ thr_mutex.h
+ thr_rwlock.h
+ typelib.h
++ unhex.h
++ unsafe_string_append.h
+ varlen_sort.h
+ violite.h
+ welcome_copyright_notice.h
diff --git a/databases/mysql80-server/files/patch-mysys_my__default.cc b/databases/mysql80-server/files/patch-mysys_my__default.cc
index 6a8cb5ebbaf2..6e479597e24a 100644
--- a/databases/mysql80-server/files/patch-mysys_my__default.cc
+++ b/databases/mysql80-server/files/patch-mysys_my__default.cc
@@ -1,5 +1,5 @@
---- mysys/my_default.cc.orig 2021-04-23 15:06:40 UTC
-+++ mysys/my_default.cc
+--- mysys/my_default.cc.orig 2021-11-02 20:29:18.337621000 +0100
++++ mysys/my_default.cc 2021-11-02 20:57:11.624299000 +0100
@@ -204,7 +204,7 @@ bool no_defaults = false;
/* Which directories are searched for options (and in which order) */
@@ -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) {
+@@ -1315,7 +1323,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
+@@ -1655,14 +1664,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
+@@ -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, 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-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-router_src_harness_src_tls__context.cc b/databases/mysql80-server/files/patch-router_src_harness_src_tls__context.cc
index 9b53b3aae974..2d5ba1470260 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
-@@ -91,7 +91,7 @@ static constexpr int o11x_version(TlsVersion version)
+--- router/src/harness/src/tls_context.cc.orig 2021-11-04 17:14:44.779135000 +0100
++++ router/src/harness/src/tls_context.cc 2021-11-04 17:35:31.121070000 +0100
+@@ -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-scripts_CMakeLists.txt b/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
index 19e53914846e..976c2397e16d 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
-@@ -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} " )
+--- scripts/CMakeLists.txt.orig 2021-11-04 17:42:29.686664000 +0100
++++ scripts/CMakeLists.txt 2021-11-04 17:57:49.957200000 +0100
+@@ -323,6 +323,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()
-@@ -414,7 +416,7 @@ ELSE()
+ ELSE()
+ SET(${var} "${${var}}-l${lib} " )
+ ENDIF()
+@@ -396,7 +398,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()
+@@ -409,23 +411,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-storage_innobase_include_detail_ut_large__page__alloc-linux.h b/databases/mysql80-server/files/patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h
new file mode 100644
index 000000000000..5297a5023741
--- /dev/null
+++ b/databases/mysql80-server/files/patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h
@@ -0,0 +1,11 @@
+--- storage/innobase/include/detail/ut/large_page_alloc-linux.h.orig 2021-09-28 11:46:34 UTC
++++ storage/innobase/include/detail/ut/large_page_alloc-linux.h
+@@ -50,7 +50,7 @@ inline void *large_page_aligned_alloc(size_t n_bytes)
+ // mmap will internally round n_bytes to the multiple of huge-page size if it
+ // is not already
+ void *ptr = mmap(nullptr, n_bytes, PROT_READ | PROT_WRITE,
+- MAP_PRIVATE | MAP_ANON | MAP_HUGETLB, -1, 0);
++ MAP_PRIVATE | MAP_ANON, -1, 0);
+ return (ptr != (void *)-1) ? ptr : nullptr;
+ }
+
diff --git a/databases/mysql80-server/files/patch-vio_viosslfactories.cc b/databases/mysql80-server/files/patch-vio_viosslfactories.cc
index 6c0f821e8911..8c88903163ee 100644
--- a/databases/mysql80-server/files/patch-vio_viosslfactories.cc
+++ b/databases/mysql80-server/files/patch-vio_viosslfactories.cc
@@ -1,5 +1,5 @@
---- vio/viosslfactories.cc.orig 2019-09-20 08:30:51 UTC
-+++ vio/viosslfactories.cc
+--- vio/viosslfactories.cc.orig 2021-11-04 18:02:40.921064000 +0100
++++ vio/viosslfactories.cc 2021-11-04 18:15:24.992676000 +0100
@@ -40,6 +40,7 @@
#include "vio/vio_priv.h"
@@ -16,13 +16,15 @@
/**
Set fips mode in openssl library,
When we set fips mode ON/STRICT, it will perform following operations:
-@@ -525,12 +527,13 @@ EXIT:
+@@ -525,6 +527,7 @@ EXIT:
@returns openssl current fips mode
*/
uint get_fips_mode() { return FIPS_mode(); }
+#endif
- long process_tls_version(const char *tls_version) {
+ /**
+ Toggle FIPS mode, to see whether it is available with the current SSL library.
+@@ -545,7 +548,7 @@ long process_tls_version(const char *tls_version) {
const char *separator = ",";
char *token, *lasts = nullptr;
@@ -31,7 +33,7 @@
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(
+@@ -624,7 +627,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
@@ -40,7 +42,7 @@
| SSL_OP_NO_TLSv1_3
#endif /* HAVE_TLSv13 */
| SSL_OP_NO_TICKET);
-@@ -618,7 +621,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
+@@ -633,7 +636,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
return nullptr;
if (!(ssl_fd->ssl_context = SSL_CTX_new(is_client ?
@@ -49,7 +51,7 @@
TLS_client_method()
: TLS_server_method()
#else /* HAVE_TLSv13 */
-@@ -633,7 +636,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
+@@ -648,7 +651,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
return nullptr;
}
diff --git a/databases/mysql80-server/pkg-plist b/databases/mysql80-server/pkg-plist
index 880259841bf0..3410b5358397 100644
--- a/databases/mysql80-server/pkg-plist
+++ b/databases/mysql80-server/pkg-plist
@@ -9,8 +9,6 @@ bin/myisampack
bin/mysqldumpslow
bin/mysql_client_test
bin/mysql_keyring_encryption_test
-bin/mysql_secure_installation
-bin/mysql_ssl_rsa_setup
bin/mysql_tzinfo_to_sql
bin/mysql_upgrade
bin/mysqld_multi
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/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile
index 1930386321ac..fd3b494023f8 100644
--- a/databases/mysqlwsrep56-server/Makefile
+++ b/databases/mysqlwsrep56-server/Makefile
@@ -92,11 +92,11 @@ 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-*
+CONFLICTS_INSTALL= mariadb*-server \
+ mysql[0-9]*-server \
+ mysqlwsrep57*-server \
+ mysqlwsrep[1-489]*-server \
+ percona*-server
USE_RC_SUBR= mysql-server
@@ -133,12 +133,6 @@ MMAN1= my_print_defaults.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
diff --git a/databases/mysqlwsrep56-server/files/mysql-server.in b/databases/mysqlwsrep56-server/files/mysql-server.in
index d6693957b2d4..c91277332e64 100644
--- a/databases/mysqlwsrep56-server/files/mysql-server.in
+++ b/databases/mysqlwsrep56-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 "/var/db/mysql"
# Base database directory.
# mysql_optfile (str): Server-specific option file.
@@ -29,14 +26,8 @@ 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"
@@ -70,12 +61,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/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile
index 70f20347216a..62c0b59cd7ec 100644
--- a/databases/mysqlwsrep57-server/Makefile
+++ b/databases/mysqlwsrep57-server/Makefile
@@ -1,9 +1,9 @@
# Created by: Vasil Dimov <vd@FreeBSD.org>
PORTNAME= mysqlwsrep
-PORTVERSION?= 5.7.34
+PORTVERSION?= 5.7.35
DISTVERSIONPREFIX?= wsrep_
-DISTVERSIONSUFFIX?= -25.26
+DISTVERSIONSUFFIX?= -25.27
CATEGORIES= databases
MASTER_SITES+= SF/boost/boost/1.59.0:boost
PKGNAMESUFFIX= 57-server
@@ -84,11 +84,11 @@ 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-*
+CONFLICTS_INSTALL= mariadb*-server \
+ mysql[0-9]*-server \
+ mysqlwsrep56*-server \
+ mysqlwsrep[1-489]*-server \
+ percona*-server
USE_RC_SUBR= mysql-server
@@ -162,12 +162,6 @@ SUB_LIST+= PERFSCHEMRC=""
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
@@ -178,13 +172,11 @@ CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE}
# ${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
+.if ${CHOSEN_COMPILER_TYPE} == clang
CXXFLAGS+= -Wno-c++11-narrowing
-. endif
.endif
# Ensure that assertions are not turned on in non-debug builds.
diff --git a/databases/mysqlwsrep57-server/distinfo b/databases/mysqlwsrep57-server/distinfo
index 4c464f3fbaef..c3db1c67a0a0 100644
--- a/databases/mysqlwsrep57-server/distinfo
+++ b/databases/mysqlwsrep57-server/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1627385828
+TIMESTAMP = 1636993366
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-mysql-wsrep-wsrep_5.7.35-25.27_GH0.tar.gz) = 1edd43a21eb413a1dc09431e5f85fa34c0ebcbeb11019fefb0396c4929bdd260
+SIZE (codership-mysql-wsrep-wsrep_5.7.35-25.27_GH0.tar.gz) = 56580667
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/mysql-server.in b/databases/mysqlwsrep57-server/files/mysql-server.in
index 17320906bf56..1ea9411cde8b 100644
--- a/databases/mysqlwsrep57-server/files/mysql-server.in
+++ b/databases/mysqlwsrep57-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%%"
@@ -35,7 +32,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
@@ -48,7 +44,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"
@@ -83,12 +78,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/ods2sql/Makefile b/databases/ods2sql/Makefile
index 41fccf2eca78..a70f78b0dad9 100644
--- a/databases/ods2sql/Makefile
+++ b/databases/ods2sql/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ods2sql
DISTVERSION= 0.4.0
-PORTREVISION= 8
+PORTREVISION= 10
CATEGORIES= databases
MAINTAINER= yuri@FreeBSD.org
diff --git a/databases/ora2pg/Makefile b/databases/ora2pg/Makefile
index ba935adeb1fa..f181bf65fa59 100644
--- a/