diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2023-05-28 11:00:28 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2023-05-28 11:00:28 +0000 |
| commit | 8c5ba4973645b9625212628e8b115e65dc8878b0 (patch) | |
| tree | 3db9bbd7553f88689d0b03f52a7e268a9615c399 | |
| parent | ff82663b674567c432167b1d3c78c1a4da1d20ed (diff) | |
| download | ports-8c5ba4973645b9625212628e8b115e65dc8878b0.tar.gz ports-8c5ba4973645b9625212628e8b115e65dc8878b0.zip | |
cleanup: Remove expired ports:
2023-05-25 databases/mariadb103-server: Use databases/mariadb106-server
2023-05-25 databases/mariadb103-client: Use databases/mariadb106-server
44 files changed, 2 insertions, 1650 deletions
@@ -7572,3 +7572,5 @@ www/rubygem-asana0|www/rubygem-asana|2023-05-27|Remove obsoleted port. Use www/r www/rubygem-jwt25|www/rubygem-jwt|2023-05-27|Remove obsoleted port. Use www/rubygem-jwt instead www/rubygem-webrick17|www/rubygem-webrick|2023-05-27|Remove obsoleted port. Use www/rubygem-webrick instead textproc/rtf2html||2023-05-28|Has expired: Abandonware, please use something modern like markdown +databases/mariadb103-server|databases/mariadb106-server|2023-05-28|Has expired: Use databases/mariadb106-server +databases/mariadb103-client|databases/mariadb106-client|2023-05-28|Has expired: Use databases/mariadb106-server diff --git a/databases/Makefile b/databases/Makefile index 232259469f98..b8ff199d6db4 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -177,8 +177,6 @@ SUBDIR += mariadb-connector-odbc SUBDIR += mariadb1011-client SUBDIR += mariadb1011-server - SUBDIR += mariadb103-client - SUBDIR += mariadb103-server SUBDIR += mariadb104-client SUBDIR += mariadb104-server SUBDIR += mariadb105-client diff --git a/databases/mariadb103-client/Makefile b/databases/mariadb103-client/Makefile deleted file mode 100644 index dc2d02b7baf2..000000000000 --- a/databases/mariadb103-client/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -PORTNAME= mariadb -PKGNAMESUFFIX= 103-client - -COMMENT= Multithreaded SQL database (client) - -MASTERDIR= ${.CURDIR}/../mariadb103-server - -FILESDIR= ${.CURDIR}/files -PATCHDIR= ${.CURDIR}/files -PLIST= ${.CURDIR}/pkg-plist - -CONFLICTS_INSTALL= databases/mytop - -.include "${MASTERDIR}/Makefile" diff --git a/databases/mariadb103-client/files/patch-CMakeLists.txt b/databases/mariadb103-client/files/patch-CMakeLists.txt deleted file mode 100644 index 7122c9289f07..000000000000 --- a/databases/mariadb103-client/files/patch-CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- CMakeLists.txt.orig 2021-05-08 08:36:42.000000000 +0200 -+++ CMakeLists.txt 2021-05-08 08:40:29.000000000 +0200 -@@ -517,13 +517,15 @@ - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - ) - -+IF(FALSE) - INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme) -+ENDIF() - - # MDEV-6526 these files are not installed anymore - #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC - # ${CMAKE_BINARY_DIR}/Docs/INFO_BIN) - --IF(UNIX) -+IF(FALSE) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) - ENDIF() - diff --git a/databases/mariadb103-client/files/patch-MDEV-11790 b/databases/mariadb103-client/files/patch-MDEV-11790 deleted file mode 100644 index 1794bcf44da7..000000000000 --- a/databases/mariadb103-client/files/patch-MDEV-11790 +++ /dev/null @@ -1,46 +0,0 @@ -WITHOUT_SERVER installs server-only files - -https://jira.mariadb.org/browse/MDEV-11790 ---- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC -+++ extra/CMakeLists.txt -@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) - ADD_DEPENDENCIES(innochecksum GenError) - ENDIF() - --MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) -+MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client) - TARGET_LINK_LIBRARIES(replace mysys) - - IF(UNIX) ---- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC -+++ scripts/CMakeLists.txt -@@ -241,7 +241,10 @@ ENDIF() - SET(mysql_config_COMPONENT COMPONENT Development) - SET(msql2mysql_COMPONENT COMPONENT Client) - SET(mysqlaccess_COMPONENT COMPONENT Client) -+SET(mysqlhotcopy_COMPONENT COMPONENT Client) -+SET(mysql_convert_table_format_COMPONENT COMPONENT Client) - SET(mysql_find_rows_COMPONENT COMPONENT Client) -+SET(mysql_setpermission_COMPONENT COMPONENT Client) - SET(mytop_COMPONENT Mytop) - - IF(WIN32) -@@ -298,14 +301,14 @@ ELSE() - # On Unix, most of the files end up in the bin directory - SET(BIN_SCRIPTS - msql2mysql -- mysql_config -- mysql_setpermission -- mysql_secure_installation - mysqlaccess -+ mysqlhotcopy -+ mysql_config - mysql_convert_table_format - mysql_find_rows -+ mysql_secure_installation -+ mysql_setpermission - mytop -- mysqlhotcopy - ${SERVER_SCRIPTS} - ${WSREP_SCRIPTS} - ${SYSTEMD_SCRIPTS} diff --git a/databases/mariadb103-client/files/patch-include_my__cpu.h b/databases/mariadb103-client/files/patch-include_my__cpu.h deleted file mode 100644 index 36a374bb7cc6..000000000000 --- a/databases/mariadb103-client/files/patch-include_my__cpu.h +++ /dev/null @@ -1,48 +0,0 @@ ---- 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-client/files/pkg-message.in b/databases/mariadb103-client/files/pkg-message.in deleted file mode 100644 index 00ac47038607..000000000000 --- a/databases/mariadb103-client/files/pkg-message.in +++ /dev/null @@ -1,9 +0,0 @@ -[ -{ type: install - message: <<EOM -MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for -my.cnf. Please move existing my.cnf files from those paths to -%%PREFIX%%/etc and %%PREFIX%%/etc/mysql. -EOM -} -] diff --git a/databases/mariadb103-client/pkg-plist b/databases/mariadb103-client/pkg-plist deleted file mode 100644 index 038def763f8a..000000000000 --- a/databases/mariadb103-client/pkg-plist +++ /dev/null @@ -1,130 +0,0 @@ -bin/mariadb_config -bin/msql2mysql -bin/mysql -bin/mysql_config -bin/mysql_convert_table_format -bin/mysql_find_rows -bin/mysql_setpermission -@comment bin/mysql_plugin -bin/mysql_waitpid -bin/mysqlaccess -bin/mysqladmin -bin/mysqlbinlog -bin/mysqlcheck -bin/mysqldump -bin/mysqlhotcopy -bin/mysqlimport -bin/mysqlshow -bin/mysqlslap -bin/mysqltest -bin/mytop -bin/replace -@comment bin/wsrep_sst_rsync_wan -include/mysql/errmsg.h -include/mysql/ma_list.h -include/mysql/ma_pvio.h -include/mysql/ma_tls.h -include/mysql/mariadb/ma_io.h -include/mysql/mariadb_com.h -include/mysql/mariadb_ctype.h -include/mysql/mariadb_dyncol.h -include/mysql/mariadb_rpl.h -include/mysql/mariadb_stmt.h -include/mysql/mariadb_version.h -include/mysql/my_config.h -include/mysql/my_global.h -include/mysql/my_sys.h -include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_version.h -include/mysql/mysql/client_plugin.h -include/mysql/mysql/plugin_auth.h -include/mysql/mysql/plugin_auth_common.h -include/mysql/mysqld_error.h -@comment etc/init.d/mysql -@comment etc/logrotate.d/mysql -@sample etc/my.cnf.sample -@comment libexec/rcmysql -%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so -lib/mysql/libmariadb.a -lib/mysql/libmariadb.so -lib/mysql/libmariadb.so.3 -lib/mysql/libmariadbclient.a -lib/mysql/libmysqlservices.a -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient_r.a -lib/mysql/libmysqlclient_r.so -@comment lib/mysql/plugin/caching_sha2_password.so -lib/mysql/plugin/client_ed25519.so -lib/mysql/plugin/daemon_example.ini -lib/mysql/plugin/dialog.so -lib/mysql/plugin/mysql_clear_password.so -lib/mysql/plugin/sha256_password.so -libdata/pkgconfig/libmariadb.pc -libdata/pkgconfig/mariadb.pc -@comment share/man/man1/aria_chk.1.gz -@comment share/man/man1/aria_dump_log.1.gz -@comment share/man/man1/aria_ftdump.1.gz -@comment share/man/man1/aria_pack.1.gz -@comment share/man/man1/aria_read_log.1.gz -@comment share/man/man1/galera_new_cluster.1.gz -@comment share/man/man1/galera_recovery.1.gz -@comment share/man/man1/innochecksum.1.gz -@comment share/man/man1/mariabackup.1.gz -@comment share/man/man1/mariadb-service-convert.1.gz -share/man/man1/msql2mysql.1.gz -@comment share/man/man1/mbstream.1.gz -@comment share/man/man1/my_print_defaults.1.gz -share/man/man1/my_safe_process.1.gz -@comment share/man/man1/myisam_ftdump.1.gz -@comment share/man/man1/myisamchk.1.gz -@comment share/man/man1/myisamlog.1.gz -@comment share/man/man1/myisampack.1.gz -share/man/man1/mysql-stress-test.pl.1.gz -share/man/man1/mysql-test-run.pl.1.gz -share/man/man1/mysql.1.gz -@comment share/man/man1/mysql.server.1.gz -share/man/man1/mysql_client_test.1.gz -share/man/man1/mysql_client_test_embedded.1.gz -share/man/man1/mysql_config.1.gz -share/man/man1/mysql_convert_table_format.1.gz -@comment share/man/man1/mysql_embedded.1.gz -share/man/man1/mysql_find_rows.1.gz -@comment share/man/man1/mysql_fix_extensions.1.gz -@comment share/man/man1/mysql_install_db.1.gz -@comment share/man/man1/mysql_ldb.1.gz -share/man/man1/mysql_plugin.1.gz -@comment share/man/man1/mysql_secure_installation.1.gz -share/man/man1/mysql_setpermission.1.gz -share/man/man1/mysql_tzinfo_to_sql.1.gz -@comment share/man/man1/mysql_upgrade.1.gz -share/man/man1/mysql_waitpid.1.gz -share/man/man1/mysqlaccess.1.gz -share/man/man1/mysqladmin.1.gz -share/man/man1/mysqlbinlog.1.gz -share/man/man1/mysqlcheck.1.gz -@comment share/man/man1/mysqld_multi.1.gz -@comment share/man/man1/mysqld_safe.1.gz -@comment share/man/man1/mysqld_safe_helper.1.gz -share/man/man1/mysqldump.1.gz -@comment share/man/man1/mysqldumpslow.1.gz -share/man/man1/mysqlhotcopy.1.gz -share/man/man1/mysqlimport.1.gz -share/man/man1/mysqlshow.1.gz -share/man/man1/mysqlslap.1.gz -share/man/man1/mysqltest.1.gz -share/man/man1/mysqltest_embedded.1.gz -@comment share/man/man1/perror.1.gz -share/man/man1/replace.1.gz -@comment share/man/man1/resolve_stack_dump.1.gz -@comment share/man/man1/resolveip.1.gz -@comment share/man/man1/wsrep_sst_common.1.gz -@comment share/man/man1/wsrep_sst_mariabackup.1.gz -@comment share/man/man1/wsrep_sst_mysqldump.1.gz -@comment share/man/man1/wsrep_sst_rsync.1.gz -@comment share/man/man1/wsrep_sst_rsync_wan.1.gz -@comment share/man/man8/mysqld.8.gz -@comment share/aclocal/mysql.m4 -@dir etc/mysql -@dir etc/mysql/conf.d diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile deleted file mode 100644 index 164fe34d9ee5..000000000000 --- a/databases/mariadb103-server/Makefile +++ /dev/null @@ -1,229 +0,0 @@ -PORTNAME?= mariadb -PORTVERSION= 10.3.38 -PORTREVISION?= 0 -CATEGORIES= databases -MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ - https://mirror.one.com/${SITESDIR}/ \ - https://ftp.nluug.nl/db/${SITESDIR}/ \ - https://ftp.icm.edu.pl/pub/unix/database/${SITESDIR}/ \ - https://mirror.truenetwork.ru/${SITESDIR}/ \ - https://mirrors.aliyun.com/${SITESDIR}/ \ - https://ftp.ubuntu-tw.org/mirror/${SITESDIR}/ \ - https://mirror.kku.ac.th/${SITESDIR}/ \ - https://espejito.fder.edu.uy/${SITESDIR}/ \ - https://mirror1.cl.netactuate.com/${SITESDIR}/ \ - https://ftp.osuosl.org/pub/${SITESDIR}/ \ - https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/ -PKGNAMESUFFIX?= 103-server - -MAINTAINER= brnrd@FreeBSD.org -COMMENT?= Multithreaded SQL database (server) -WWW= https://mariadb.org/ - -DEPRECATED= Use databases/mariadb106-server -EXPIRATION_DATE= 2023-05-25 - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -SUB_FILES= pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message - -USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl -IGNORE_SSL= openssl30 openssl31 -IGNORE_SSL_REASON= Upstream only supports OpenSSL 1.0.1 upto 1.1.X -USE_LDCONFIG= ${PREFIX}/lib/mysql -SHEBANG_FILES= scripts/*.sh -SITESDIR= mariadb/mariadb-${PORTVERSION}/source -DOCSDIR= ${PREFIX}/share/doc/mysql - -OPTIONS_SINGLE= GSSAPI -OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE -OPTIONS_DEFAULT= GSSAPI_BASE - -.if ${PKGNAMESUFFIX:M*-server} -# MySQL-Server options -OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP -OPTIONS_GROUP= COMPRESSION ENGINES GROONGA -OPTIONS_DEFINE= CONNECT_EXTRA DOCS -OPTIONS_DEFINE_amd64= WSREP -OPTIONS_DEFINE_powerpc64le= WSREP -OPTIONS_DEFINE_powerpc64= WSREP -OPTIONS_DEFINE_riscv64= WSREP -OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD -OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB -OPTIONS_GROUP_GROONGA= ZMQ MSGPACK -OPTIONS_EXCLUDE_i386= TOKUDB - -CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine -COMPRESSION_DESC= Optional page compression -ENGINES_DESC= Optional MariaDB storage engines -GROONGA_DESC= Optional Mroonga features -INNOBASE_DESC= InnoDB default engine -MROONGA_DESC= Mroonga Full Text Search engine -MSGPACK_DESC= MsgPack support -OQGRAPH_DESC= Open Query Graph Computation engine -ROCKSDB_DESC= RocksDB LSM engine (Alpha) -SPHINX_DESC= SphinxSE engine -SPIDER_DESC= Partitioning and XA-transactions engine -TOKUDB_DESC= Fractal tree index tree data structure engine -WSREP_DESC= Build wsrep clustering -ZMQ_DESC= ZeroMQ support -ZSTD_DESC+= Zstandard compression support (RocksDB only) -.endif - -CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ - -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ - -DINSTALL_INCLUDEDIR="include/mysql" \ - -DINSTALL_INFODIR="info" \ - -DINSTALL_LIBDIR="lib/mysql" \ - -DINSTALL_MANDIR="share/man" \ - -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ - -DINSTALL_MYSQLSHAREDIR="share/mysql" \ - -DINSTALL_MYSQLTESTDIR= \ - -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ - -DINSTALL_SBINDIR="libexec" \ - -DINSTALL_SCRIPTDIR="bin" \ - -DINSTALL_SHAREDIR="share" \ - -DINSTALL_SQLBENCHDIR= \ - -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DINSTALL_SYSCONFDIR="${PREFIX}/etc" \ - -DWITH_SSL="${OPENSSLBASE}" \ - -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ - -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \ - -DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \ - -DKRB5_CONFIG="${KRB5CONFIG}" \ - -DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \ - -DCOMPILATION_COMMENT="FreeBSD Ports" \ - -DCMAKE_PREFIX_PATH=${PREFIX} \ -CMAKE_OFF+= CONNECT_WITH_MONGO WITH_UNIT_TESTS -CMAKE_ON+= WITH_LIBWRAP WITHOUT_DOCS -DISABLED_PLUGINS+= DAEMON_EXAMPLE DIALOG_EXAMPLES EXAMPLE \ - EXAMPLE_KEY_MANAGEMENT FTEXAMPLE - -DATADIR= ${PREFIX}/share/mysql - -CONFLICTS_INSTALL= mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \ - mariadb1011-${PKGNAMESUFFIX:C/^[0-9]*-//} \ - mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \ - mysqlwsrep*-server \ - percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} - -FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES -GSSAPI_BASE_USES= gssapi -GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_MIT_USES= gssapi:mit -GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF -OPTIONS_SUB= yes - -.if ${PKGNAMESUFFIX:M*-client} -# MySQL-Client part -CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER -CMAKE_OFF+= CONC_WITH_UNITTEST WITH_WSREP -USES+= readline -USE_LDCONFIG= ${PREFIX}/lib/mysql -.else # ! ${PKGNAMESUFFIX:M*-client} -# MySQL-Server part -USES+= mysql:103m -USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin -USE_RC_SUBR= mysql-server -USERS= mysql -GROUPS= mysql -CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER -CMAKE_OFF+= WITH_CLIENT - -.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} -${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO -${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC -.endfor -INNOBASE_VARS_OFF= disabled_plugins+=INNOBASE - -CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC -CONNECT_EXTRA_USE= gnome=libxml2 -CONNECT_EXTRA_USES= gnome -CONNECT_EXTRA_CMAKE_BOOL= CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC -GSSAPI_NONE_VARS= disabled_plugins+=AUTH_GSSAPI -LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON -LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF -LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 -LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON -LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF -LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 -MROONGA_IMPLIES= LZ4 -MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack-c -OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ - libJudy.so:devel/judy -ROCKSDB_USES= python -ROCKSDB_CMAKE_ON= -DPYTHON_SHEBANG=${PYTHON_CMD} -SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON -SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF -SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy -TOKUDB_IMPLIES= SNAPPY -TOKUDB_PORTDOCS= README.md -WSREP_CMAKE_BOOL= WITH_WSREP -WSREP_LIB_DEPENDS= libgalera.so:databases/galera -WSREP_RUN_DEPENDS= bash:shells/bash \ - rsync:net/rsync \ - # stunnel:security/stunnel -ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 -ZSTD_CMAKE_ON= -DWITH_ROCKSDB_zstd=ON -ZSTD_CMAKE_OFF= -DWITH_ROCKSDB_zstd=OFF -ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd - -.include <bsd.port.options.mk> - -.for PLUGIN in ${DISABLED_PLUGINS} -CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO -.endfor - -.endif # ${PKGNAMESUFFIX:M*-client} - -.if defined(WITH_OPENSSL_PORT) -GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system -.endif - -.include <bsd.port.pre.mk> - -.if ${ARCH} != amd64 -PLIST_SUB+= WSREP="@comment " -.endif - -.if ${OPSYS} == DragonFly -CMAKE_OFF+= WITH_TOKUDB -.endif - -post-patch: - ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c - ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake - ${REINPLACE_CMD} 's|/etc/my.cnf.d|${LOCALBASE}/etc/mysql/conf.d|' \ - ${WRKSRC}/support-files/rpm/my.cnf -.if ${OPSYS} == DragonFly - ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ - ${WRKSRC}/cmake/os/DragonFly.cmake -.endif - -.if ${PKGNAMESUFFIX:M*-client} -post-install: - ${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \ - ${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc - ${RM} -r ${STAGEDIR}${DATADIR} \ - ${STAGEDIR}${PREFIX}/include/mysql/server \ - ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig - ${MV} ${STAGEDIR}${PREFIX}/etc/my.cnf ${STAGEDIR}${PREFIX}/etc/my.cnf.sample - ${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/mysql/conf.d - -post-install-GSSAPI_NONE-off: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so - -.else # ! ${PKGNAMESUFFIX:M*-client} -post-install: - ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \ - ${STAGEDIR}${PREFIX}/include/mysql/server/private \ - ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig \ - ${STAGEDIR}${PREFIX}/libexec/rcmysql - ${MV} ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf \ - ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample -.endif # ${PKGNAMESUFFIX:M*-client} - -.include <bsd.port.post.mk> diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo deleted file mode 100644 index a14bd3dbc9ef..000000000000 --- a/databases/mariadb103-server/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1676836096 -SHA256 (mariadb-10.3.38.tar.gz) = 4afbeff86d996475bb2324db9845c0746ea6e128c129b86a4a0163e4dc93293c -SIZE (mariadb-10.3.38.tar.gz) = 74376545 diff --git a/databases/mariadb103-server/files/mysql-server.in b/databases/mariadb103-server/files/mysql-server.in deleted file mode 100644 index 8722aef18b47..000000000000 --- a/databases/mariadb103-server/files/mysql-server.in +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/sh - -# PROVIDE: mysql -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following line to /etc/rc.conf to enable mysql: -# mysql_(instance_)?enable (bool): Set to "NO" by default. -# Set it to "YES" to enable MySQL. -# mysql_(instance_)?dbdir (str): Default to "/var/db/mysql" -# Base database directory. -# mysql_(instance_)?args (str): Custom additional arguments to be passed -# to mysqld_safe (default empty). -# mysql_(instance_)?pidfile (str): Custom PID file path and name. -# Default to "${mysql_dbdir}/${hostname}.pid". -# mysql_(instance_)?user (str): User to run mysqld as -# Default to "mysql" created by the port -# mysql_(instance_)?optfile (str): Server-specific option file. -# Default to "${mysql_dbdir}/my.cnf". -# mysql_instances (str): Set to "" by default. -# If defined, list of instances to enable - -. /etc/rc.subr - -name="mysql" -rcvar=mysql_enable - -load_rc_config $name - -: ${mysql_enable="NO"} -: ${mysql_user="mysql"} -: ${mysql_dbdir="/var/db/mysql"} -: ${mysql_optfile="${mysql_dbdir}/my.cnf"} - -command="/usr/sbin/daemon" -procname="%%PREFIX%%/libexec/mysqld" -start_precmd="${name}_prestart" -start_postcmd="${name}_poststart" - -if [ -n "$2" ]; then - instance="$2" - load_rc_config ${name}_${instance} - case "$mysql_instances" in - "$2 "*|*" $2 "*|*" $2"|"$2") - eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" - eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" - eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" - eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" - eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}" - ;; - *) - err 1 "$2 not found in mysql_instances" ;; - esac -else - if [ -n "${mysql_instances}" -a -n "$1" ]; then - for instance in ${mysql_instances}; do - eval _enable="\${mysql_${instance}_enable}" - case "${_enable:-${mysql_enable}}" in - [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) - continue - ;; - [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) - ;; - *) - if [ -z "$_enable" ]; then - _var=mysql_enable - else - _var=mysql_${instance}_enable - fi - warn "Bad value" \ - "'${_enable:-${mysql_enable}}'" \ - "for ${_var}. " \ - "Instance ${instance} skipped." - continue - ;; - esac - echo "===> mysql instance: ${instance}" - if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then - success="${instance} ${success}" - else - failed="${instance} (${retcode}) ${failed}" - fi - done - exit 0 - else - mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} - fi -fi - -pidfile=$mysql_pidfile -mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" - -mysql_create_auth_tables() -{ - eval $mysql_install_db $mysql_install_db_args - [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir} -} - -mysql_prestart() -{ - local dir - for dir in /etc /etc/mysql; do - if [ -f "${dir}/my.cnf" ]; then - echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}" - return 1 - fi - done - if [ ! -d "${mysql_dbdir}/mysql/." ]; then - mysql_create_auth_tables || return 1 - fi - return 0 -} - -mysql_poststart() -{ - local timeout=15 - while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do - timeout=$(( timeout - 1 )) - sleep 1 - done - return 0 -} - -run_rc_command "$1" diff --git a/databases/mariadb103-server/files/patch-CMakeLists.txt b/databases/mariadb103-server/files/patch-CMakeLists.txt deleted file mode 100644 index 7122c9289f07..000000000000 --- a/databases/mariadb103-server/files/patch-CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- CMakeLists.txt.orig 2021-05-08 08:36:42.000000000 +0200 -+++ CMakeLists.txt 2021-05-08 08:40:29.000000000 +0200 -@@ -517,13 +517,15 @@ - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - ) - -+IF(FALSE) - INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme) -+ENDIF() - - # MDEV-6526 these files are not installed anymore - #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC - # ${CMAKE_BINARY_DIR}/Docs/INFO_BIN) - --IF(UNIX) -+IF(FALSE) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) - ENDIF() - diff --git a/databases/mariadb103-server/files/patch-MDEV-11790 b/databases/mariadb103-server/files/patch-MDEV-11790 deleted file mode 100644 index 1794bcf44da7..000000000000 --- a/databases/mariadb103-server/files/patch-MDEV-11790 +++ /dev/null @@ -1,46 +0,0 @@ -WITHOUT_SERVER installs server-only files - -https://jira.mariadb.org/browse/MDEV-11790 ---- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC -+++ extra/CMakeLists.txt -@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) - ADD_DEPENDENCIES(innochecksum GenError) - ENDIF() - --MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) -+MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client) - TARGET_LINK_LIBRARIES(replace mysys) - - IF(UNIX) ---- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC -+++ scripts/CMakeLists.txt -@@ -241,7 +241,10 @@ ENDIF() - SET(mysql_config_COMPONENT COMPONENT Development) - SET(msql2mysql_COMPONENT COMPONENT Client) - SET(mysqlaccess_COMPONENT COMPONENT Client) -+SET(mysqlhotcopy_COMPONENT COMPONENT Client) -+SET(mysql_convert_table_format_COMPONENT COMPONENT Client) - SET(mysql_find_rows_COMPONENT COMPONENT Client) -+SET(mysql_setpermission_COMPONENT COMPONENT Client) - SET(mytop_COMPONENT Mytop) - - IF(WIN32) -@@ -298,14 +301,14 @@ ELSE() - # On Unix, most of the files end up in the bin directory - SET(BIN_SCRIPTS - msql2mysql -- mysql_config -- mysql_setpermission -- mysql_secure_installation - mysqlaccess -+ mysqlhotcopy -+ mysql_config - mysql_convert_table_format - mysql_find_rows -+ mysql_secure_installation -+ mysql_setpermission - mytop -- mysqlhotcopy - ${SERVER_SCRIPTS} - ${WSREP_SCRIPTS} - ${SYSTEMD_SCRIPTS} diff --git a/databases/mariadb103-server/files/patch-MDEV-20248 b/databases/mariadb103-server/files/patch-MDEV-20248 deleted file mode 100644 index ef0d97b17225..000000000000 --- a/databases/mariadb103-server/files/patch-MDEV-20248 +++ /dev/null @@ -1,13 +0,0 @@ ---- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig 2019-07-30 11:32:15 UTC -+++ storage/rocksdb/rocksdb/port/jemalloc_helper.h -@@ -12,6 +12,10 @@ - #include <jemalloc/jemalloc.h> - #endif - -+#ifdef __FreeBSD__ -+#define JEMALLOC_USABLE_SIZE_CONST const -+#endif -+ - #ifndef JEMALLOC_CXX_THROW - #define JEMALLOC_CXX_THROW - #endif diff --git a/databases/mariadb103-server/files/patch-cmake_install__layout.cmake b/databases/mariadb103-server/files/patch-cmake_install__layout.cmake deleted file mode 100644 index 2f6b38ffa45d..000000000000 --- a/databases/mariadb103-server/files/patch-cmake_install__layout.cmake +++ /dev/null @@ -1,13 +0,0 @@ ---- cmake/install_layout.cmake.orig 2020-05-09 19:27:56 UTC -+++ cmake/install_layout.cmake -@@ -128,8 +128,8 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files - SET(INSTALL_MYSQLDATADIR_STANDALONE "data") - - SET(INSTALL_UNIX_ADDRDIR_STANDALONE "/tmp/mysql.sock") --SET(INSTALL_PAMDIR_STANDALONE "share") --SET(INSTALL_PAMDATADIR_STANDALONE "share") -+SET(INSTALL_PAMDIR_STANDALONE "lib/mysql/plugin") -+SET(INSTALL_PAMDATADIR_STANDALONE "etc/mysql") - # - # RPM layout - # diff --git a/databases/mariadb103-server/files/patch-extra_CMakeLists.txt b/databases/mariadb103-server/files/patch-extra_CMakeLists.txt deleted file mode 100644 index e083792cd77c..000000000000 --- a/databases/mariadb103-server/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options - ---- extra/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC -+++ extra/CMakeLists.txt -@@ -96,9 +96,11 @@ IF(UNIX) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) - TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) - TARGET_LINK_LIBRARIES(mysql_waitpid mysys) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server) - TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys) - ENDIF() diff --git a/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt b/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt deleted file mode 100644 index 4a4abfc53dc0..000000000000 --- a/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- extra/mariabackup/CMakeLists.txt.orig 2019-12-05 22:22:27 UTC -+++ extra/mariabackup/CMakeLists.txt -@@ -114,6 +114,7 @@ MYSQL_ADD_EXECUTABLE(mbstream - TARGET_LINK_LIBRARIES(mbstream - mysys - crc -+ sql - ) - ADD_DEPENDENCIES(mbstream GenError) - diff --git a/databases/mariadb103-server/files/patch-include_my__cpu.h b/databases/mariadb103-server/files/patch-include_my__cpu.h deleted file mode 100644 index 36a374bb7cc6..000000000000 --- a/databases/mariadb103-server/files/patch-include_my__cpu.h +++ /dev/null @@ -1,48 +0,0 @@ ---- 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/files/patch-include_ssl__compat.h b/databases/mariadb103-server/files/patch-include_ssl__compat.h deleted file mode 100644 index 30d695673280..000000000000 --- a/databases/mariadb103-server/files/patch-include_ssl__compat.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/ssl_compat.h.orig 2022-11-02 12:18:48 UTC -+++ include/ssl_compat.h -@@ -19,7 +19,7 @@ - /* OpenSSL version specific definitions */ - #if defined(OPENSSL_VERSION_NUMBER) - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) - #define HAVE_OPENSSL11 1 - #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) - #define ERR_remove_state(X) ERR_clear_error() diff --git a/databases/mariadb103-server/files/patch-libmariadb_CMakeLists.txt b/databases/mariadb103-server/files/patch-libmariadb_CMakeLists.txt deleted file mode 100644 index 827b9f87ceef..000000000000 --- a/databases/mariadb103-server/files/patch-libmariadb_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- libmariadb/CMakeLists.txt.orig 2018-05-23 20:38:41 UTC -+++ libmariadb/CMakeLists.txt -@@ -371,7 +371,7 @@ ENDIF() - INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt) - ADD_SUBDIRECTORY(include) - ADD_SUBDIRECTORY(libmariadb) --IF(NOT WIN32) -+IF(NOT WIN32 AND NOT WITHOUT_CLIENT) - ADD_SUBDIRECTORY(mariadb_config) - ENDIF() - diff --git a/databases/mariadb103-server/files/patch-libmariadb_include_CMakeLists.txt b/databases/mariadb103-server/files/patch-libmariadb_include_CMakeLists.txt deleted file mode 100644 index 70e8fad20f85..000000000000 --- a/databases/mariadb103-server/files/patch-libmariadb_include_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ ---- libmariadb/include/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC -+++ libmariadb/include/CMakeLists.txt -@@ -21,6 +21,7 @@ IF(WIN32) - SET(WIX_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES} PARENT_SCOPE) - ENDIF() - -+IF(NOT WITHOUT_CLIENT) - INSTALL(FILES - ${MARIADB_CLIENT_INCLUDES} - DESTINATION ${INSTALL_INCLUDEDIR} -@@ -33,3 +34,4 @@ INSTALL(FILES - ${MARIADB_ADDITIONAL_INCLUDES} - DESTINATION ${INSTALL_INCLUDEDIR}/mariadb - COMPONENT Development) -+ENDIF() diff --git a/databases/mariadb103-server/files/patch-libmariadb_libmariadb_CMakeLists.txt b/databases/mariadb103-server/files/patch-libmariadb_libmariadb_CMakeLists.txt deleted file mode 100644 index 4ae28bb590c5..000000000000 --- a/databases/mariadb103-server/files/patch-libmariadb_libmariadb_CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- libmariadb/libmariadb/CMakeLists.txt.orig 2022-08-10 09:34:58 UTC -+++ libmariadb/libmariadb/CMakeLists.txt -@@ -464,6 +464,7 @@ IF(NOT WIN32) - SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}") - ENDIF() - -+IF(NOT WITHOUT_CLIENT) - INSTALL(TARGETS mariadbclient - COMPONENT Development - DESTINATION ${INSTALL_LIBDIR}) -@@ -480,6 +481,8 @@ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTA - COMPONENT SharedLibraries NAMELINK_SKIP) - INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} - COMPONENT Development NAMELINK_ONLY) -+ENDIF() -+ - ENDIF() - - IF(MSVC) diff --git a/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt b/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt deleted file mode 100644 index aa01e9d54190..000000000000 --- a/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ ---- libmariadb/plugins/auth/CMakeLists.txt.orig 2019-11-11 05:31:43 UTC -+++ libmariadb/plugins/auth/CMakeLists.txt -@@ -75,6 +75,7 @@ IF(CRYPTO_PLUGIN) - ${CRYPT_SOURCE} - LIBRARIES ${CRYPT_LIBS}) - -+ IF(NOT WITHOUT_CLIENT) - IF(WITH_SSL STREQUAL "GNUTLS" AND NOT WIN32) - MESSAGE1(STATUS "sha256_password not supported by GnuTLS due to missing OAEP padding") - ELSE() -@@ -85,6 +86,7 @@ IF(CRYPTO_PLUGIN) - SOURCES ${AUTH_DIR}/sha256_pw.c - LIBRARIES ${CRYPT_LIBS}) - ENDIF() -+ ENDIF() - ENDIF() - - #GSSAPI client authentication plugin -@@ -119,9 +121,11 @@ REGISTER_PLUGIN(TARGET mysql_old_password - DEFAULT STATIC - SOURCES ${AUTH_DIR}/old_password.c) - -+IF(NOT WITHOUT_CLIENT) - # Cleartext - REGISTER_PLUGIN(TARGET mysql_clear_password - TYPE MARIADB_CLIENT_PLUGIN_AUTH - CONFIGURATIONS DYNAMIC STATIC OFF - DEFAULT DYNAMIC - SOURCES ${AUTH_DIR}/mariadb_cleartext.c) -+ENDIF() diff --git a/databases/mariadb103-server/files/patch-libservices_CMakeLists.txt b/databases/mariadb103-server/files/patch-libservices_CMakeLists.txt deleted file mode 100644 index 82bf5fac68ea..000000000000 --- a/databases/mariadb103-server/files/patch-libservices_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options - ---- libservices/CMakeLists.txt.orig 2017-05-14 23:13:16 UTC -+++ libservices/CMakeLists.txt -@@ -40,4 +40,6 @@ SET(MYSQLSERVICES_SOURCES - ) - - ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) -+IF(FALSE) - INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) -+ENDIF() diff --git a/databases/mariadb103-server/files/patch-man_CMakeLists.txt b/databases/mariadb103-server/files/patch-man_CMakeLists.txt deleted file mode 100644 index 350a8f5ef2b7..000000000000 --- a/databases/mariadb103-server/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options - ---- man/CMakeLists.txt.orig 2017-05-14 23:13:16 UTC -+++ man/CMakeLists.txt -@@ -38,7 +38,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys - - INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) - INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) -+IF(FALSE) - INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient) - INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment) - INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) -- -+ENDIF() diff --git a/databases/mariadb103-server/files/patch-mysys_my__default.c b/databases/mariadb103-server/files/patch-mysys_my__default.c deleted file mode 100644 index ef8d9b5ca53e..000000000000 --- a/databases/mariadb103-server/files/patch-mysys_my__default.c +++ /dev/null @@ -1,52 +0,0 @@ ---- mysys/my_default.c.orig 2017-05-14 23:13:17 UTC -+++ mysys/my_default.c -@@ -785,7 +785,7 @@ static int search_default_file_with_ext( - { - MY_STAT stat_info; - if (!my_stat(name,&stat_info,MYF(0))) -- return 1; -+ return 0; - /* - Ignore world-writable regular files. - This is mainly done to protect us to not read a file created by -@@ -803,6 +803,14 @@ static int search_default_file_with_ext( - if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) - return 1; /* Ignore wrong files */ - -+ if (strstr(name, "/etc") == name) -+ { -+ fprintf(stderr, -+ "error: Config file %s in invalid location, please move to or merge with %%PREFIX%%%s\n", -+ name,name); -+ goto err; -+ } -+ - while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) - { - line++; -@@ -1067,7 +1075,8 @@ void my_print_default_files(const char * - if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ - *end++= '.'; - strxmov(end, conf_file, *ext, " ", NullS); -- fputs(name, stdout); -+ if (strstr(name, "/etc") != name) -+ fputs(name, stdout); - } - } - } -@@ -1192,13 +1201,10 @@ static const char **init_default_directo - - #else - --#if defined(DEFAULT_SYSCONFDIR) -- if (DEFAULT_SYSCONFDIR[0]) -- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); --#else - errors += add_directory(alloc, "/etc/", dirs); - errors += add_directory(alloc, "/etc/mysql/", dirs); --#endif /* DEFAULT_SYSCONFDIR */ -+ errors += add_directory(alloc, "%%PREFIX%%/etc/", dirs); -+ errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs); - - #endif - diff --git a/databases/mariadb103-server/files/patch-oqgraph-MDEV-15291 b/databases/mariadb103-server/files/patch-oqgraph-MDEV-15291 deleted file mode 100644 index 05083cd206ac..000000000000 --- a/databases/mariadb103-server/files/patch-oqgraph-MDEV-15291 +++ /dev/null @@ -1,40 +0,0 @@ ---- storage/oqgraph/oqgraph_judy.cc.orig 2018-02-12 15:01:28 UTC -+++ storage/oqgraph/oqgraph_judy.cc -@@ -27,7 +27,7 @@ - /* - Currently the only active code that can return error is: - judy_bitset::reset()/J1U() -- judy_bitset::setbit()/J1S() -+ judy_bitset::jsetbit()/J1S() - - In most cases errors are either about wrong parameters passed to Judy - functions or internal structures corruption. These definitely deserve -@@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_ - return rc == 1; - } - --open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n) -+open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n) - { - int rc; - J1S(rc, array, n); ---- storage/oqgraph/oqgraph_judy.h.orig 2018-02-12 15:01:28 UTC -+++ storage/oqgraph/oqgraph_judy.h -@@ -63,7 +63,7 @@ namespace open_query - if (!val) - return reset(n); - else -- return setbit(n); -+ return jsetbit(n); - } - - judy_bitset& set(const judy_bitset& src); -@@ -115,7 +115,7 @@ namespace open_query - private: - mutable void* array; - -- judy_bitset& setbit(size_type n); -+ judy_bitset& jsetbit(size_type n); - }; - } - diff --git a/databases/mariadb103-server/files/patch-pcre_CMakeLists.txt b/databases/mariadb103-server/files/patch-pcre_CMakeLists.txt deleted file mode 100644 index c09bb5f9d875..000000000000 --- a/databases/mariadb103-server/files/patch-pcre_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- pcre/CMakeLists.txt.orig 2017-08-17 10:05:39 UTC -+++ pcre/CMakeLists.txt -@@ -510,6 +510,8 @@ IF(PCRE_SHOW_REPORT) - MESSAGE(STATUS "") - ENDIF(PCRE_SHOW_REPORT) - -+IF(FALSE) - INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development) -+ENDIF() - - # end CMakeLists.txt diff --git a/databases/mariadb103-server/files/patch-scripts_mysql__config.sh b/databases/mariadb103-server/files/patch-scripts_mysql__config.sh deleted file mode 100644 index 13f25ca9fb74..000000000000 --- a/databases/mariadb103-server/files/patch-scripts_mysql__config.sh +++ /dev/null @@ -1,12 +0,0 @@ ---- scripts/mysql_config.sh.orig 2017-05-24 09:15:23 UTC -+++ scripts/mysql_config.sh -@@ -106,7 +106,9 @@ fi - - # Create options - libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" -+libs="$libs -L%%LOCALBASE%%/lib " - embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" -+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " - - include="-I$pkgincludedir" - if [ "$basedir" != "/usr" ]; then diff --git a/databases/mariadb103-server/files/patch-scripts_mysqld__safe.sh b/databases/mariadb103-server/files/patch-scripts_mysqld__safe.sh deleted file mode 100644 index 0c694bd3a30a..000000000000 --- a/databases/mariadb103-server/files/patch-scripts_mysqld__safe.sh +++ /dev/null @@ -1,16 +0,0 @@ ---- scripts/mysqld_safe.sh.orig 2017-05-24 09:15:23 UTC -+++ scripts/mysqld_safe.sh -@@ -568,11 +568,11 @@ fi - - if test -z "$MYSQL_HOME" - then -- if test -r "$DATADIR/my.cnf" -+ if test -r "$DATADIR/etc/my.cnf" - then - log_error "WARNING: Found $DATADIR/my.cnf - The data directory is not a valid location for my.cnf, please move it to --$MY_BASEDIR_VERSION/my.cnf" -+$MY_BASEDIR_VERSION/etc/my.cnf" - fi - MYSQL_HOME=$MY_BASEDIR_VERSION - fi diff --git a/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh deleted file mode 100644 index 7f3ea98f52e1..000000000000 --- a/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/wsrep_sst_mariabackup.sh.orig 2022-05-24 14:46:36 UTC -+++ scripts/wsrep_sst_mariabackup.sh -@@ -725,7 +725,7 @@ recv_joiner() - local ltcmd="$tcmd" - if [ $tmt -gt 0 ]; then - if [ -n "$(commandex timeout)" ]; then -- if timeout --help | grep -qw -F -- '-k'; then -+ if timeout --help 2>&1 | grep -qw -F -- '-k'; then - ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd" - else - ltcmd="timeout -s9 $tmt $tcmd" diff --git a/databases/mariadb103-server/files/patch-sql_mysqld.cc b/databases/mariadb103-server/files/patch-sql_mysqld.cc deleted file mode 100644 index 4109d800da4c..000000000000 --- a/databases/mariadb103-server/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,31 +0,0 @@ ---- sql/mysqld.cc.orig 2021-05-05 15:26:23 UTC -+++ sql/mysqld.cc -@@ -206,7 +206,7 @@ typedef fp_except fp_except_t; - - inline void setup_fpu() - { --#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) -+#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV) - /* We can't handle floating point exceptions with threads, so disable - this on freebsd - Don't fall for overflow, underflow,divide-by-zero or loss of precision. -@@ -219,7 +219,7 @@ inline void setup_fpu() - fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | - FP_X_IMP)); - #endif /* FP_X_DNML */ --#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */ -+#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && defined(FP_X_INV) */ - - #ifdef HAVE_FEDISABLEEXCEPT - fedisableexcept(FE_ALL_EXCEPT); -@@ -5033,8 +5033,9 @@ static void init_ssl() - while ((err= ERR_get_error())) - sql_print_warning("SSL error: %s", ERR_error_string(err, NULL)); - } -- else -+ else { - ERR_remove_state(0); -+ } - } - else - { diff --git a/databases/mariadb103-server/files/patch-storage_innobase_lz4.cmake b/databases/mariadb103-server/files/patch-storage_innobase_lz4.cmake deleted file mode 100644 index 245725cd4801..000000000000 --- a/databases/mariadb103-server/files/patch-storage_innobase_lz4.cmake +++ /dev/null @@ -1,36 +0,0 @@ ---- storage/innobase/lz4.cmake.orig 2021-08-02 10:58:57 UTC -+++ storage/innobase/lz4.cmake -@@ -17,9 +17,16 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING - - MACRO (MYSQL_CHECK_LZ4) - IF (WITH_INNODB_LZ4 STREQUAL "ON" OR WITH_INNODB_LZ4 STREQUAL "AUTO") -- CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H) -- CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput "" HAVE_LZ4_SHARED_LIB) -- CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default "" HAVE_LZ4_COMPRESS_DEFAULT) -+ find_path(LZ4_INCLUDE_DIR NAMES lz4.h) -+ find_library(LZ4_LIBRARY NAMES lz4) -+ IF (LZ4_LIBRARY) -+ get_filename_component(LZ4_LIBDIR ${LZ4_LIBRARY} DIRECTORY) -+#MESSAGE(STATUS "LZ4_INCLUDE_DIR=${LZ4_INCLUDE_DIR} LZ4_LIBRARY=${LZ4_LIBRARY} LZ4_LIBDIR=${LZ4_LIBDIR}") -+ IF (LZ4_INCLUDE_DIR) -+ SET(HAVE_LZ4_H YES) -+ ENDIF() -+ CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput ${LZ4_LIBDIR} HAVE_LZ4_SHARED_LIB) -+ CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default ${LZ4_LIBDIR} HAVE_LZ4_COMPRESS_DEFAULT) - - IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H) - SET(HAVE_INNODB_LZ4 TRUE) -@@ -27,11 +34,12 @@ MACRO (MYSQL_CHECK_LZ4) - IF (HAVE_LZ4_COMPRESS_DEFAULT) - ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1) - ENDIF() -- LINK_LIBRARIES(lz4) -+ LINK_LIBRARIES(${LZ4_LIBRARY}) - ELSE() - IF (WITH_INNODB_LZ4 STREQUAL "ON") - MESSAGE(FATAL_ERROR "Required lz4 library is not found") - ENDIF() -+ ENDIF() - ENDIF() - ENDIF() - ADD_FEATURE_INFO(INNODB_LZ4 HAVE_INNODB_LZ4 "LZ4 compression in the InnoDB storage engine") diff --git a/databases/mariadb103-server/files/patch-storage_innobase_lzo.cmake b/databases/mariadb103-server/files/patch-storage_innobase_lzo.cmake deleted file mode 100644 index 54de34c4f0d8..000000000000 --- a/databases/mariadb103-server/files/patch-storage_innobase_lzo.cmake +++ /dev/null @@ -1,24 +0,0 @@ ---- storage/innobase/lzo.cmake.orig 2021-08-02 10:58:57 UTC -+++ storage/innobase/lzo.cmake -@@ -17,13 +17,17 @@ SET(WITH_INNODB_LZO AUTO CACHE STRING - - MACRO (MYSQL_CHECK_LZO) - IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO") -- CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H) -- CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "" HAVE_LZO_SHARED_LIB) -- -+ find_path(LZO_INCLUDE NAMES lzo/lzo1x.h) -+ find_library(LZO_LIBRARY NAMES lzo2) -+ get_filename_component(LZO_LIBDIR ${LZO_LIBRARY} DIRECTORY) -+ IF (LZO_INCLUDE) -+ SET(HAVE_LZO_H 1) -+ ENDIF() -+ CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress ${LZO_LIBDIR} HAVE_LZO_SHARED_LIB) - IF(HAVE_LZO_SHARED_LIB AND HAVE_LZO_H) - SET(HAVE_INNODB_LZO TRUE) - ADD_DEFINITIONS(-DHAVE_LZO=1) -- LINK_LIBRARIES(lzo2) -+ LINK_LIBRARIES(${LZO_LIBRARY}) - ELSE() - IF (WITH_INNODB_LZO STREQUAL "ON") - MESSAGE(FATAL_ERROR "Required lzo library is not found") diff --git a/databases/mariadb103-server/files/patch-storage_innobase_snappy.cmake b/databases/mariadb103-server/files/patch-storage_innobase_snappy.cmake deleted file mode 100644 index 9e8fc040616c..000000000000 --- a/databases/mariadb103-server/files/patch-storage_innobase_snappy.cmake +++ /dev/null @@ -1,25 +0,0 @@ ---- storage/innobase/snappy.cmake.orig 2021-08-02 10:58:58 UTC -+++ storage/innobase/snappy.cmake -@@ -17,13 +17,18 @@ SET(WITH_INNODB_SNAPPY AUTO CACHE STRING - - MACRO (MYSQL_CHECK_SNAPPY) - IF (WITH_INNODB_SNAPPY STREQUAL "ON" OR WITH_INNODB_SNAPPY STREQUAL "AUTO") -- CHECK_INCLUDE_FILES(snappy-c.h HAVE_SNAPPY_H) -- CHECK_LIBRARY_EXISTS(snappy snappy_uncompress "" HAVE_SNAPPY_SHARED_LIB) -- -+ find_path(SNAPPY_INCLUDE_DIR NAMES snappy-c.h) -+ find_library(SNAPPY_LIBRARY NAMES snappy) -+ get_filename_component(SNAPPY_LIBDIR ${SNAPPY_LIBRARY} DIRECTORY) -+ IF (SNAPPY_INCLUDE_DIR) -+ SET(HAVE_SNAPPY_H 1) -+ ENDIF() -+ CHECK_LIBRARY_EXISTS(snappy snappy_uncompress ${SNAPPY_LIBDIR} HAVE_SNAPPY_SHARED_LIB) -+#MESSAGE(STATUS "HAVE_SNAPPY_H=${HAVE_SNAPPY_H} HAVE_SNAPPY_SHARED_LIB=${HAVE_SNAPPY_SHARED_LIB} SNAPPY_LIBDIR=${SNAPPY_LIBDIR} ") - IF(HAVE_SNAPPY_SHARED_LIB AND HAVE_SNAPPY_H) - SET(HAVE_INNODB_SNAPPY TRUE) - ADD_DEFINITIONS(-DHAVE_SNAPPY=1) -- LINK_LIBRARIES(snappy) -+ LINK_LIBRARIES(${SNAPPY_LIBRARY}) - ELSE() - IF (WITH_INNODB_SNAPPY STREQUAL "ON") - MESSAGE(FATAL_ERROR "Required snappy library is not found") diff --git a/databases/mariadb103-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt b/databases/mariadb103-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt deleted file mode 100644 index 023d10e97d94..000000000000 --- a/databases/mariadb103-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -From https://github.com/openquery/mariadb-server/commit/43bf72e45b9ead6aa0dc4abd6e5719c6381974b5 - ---- storage/mroonga/vendor/groonga/CMakeLists.txt.orig 2017-05-14 23:13:18 UTC -+++ storage/mroonga/vendor/groonga/CMakeLists.txt -@@ -167,6 +167,10 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COM - MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-clobbered") - endif() - -+if(CMAKE_COMPILER_IS_CLANGCXX) -+ MY_CHECK_AND_SET_COMPILER_FLAG("-fexceptions") -+endif() -+ - if(NOT DEFINED CMAKE_C_COMPILE_OPTIONS_PIC) - # For old CMake - if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGCXX) diff --git a/databases/mariadb103-server/files/patch-storage_tokudb_CMakeLists.txt b/databases/mariadb103-server/files/patch-storage_tokudb_CMakeLists.txt deleted file mode 100644 index e75813586e40..000000000000 --- a/databases/mariadb103-server/files/patch-storage_tokudb_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- storage/tokudb/CMakeLists.txt.orig 2017-09-25 08:33:26.000000000 +0200 -+++ storage/tokudb/CMakeLists.txt 2017-09-28 21:46:55.119327000 +0200 -@@ -108,6 +108,3 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA - - TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static - ${ZLIB_LIBRARY} ${LIBJEMALLOC} stdc++) -- --SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin") --SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin") diff --git a/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt b/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt deleted file mode 100644 index 9ef62147175b..000000000000 --- a/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- storage/tokudb/PerconaFT/CMakeLists.txt.orig 2017-05-14 23:13:20 UTC -+++ storage/tokudb/PerconaFT/CMakeLists.txt -@@ -80,7 +80,7 @@ add_subdirectory(src) - add_subdirectory(ftcxx) - add_subdirectory(tools) - --INSTALL_DOCUMENTATION(README.md COPYING.AGPLv3 COPYING.GPLv2 PATENTS -+INSTALL_DOCUMENTATION(README.md - COMPONENT Server) - - ## build tags diff --git a/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake b/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake deleted file mode 100644 index 5bd9971c69da..000000000000 --- a/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake +++ /dev/null @@ -1,36 +0,0 @@ ---- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2019-11-06 16:01:58 UTC -+++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake -@@ -1,5 +1,12 @@ - include(ExternalProject) - -+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ include_directories("/usr/include") -+ -+ add_library(lzma SHARED IMPORTED) -+ set_target_properties(lzma PROPERTIES IMPORTED_LOCATION -+ "/usr/lib/liblzma.so") -+ELSE() - ## add lzma with an external project - set(xz_configure_opts --with-pic --enable-static) - if (APPLE) -@@ -105,8 +112,15 @@ add_library(lzma STATIC IMPORTED) - set_target_properties(lzma PROPERTIES IMPORTED_LOCATION - "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a") - add_dependencies(lzma build_lzma) -+ENDIF() - -+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ include_directories("%%LOCALBASE%%/include") - -+ add_library(snappy SHARED IMPORTED) -+ set_target_properties(snappy PROPERTIES IMPORTED_LOCATION -+ "%%LOCALBASE%%/lib/libsnappy.so") -+ELSE() - ## add snappy with an external project - set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.") - if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt") -@@ -140,3 +154,4 @@ add_library(snappy STATIC IMPORTED) - set_target_properties(snappy PROPERTIES IMPORTED_LOCATION - "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a") - add_dependencies(snappy build_snappy) -+ENDIF() diff --git a/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc b/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc deleted file mode 100644 index c6eb23c5a525..000000000000 --- a/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc +++ /dev/null @@ -1,16 +0,0 @@ -Fix build error - ---- storage/tokudb/PerconaFT/portability/memory.cc.orig 2017-05-14 23:13:21 UTC -+++ storage/tokudb/PerconaFT/portability/memory.cc -@@ -42,11 +42,6 @@ Copyright (c) 2006, 2015, Percona and/or - #include <string.h> - #include <stdio.h> - #include <stdlib.h> --#if defined(HAVE_MALLOC_H) --# include <malloc.h> --#elif defined(HAVE_SYS_MALLOC_H) --# include <sys/malloc.h> --#endif - #include <dlfcn.h> - #include <toku_race_tools.h> - #include "memory.h" diff --git a/databases/mariadb103-server/files/patch-support-files_CMakeLists.txt b/databases/mariadb103-server/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index c9392ca628a2..000000000000 --- a/databases/mariadb103-server/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options - ---- support-files/CMakeLists.txt.orig 2017-05-14 23:13:28 UTC -+++ support-files/CMakeLists.txt -@@ -83,7 +83,9 @@ IF(UNIX) - CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development) - -+IF(FALSE) - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -+ENDIF() - - SET(bindir ${INSTALL_BINDIRABS}) - SET(sbindir ${INSTALL_SBINDIRABS}) diff --git a/databases/mariadb103-server/files/pkg-message.in b/databases/mariadb103-server/files/pkg-message.in deleted file mode 100644 index 7c02aa873dca..000000000000 --- a/databases/mariadb103-server/files/pkg-message.in +++ /dev/null @@ -1,20 +0,0 @@ -[ -{ type: install - message: <<EOM -MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for -my.cnf. Please move existing my.cnf files from those paths to -%%PREFIX%%/etc and %%PREFIX%%/etc/mysql. - -This port does NOT include the mytop perl script, this is included in -the MariaDB tarball but the most recent version can be found in the -databases/mytop port -EOM -} -{ type: upgrade - message: <<EOM -Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag) -the first time you start the MySQL server after an upgrade from an -earlier version. -EOM -} -] diff --git a/databases/mariadb103-server/pkg-descr b/databases/mariadb103-server/pkg-descr deleted file mode 100644 index f76c83728f01..000000000000 --- a/databases/mariadb103-server/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -MariaDB is a database server that offers drop-in replacement functionality -for MySQL. MariaDB is built by some of the original authors of MySQL, with -assistance from the broader community of Free and open source software -developers. In addition to the core functionality of MySQL, MariaDB offers -a rich set of feature enhancements including alternate storage engines, -server optimizations, and patches. - -MariaDB is primarily driven by developers at Monty Program, a company -founded by Michael "Monty" Widenius, the original author of MySQL, but -this is not the whole story about MariaDB. On the "About MariaDB" page you -will find more information about all participants in the MariaDB community, -including storage engines XtraDB and PBXT. diff --git a/databases/mariadb103-server/pkg-plist b/databases/mariadb103-server/pkg-plist deleted file mode 100644 index 3daa272c2ba4..000000000000 --- a/databases/mariadb103-server/pkg-plist +++ /dev/null @@ -1,357 +0,0 @@ -bin/aria_chk -bin/aria_dump_log -bin/aria_ftdump -bin/aria_pack -bin/aria_read_log -%%INNOBASE%%bin/innochecksum -%%INNOBASE%%bin/mariabackup -%%INNOBASE%%bin/mbstream -@comment bin/msql2mysql -bin/my_print_defaults -bin/myisam_ftdump -bin/myisamchk -bin/myisamlog -bin/myisampack -%%ROCKSDB%%bin/myrocks_hotbackup -bin/mysql_client_test -bin/mysql_client_test_embedded -@comment bin/mysql_config -@comment bin/mysql_convert_table_format -bin/mysql_embedded -@comment bin/mysql_find_rows -bin/mysql_fix_extensions -bin/mysql_install_db -%%ROCKSDB%%bin/mysql_ldb -bin/mysql_plugin -bin/mysql_secure_installation -@comment bin/mysql_setpermission -bin/mysql_tzinfo_to_sql -bin/mysql_upgrade -@comment bin/mysqlaccess -bin/mysqld_multi -bin/mysqld_safe -bin/mysqld_safe_helper -bin/mysqldumpslow -@comment bin/mysqlhotcopy -@comment bin/mysqltest -@comment bin/mysqltest_embedded -@comment bin/mytop -bin/perror -@comment bin/replace -bin/resolve_stack_dump -bin/resolveip -%%ROCKSDB%%bin/sst_dump -@comment bin/test-connect-t -%%TOKUDB%%bin/tokuft_logprint -%%TOKUDB%%bin/tokuftdump -%%WSREP%%bin/wsrep_sst_backup -%%WSREP%%bin/wsrep_sst_common -%%WSREP%%bin/wsrep_sst_mariabackup -%%WSREP%%bin/wsrep_sst_mysqldump -%%WSREP%%bin/wsrep_sst_rsync -%%WSREP%%bin/wsrep_sst_rsync_wan -@comment data/test/db.opt -@comment etc/init.d/mysql -etc/logrotate.d/mysql -@comment etc/my.cnf -@sample etc/mysql/user_map.conf.sample -@comment include/mysql/mariadb_rpl.h -@comment include/mysql/my_config.h -@comment include/mysql/my_global.h -@comment include/mysql/my_sys.h -@comment include/mysql/mysql_com.h -@comment include/mysql/mysql_version.h -@comment include/mysql/mysqld_error.h -include/mysql/server/big_endian.h -include/mysql/server/byte_order_generic.h -include/mysql/server/byte_order_generic_x86.h -include/mysql/server/byte_order_generic_x86_64.h -include/mysql/server/decimal.h -include/mysql/server/errmsg.h -include/mysql/server/handler_ername.h -include/mysql/server/handler_state.h -include/mysql/server/json_lib.h -include/mysql/server/keycache.h -include/mysql/server/little_endian.h -include/mysql/server/m_ctype.h -include/mysql/server/m_string.h -include/mysql/server/ma_dyncol.h -include/mysql/server/mariadb_capi_rename.h -include/mysql/server/my_alloc.h -include/mysql/server/my_attribute.h -include/mysql/server/my_byteorder.h -include/mysql/server/my_compiler.h -include/mysql/server/my_config.h -include/mysql/server/my_dbug.h -include/mysql/server/my_decimal_limits.h -include/mysql/server/my_dir.h -include/mysql/server/my_getopt.h -include/mysql/server/my_global.h -include/mysql/server/my_list.h -include/mysql/server/my_net.h -include/mysql/server/my_pthread.h -include/mysql/server/my_sys.h -include/mysql/server/my_valgrind.h -include/mysql/server/my_xml.h -include/mysql/server/mysql.h -include/mysql/server/mysql/auth_dialog_client.h -include/mysql/server/mysql/client_plugin.h -include/mysql/server/mysql/plugin.h -include/mysql/server/mysql/plugin_audit.h -include/mysql/server/mysql/plugin_auth.h -include/mysql/server/mysql/plugin_auth_common.h -include/mysql/server/mysql/plugin_encryption.h -include/mysql/server/mysql/plugin_ftparser.h -include/mysql/server/mysql/plugin_password_validation.h -include/mysql/server/mysql/psi/mysql_file.h -include/mysql/server/mysql/psi/mysql_idle.h -include/mysql/server/mysql/psi/mysql_socket.h -include/mysql/server/mysql/psi/mysql_stage.h -include/mysql/server/mysql/psi/mysql_statement.h -include/mysql/server/mysql/psi/mysql_table.h -include/mysql/server/mysql/psi/mysql_thread.h -include/mysql/server/mysql/psi/psi.h -include/mysql/server/mysql/psi/psi_abi_v0.h -include/mysql/server/mysql/psi/psi_abi_v1.h -include/mysql/server/mysql/psi/psi_abi_v2.h -include/mysql/server/mysql/psi/psi_base.h -include/mysql/server/mysql/psi/psi_memory.h -include/mysql/server/mysql/service_base64.h -include/mysql/server/mysql/service_debug_sync.h -include/mysql/server/mysql/service_encryption.h -include/mysql/server/mysql/service_encryption_scheme.h -include/mysql/server/mysql/service_kill_statement.h -include/mysql/server/mysql/service_logger.h -include/mysql/server/mysql/service_md5.h -include/mysql/server/mysql/service_my_crypt.h -include/mysql/server/mysql/service_my_print_error.h -include/mysql/server/mysql/service_my_snprintf.h -include/mysql/server/mysql/service_progress_report.h -include/mysql/server/mysql/service_sha1.h -include/mysql/server/mysql/service_sha2.h -include/mysql/server/mysql/service_thd_alloc.h -include/mysql/server/mysql/service_thd_autoinc.h -include/mysql/server/mysql/service_thd_error_context.h -include/mysql/server/mysql/service_thd_rnd.h -include/mysql/server/mysql/service_thd_specifics.h -include/mysql/server/mysql/service_thd_timezone.h -include/mysql/server/mysql/service_thd_wait.h -include/mysql/server/mysql/service_wsrep.h -include/mysql/server/mysql/services.h -include/mysql/server/mysql_com.h -include/mysql/server/mysql_com_server.h -include/mysql/server/mysql_embed.h -include/mysql/server/mysql_time.h -include/mysql/server/mysql_version.h -include/mysql/server/mysqld_ername.h -include/mysql/server/mysqld_error.h -include/mysql/server/pack.h -include/mysql/server/sql_common.h -include/mysql/server/sql_state.h -include/mysql/server/sslopt-case.h -include/mysql/server/sslopt-longopts.h -include/mysql/server/sslopt-vars.h -include/mysql/server/typelib.h -@comment lib/mysql/libmariadb.a -@comment lib/mysql/libmariadbclient.a -lib/mysql/libmariadbd.a -lib/mysql/libmariadbd.so -lib/mysql/libmariadbd.so.19 -@comment lib/mysql/libmysqlclient.a -@comment lib/mysql/libmysqlclient.so -@comment lib/mysql/libmysqlclient_r.a -@comment lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqld.a -lib/mysql/libmysqld.so -lib/mysql/plugin/adt_null.so -lib/mysql/plugin/auth_0x0100.so -lib/mysql/plugin/auth_ed25519.so -%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so -lib/mysql/plugin/auth_pam.so -lib/mysql/plugin/auth_socket.so -lib/mysql/plugin/auth_test_plugin.so -lib/mysql/plugin/caching_sha2_password.so -lib/mysql/plugin/debug_key_management.so -@comment lib/mysql/plugin/dialog.so -lib/mysql/plugin/disks.so -lib/mysql/plugin/file_key_management.so -lib/mysql/plugin/ha_archive.so -lib/mysql/plugin/ha_blackhole.so -lib/mysql/plugin/ha_connect.so -lib/mysql/plugin/ha_federated.so -lib/mysql/plugin/ha_federatedx.so -%%MROONGA%%lib/mysql/plugin/ha_mroonga.so -%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so -%%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.so -%%SPHINX%%lib/mysql/plugin/ha_sphinx.so -%%SPIDER%%lib/mysql/plugin/ha_spider.so -%%TOKUDB%%lib/mysql/plugin/ha_tokudb.so -@comment lib/mysql/plugin/daemon_example.ini -lib/mysql/plugin/ha_test_sql_discovery.so -lib/mysql/plugin/handlersocket.so -lib/mysql/plugin/locales.so -lib/mysql/plugin/metadata_lock_info.so -lib/mysql/plugin/pam_user_map.so -lib/mysql/plugin/qa_auth_client.so -lib/mysql/plugin/qa_auth_interface.so -lib/mysql/plugin/qa_auth_server.so -lib/mysql/plugin/query_cache_info.so -lib/mysql/plugin/query_response_time.so -lib/mysql/plugin/server_audit.so -lib/mysql/plugin/simple_password_check.so -lib/mysql/plugin/sql_errlog.so -lib/mysql/plugin/test_versioning.so -%%WSREP%%lib/mysql/plugin/wsrep_info.so -libexec/mysqld -@comment libexec/rcmysql -share/man/man1/aria_chk.1.gz -share/man/man1/aria_dump_log.1.gz -share/man/man1/aria_ftdump.1.gz -share/man/man1/aria_pack.1.gz -share/man/man1/aria_read_log.1.gz -share/man/man1/galera_new_cluster.1.gz -share/man/man1/galera_recovery.1.gz -share/man/man1/innochecksum.1.gz -@comment share/man/man1/mariadb-service-convert.1.gz -share/man/man1/mariabackup.1.gz -share/man/man1/mbstream.1.gz -share/man/man1/my_print_defaults.1.gz -share/man/man1/myisam_ftdump.1.gz -share/man/man1/myisamchk.1.gz -share/man/man1/myisamlog.1.gz -share/man/man1/myisampack.1.gz -share/man/man1/mysql.server.1.gz -@comment share/man/man1/mysql_convert_table_format.1.gz -share/man/man1/mysql_fix_extensions.1.gz -%%ROCKSDB%%share/man/man1/mysql_ldb.1.gz -share/man/man1/mysql_install_db.1.gz -share/man/man1/mysql_secure_installation.1.gz -@comment share/man/man1/mysql_setpermission.1.gz -@comment share/man/man1/mysql_tzinfo_to_sql.1.gz -share/man/man1/mysql_upgrade.1.gz -share/man/man1/mysqld_multi.1.gz -share/man/man1/mysqld_safe.1.gz -share/man/man1/mysqld_safe_helper.1.gz -share/man/man1/mysqldumpslow.1.gz -@comment share/man/man1/mysqlhotcopy.1.gz -@comment share/man/man1/mysqltest.1.gz -share/man/man1/perror.1.gz -@comment share/man/man1/replace.1.gz -share/man/man1/resolve_stack_dump.1.gz -share/man/man1/resolveip.1.gz -%%TOKUDB%%share/man/man1/tokuft_logprint.1.gz -%%TOKUDB%%share/man/man1/tokuftdump.1.gz -%%WSREP%%share/man/man1/wsrep_sst_common.1.gz -%%WSREP%%share/man/man1/wsrep_sst_mariabackup.1.gz -%%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz -%%WSREP%%share/man/man1/wsrep_sst_rsync.1.gz -%%WSREP%%share/man/man1/wsrep_sst_rsync_wan.1.gz -share/man/man8/mysqld.8.gz -%%DATADIR%%/binary-configure -%%DATADIR%%/fill_help_tables.sql -%%DATADIR%%/magic -%%SPIDER%%%%DATADIR%%/install_spider.sql -%%DATADIR%%/maria_add_gis_sp.sql -%%DATADIR%%/maria_add_gis_sp_bootstrap.sql -%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS -@comment %%DATADIR%%/mroonga/COPYING -%%MROONGA%%%%DATADIR%%/mroonga/install.sql -%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql -%%DATADIR%%/mysql-log-rotate -%%DATADIR%%/mysql.server -%%DATADIR%%/mysql_performance_tables.sql -%%DATADIR%%/mysql_system_tables.sql -%%DATADIR%%/mysql_system_tables_data.sql -%%DATADIR%%/mysql_test_data_timezone.sql -%%DATADIR%%/mysql_test_db.sql -%%DATADIR%%/mysqld_multi.server -%%DATADIR%%/charsets/Index.xml -%%DATADIR%%/charsets/README -%%DATADIR%%/charsets/armscii8.xml -%%DATADIR%%/charsets/ascii.xml -%%DATADIR%%/charsets/cp1250.xml -%%DATADIR%%/charsets/cp1251.xml -%%DATADIR%%/charsets/cp1256.xml -%%DATADIR%%/charsets/cp1257.xml -%%DATADIR%%/charsets/cp850.xml -%%DATADIR%%/charsets/cp852.xml -%%DATADIR%%/charsets/cp866.xml -%%DATADIR%%/charsets/dec8.xml -%%DATADIR%%/charsets/geostd8.xml -%%DATADIR%%/charsets/greek.xml -%%DATADIR%%/charsets/hebrew.xml -%%DATADIR%%/charsets/hp8.xml -%%DATADIR%%/charsets/keybcs2.xml -%%DATADIR%%/charsets/koi8r.xml -%%DATADIR%%/charsets/koi8u.xml -%%DATADIR%%/charsets/latin1.xml -%%DATADIR%%/charsets/latin2.xml -%%DATADIR%%/charsets/latin5.xml -%%DATADIR%%/charsets/latin7.xml -%%DATADIR%%/charsets/macce.xml -%%DATADIR%%/charsets/macroman.xml -%%DATADIR%%/charsets/swe7.xml -%%DATADIR%%/czech/errmsg.sys -%%DATADIR%%/danish/errmsg.sys -%%DATADIR%%/dutch/errmsg.sys -%%DATADIR%%/english/errmsg.sys -%%DATADIR%%/errmsg-utf8.txt -%%DATADIR%%/estonian/errmsg.sys -%%DATADIR%%/french/errmsg.sys -%%DATADIR%%/german/errmsg.sys -%%DATADIR%%/greek/errmsg.sys -%%DATADIR%%/hindi/errmsg.sys -%%DATADIR%%/hungarian/errmsg.sys -%%DATADIR%%/italian/errmsg.sys -%%DATADIR%%/japanese/errmsg.sys -%%DATADIR%%/korean/errmsg.sys -%%DATADIR%%/norwegian-ny/errmsg.sys -%%DATADIR%%/norwegian/errmsg.sys -%%DATADIR%%/polish/errmsg.sys -%%DATADIR%%/portuguese/errmsg.sys -%%DATADIR%%/romanian/errmsg.sys -%%DATADIR%%/russian/errmsg.sys -%%DATADIR%%/serbian/errmsg.sys -%%DATADIR%%/slovak/errmsg.sys -%%DATADIR%%/spanish/errmsg.sys -%%DATADIR%%/swedish/errmsg.sys -%%DATADIR%%/ukrainian/errmsg.sys -%%WSREP%%%%DATADIR%%/wsrep.cnf -%%WSREP%%%%DATADIR%%/wsrep_notify -@comment %%DOCSDIR%%/COPYING -@comment %%DOCSDIR%%/COPYING.thirdparty -@comment share/groonga-normalizer-mysql/lgpl-2.0.txt -@comment share/groonga/COPYING -%%MROONGA%%share/groonga-normalizer-mysql/README.md -%%MROONGA%%share/groonga/README.md -@comment bin/mariadb_config -@comment bin/mysql -@comment bin/mysqladmin -@comment bin/mysqlbinlog -@comment bin/mysqlcheck -@comment bin/mysqldump -@comment bin/mysqlimport -@comment bin/mysqlshow -@comment bin/mysqlslap -@comment include/mysql/errmsg.h -@comment include/mysql/ma_list.h -@comment include/mysql/ma_pvio.h -@comment include/mysql/ma_tls.h -@comment include/mysql/mariadb/ma_io.h -@comment include/mysql/mariadb_com.h -@comment include/mysql/mariadb_ctype.h -@comment include/mysql/mariadb_dyncol.h -@comment include/mysql/mariadb_stmt.h -@comment include/mysql/mariadb_version.h -@comment include/mysql/mysql.h -@comment include/mysql/mysql/client_plugin.h -@comment include/mysql/mysql/plugin_auth.h -@comment include/mysql/mysql/plugin_auth_common.h -@comment lib/mysql/libmariadb.so -@comment lib/mysql/libmariadb.so.3 -@comment lib/mysql/plugin/auth_gssapi_client.so -@comment lib/mysql/plugin/client_ed25519.so -@comment lib/mysql/plugin/mysql_clear_password.so -@comment lib/mysql/plugin/sha256_password.so -@comment libdata/pkgconfig/libmariadb.pc - |