Index: head/databases/mariadb102-client/Makefile =================================================================== --- head/databases/mariadb102-client/Makefile (revision 451043) +++ head/databases/mariadb102-client/Makefile (revision 451044) @@ -1,35 +1,35 @@ # $FreeBSD$ PORTNAME= mariadb PKGNAMESUFFIX= 102-client COMMENT= Multithreaded SQL database (client) MASTERDIR= ${.CURDIR}/../mariadb102-server FILESDIR= ${.CURDIR}/files PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist CMAKE_ARGS+= -DWITHOUT_SERVER=1 \ -DCONC_WITH_UNITTEST=0 \ -DCONC_WITH_MYSQLCOMPAT=1 \ -DWITH_WSREP=0 USE_LDCONFIG= ${PREFIX}/lib/mysql CLIENT_ONLY= yes post-install: ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 ${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig - ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private + ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server ${RM} -r ${STAGEDIR}${DATADIR}/policy ${RM} ${STAGEDIR}${PREFIX}/man/man1/aria* ${STAGEDIR}${PREFIX}/man/man1/myisam* # Fix https://mariadb.atlassian.net/browse/MDEV-9388 @${REINPLACE_CMD} 's/-l-pthread/-lpthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config post-install-GSSAPI_NONE: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so .include "${MASTERDIR}/Makefile" Index: head/databases/mariadb102-client/files/patch-include_CMakeLists.txt =================================================================== --- head/databases/mariadb102-client/files/patch-include_CMakeLists.txt (revision 451043) +++ head/databases/mariadb102-client/files/patch-include_CMakeLists.txt (revision 451044) @@ -1,16 +1,17 @@ ---- include/CMakeLists.txt.orig 2017-04-04 19:11:34 UTC +--- include/CMakeLists.txt.orig 2017-08-17 10:05:38 UTC +++ include/CMakeLists.txt -@@ -73,11 +73,13 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I - STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") +@@ -80,12 +80,14 @@ STRING(REPLACE "." "\\." EXCL_RE "${HEAD STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") + MACRO(INSTALL_PRIVATE DIR) +IF(FALSE) - INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" - PATTERN CMakeFiles EXCLUDE - PATTERN mysql EXCLUDE - REGEX "\\./(${EXCL_RE}$)" EXCLUDE) + INSTALL(DIRECTORY ${DIR}/. + DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development + FILES_MATCHING PATTERN "*.h" + PATTERN CMakeFiles EXCLUDE + PATTERN mysql EXCLUDE + REGEX "\\./(${EXCL_RE}$)" EXCLUDE) +ENDIF() + ENDMACRO() - INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" + INSTALL_PRIVATE(${CMAKE_CURRENT_BINARY_DIR}) Index: head/databases/mariadb102-client/pkg-plist =================================================================== --- head/databases/mariadb102-client/pkg-plist (revision 451043) +++ head/databases/mariadb102-client/pkg-plist (revision 451044) @@ -1,192 +1,107 @@ bin/mariadb_config bin/msql2mysql bin/mysql bin/mysql_find_rows bin/mysqlaccess bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlimport bin/mysqlshow bin/mysqlslap bin/mysql_config -include/mysql/auth_dialog_client.h -include/mysql/big_endian.h -include/mysql/byte_order_generic.h -include/mysql/byte_order_generic_x86.h -include/mysql/byte_order_generic_x86_64.h -include/mysql/client_plugin.h -include/mysql/decimal.h include/mysql/errmsg.h -include/mysql/handler_ername.h -include/mysql/handler_state.h -include/mysql/json_lib.h -include/mysql/keycache.h -include/mysql/little_endian.h -include/mysql/m_ctype.h -include/mysql/m_string.h -include/mysql/ma_dyncol.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_stmt.h include/mysql/mariadb_version.h -include/mysql/my_alloc.h -include/mysql/my_attribute.h -include/mysql/my_byteorder.h -include/mysql/my_compiler.h -include/mysql/my_config.h -include/mysql/my_dbug.h -include/mysql/my_decimal_limits.h -include/mysql/my_dir.h -include/mysql/my_getopt.h -include/mysql/my_global.h -include/mysql/my_list.h -include/mysql/my_net.h -include/mysql/my_pthread.h -include/mysql/my_sys.h -include/mysql/my_valgrind.h -include/mysql/my_xml.h include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_com_server.h -include/mysql/mysql_embed.h -include/mysql/mysql_time.h -include/mysql/mysql_version.h -include/mysql/mysqld_ername.h -include/mysql/mysqld_error.h include/mysql/mysql/client_plugin.h include/mysql/mysql/plugin_auth.h include/mysql/mysql/plugin_auth_common.h -include/mysql/pack.h -include/mysql/plugin.h -include/mysql/plugin_audit.h -include/mysql/plugin_auth.h -include/mysql/plugin_auth_common.h -include/mysql/plugin_encryption.h -include/mysql/plugin_ftparser.h -include/mysql/plugin_password_validation.h -include/mysql/psi/mysql_file.h -include/mysql/psi/mysql_idle.h -include/mysql/psi/mysql_socket.h -include/mysql/psi/mysql_stage.h -include/mysql/psi/mysql_statement.h -include/mysql/psi/mysql_table.h -include/mysql/psi/mysql_thread.h -include/mysql/psi/psi.h -include/mysql/psi/psi_abi_v0.h -include/mysql/psi/psi_abi_v1.h -include/mysql/psi/psi_abi_v2.h -include/mysql/psi/psi_base.h -include/mysql/psi/psi_memory.h -include/mysql/service_base64.h -include/mysql/service_debug_sync.h -include/mysql/service_encryption.h -include/mysql/service_encryption_scheme.h -include/mysql/service_kill_statement.h -include/mysql/service_logger.h -include/mysql/service_md5.h -include/mysql/service_my_crypt.h -include/mysql/service_my_print_error.h -include/mysql/service_my_snprintf.h -include/mysql/service_progress_report.h -include/mysql/service_sha1.h -include/mysql/service_sha2.h -include/mysql/service_thd_alloc.h -include/mysql/service_thd_autoinc.h -include/mysql/service_thd_error_context.h -include/mysql/service_thd_rnd.h -include/mysql/service_thd_specifics.h -include/mysql/service_thd_timezone.h -include/mysql/service_thd_wait.h -include/mysql/service_wsrep.h -include/mysql/services.h -include/mysql/sql_common.h -include/mysql/sql_state.h -include/mysql/sslopt-case.h -include/mysql/sslopt-longopts.h -include/mysql/sslopt-vars.h -include/mysql/typelib.h +@comment include/mysql/mysqld_error.h %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so lib/mysql/libmariadb.so lib/mysql/libmariadb.so.3 lib/mysql/libmariadbclient.a lib/mysql/libmysqlservices.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so @comment 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 %%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 man/man1/msql2mysql.1.gz man/man1/mysql.1.gz man/man1/mysql_config.1.gz man/man1/mysql_find_rows.1.gz man/man1/mysql_plugin.1.gz man/man1/mysql_waitpid.1.gz man/man1/mysqlaccess.1.gz man/man1/mysqladmin.1.gz man/man1/mysqlbinlog.1.gz man/man1/mysqlcheck.1.gz man/man1/mysqldump.1.gz man/man1/mysqlimport.1.gz man/man1/mysqlshow.1.gz man/man1/mysqlslap.1.gz Index: head/databases/mariadb102-server/Makefile =================================================================== --- head/databases/mariadb102-server/Makefile (revision 451043) +++ head/databases/mariadb102-server/Makefile (revision 451044) @@ -1,208 +1,208 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.2.7 -PORTREVISION?= 3 +PORTVERSION= 10.2.9 +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?= 102-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 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 BROKEN_aarch64= fails to link: stacktrace.c: undefined reference to 'sbrk' SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb102-client USES= bison:build cmake 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 !defined(CLIENT_ONLY) # MySQL-Server options OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER OPTIONS_GROUP= COMPRESSION ENGINES GROONGA OPTIONS_DEFINE= CONNECT_EXTRA OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB XTRADB 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 XTRADB_DESC= Build XtraDB engine next to InnoDB ZMQ_DESC= ZeroMQ support ZSTD_DESC+= Zstandard compression support (RocksDB only) .endif GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit 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_JEMALLOC="system" \ -DWITH_LIBWRAP=1 \ -DWITH_SSL="${OPENSSLBASE}" \ -DWITH_UNIT_TESTS=0 \ -DWITHOUT_DOCS=1 \ -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \ -DICONV_LIBRARIES="${ICONV_LIB_PATH}" \ -DKRB5_CONFIG="${KRB5CONFIG}" \ -DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \ -DOPENSSL_ROOT_DIR="${OPENSSLBASE}" \ -DOPENSSL_CRYPTO_LIBRARY="${OPENSSLBASE}/lib/libcrypto.so" \ -DOPENSSL_SSL_LIBRARY="${OPENSSLBASE}/lib/libssl.so" \ -DREMOTEIO_PLUGIN_TYPE="NO" \ -DCOMPILATION_COMMENT="FreeBSD Ports" \ -DCMAKE_PREFIX_PATH=${PREFIX} DATADIR= ${PREFIX}/share/mysql .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again. .endif CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mariadb10[013-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 OPTIONS_SUB= yes .if defined(CLIENT_ONLY) # MySQL-Client part USES+= readline GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO .else # MySQL-Server part USES+= mysql:102m USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ -DPLUGIN_AUTH_GSSAPI_CLIENT=NO \ -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ -DWITHOUT_CLIENT=1 .for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO \ -DWITHOUT_${ENGINE}=1 ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor INNOBASE_CMAKE_OFF= -DPLUGIN_INNOBASE=NO -DWITHOUT_INNOBASE=1 CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO -DPLUGIN_AUTH_GSSAPI_CLIENT=NO LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON 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 SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_IMPLIES= SNAPPY TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 ZSTD_CMAKE_ON= -DWITH_ROCKSDB_ZSTD=ON ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \ https://jira.mariadb.org/browse/MDEV-9627 post-install: # Remove programs to avoid conflict with mariadb102-client # These are "client" components, so there should be a switch that # prevents them from being installed but it's unknown right now ${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \ ${STAGEDIR}${PREFIX}/bin/mysql_config \ ${STAGEDIR}${PREFIX}/bin/mysql_find_rows \ ${STAGEDIR}${PREFIX}/bin/mysqlaccess ${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy \ ${STAGEDIR}/${PREFIX}/share/pkgconfig ${RM} ${STAGEDIR}${LOCALBASE}/lib/mysql/libmysqlclient* .endif # defined(CLIENT_ONLY) .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 ${OPSYS} == DragonFly CMAKE_ARGS+= -DWITHOUT_TOKUDB .endif post-patch: ${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake .endif #post-configure-MROONGA-on: # ${REINPLACE_CMD} 's|-llz4|-L${LOCALBASE}/lib -llz4|' \ # ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt .include Index: head/databases/mariadb102-server/distinfo =================================================================== --- head/databases/mariadb102-server/distinfo (revision 451043) +++ head/databases/mariadb102-server/distinfo (revision 451044) @@ -1,3 +1,3 @@ -TIMESTAMP = 1499877512 -SHA256 (mariadb-10.2.7.tar.gz) = 225ba1bbc48325ad38a9f433ff99da4641028f42404a29591cc370e4a676c0bc -SIZE (mariadb-10.2.7.tar.gz) = 67669554 +TIMESTAMP = 1506627462 +SHA256 (mariadb-10.2.9.tar.gz) = 12e0a01c52591ee77cf0f940fe65df024457fa16c70f08c6116048d576096124 +SIZE (mariadb-10.2.9.tar.gz) = 70858881 Index: head/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_db__impl.cc =================================================================== --- head/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_db__impl.cc (revision 451043) +++ head/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_db__impl.cc (nonexistent) @@ -1,23 +0,0 @@ ---- storage/rocksdb/rocksdb/db/db_impl.cc.orig 2017-05-25 21:54:40 UTC -+++ storage/rocksdb/rocksdb/db/db_impl.cc -@@ -18,7 +18,7 @@ - #ifdef OS_SOLARIS - #include - #endif --#ifdef ROCKSDB_JEMALLOC -+#if defined(ROCKSDB_JEMALLOC) && !defined(__FreeBSD__) - #include "jemalloc/jemalloc.h" - #endif - -@@ -400,7 +400,11 @@ static void DumpMallocStats(std::string* - std::unique_ptr buf{new char[kMallocStatusLen + 1]}; - mstat.cur = buf.get(); - mstat.end = buf.get() + kMallocStatusLen; -+#ifdef __FreeBSD__ -+ __malloc_stats_print(GetJemallocStatus, &mstat, ""); -+#else - je_malloc_stats_print(GetJemallocStatus, &mstat, ""); -+#endif - stats->append(buf.get()); - #endif // ROCKSDB_JEMALLOC - } Property changes on: head/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_db__impl.cc ___________________________________________________________________ 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: head/databases/mariadb102-server/files/patch-include_CMakeLists.txt =================================================================== --- head/databases/mariadb102-server/files/patch-include_CMakeLists.txt (revision 451043) +++ head/databases/mariadb102-server/files/patch-include_CMakeLists.txt (revision 451044) @@ -1,27 +1,38 @@ ---- include/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC +--- include/CMakeLists.txt.orig 2017-08-17 10:05:38 UTC +++ include/CMakeLists.txt -@@ -64,20 +64,24 @@ SET(HEADERS - json_lib.h - ) +@@ -1,5 +1,5 @@ + # Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. +-# ++# + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; version 2 of the License. +@@ -68,6 +68,7 @@ SET(HEADERS + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h + DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) +IF(FALSE) - INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) + INSTALL(FILES ${HEADERS} + DESTINATION ${INSTALL_INCLUDEDIR}/server COMPONENT Development) FOREACH(f ${HEADERS_GEN_CONFIGURE}) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) +@@ -75,17 +76,20 @@ FOREACH(f ${HEADERS_GEN_CONFIGURE}) + DESTINATION ${INSTALL_INCLUDEDIR}/server COMPONENT Development) ENDFOREACH(f) - INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") + INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/server/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h") +ENDIF() STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") + MACRO(INSTALL_PRIVATE DIR) +IF(FALSE) - INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" - PATTERN CMakeFiles EXCLUDE - PATTERN mysql EXCLUDE - REGEX "\\./(${EXCL_RE}$)" EXCLUDE) + INSTALL(DIRECTORY ${DIR}/. + DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development + FILES_MATCHING PATTERN "*.h" + PATTERN CMakeFiles EXCLUDE + PATTERN mysql EXCLUDE + REGEX "\\./(${EXCL_RE}$)" EXCLUDE) +ENDIF() + ENDMACRO() - INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" + INSTALL_PRIVATE(${CMAKE_CURRENT_BINARY_DIR}) Index: head/databases/mariadb102-server/files/patch-pcre_CMakeLists.txt =================================================================== --- head/databases/mariadb102-server/files/patch-pcre_CMakeLists.txt (revision 451043) +++ head/databases/mariadb102-server/files/patch-pcre_CMakeLists.txt (revision 451044) @@ -1,13 +1,11 @@ -Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options - ---- pcre/CMakeLists.txt.orig 2017-05-14 23:13:17 UTC +--- 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}/private COMPONENT Development) + INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development) +ENDIF() # end CMakeLists.txt Index: head/databases/mariadb102-server/files/patch-sql_CMakeLists.txt =================================================================== --- head/databases/mariadb102-server/files/patch-sql_CMakeLists.txt (revision 451043) +++ head/databases/mariadb102-server/files/patch-sql_CMakeLists.txt (revision 451044) @@ -1,30 +1,28 @@ -Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options - ---- sql/CMakeLists.txt.orig 2017-05-14 23:13:18 UTC +--- sql/CMakeLists.txt.orig 2017-08-17 10:05:40 UTC +++ sql/CMakeLists.txt -@@ -379,6 +379,7 @@ ADD_CUSTOM_TARGET(distclean +@@ -386,6 +386,7 @@ ADD_CUSTOM_TARGET(distclean VERBATIM ) +IF(FALSE) IF(INSTALL_LAYOUT STREQUAL "STANDALONE") # Copy db.opt into data/test/ -@@ -422,6 +423,7 @@ ELSE() +@@ -429,6 +430,7 @@ ELSE() INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) ENDIF(WIN32 AND MYSQLD_EXECUTABLE) ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE") +ENDIF() IF(WIN32) SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql) -@@ -465,7 +467,9 @@ IF(WIN32) +@@ -472,7 +474,9 @@ IF(WIN32) TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice) ENDIF(WIN32) +IF(FALSE) - INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development + INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development FILES_MATCHING PATTERN "*.h" PATTERN share EXCLUDE PATTERN CMakeFiles EXCLUDE) +ENDIF() Index: head/databases/mariadb102-server/files/patch-storage_rocksdb_rdb__datadic.h =================================================================== --- head/databases/mariadb102-server/files/patch-storage_rocksdb_rdb__datadic.h (nonexistent) +++ head/databases/mariadb102-server/files/patch-storage_rocksdb_rdb__datadic.h (revision 451044) @@ -0,0 +1,10 @@ +--- storage/rocksdb/rdb_datadic.h.orig 2017-09-25 06:33:26 UTC ++++ storage/rocksdb/rdb_datadic.h +@@ -16,6 +16,7 @@ + #pragma once + + /* C++ standard header files */ ++#include + #include + #include + #include Property changes on: head/databases/mariadb102-server/files/patch-storage_rocksdb_rdb__datadic.h ___________________________________________________________________ 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: head/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc =================================================================== --- head/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc (nonexistent) +++ head/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc (revision 451044) @@ -0,0 +1,15 @@ +--- storage/rocksdb/rocksdb/db/malloc_stats.cc.orig 2017-08-17 10:05:38 UTC ++++ storage/rocksdb/rocksdb/db/malloc_stats.cc +@@ -16,7 +16,12 @@ + namespace rocksdb { + + #ifdef ROCKSDB_JEMALLOC ++#ifdef __FreeBSD__ ++#include ++#define je_malloc_stats_print malloc_stats_print ++#else + #include "jemalloc/jemalloc.h" ++#endif + + typedef struct { + char* cur; Property changes on: head/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc ___________________________________________________________________ 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: head/databases/mariadb102-server/files/patch-storage_tokudb_CMakeLists.txt =================================================================== --- head/databases/mariadb102-server/files/patch-storage_tokudb_CMakeLists.txt (revision 451043) +++ head/databases/mariadb102-server/files/patch-storage_tokudb_CMakeLists.txt (revision 451044) @@ -1,12 +1,9 @@ ---- storage/tokudb/CMakeLists.txt.orig 2017-05-14 23:13:20 UTC -+++ storage/tokudb/CMakeLists.txt -@@ -108,9 +108,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA +--- 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") -- - IF (INSTALL_SYSCONF2DIR) - INSTALL(FILES tokudb.cnf DESTINATION ${INSTALL_SYSCONF2DIR} - COMPONENT tokudb-engine) Index: head/databases/mariadb102-server/pkg-plist =================================================================== --- head/databases/mariadb102-server/pkg-plist (revision 451043) +++ head/databases/mariadb102-server/pkg-plist (revision 451044) @@ -1,216 +1,164 @@ bin/aria_chk bin/aria_dump_log bin/aria_ftdump bin/aria_pack bin/aria_read_log bin/innochecksum bin/mariabackup bin/mbstream bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack bin/mysql_client_test bin/mysql_client_test_embedded bin/mysql_convert_table_format bin/mysql_embedded bin/mysql_fix_extensions bin/mysql_install_db %%ROCKSDB%%bin/mysql_ldb bin/mysql_plugin bin/mysql_secure_installation bin/mysql_setpermission bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysqld_multi bin/mysqld_safe bin/mysqld_safe_helper bin/mysqldumpslow bin/mysqlhotcopy bin/mysqltest bin/mysqltest_embedded @comment bin/mytop bin/perror bin/replace bin/resolve_stack_dump bin/resolveip %%ROCKSDB%%bin/sst_dump %%TOKUDB%%bin/tokuft_logprint %%TOKUDB%%bin/tokuftdump bin/wsrep_sst_common bin/wsrep_sst_mariabackup bin/wsrep_sst_mysqldump bin/wsrep_sst_rsync bin/wsrep_sst_xtrabackup bin/wsrep_sst_xtrabackup-v2 -include/mysql/private/atomic/gcc_builtins.h -include/mysql/private/atomic/generic-msvc.h -include/mysql/private/atomic/solaris.h -include/mysql/private/atomic/x86-gcc.h -include/mysql/private/config.h -include/mysql/private/dur_prop.h -include/mysql/private/embedded_priv.h -include/mysql/private/ft_global.h -include/mysql/private/hash.h -include/mysql/private/heap.h -include/mysql/private/lf.h -include/mysql/private/maria.h -include/mysql/private/my_alarm.h -include/mysql/private/my_atomic.h -include/mysql/private/my_base.h -include/mysql/private/my_bit.h -include/mysql/private/my_bitmap.h -include/mysql/private/my_check_opt.h -include/mysql/private/my_compare.h -include/mysql/private/my_context.h -include/mysql/private/my_cpu.h -include/mysql/private/my_crypt.h -include/mysql/private/my_default.h -include/mysql/private/my_handler_errors.h -include/mysql/private/my_libwrap.h -include/mysql/private/my_md5.h -include/mysql/private/my_nosys.h -include/mysql/private/my_rdtsc.h -include/mysql/private/my_rnd.h -include/mysql/private/my_stacktrace.h -include/mysql/private/my_systemd.h -include/mysql/private/my_time.h -include/mysql/private/my_tree.h -include/mysql/private/my_uctype.h -include/mysql/private/my_user.h -include/mysql/private/myisam.h -include/mysql/private/myisamchk.h -include/mysql/private/myisammrg.h -include/mysql/private/myisampack.h -include/mysql/private/mysql_async.h -include/mysql/private/mysqld_default_groups.h -include/mysql/private/mysys_err.h -include/mysql/private/password.h -include/mysql/private/probes_mysql.h -include/mysql/private/probes_mysql_nodtrace.h -include/mysql/private/queues.h -include/mysql/private/rijndael.h -include/mysql/private/service_versions.h -include/mysql/private/ssl_compat.h -include/mysql/private/t_ctype.h -include/mysql/private/thr_alarm.h -include/mysql/private/thr_lock.h -include/mysql/private/thr_timer.h -include/mysql/private/thread_pool_priv.h -include/mysql/private/violite.h -include/mysql/private/waiting_threads.h -include/mysql/private/welcome_copyright_notice.h -include/mysql/private/wqueue.h -include/mysql/private/wsrep.h +include/mysql/my_config.h +include/mysql/my_global.h +include/mysql/my_sys.h +include/mysql/mysql_com.h +include/mysql/mysql_version.h +include/mysql/mysqld_error.h +include/mysql/server/private/embedded_priv.h @comment lib/mysql/libmariadb.so @comment lib/mysql/libmariadb.so.3 @comment lib/mysql/libmariadbclient.a lib/mysql/libmysqld.a lib/mysql/libmysqld.so lib/mysql/libmysqld.so.19 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 @comment lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/debug_key_management.so @comment lib/mysql/plugin/dialog.so lib/mysql/plugin/dialog_examples.so lib/mysql/plugin/example_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/libdaemon_example.so lib/mysql/plugin/locales.so lib/mysql/plugin/metadata_lock_info.so lib/mysql/plugin/mypluglib.so lib/mysql/plugin/qa_auth_client.so lib/mysql/plugin/qa_auth_interface.so lib/mysql/plugin/qa_auth_server.so lib/mysql/plugin/query_cache_info.so lib/mysql/plugin/query_response_time.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/server_audit.so lib/mysql/plugin/simple_password_check.so lib/mysql/plugin/sql_errlog.so lib/mysql/plugin/wsrep_info.so 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/mariadb-service-convert.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_convert_table_format.1.gz man/man1/mysql_fix_extensions.1.gz man/man1/mysql_install_db.1.gz man/man1/mysql_secure_installation.1.gz man/man1/mysql_setpermission.1.gz man/man1/mysql_tzinfo_to_sql.1.gz man/man1/mysql_upgrade.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqld_safe_helper.1.gz man/man1/mysqldumpslow.1.gz man/man1/mysqlhotcopy.1.gz man/man1/mysqltest.1.gz man/man1/perror.1.gz man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz man/man1/tokuft_logdump.1.gz man/man1/tokuftdump.1.gz man/man1/wsrep_sst_common.1.gz man/man1/wsrep_sst_mysqldump.1.gz man/man1/wsrep_sst_rsync.1.gz man/man1/wsrep_sst_xtrabackup-v2.1.gz man/man1/wsrep_sst_xtrabackup.1.gz man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%DATADIR%%/fill_help_tables.sql %%DATADIR%%/magic %%SPIDER%%%%DATADIR%%/install_spider.sql %%DATADIR%%/maria_add_gis_sp.sql %%DATADIR%%/maria_add_gis_sp_bootstrap.sql %%MROONGA%%%%DATADIR%%/mroonga/install.sql %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql %%DATADIR%%/my-huge.cnf %%DATADIR%%/my-innodb-heavy-4G.cnf %%DATADIR%%/my-large.cnf %%DATADIR%%/my-medium.cnf %%DATADIR%%/my-small.cnf %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysql_performance_tables.sql %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_system_tables_data.sql %%DATADIR%%/mysql_test_data_timezone.sql %%DATADIR%%/mysql_to_mariadb.sql %%DATADIR%%/mysqld_multi.server %%DATADIR%%/wsrep.cnf %%DATADIR%%/wsrep_notify