Index: branches/2019Q1/databases/mariadb101-client/files/patch-client_CMakeLists.txt =================================================================== --- branches/2019Q1/databases/mariadb101-client/files/patch-client_CMakeLists.txt (revision 493584) +++ branches/2019Q1/databases/mariadb101-client/files/patch-client_CMakeLists.txt (revision 493585) @@ -1,57 +1,58 @@ ---- client/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC +--- client/CMakeLists.txt.orig 2019-02-04 17:02:08 UTC +++ client/CMakeLists.txt -@@ -38,11 +38,12 @@ IF(UNIX) +@@ -39,12 +39,13 @@ IF(UNIX) SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) ENDIF(UNIX) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix) + TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcreposix pcre) SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) -- +ENDIF() +- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -54,21 +55,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim + +@@ -55,21 +56,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) +ENDIF() MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) +ENDIF() MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc) -TARGET_LINK_LIBRARIES(mysqladmin mysqlclient) +tARGET_LINK_LIBRARIES(mysqladmin mysqlclient) MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") -@@ -80,10 +85,12 @@ IF(WIN32) +@@ -81,10 +86,12 @@ IF(WIN32) ENDIF(WIN32) # async_example is just a code example, do not install it. +IF(FALSE) ADD_EXECUTABLE(async_example async_example.c) TARGET_LINK_LIBRARIES(async_example mysqlclient) +ENDIF() -SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example +SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap PROPERTIES HAS_CXX TRUE) ADD_DEFINITIONS(-DHAVE_DLOPEN) Index: branches/2019Q1/databases/mariadb101-client/pkg-plist =================================================================== --- branches/2019Q1/databases/mariadb101-client/pkg-plist (revision 493584) +++ branches/2019Q1/databases/mariadb101-client/pkg-plist (revision 493585) @@ -1,120 +1,121 @@ 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/keycache.h include/mysql/little_endian.h include/mysql/m_ctype.h include/mysql/m_string.h include/mysql/ma_dyncol.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/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/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 lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.18 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.18 %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.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 man/man1/msql2mysql.1.gz man/man1/mysql.1.gz man/man1/mysql_config.1.gz +man/man1/mysql_embedded.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 @comment %%DATADIR%%/wsrep.cnf Index: branches/2019Q1/databases/mariadb101-server/Makefile =================================================================== --- branches/2019Q1/databases/mariadb101-server/Makefile (revision 493584) +++ branches/2019Q1/databases/mariadb101-server/Makefile (revision 493585) @@ -1,210 +1,204 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.1.37 -PORTREVISION= 2 +PORTVERSION= 10.1.38 +PORTREVISION= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ http://gd.tuwien.ac.at/db/${SITESDIR}/ \ http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ http://mirror.layerjet.com/${SITESDIR}/ \ http://mirror.switch.ch/mirror/${SITESDIR}/ PKGNAMESUFFIX?= 101-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_SSL= openssl111 -BROKEN_SSL_REASON_openssl111= Does not support OpenSSL 1.1, use MariaDB 10.2 or 10.3 - SUB_FILES= pkg-message SLAVEDIRS= databases/mariadb101-client USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe libedit ncurses \ shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source DOCSDIR= ${PREFIX}/share/doc/mysql OPTIONS_DEFINE= FASTMTX OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= GSSAPI_BASE FASTMTX_DESC= Replace mutexes with spinlocks .if !defined(CLIENT_ONLY) # MySQL-Server options OPTIONS_DEFINE+= CONNECT_EXTRA MAXKEY DOCS OPTIONS_DEFAULT+= MAXKEY SPHINX SPIDER OPTIONS_GROUP= COMPRESSION ENGINES GROONGA OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH 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= Build InnoDB engine next to XtraDB MAXKEY_DESC= Change max key length from 1000 to 4000 MROONGA_DESC= Mroonga Full Text Search engine MSGPACK_DESC= MsgPack support OQGRAPH_DESC= Open Query Graph Computation engine SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine TOKUDB_DESC= Fractal tree index tree data structure engine ZMQ_DESC= ZeroMQ support .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" \ -DWITH_UNIT_TESTS=0 \ -DWITH_LIBWRAP=1 \ -DWITH_SSL=${OPENSSLBASE} \ -DKRB5_CONFIG=${KRB5CONFIG} \ -DCOMPILATION_COMMENT="FreeBSD Ports" 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[02-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 BROKEN_powerpc64= Does not build: fatal error: sys/platform/ppc.h: No such file or directory #LIB_DEPENDS= libevent.so:devel/libevent USES+= mysql:101m USE_GNOME= libxml2 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 .for ENGINE in ${OPTIONS_GROUP_ENGINES} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF LZ4_CMAKE_ON= -DGRN_WITH_LZ4=${LOCALBASE}/lib -DWITH_INNODB_LZ4=${LOCALBASE}/lib LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF LZO_CMAKE_ON= -DWITH_INNODB_LZO=${LOCALBASE}/lib LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4 MROONGA_VARS= LICENSE+=LGPL20 LICENSE_COMB=multi 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 SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=${LOCALBASE}/lib 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 post-install: # Remove programs to avoid conflict with mariadb101-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 \ ${STAGEDIR}${PREFIX}/lib/mysql/plugin/client_ed25519.so \ ${STAGEDIR}${PREFIX}/share/groonga-normalizer-mysql/lgpl-2.0.txt \ ${STAGEDIR}${PREFIX}/share/groonga/COPYING \ ${STAGEDIR}${DATADIR}/mroonga/COPYING ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \ ${STAGEDIR}${PREFIX}/share/pkgconfig \ ${STAGEDIR}${PREFIX}/mysql/mysql-test \ ${STAGEDIR}${PREFIX}/mysql/sql-bench post-install-MROONGA-on: ${MV} ${STAGEDIR}${PREFIX}/share/groonga-normalizer-mysql \ ${STAGEDIR}${PREFIX}/share/groonga \ ${STAGEDIR}${PREFIX}/share/mysql .endif # defined(CLIENT_ONLY) .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .include .if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE} IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif .if ${OPSYS} == FreeBSD CMAKE_ARGS+= -DWITH_JEMALLOC="system" -. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base -BROKEN= ${BROKEN_SSL_REASON_openssl111} -. endif .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 .include Index: branches/2019Q1/databases/mariadb101-server/distinfo =================================================================== --- branches/2019Q1/databases/mariadb101-server/distinfo (revision 493584) +++ branches/2019Q1/databases/mariadb101-server/distinfo (revision 493585) @@ -1,3 +1,3 @@ -TIMESTAMP = 1541157538 -SHA256 (mariadb-10.1.37.tar.gz) = 8cd516b0a7f7aa36a7c1d6e687dbbad8c0b08c92d5fd60c6e691b19a6cab4d46 -SIZE (mariadb-10.1.37.tar.gz) = 63492946 +TIMESTAMP = 1549448520 +SHA256 (mariadb-10.1.38.tar.gz) = caf1f4fc237d143343995b6625375aef911dfc366433645d400727e7063f077f +SIZE (mariadb-10.1.38.tar.gz) = 63535685 Index: branches/2019Q1 =================================================================== --- branches/2019Q1 (revision 493584) +++ branches/2019Q1 (revision 493585) Property changes on: branches/2019Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r492419