Index: branches/2019Q4/databases/mariadb104-server/Makefile =================================================================== --- branches/2019Q4/databases/mariadb104-server/Makefile (revision 518627) +++ branches/2019Q4/databases/mariadb104-server/Makefile (revision 518628) @@ -1,226 +1,227 @@ # Created by: Bernard Spil # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.4.7 +PORTVERSION= 10.4.10 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ http://gd.tuwien.ac.at/db/${SITESDIR}/ \ http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ http://mirror.layerjet.com/${SITESDIR}/ \ http://mirror.switch.ch/mirror/${SITESDIR}/ \ http://ftp.osuosl.org/pub/${SITESDIR}/ PKGNAMESUFFIX?= 104-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_NAME_PerconaFT= PerconaFT patents license LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl + SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb102-client -USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source DOCSDIR= ${PREFIX}/share/doc/mysql OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= GSSAPI_BASE .if ${PKGNAMESUFFIX:M*-server} # MySQL-Server options OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP OPTIONS_GROUP= COMPRESSION ENGINES GROONGA -OPTIONS_DEFINE= AWS_KMS CONNECT_EXTRA DOCS +OPTIONS_DEFINE= CONNECT_EXTRA DOCS OPTIONS_DEFINE_amd64= WSREP OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB OPTIONS_GROUP_GROONGA= ZMQ MSGPACK -OPTIONS_EXCLUDE_i386= TOKUDB +OPTIONS_EXCLUDE_i386= ROCKSDB TOKUDB CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine COMPRESSION_DESC= Optional page compression ENGINES_DESC= Optional MariaDB storage engines GROONGA_DESC= Optional Mroonga features INNOBASE_DESC= InnoDB default engine MROONGA_DESC= Mroonga Full Text Search engine MSGPACK_DESC= MsgPack support OQGRAPH_DESC= Open Query Graph Computation engine ROCKSDB_DESC= RocksDB LSM engine (Alpha) SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine TOKUDB_DESC= Fractal tree index tree data structure engine WSREP_DESC= Build wsrep clustering ZMQ_DESC= ZeroMQ support ZSTD_DESC+= Zstandard compression support (RocksDB only) .endif CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR= \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \ -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} \ -DPLUGIN_AUTH_TEST_PLUGIN=NO CMAKE_OFF+= CONC_WITH_UNIT_TESTS CONNECT_WITH_MONGO WITH_UNIT_TESTS CMAKE_ON+= WITH_LIBWRAP WITHOUT_DOCS DISABLED_PLUGINS+= DAEMON_EXAMPLE DIALOG_EXAMPLES EXAMPLE \ EXAMPLE_KEY_MANAGEMENT FTEXAMPLE DATADIR= ${PREFIX}/share/mysql CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF OPTIONS_SUB= yes .if ${PKGNAMESUFFIX:M*-client} # MySQL-Client part CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER CMAKE_OFF+= WITH_WSREP USES+= readline USE_LDCONFIG= ${PREFIX}/lib/mysql .else # ! ${PKGNAMESUFFIX:M*-client} # MySQL-Server part USES+= mysql:104m 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_BOOL= GRN_WITH_LZ4 WITH_INNODB_LZ4 WITH_ROCKSDB_LZ4 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 LZO_CMAKE_BOOL= WITH_INNODB_LZO LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MROONGA_IMPLIES= LZ4 MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy ROCKSDB_USES= python SNAPPY_CMAKE_BOOL= WITH_INNODB_SNAPPY WITH_ROCKSDB_snappy SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy -TOKUDB_BROKEN= Error with bundled liblzma TOKUDB_IMPLIES= SNAPPY TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi WSREP_CMAKE_BOOL= WITH_WSREP +WSREP_LIB_DEPENDS= libgalera.so:databases/galera26 ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 ZSTD_CMAKE_BOOL= WITH_ROCKSDB_ZSTD ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .include .for PLUGIN in ${DISABLED_PLUGINS} CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO .endfor .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .endif # ${PKGNAMESUFFIX:M*-client} .if defined(WITH_OPENSSL_PORT) GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif .include .if ${ARCH} != amd64 PLIST_SUB+= WSREP="@comment " .endif .if ${OPSYS} == DragonFly CMAKE_OFF+= WITH_TOKUDB .endif post-patch: ${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh \ ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake .endif post-configure: ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \ ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c -# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 -post-configure-INNOBASE-on: +# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 +post-configure-INNOBASE-on: ${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \ -e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \ -e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \ -e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \ ${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt .if ${PKGNAMESUFFIX:M*-client} post-install: ${RM} -r ${STAGEDIR}${DATADIR} ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server 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 ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private .endif # ${PKGNAMESUFFIX:M*-client} .include Index: branches/2019Q4/databases/mariadb104-server/distinfo =================================================================== --- branches/2019Q4/databases/mariadb104-server/distinfo (revision 518627) +++ branches/2019Q4/databases/mariadb104-server/distinfo (revision 518628) @@ -1,3 +1,3 @@ -TIMESTAMP = 1564591340 -SHA256 (mariadb-10.4.7.tar.gz) = c8e6a6d0bb4f22c416ed675d24682a3ecfa383c5283efee70c8edf131374d817 -SIZE (mariadb-10.4.7.tar.gz) = 78155161 +TIMESTAMP = 1574142229 +SHA256 (mariadb-10.4.10.tar.gz) = cd50fddf86c2a47405737e342f78ebd40d5716f0fb32b976245de713bed01421 +SIZE (mariadb-10.4.10.tar.gz) = 78352896 Index: branches/2019Q4/databases/mariadb104-server/files/patch-MDEV-20258 =================================================================== --- branches/2019Q4/databases/mariadb104-server/files/patch-MDEV-20258 (revision 518627) +++ branches/2019Q4/databases/mariadb104-server/files/patch-MDEV-20258 (nonexistent) @@ -1,22 +0,0 @@ ---- plugin/auth_pam/testing/pam_mariadb_mtr.c.orig 2019-07-30 11:32:16.000000000 +0000 -+++ plugin/auth_pam/testing/pam_mariadb_mtr.c 2019-08-20 18:31:37.712246000 +0000 -@@ -15,6 +15,9 @@ - - #define N 3 - -+typedef unsigned int uint; -+typedef unsigned short ushort; -+ - int pam_sm_authenticate(pam_handle_t *pamh, int flags, - int argc, const char *argv[]) - { ---- plugin/auth_pam/CMakeLists.txt.orig 2019-07-30 11:32:16.000000000 +0000 -+++ plugin/auth_pam/CMakeLists.txt 2019-08-23 12:04:17.702326000 +0000 -@@ -21,7 +21,4 @@ IF(HAVE_PAM_APPL_H) - WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)" - COMPONENT Server) - ENDIF() -- IF(TARGET auth_pam OR TARGET auth_pam_v1) -- ADD_SUBDIRECTORY(testing) -- ENDIF() - ENDIF(HAVE_PAM_APPL_H) Property changes on: branches/2019Q4/databases/mariadb104-server/files/patch-MDEV-20258 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q4/databases/mariadb104-server/files/patch-CMakeLists.txt =================================================================== --- branches/2019Q4/databases/mariadb104-server/files/patch-CMakeLists.txt (nonexistent) +++ branches/2019Q4/databases/mariadb104-server/files/patch-CMakeLists.txt (revision 518628) @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2019-11-07 05:52:21 UTC ++++ CMakeLists.txt +@@ -498,8 +498,10 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + ) + ++IF(FALSE) + INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY + EXCEPTIONS-CLIENT COMPONENT Readme) ++ENDIF() + + # MDEV-6526 these files are not installed anymore + #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC Property changes on: branches/2019Q4/databases/mariadb104-server/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q4/databases/mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt =================================================================== --- branches/2019Q4/databases/mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt (revision 518627) +++ branches/2019Q4/databases/mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt (revision 518628) @@ -1,31 +1,31 @@ ---- libmariadb/plugins/auth/CMakeLists.txt.orig 2018-05-23 20:38:41 UTC +--- libmariadb/plugins/auth/CMakeLists.txt.orig 2019-11-07 05:52:21 UTC +++ libmariadb/plugins/auth/CMakeLists.txt -@@ -38,6 +38,7 @@ IF(GSSAPI_SOURCES) - LIBRARIES ${GSSAPI_LIBS}) - ENDIF() +@@ -3,6 +3,7 @@ SET(AUTH_DIR ${CC_SOURCE_DIR}/plugins/auth) + INCLUDE_DIRECTORIES(${AUTH_DIR}) + INCLUDE_DIRECTORIES(${CC_SOURCE_DIR}/include) +IF(NOT WITHOUT_CLIENT) - IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${WITH_SSL} STREQUAL "SCHANNEL") - IF(WIN32) - SET(SHA256_LIBS crypt32) -@@ -51,6 +52,7 @@ IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${W - SOURCES ${AUTH_DIR}/sha256_pw.c - LIBRARIES ${SHA256_LIBS}) + SET(CRYPTO_PLUGIN 1) + IF(WIN32) + SET(CRYPT_SOURCE ${CC_SOURCE_DIR}/libmariadb/secure/win_crypt.c) +@@ -18,6 +19,7 @@ ELSEIF(WITH_SSL STREQUAL "GNUTLS") + ELSE() + UNSET(CRYPTO_PLUGIN) ENDIF() +ENDIF() - # old_password plugin - REGISTER_PLUGIN(TARGET mysql_old_password -@@ -60,10 +62,11 @@ REGISTER_PLUGIN(TARGET mysql_old_passwor + #native password + REGISTER_PLUGIN(TARGET mysql_native_password +@@ -119,10 +121,11 @@ REGISTER_PLUGIN(TARGET mysql_old_password + DEFAULT STATIC SOURCES ${AUTH_DIR}/old_password.c) - +IF(NOT WITHOUT_CLIENT) # Cleartext REGISTER_PLUGIN(TARGET mysql_clear_password TYPE MARIADB_CLIENT_PLUGIN_AUTH CONFIGURATIONS DYNAMIC STATIC OFF DEFAULT DYNAMIC SOURCES ${AUTH_DIR}/mariadb_cleartext.c) - +ENDIF() Index: branches/2019Q4/databases/mariadb104-server/files/patch-man_CMakeLists.txt =================================================================== --- branches/2019Q4/databases/mariadb104-server/files/patch-man_CMakeLists.txt (revision 518627) +++ branches/2019Q4/databases/mariadb104-server/files/patch-man_CMakeLists.txt (revision 518628) @@ -1,14 +1,17 @@ Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options ---- man/CMakeLists.txt.orig 2017-05-14 23:13:16 UTC +--- man/CMakeLists.txt.orig 2019-11-07 05:52:21 UTC +++ man/CMakeLists.txt -@@ -38,7 +38,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys +@@ -40,10 +40,11 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl 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() + macro(MARIADB_SYMLINK_MANPAGE) + list(LENGTH MARIADB_SYMLINK_FROMS _len) + math(EXPR _listlen "${_len}-1") Index: branches/2019Q4/databases/mariadb104-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt =================================================================== --- branches/2019Q4/databases/mariadb104-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt (nonexistent) +++ branches/2019Q4/databases/mariadb104-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt (revision 518628) @@ -0,0 +1,10 @@ +--- plugin/auth_pam/testing/CMakeLists.txt.orig 2019-11-07 05:52:22 UTC ++++ plugin/auth_pam/testing/CMakeLists.txt +@@ -5,5 +5,7 @@ SET_TARGET_PROPERTIES (pam_mariadb_mtr PROPERTIES PREF + TARGET_LINK_LIBRARIES(pam_mariadb_mtr pam) + + SET(dest DESTINATION "${INSTALL_MYSQLTESTDIR}/suite/plugins/pam" COMPONENT Test) ++IF(FALSE) + INSTALL(TARGETS pam_mariadb_mtr ${dest}) + INSTALL(FILES mariadb_mtr.conf RENAME mariadb_mtr ${dest}) ++ENDIF() Property changes on: branches/2019Q4/databases/mariadb104-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q4/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake =================================================================== --- branches/2019Q4/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake (revision 518627) +++ branches/2019Q4/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake (revision 518628) @@ -1,39 +1,38 @@ Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports ---- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2017-05-14 23:13:20 UTC +--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2019-11-07 05:52:23 UTC +++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake -@@ -34,6 +34,13 @@ if (CMAKE_PROJECT_NAME STREQUAL TokuDB) - endif () - endif () +@@ -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) +@@ -71,8 +78,15 @@ add_library(lzma STATIC IMPORTED) set_target_properties(lzma PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a") add_dependencies(lzma build_lzma) +ENDIF() +IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + include_directories("%%LOCALBASE%%/include") + add_library(snappy SHARED IMPORTED) + set_target_properties(snappy PROPERTIES IMPORTED_LOCATION + "%%LOCALBASE%%/lib/libsnappy.so") +ELSE() ## add snappy with an external project set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.") if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt") -@@ -140,3 +154,4 @@ add_library(snappy STATIC IMPORTED) +@@ -109,3 +123,4 @@ add_library(snappy STATIC IMPORTED) set_target_properties(snappy PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a") add_dependencies(snappy build_snappy) +ENDIF() Index: branches/2019Q4/databases/mariadb104-server/pkg-plist =================================================================== --- branches/2019Q4/databases/mariadb104-server/pkg-plist (revision 518627) +++ branches/2019Q4/databases/mariadb104-server/pkg-plist (revision 518628) @@ -1,420 +1,417 @@ bin/aria_chk bin/aria_dump_log bin/aria_ftdump bin/aria_pack bin/aria_read_log %%INNOBASE%%bin/innochecksum %%INNOBASE%%bin/mariabackup bin/mariadb-backup bin/mariadb-dumpslow bin/mariadb-embedded bin/mariadb-fix-extensions bin/mariadb-install-db %%ROCKSDB%%bin/mariadb-ldb bin/mariadb-secure-installation bin/mariadb-tzinfo-to-sql bin/mariadb-upgrade bin/mariadbd-multi bin/mariadbd-safe bin/mariadbd-safe-helper bin/mariadb-waitpid %%INNOBASE%%bin/mbstream bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack %%ROCKSDB%%bin/myrocks_hotbackup bin/mysql_client_test bin/mysql_client_test_embedded bin/mysql_embedded bin/mysql_fix_extensions bin/mysql_install_db %%ROCKSDB%%bin/mysql_ldb bin/mysql_plugin bin/mysql_secure_installation bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysql_waitpid bin/mysqld_multi bin/mysqld_safe bin/mysqld_safe_helper bin/mysqldumpslow @comment bin/mysqltest_embedded bin/perror bin/resolve_stack_dump bin/resolveip %%ROCKSDB%%bin/sst_dump @comment bin/test-connect-t %%TOKUDB%%bin/tokuft_logprint %%TOKUDB%%bin/tokuftdump %%WSREP%%bin/wsrep_sst_common %%WSREP%%bin/wsrep_sst_mariabackup %%WSREP%%bin/wsrep_sst_mysqldump %%WSREP%%bin/wsrep_sst_rsync %%WSREP%%bin/wsrep_sst_rsync_wan @comment data/test/db.opt include/mysql/server/big_endian.h include/mysql/server/byte_order_generic.h include/mysql/server/byte_order_generic_x86.h include/mysql/server/byte_order_generic_x86_64.h include/mysql/server/decimal.h include/mysql/server/errmsg.h include/mysql/server/handler_ername.h include/mysql/server/handler_state.h include/mysql/server/json_lib.h include/mysql/server/keycache.h include/mysql/server/little_endian.h include/mysql/server/m_ctype.h include/mysql/server/m_string.h include/mysql/server/ma_dyncol.h include/mysql/server/my_alloc.h include/mysql/server/my_attribute.h include/mysql/server/my_byteorder.h include/mysql/server/my_compiler.h include/mysql/server/my_config.h include/mysql/server/my_dbug.h include/mysql/server/my_decimal_limits.h include/mysql/server/my_dir.h include/mysql/server/my_getopt.h include/mysql/server/my_global.h include/mysql/server/my_list.h include/mysql/server/my_net.h include/mysql/server/my_pthread.h include/mysql/server/my_sys.h include/mysql/server/my_valgrind.h include/mysql/server/my_xml.h include/mysql/server/mysql.h include/mysql/server/mysql/auth_dialog_client.h include/mysql/server/mysql/client_plugin.h include/mysql/server/mysql/plugin.h include/mysql/server/mysql/plugin_audit.h include/mysql/server/mysql/plugin_auth.h include/mysql/server/mysql/plugin_auth_common.h include/mysql/server/mysql/plugin_encryption.h include/mysql/server/mysql/plugin_ftparser.h include/mysql/server/mysql/plugin_password_validation.h include/mysql/server/mysql/psi/mysql_file.h include/mysql/server/mysql/psi/mysql_idle.h include/mysql/server/mysql/psi/mysql_socket.h include/mysql/server/mysql/psi/mysql_stage.h include/mysql/server/mysql/psi/mysql_statement.h include/mysql/server/mysql/psi/mysql_table.h include/mysql/server/mysql/psi/mysql_thread.h include/mysql/server/mysql/psi/psi.h include/mysql/server/mysql/psi/psi_abi_v0.h include/mysql/server/mysql/psi/psi_abi_v1.h include/mysql/server/mysql/psi/psi_abi_v2.h include/mysql/server/mysql/psi/psi_base.h include/mysql/server/mysql/psi/psi_memory.h include/mysql/server/mysql/service_base64.h include/mysql/server/mysql/service_debug_sync.h include/mysql/server/mysql/service_encryption.h include/mysql/server/mysql/service_encryption_scheme.h include/mysql/server/mysql/service_json.h include/mysql/server/mysql/service_kill_statement.h include/mysql/server/mysql/service_logger.h include/mysql/server/mysql/service_md5.h include/mysql/server/mysql/service_my_crypt.h include/mysql/server/mysql/service_my_print_error.h include/mysql/server/mysql/service_my_snprintf.h include/mysql/server/mysql/service_progress_report.h include/mysql/server/mysql/service_sha1.h include/mysql/server/mysql/service_sha2.h include/mysql/server/mysql/service_thd_alloc.h include/mysql/server/mysql/service_thd_autoinc.h include/mysql/server/mysql/service_thd_error_context.h include/mysql/server/mysql/service_thd_rnd.h include/mysql/server/mysql/service_thd_specifics.h include/mysql/server/mysql/service_thd_timezone.h include/mysql/server/mysql/service_thd_wait.h include/mysql/server/mysql/service_wsrep.h include/mysql/server/mysql/services.h include/mysql/server/mysql_com.h include/mysql/server/mysql_com_server.h include/mysql/server/mysql_embed.h include/mysql/server/mysql_time.h include/mysql/server/mysql_version.h include/mysql/server/mysqld_ername.h include/mysql/server/mysqld_error.h include/mysql/server/pack.h include/mysql/server/sql_common.h include/mysql/server/sql_state.h include/mysql/server/sslopt-case.h include/mysql/server/sslopt-longopts.h include/mysql/server/sslopt-vars.h include/mysql/server/typelib.h @comment lib/mysql/libmariadbclient.a lib/mysql/libmariadbd.a lib/mysql/libmariadbd.so lib/mysql/libmariadbd.so.19 lib/mysql/libmysqld.a lib/mysql/libmysqld.so lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth_0x0100.so lib/mysql/plugin/auth_ed25519.so %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool lib/mysql/plugin/auth_pam_v1.so lib/mysql/plugin/caching_sha2_password.so lib/mysql/plugin/debug_key_management.so lib/mysql/plugin/file_key_management.so lib/mysql/plugin/ha_archive.so lib/mysql/plugin/ha_blackhole.so lib/mysql/plugin/ha_connect.so lib/mysql/plugin/ha_federated.so lib/mysql/plugin/ha_federatedx.so %%MROONGA%%lib/mysql/plugin/ha_mroonga.so %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so %%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.so %%SPHINX%%lib/mysql/plugin/ha_sphinx.so %%SPIDER%%lib/mysql/plugin/ha_spider.so %%TOKUDB%%lib/mysql/plugin/ha_tokudb.so lib/mysql/plugin/ha_test_sql_discovery.so lib/mysql/plugin/handlersocket.so lib/mysql/plugin/locales.so lib/mysql/plugin/metadata_lock_info.so lib/mysql/plugin/qa_auth_client.so lib/mysql/plugin/qa_auth_interface.so lib/mysql/plugin/qa_auth_server.so lib/mysql/plugin/query_cache_info.so lib/mysql/plugin/query_response_time.so lib/mysql/plugin/server_audit.so lib/mysql/plugin/simple_password_check.so lib/mysql/plugin/sql_errlog.so lib/mysql/plugin/test_versioning.so %%WSREP%%lib/mysql/plugin/wsrep_info.so libexec/mariadbd libexec/mysqld man/man1/aria_chk.1.gz man/man1/aria_dump_log.1.gz man/man1/aria_ftdump.1.gz man/man1/aria_pack.1.gz man/man1/aria_read_log.1.gz man/man1/galera_new_cluster.1.gz man/man1/galera_recovery.1.gz man/man1/innochecksum.1.gz man/man1/mariabackup.1.gz man/man1/mariadb-backup.1.gz man/man1/mariadb-dumpslow.1.gz man/man1/mariadb-embedded.1.gz man/man1/mariadb-fix-extensions.1.gz man/man1/mariadb-install-db.1.gz %%ROCKSDB%%man/man1/mariadb-ldb.1.gz man/man1/mariadb-secure-installation.1.gz @comment man/man1/mariadb-service-convert.1.gz man/man1/mariadb-tzinfo-to-sql.1.gz man/man1/mariadb-upgrade.1.gz man/man1/mariadbd-multi.1.gz man/man1/mariadbd-safe-helper.1.gz man/man1/mariadbd-safe.1.gz man/man1/mbstream.1.gz man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz man/man1/myisamchk.1.gz man/man1/myisamlog.1.gz man/man1/myisampack.1.gz man/man1/mysql.server.1.gz man/man1/mysql_fix_extensions.1.gz %%ROCKSDB%%man/man1/mysql_ldb.1.gz man/man1/mysql_install_db.1.gz man/man1/mysql_secure_installation.1.gz man/man1/mysql_tzinfo_to_sql.1.gz man/man1/mysql_upgrade.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqld_safe_helper.1.gz man/man1/mysqldumpslow.1.gz man/man1/perror.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz %%TOKUDB%%man/man1/tokuft_logprint.1.gz %%TOKUDB%%man/man1/tokuftdump.1.gz %%WSREP%%man/man1/wsrep_sst_common.1.gz %%WSREP%%man/man1/wsrep_sst_mariabackup.1.gz %%WSREP%%man/man1/wsrep_sst_mysqldump.1.gz %%WSREP%%man/man1/wsrep_sst_rsync.1.gz %%WSREP%%man/man1/wsrep_sst_rsync_wan.1.gz man/man8/mariadbd.8.gz man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml %%DATADIR%%/charsets/ascii.xml %%DATADIR%%/charsets/cp1250.xml %%DATADIR%%/charsets/cp1251.xml %%DATADIR%%/charsets/cp1256.xml %%DATADIR%%/charsets/cp1257.xml %%DATADIR%%/charsets/cp850.xml %%DATADIR%%/charsets/cp852.xml %%DATADIR%%/charsets/cp866.xml %%DATADIR%%/charsets/dec8.xml %%DATADIR%%/charsets/geostd8.xml %%DATADIR%%/charsets/greek.xml %%DATADIR%%/charsets/hebrew.xml %%DATADIR%%/charsets/hp8.xml %%DATADIR%%/charsets/keybcs2.xml %%DATADIR%%/charsets/koi8r.xml %%DATADIR%%/charsets/koi8u.xml %%DATADIR%%/charsets/latin1.xml %%DATADIR%%/charsets/latin2.xml %%DATADIR%%/charsets/latin5.xml %%DATADIR%%/charsets/latin7.xml %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys %%DATADIR%%/english/errmsg.sys %%DATADIR%%/errmsg-utf8.txt %%DATADIR%%/estonian/errmsg.sys %%DATADIR%%/fill_help_tables.sql %%DATADIR%%/french/errmsg.sys %%DATADIR%%/german/errmsg.sys %%DATADIR%%/greek/errmsg.sys %%DATADIR%%/hindi/errmsg.sys %%DATADIR%%/hungarian/errmsg.sys %%SPIDER%%%%DATADIR%%/install_spider.sql %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic %%DATADIR%%/maria_add_gis_sp.sql %%DATADIR%%/maria_add_gis_sp_bootstrap.sql %%MROONGA%%%%DATADIR%%/mroonga/AUTHORS %%MROONGA%%%%DATADIR%%/mroonga/install.sql %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysql_performance_tables.sql %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_system_tables_data.sql %%DATADIR%%/mysql_test_data_timezone.sql %%DATADIR%%/mysql_test_db.sql %%DATADIR%%/mysql_to_mariadb.sql %%DATADIR%%/mysqld_multi.server %%DATADIR%%/norwegian-ny/errmsg.sys %%DATADIR%%/norwegian/errmsg.sys %%DATADIR%%/polish/errmsg.sys %%DATADIR%%/portuguese/errmsg.sys %%DATADIR%%/romanian/errmsg.sys %%DATADIR%%/russian/errmsg.sys %%DATADIR%%/serbian/errmsg.sys %%DATADIR%%/slovak/errmsg.sys %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys %%WSREP%%%%DATADIR%%/wsrep.cnf %%WSREP%%%%DATADIR%%/wsrep_notify -%%DOCSDIR%%/CREDITS @comment %%DOCSDIR%%/COPYING -%%DOCSDIR%%/EXCEPTIONS-CLIENT %%DOCSDIR%%/INSTALL-BINARY %%WSREP%%%%DOCSDIR%%/README-wsrep -%%DOCSDIR%%/README.md @comment %%DOCSDIR%%/THIRDPARTY @comment share/groonga-normalizer-mysql/lgpl-2.0.txt @comment share/groonga/COPYING @comment share/mysql/mroonga/COPYING %%MROONGA%%share/groonga-normalizer-mysql/README.md %%MROONGA%%share/groonga/README.md @comment bin/mariadb @comment bin/mariadb-access @comment bin/mariadb-admin @comment bin/mariadb-binlog @comment bin/mariadb-check @comment bin/mariadb-client-test @comment bin/mariadb-client-test-embedded @comment bin/mariadb-convert-table-format @comment bin/mariadb-dump @comment bin/mariadb-find-rows @comment bin/mariadb-hotcopy @comment bin/mariadb-import @comment bin/mariadb-plugin @comment bin/mariadb-setpermission @comment bin/mariadb-show @comment bin/mariadb-slap @comment bin/mariadb-test @comment bin/mariadb-test-embedded @comment bin/mariadb_config @comment bin/msql2mysql @comment bin/mysql @comment bin/mysql_config @comment bin/mysql_convert_table_format @comment bin/mysql_find_rows @comment bin/mysql_setpermission @comment bin/mysqlaccess @comment bin/mysqladmin @comment bin/mysqlbinlog @comment bin/mysqlcheck @comment bin/mysqldump @comment bin/mysqlhotcopy @comment bin/mysqlimport @comment bin/mysqlshow @comment bin/mysqlslap @comment bin/mysqltest @comment bin/mytop @comment bin/replace @comment include/mysql/errmsg.h @comment include/mysql/ma_list.h @comment include/mysql/ma_pvio.h @comment include/mysql/ma_tls.h @comment include/mysql/mariadb/ma_io.h @comment include/mysql/mariadb_com.h @comment include/mysql/mariadb_ctype.h @comment include/mysql/mariadb_dyncol.h @comment include/mysql/mariadb_rpl.h @comment include/mysql/mariadb_stmt.h @comment include/mysql/mariadb_version.h @comment include/mysql/my_config.h @comment include/mysql/my_global.h @comment include/mysql/my_sys.h @comment include/mysql/mysql.h @comment include/mysql/mysql/client_plugin.h @comment include/mysql/mysql/plugin_auth.h @comment include/mysql/mysql/plugin_auth_common.h @comment include/mysql/mysql_com.h @comment include/mysql/mysql_version.h @comment include/mysql/mysqld_error.h @comment lib/mysql/libmariadb.so @comment lib/mysql/libmariadb.so.3 @comment lib/mysql/libmariadbclient.a @comment lib/mysql/libmysqlclient.a @comment lib/mysql/libmysqlclient.so @comment lib/mysql/libmysqlclient_r.a @comment lib/mysql/libmysqlclient_r.so @comment lib/mysql/plugin/auth_gssapi_client.so @comment lib/mysql/plugin/client_ed25519.so @comment lib/mysql/plugin/daemon_example.ini @comment lib/mysql/plugin/dialog.so @comment lib/mysql/plugin/mysql_clear_password.so @comment lib/mysql/plugin/sha256_password.so @comment libdata/pkgconfig/libmariadb.pc @comment man/man1/mysql_convert_table_format.1.gz @comment man/man1/mariadb.1.gz @comment man/man1/mariadb-access.1.gz @comment man/man1/mariadb-admin.1.gz @comment man/man1/mariadb-binlog.1.gz @comment man/man1/mariadb-check.1.gz @comment man/man1/mariadb-client-test-embedded.1.gz @comment man/man1/mariadb-client-test.1.gz @comment man/man1/mariadb-convert-table-format.1.gz @comment man/man1/mariadb-dump.1.gz @comment man/man1/mariadb-find-rows.1.gz @comment man/man1/mariadb-hotcopy.1.gz @comment man/man1/mariadb-import.1.gz @comment man/man1/mariadb-plugin.1.gz @comment man/man1/mariadb-setpermission.1.gz @comment man/man1/mariadb-show.1.gz @comment man/man1/mariadb-slap.1.gz @comment man/man1/mariadb-test-embedded.1.gz @comment man/man1/mariadb-test.1.gz man/man1/mariadb-waitpid.1.gz @comment man/man1/mysql_setpermission.1.gz @comment man/man1/mysqlhotcopy.1.gz @comment man/man1/mysqltest.1.gz @comment man/man1/replace.1.gz @comment share/pkgconfig/mariadb.pc Index: branches/2019Q4 =================================================================== --- branches/2019Q4 (revision 518627) +++ branches/2019Q4 (revision 518628) Property changes on: branches/2019Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r518601