Index: head/databases/percona56-client/files/patch-CMakeLists.txt =================================================================== --- head/databases/percona56-client/files/patch-CMakeLists.txt (revision 447071) +++ head/databases/percona56-client/files/patch-CMakeLists.txt (revision 447072) @@ -1,72 +1,74 @@ ---- CMakeLists.txt 2015-09-14 17:49:16.000000000 +0200 -+++ CMakeLists.txt.new 2015-09-16 09:04:18.149047561 +0200 -@@ -471,41 +471,17 @@ +--- CMakeLists.txt.orig 2017-05-29 12:44:32.006353000 +0200 ++++ CMakeLists.txt 2017-05-29 12:46:55.502845000 +0200 +@@ -486,42 +486,17 @@ ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(client) -ADD_SUBDIRECTORY(sql/share) ADD_SUBDIRECTORY(libservices) +ADD_SUBDIRECTORY(support-files) IF(UNIX) ADD_SUBDIRECTORY(man) ENDIF() -IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) - ADD_SUBDIRECTORY(sql) - OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) - IF(WITH_EMBEDDED_SERVER) - ADD_SUBDIRECTORY(libmysqld) - ADD_SUBDIRECTORY(libmysqld/examples) - ENDIF(WITH_EMBEDDED_SERVER) -ENDIF() - # scripts/mysql_config depends on client and server targets loaded above. # It is referenced by some of the directories below, so we insert it here. ADD_SUBDIRECTORY(scripts) -IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(mysql-test) - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(support-files) - ADD_SUBDIRECTORY(sql-bench) - IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) - ADD_SUBDIRECTORY(internal) - ENDIF() - ADD_SUBDIRECTORY(packaging/rpm-oel) - ADD_SUBDIRECTORY(packaging/rpm-fedora) - ADD_SUBDIRECTORY(packaging/rpm-sles) - ADD_SUBDIRECTORY(packaging/rpm-docker) +- ADD_SUBDIRECTORY(packaging/deb-in) -ENDIF() - INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) -@@ -542,18 +518,17 @@ +@@ -558,18 +533,17 @@ SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) -ADD_SUBDIRECTORY(packaging/solaris) # Create a single package with "make package" # (see http://public.kitware.com/Bug/view.php?id=11452) SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "") IF(UNIX) - INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -579,6 +554,7 @@ +@@ -591,6 +565,7 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) + Index: head/databases/percona56-client/files/patch-client_mysql.cc =================================================================== --- head/databases/percona56-client/files/patch-client_mysql.cc (revision 447071) +++ head/databases/percona56-client/files/patch-client_mysql.cc (revision 447072) @@ -1,25 +1,25 @@ ---- client/mysql.cc.orig 2016-09-30 11:41:40 UTC -+++ client/mysql.cc -@@ -2738,9 +2738,11 @@ static void initialize_readline (char *n +--- client/mysql.cc.orig 2017-05-29 12:49:44.423885000 +0200 ++++ client/mysql.cc 2017-05-29 12:55:13.604765000 +0200 +@@ -2784,9 +2784,11 @@ #ifdef HAVE_LOCALE_H setlocale(LC_ALL,""); /* so as libedit use isprint */ #endif - 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; -@@ -2759,7 +2761,7 @@ static char **new_mysql_completion(const +@@ -2805,7 +2807,7 @@ int end MY_ATTRIBUTE((unused))) { if (!status.batch && !quick) --#if defined(USE_NEW_READLINE_INTERFACE) +-#if defined(USE_NEW_XLINE_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/percona56-client/files/patch-support-files_CMakeLists.txt =================================================================== --- head/databases/percona56-client/files/patch-support-files_CMakeLists.txt (revision 447071) +++ head/databases/percona56-client/files/patch-support-files_CMakeLists.txt (revision 447072) @@ -1,36 +1,40 @@ ---- support-files/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ support-files/CMakeLists.txt 2013-02-13 11:13:32.000000000 +0100 -@@ -44,14 +44,17 @@ +--- support-files/CMakeLists.txt.orig 2017-05-09 08:31:39.000000000 +0200 ++++ support-files/CMakeLists.txt 2017-05-29 13:10:29.832994000 +0200 +@@ -44,11 +44,13 @@ 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) + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") +@@ -57,6 +59,7 @@ + SET (PIDOF "pgrep -d' ' -f") + ENDIF() SET(prefix ${CMAKE_INSTALL_PREFIX}) +IF(FALSE) FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -68,8 +71,10 @@ +@@ -73,8 +76,10 @@ 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) CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) -@@ -94,3 +99,4 @@ +@@ -99,3 +104,4 @@ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDIF() +ENDIF() Index: head/databases/percona56-server/Makefile =================================================================== --- head/databases/percona56-server/Makefile (revision 447071) +++ head/databases/percona56-server/Makefile (revision 447072) @@ -1,108 +1,108 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.6.35-80.0 -PORTREVISION?= 2 +DISTVERSION= 5.6.36-82.0 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/ PKGNAMESUFFIX?= 56-server DISTNAME= percona-server-${DISTVERSION} MAINTAINER= flo@FreeBSD.org COMMENT?= Multithreaded SQL database (server) NOT_FOR_ARCHS= powerpc64 NOT_FOR_ARCHS_REASON= unsupported platform SLAVEDIRS= databases/percona56-client \ databases/percona-pam-for-mysql USES= bison cmake:noninja perl5 shebangfix 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 DATADIR= ${PREFIX}/share/mysql 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="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_EDITLINE=system \ -DWITH_LIBWRAP=1 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 .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 # MySQL-Server part USES+=mysql:56p CONFLICTS_INSTALL= mysql*-server-* \ mariadb*-server-* \ percona5[0-57-9]-server-* USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql INFO= mysql 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 .endif post-patch: @${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt .include .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/percona56-server/distinfo =================================================================== --- head/databases/percona56-server/distinfo (revision 447071) +++ head/databases/percona56-server/distinfo (revision 447072) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489419333 -SHA256 (percona-server-5.6.35-80.0.tar.gz) = 259b5aa2c6218958c8cc55170b9381955ea60445127bf46e02aa09903af7f26b -SIZE (percona-server-5.6.35-80.0.tar.gz) = 55839147 +TIMESTAMP = 1496051683 +SHA256 (percona-server-5.6.36-82.0.tar.gz) = 4304ac45de79053128fb78f13527f483ec9cf1c9592498deeacbbe541216fc9d +SIZE (percona-server-5.6.36-82.0.tar.gz) = 56116691 Index: head/databases/percona56-server/files/patch-client_mysql.cc =================================================================== --- head/databases/percona56-server/files/patch-client_mysql.cc (revision 447071) +++ head/databases/percona56-server/files/patch-client_mysql.cc (revision 447072) @@ -1,25 +1,25 @@ ---- client/mysql.cc.orig 2016-09-30 11:41:40 UTC -+++ client/mysql.cc -@@ -2738,9 +2738,11 @@ static void initialize_readline (char *n +--- client/mysql.cc.orig 2017-05-09 08:31:39.000000000 +0200 ++++ client/mysql.cc 2017-05-29 13:24:38.665722000 +0200 +@@ -2784,9 +2784,11 @@ #ifdef HAVE_LOCALE_H setlocale(LC_ALL,""); /* so as libedit use isprint */ #endif - 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; -@@ -2759,7 +2761,7 @@ static char **new_mysql_completion(const +@@ -2805,7 +2807,7 @@ int end MY_ATTRIBUTE((unused))) { if (!status.batch && !quick) --#if defined(USE_NEW_READLINE_INTERFACE) +-#if defined(USE_NEW_XLINE_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);