Index: head/databases/percona57-client/Makefile =================================================================== --- head/databases/percona57-client/Makefile (revision 457696) +++ head/databases/percona57-client/Makefile (revision 457697) @@ -1,43 +1,43 @@ # Created by: Mark Felder # $FreeBSD$ PORTNAME= percona -PORTREVISION?= 3 +PORTREVISION?= 0 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) LICENSE= GPLv2+ MASTERDIR= ${.CURDIR}/../percona57-server OPTIONS_EXCLUDE=TOKUDB PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= mysql*-client-* \ mariadb*-client-* \ percona5[0-68-9]-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 USE_LDCONFIG= ${PREFIX}/lib/mysql MANPAGES= comp_err.1 mysql.1 mysql_config.1 mysql_config_editor.1 \ mysql_waitpid.1 mysqladmin.1 mysqlbinlog.1 \ mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 CLIENT_ONLY= yes # Percona renamed the libraries, until we decide how to deal with it create some symlinks # to prevent breaking installed ports. post-install: ${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so ${LN} -s libperconaserverclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.20 ${LN} -s libperconaserverclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a ${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so ${LN} -s libperconaserverclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20 .include "${MASTERDIR}/Makefile" Index: head/databases/percona57-client/files/patch-client__mysql.cc =================================================================== --- head/databases/percona57-client/files/patch-client__mysql.cc (revision 457696) +++ head/databases/percona57-client/files/patch-client__mysql.cc (revision 457697) @@ -1,39 +1,30 @@ --- client/mysql.cc.orig 2017-04-01 14:33:18 UTC +++ client/mysql.cc @@ -1903,11 +1903,11 @@ static void usage(int version) #endif #ifdef HAVE_READLINE - printf("%s Ver %s Distrib %s, for %s (%s) using %s %s\n", + printf("%s Ver %s Distrib %s Percona, for %s (%s) using %s %s\n", my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE, readline, rl_library_version); #else - printf("%s Ver %s Distrib %s, for %s (%s)\n", my_progname, VER, + printf("%s Ver %s Distrib %s Percona, for %s (%s)\n", my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE); #endif @@ -2865,9 +2865,11 @@ static void initialize_readline (char *name) rl_add_defun("magic-space", (rl_command_func_t *)&fake_magic_space, -1); #elif defined(USE_LIBEDIT_INTERFACE) setlocale(LC_ALL,""); /* so as libedit use isprint */ - rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; - rl_completion_entry_function= &no_completion; + rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion; + rl_completion_entry_function= (rl_compentry_func_t*)&no_completion; + /* rl_add_defun("magic-space", (Function*)&fake_magic_space, -1); + */ #else rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; rl_completion_entry_function= &no_completion; -@@ -2886,7 +2888,7 @@ static char **new_mysql_completion(const char *text, - int end MY_ATTRIBUTE((unused))) - { - if (!status.batch && !quick) --#if defined(USE_NEW_READLINE_INTERFACE) -+#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE) - return rl_completion_matches(text, new_command_generator); - #else - return completion_matches((char *)text, (CPFunction *)new_command_generator); Index: head/databases/percona57-client/files/patch-scripts_CMakeLists.txt =================================================================== --- head/databases/percona57-client/files/patch-scripts_CMakeLists.txt (revision 457696) +++ head/databases/percona57-client/files/patch-scripts_CMakeLists.txt (revision 457697) @@ -1,67 +1,72 @@ ---- scripts/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC -+++ scripts/CMakeLists.txt -@@ -19,7 +19,7 @@ IF(NOT CMAKE_CROSSCOMPILING) - TARGET_LINK_LIBRARIES(comp_sql) - ENDIF() +--- scripts/CMakeLists.txt.orig 2017-12-11 07:56:49.000000000 +0000 ++++ scripts/CMakeLists.txt 2017-12-31 14:31:35.649012000 +0000 +@@ -23,6 +23,7 @@ + SET(COMPILER_ID_AND_VERSION + "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") -- +IF(FALSE) # Build mysql_fix_privilege_tables.sql (concatenate 2 sql scripts) IF(NOT WIN32 OR CMAKE_CROSSCOMPILING) FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable") -@@ -63,6 +63,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs +@@ -65,7 +66,9 @@ + ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h ++ENDIF() ) +ENDIF() # If we do not have performance schema compiled in then sys will not work, # so only create an empty sys database with an auto-generated file, -@@ -143,6 +144,7 @@ IF(NOT WITHOUT_SERVER) +@@ -146,6 +149,7 @@ ) ENDIF() +IF(FALSE) IF(UNIX) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" ) -@@ -150,6 +152,7 @@ IF(UNIX) +@@ -153,6 +157,7 @@ COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution ) ENDIF() +ENDIF() IF(NOT WITHOUT_SERVER) INSTALL(FILES -@@ -347,6 +350,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) +@@ -332,6 +337,8 @@ GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) + ELSEIF(lib STREQUAL "-pthread") + SET(${var} "${${var}}-pthread " ) ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -430,21 +435,7 @@ ELSE() +@@ -417,25 +424,7 @@ # On Unix, most of the files end up in the bin directory SET(mysql_config_COMPONENT COMPONENT Development) - IF(WITH_SYSTEMD) - SET(BIN_SCRIPTS - mysql_config - mysqldumpslow - ps_tokudb_admin +- ps_mysqld_helper +- ps-admin - ) - ELSE() - SET(BIN_SCRIPTS - mysql_config - mysqldumpslow - mysqld_multi - mysqld_safe - ps_tokudb_admin +- ps_mysqld_helper +- ps-admin - ) - ENDIF() + SET(BIN_SCRIPTS mysql_config) SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc) STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}") Index: head/databases/percona57-client/files/patch-support-files_CMakeLists.txt =================================================================== --- head/databases/percona57-client/files/patch-support-files_CMakeLists.txt (revision 457696) +++ head/databases/percona57-client/files/patch-support-files_CMakeLists.txt (revision 457697) @@ -1,37 +1,27 @@ ---- support-files/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC -+++ support-files/CMakeLists.txt -@@ -44,14 +44,17 @@ ELSE() - SET(inst_location ${INSTALL_SUPPORTFILESDIR}) - ENDIF() - -+IF(FALSE) - SET(inifile my-default) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh - ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} - DESTINATION ${inst_location} COMPONENT IniFiles) -+ENDIF() - - IF(UNIX) +--- support-files/CMakeLists.txt.orig 2017-12-11 07:56:49.000000000 +0000 ++++ support-files/CMakeLists.txt 2017-12-31 14:35:25.047786000 +0000 +@@ -47,6 +47,7 @@ + SET (PIDOF "pgrep -d' ' -f") + ENDIF() SET(prefix ${CMAKE_INSTALL_PREFIX}) -+IF(FALSE) ++ IF(FALSE) FOREACH(script mysqld_multi.server mysql-log-rotate) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -68,9 +71,11 @@ IF(UNIX) +@@ -59,9 +60,11 @@ IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) ENDIF() +ENDIF() INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) +IF(FALSE) SET(bindir ${prefix}/${INSTALL_BINDIR}) SET(sbindir ${prefix}/${INSTALL_SBINDIR}) SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR}) -@@ -83,3 +88,4 @@ IF(UNIX) +@@ -74,3 +77,4 @@ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDIF() +ENDIF() Index: head/databases/percona57-pam-for-mysql/Makefile =================================================================== --- head/databases/percona57-pam-for-mysql/Makefile (revision 457696) +++ head/databases/percona57-pam-for-mysql/Makefile (revision 457697) @@ -1,33 +1,33 @@ # Created by: Mark Felder # $FreeBSD$ PORTNAME= percona57 -PORTREVISION?= 2 +PORTREVISION?= 0 PKGNAMESUFFIX= -pam-for-mysql COMMENT= PAM plugin for MySQL LICENSE= GPLv2+ RUN_DEPENDS=# This plugin has no run dependencies. It should work with any desired mysql client/server. MASTERDIR= ${.CURDIR}/../percona57-server PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${MASTERDIR}/files FILESDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist DESCR= ${.CURDIR}/pkg-descr CONFLICTS_INSTALL= percona5[0-68-9]-pam-for-mysql* \ percona-pam-for-mysql* CMAKE_ARGS+= -DWITH_PAM=1 PLUGIN_ONLY= yes do-install: (cd ${WRKSRC}/plugin/percona-pam-for-mysql && ${MAKE} ${MAKE_ARGS} install) ${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/mysqld.sample .include "${MASTERDIR}/Makefile" Index: head/databases/percona57-server/Makefile =================================================================== --- head/databases/percona57-server/Makefile (revision 457696) +++ head/databases/percona57-server/Makefile (revision 457697) @@ -1,148 +1,149 @@ # Created by: Mark Felder # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.7.16-10 -PORTREVISION?= 5 +DISTVERSION= 5.7.20-18 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \ SF/boost/boost/1.59.0:boost PKGNAMESUFFIX?= 57-server DISTNAME= percona-server-${DISTVERSION} DISTFILES= percona-server-${DISTVERSION}${EXTRACT_SUFX}:percona \ boost_1_59_0${EXTRACT_SUFX}:boost MAINTAINER= feld@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE?= GPLv2+ LIB_DEPENDS= libevent.so:devel/libevent \ liblz4.so:archivers/liblz4 BROKEN_powerpc64= Does not build SLAVEDIRS= databases/percona57-client \ databases/percona57-pam-for-mysql USES= bison:build cmake:noninja compiler:c11 compiler:c++11-lib \ cpe libedit localbase perl5 shebangfix MY_DBDIR= /var/db/mysql MY_SECDIR= /var/db/mysql_secure MY_TMPDIR= /var/db/mysql_tmpdir DATADIR= ${LOCALBASE}/share/mysql DOCSDIR= ${LOCALBASE}/share/doc/mysql CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \ -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ -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_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_UNIT_TESTS=0 \ -DWITH_EDITLINE=system \ -DWITH_LIBWRAP=0 \ -DWITH_LZ4=system \ -DWITH_ZLIB=system \ -DINSTALL_MYSQLTESTDIR=0 \ -DWITH_BOOST="${WRKDIR}/boost_1_59_0" SHEBANG_FILES= scripts/*.pl* scripts/*.sh .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif SUB_LIST= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} .ifdef CLIENT_ONLY # Client part USES+= libedit .elifdef PLUGIN_ONLY # For building plugins (percona-pam-for-mysql, etc) # Currently do nothing special USES+= libedit .else +LIB_DEPENDS+= libcurl.so:ftp/curl # MySQL-Server part OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED TOKUDB OPTIONS_DEFAULT= OPENSSL INNODBMEMCACHED OPTIONS_SUB= yes FASTMTX_DESC= Replace mutexes with spinlocks FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 INNODBMEMCACHED_DESC= InnoDB Memcached plugin INNODBMEMCACHED_CMAKE_ON= -DWITH_INNODB_MEMCACHED=1 OPENSSL_CMAKE_ON= -DWITH_SSL=system OPENSSL_USES= ssl TOKUDB_DESC= TokuDB Engine (experimental) TOKUDB_CMAKE_ON= -DUSE_CTAGS=0 TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb USES+=mysql:57p CONFLICTS_INSTALL= mysql*-server-* \ mysqlwsrep* \ mariadb*-server-* \ percona5[0-68-9]-server-* USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql INFO= mysql USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin MANPAGES= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \ mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" post-install: ${MKDIR} ${STAGEDIR}/var/db/mysql ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring ${MKDIR} ${STAGEDIR}${MY_SECDIR} ${MKDIR} ${STAGEDIR}${MY_TMPDIR} .endif post-patch: @${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt .include .if ${ARCH} == "arm" BROKEN= Does not compile on arm .endif .if ${PORT_OPTIONS:MTOKUDB} NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \ https://github.com/percona/PerconaFT/blob/master/README.md .endif .include Index: head/databases/percona57-server/distinfo =================================================================== --- head/databases/percona57-server/distinfo (revision 457696) +++ head/databases/percona57-server/distinfo (revision 457697) @@ -1,5 +1,5 @@ -TIMESTAMP = 1481662079 -SHA256 (percona-server-5.7.16-10.tar.gz) = 1e88233d4bc5fd9a6910f2cc01ad5aca7d751f036cdba5a1c9954e1e25300347 -SIZE (percona-server-5.7.16-10.tar.gz) = 74341476 +TIMESTAMP = 1514728385 +SHA256 (percona-server-5.7.20-18.tar.gz) = ebbdf859d571562b9c9614c29355dd73adb9021b67108edd46b67063039a28af +SIZE (percona-server-5.7.20-18.tar.gz) = 82206679 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 Index: head/databases/percona57-server/files/patch-storage_innobase_buf_buf0buf.cc =================================================================== --- head/databases/percona57-server/files/patch-storage_innobase_buf_buf0buf.cc (revision 457696) +++ head/databases/percona57-server/files/patch-storage_innobase_buf_buf0buf.cc (nonexistent) @@ -1,11 +0,0 @@ ---- storage/innobase/buf/buf0buf.cc.orig 2016-11-27 19:44:54 UTC -+++ storage/innobase/buf/buf0buf.cc -@@ -333,7 +333,7 @@ typedef std::map< - const byte*, - buf_chunk_t*, - std::less, -- ut_allocator > > -+ ut_allocator > > - buf_pool_chunk_map_t; - - static buf_pool_chunk_map_t* buf_chunk_map_reg; Property changes on: head/databases/percona57-server/files/patch-storage_innobase_buf_buf0buf.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/databases/percona57-server/files/patch-storage_innobase_sync_sync0debug.cc =================================================================== --- head/databases/percona57-server/files/patch-storage_innobase_sync_sync0debug.cc (revision 457696) +++ head/databases/percona57-server/files/patch-storage_innobase_sync_sync0debug.cc (nonexistent) @@ -1,11 +0,0 @@ ---- storage/innobase/sync/sync0debug.cc.orig 2016-11-27 19:44:54 UTC -+++ storage/innobase/sync/sync0debug.cc -@@ -1717,7 +1717,7 @@ private: - const void*, - File, - std::less, -- ut_allocator > > -+ ut_allocator > > - Files; - - typedef OSMutex Mutex; Property changes on: head/databases/percona57-server/files/patch-storage_innobase_sync_sync0debug.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/databases/percona57-server/files/patch-sql_json__dom.h =================================================================== --- head/databases/percona57-server/files/patch-sql_json__dom.h (revision 457696) +++ head/databases/percona57-server/files/patch-sql_json__dom.h (nonexistent) @@ -1,11 +0,0 @@ ---- sql/json_dom.h.orig 2017-01-05 16:09:35 UTC -+++ sql/json_dom.h -@@ -337,7 +337,7 @@ struct Json_key_comparator - Json_object class. - */ - typedef std::map > > Json_object_map; -+ Malloc_allocator > > Json_object_map; - - /** - Represents a JSON container value of type "object" (ECMA), type Property changes on: head/databases/percona57-server/files/patch-sql_json__dom.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/databases/percona57-server/files/patch-storage_innobase_dict_dict0stats.cc =================================================================== --- head/databases/percona57-server/files/patch-storage_innobase_dict_dict0stats.cc (revision 457696) +++ head/databases/percona57-server/files/patch-storage_innobase_dict_dict0stats.cc (nonexistent) @@ -1,11 +0,0 @@ ---- storage/innobase/dict/dict0stats.cc.orig 2016-11-27 19:44:54 UTC -+++ storage/innobase/dict/dict0stats.cc -@@ -139,7 +139,7 @@ then we would store 5,7,10,11,12 in the - typedef std::vector > boundaries_t; - - /** Allocator type used for index_map_t. */ --typedef ut_allocator > -+typedef ut_allocator > - index_map_t_allocator; - - /** Auxiliary map used for sorting indexes by name in dict_stats_save(). */ Property changes on: head/databases/percona57-server/files/patch-storage_innobase_dict_dict0stats.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/databases/percona57-server/files/patch-scripts_CMakeLists.txt =================================================================== --- head/databases/percona57-server/files/patch-scripts_CMakeLists.txt (revision 457696) +++ head/databases/percona57-server/files/patch-scripts_CMakeLists.txt (revision 457697) @@ -1,34 +1,36 @@ ---- scripts/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC -+++ scripts/CMakeLists.txt -@@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) +--- scripts/CMakeLists.txt.orig 2017-12-11 07:56:49.000000000 +0000 ++++ scripts/CMakeLists.txt 2017-12-31 14:59:46.762799000 +0000 +@@ -332,6 +332,8 @@ GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) + ELSEIF(lib STREQUAL "-pthread") + SET(${var} "${${var}}-pthread " ) ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -432,13 +434,11 @@ ELSE() +@@ -419,7 +421,6 @@ IF(WITH_SYSTEMD) SET(BIN_SCRIPTS - mysql_config mysqldumpslow ps_tokudb_admin + ps_mysqld_helper +@@ -427,7 +428,6 @@ ) ELSE() SET(BIN_SCRIPTS - mysql_config mysqldumpslow mysqld_multi mysqld_safe -@@ -473,7 +473,7 @@ ELSE() +@@ -464,7 +464,7 @@ FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh - ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY) + ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY) ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY) Index: head/databases/percona57-server/pkg-plist =================================================================== --- head/databases/percona57-server/pkg-plist (revision 457696) +++ head/databases/percona57-server/pkg-plist (revision 457697) @@ -1,182 +1,187 @@ bin/innochecksum bin/lz4_decompress bin/myisamchk bin/myisam_ftdump bin/myisamlog bin/myisampack bin/my_print_defaults bin/mysqld_multi bin/mysqld_safe bin/mysqldumpslow bin/mysql_install_db bin/mysql_plugin bin/mysqltest bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysqlxtest bin/perror +bin/ps-admin +bin/ps_mysqld_helper bin/ps_tokudb_admin bin/replace bin/resolveip bin/resolve_stack_dump bin/zlib_decompress %%DATADIR%%/bulgarian/errmsg.sys %%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/Index.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/README %%DATADIR%%/charsets/swe7.xml %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dictionary.txt %%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%%/hungarian/errmsg.sys %%DATADIR%%/innodb_memcached_config.sql %%DATADIR%%/install_rewriter.sql %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic -%%DATADIR%%/my-default.cnf %%DATADIR%%/mysqld_multi.server %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql_security_commands.sql %%DATADIR%%/mysql.server %%DATADIR%%/mysql_sys_schema.sql %%DATADIR%%/mysql_system_tables_data.sql %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_test_data_timezone.sql %%DATADIR%%/norwegian/errmsg.sys %%DATADIR%%/norwegian-ny/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 %%DATADIR%%/uninstall_rewriter.sql +include/mysql/mysqlx_ername.h include/mysql/mysqlx_error.h include/mysql/mysqlx_version.h @dir lib/mysql/plugin/debug @dir(mysql,mysql,) /var/db/mysql %%INNODBMEMCACHED%%lib/mysql/plugin/innodb_engine.so %%INNODBMEMCACHED%%lib/mysql/plugin/libmemcached.so libexec/mysqld lib/mysql/libmysqld.a lib/mysql/plugin/adt_null.so lib/mysql/plugin/audit_log.so lib/mysql/plugin/auth.so lib/mysql/plugin/auth_test_plugin.so +lib/mysql/plugin/connection_control.so lib/mysql/plugin/daemon_example.ini +lib/mysql/plugin/group_replication.so lib/mysql/plugin/ha_example.so lib/mysql/plugin/keyring_file.so lib/mysql/plugin/keyring_udf.so +lib/mysql/plugin/keyring_vault.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/libfnv1a_udf.so lib/mysql/plugin/libfnv_udf.so lib/mysql/plugin/libmurmur_udf.so lib/mysql/plugin/libtest_framework.so lib/mysql/plugin/libtest_services.so lib/mysql/plugin/libtest_services_threaded.so lib/mysql/plugin/libtest_session_detach.so lib/mysql/plugin/libtest_session_info.so lib/mysql/plugin/libtest_session_in_thd.so lib/mysql/plugin/libtest_sql_2_sessions.so lib/mysql/plugin/libtest_sql_all_col_types.so lib/mysql/plugin/libtest_sql_cmds_1.so lib/mysql/plugin/libtest_sql_commit.so lib/mysql/plugin/libtest_sql_complex.so lib/mysql/plugin/libtest_sql_errors.so lib/mysql/plugin/libtest_sql_lock.so lib/mysql/plugin/libtest_sql_processlist.so lib/mysql/plugin/libtest_sql_replication.so lib/mysql/plugin/libtest_sql_shutdown.so lib/mysql/plugin/libtest_sql_sqlmode.so lib/mysql/plugin/libtest_sql_stored_procedures_functions.so lib/mysql/plugin/libtest_sql_views_triggers.so lib/mysql/plugin/libtest_x_sessions_deinit.so lib/mysql/plugin/libtest_x_sessions_init.so lib/mysql/plugin/locking_service.so lib/mysql/plugin/mypluglib.so lib/mysql/plugin/mysql_no_login.so lib/mysql/plugin/mysqlx.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_response_time.so lib/mysql/plugin/replication_observers_example_plugin.so lib/mysql/plugin/rewrite_example.so lib/mysql/plugin/rewriter.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/test_security_context.so lib/mysql/plugin/test_udf_services.so lib/mysql/plugin/validate_password.so lib/mysql/plugin/version_token.so libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc man/man1/myisamchk.1.gz man/man1/myisam_ftdump.1.gz man/man1/myisamlog.1.gz man/man1/myisampack.1.gz man/man1/my_print_defaults.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqldumpslow.1.gz man/man1/mysql_install_db.1.gz man/man1/mysqlman.1.gz man/man1/mysql_plugin.1.gz man/man1/mysql_secure_installation.1.gz man/man1/mysql.server.1.gz man/man1/mysqltest.1.gz man/man1/mysql_tzinfo_to_sql.1.gz man/man1/mysql_upgrade.1.gz man/man1/perror.1.gz man/man1/replace.1.gz man/man1/resolveip.1.gz man/man1/resolve_stack_dump.1.gz man/man8/mysqld.8.gz %%TOKUDB%%bin/tokuftdump %%TOKUDB%%bin/tokuft_logprint %%TOKUDB%%include/backup.h %%TOKUDB%%lib/mysql/libHotBackup.so %%TOKUDB%%lib/mysql/plugin/ha_tokudb.so %%TOKUDB%%lib/mysql/plugin/tokudb_backup.so %%TOKUDB%%share/doc/mysql/COPYING.AGPLv3 %%TOKUDB%%share/doc/mysql/COPYING.GPLv2 %%TOKUDB%%share/doc/mysql/PATENTS %%TOKUDB%%share/doc/mysql/README.md %%TOKUDB%%share/doc/mysql/README_tokudb_backup @dir(mysql,mysql,0750) %%ETCDIR%%/keyring @dir(mysql,mysql,0750) %%MY_SECDIR%% @dir(mysql,mysql,0750) %%MY_TMPDIR%%