Index: head/databases/mysql56-client/Makefile =================================================================== --- head/databases/mysql56-client/Makefile (revision 438697) +++ head/databases/mysql56-client/Makefile (revision 438698) @@ -1,35 +1,34 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= mysql -PORTREVISION?= 4 PKGNAMESUFFIX= 56-client COMMENT= Multithreaded SQL database (client) LICENSE+= LGPL21 BROKEN_sparc64= Does not build: reports unsupported compiler MASTERDIR= ${.CURDIR}/../mysql56-server PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= mysql5[0-57-9]-client-* \ mysql[0-46-9][0-9]-client-* \ mariadb[0-9][0-9]-client-* \ percona[0-9][0-9]-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 USE_LDCONFIG+= ${PREFIX}/lib/mysql MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \ mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \ mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 CLIENT_ONLY= yes .include "${MASTERDIR}/Makefile" Index: head/databases/mysql56-client/files/patch-client_mysql.cc =================================================================== --- head/databases/mysql56-client/files/patch-client_mysql.cc (revision 438697) +++ head/databases/mysql56-client/files/patch-client_mysql.cc (nonexistent) @@ -1,25 +0,0 @@ ---- client/mysql.cc.orig 2016-09-30 11:41:40 UTC -+++ client/mysql.cc -@@ -2738,9 +2738,11 @@ static void initialize_readline (char *n - #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 - 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); Property changes on: head/databases/mysql56-client/files/patch-client_mysql.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/mysql56-client/files/patch-cmake_readline.cmake =================================================================== --- head/databases/mysql56-client/files/patch-cmake_readline.cmake (revision 438697) +++ head/databases/mysql56-client/files/patch-cmake_readline.cmake (nonexistent) @@ -1,17 +0,0 @@ ---- cmake/readline.cmake.orig 2016-09-30 11:41:40 UTC -+++ cmake/readline.cmake -@@ -173,11 +173,11 @@ MACRO (FIND_SYSTEM_EDITLINE) - #include - int main(int argc, char **argv) - { -- typedef int MYFunction(const char*, int); -+ typedef char *MYFunction(const char*, int); - MYFunction* myf= rl_completion_entry_function; -- int res= (myf)(NULL, 0); -+ char *res= (myf)(NULL, 0); - completion_matches(0,0); -- return res; -+ return (res != NULL); - }" - EDITLINE_HAVE_COMPLETION) - Property changes on: head/databases/mysql56-client/files/patch-cmake_readline.cmake ___________________________________________________________________ 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/mysql56-client/files/patch-support-files_CMakeLists.txt =================================================================== --- head/databases/mysql56-client/files/patch-support-files_CMakeLists.txt (revision 438697) +++ head/databases/mysql56-client/files/patch-support-files_CMakeLists.txt (revision 438698) @@ -1,36 +1,40 @@ ---- support-files/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC +--- support-files/CMakeLists.txt.orig 2017-03-18 06:43:12 UTC +++ support-files/CMakeLists.txt -@@ -44,14 +44,17 @@ ELSE() +@@ -44,11 +44,13 @@ 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) + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") +@@ -57,6 +59,7 @@ IF(UNIX) + 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 @@ IF(UNIX) +@@ -73,8 +76,10 @@ IF(UNIX) 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 @@ IF(UNIX) +@@ -99,3 +104,4 @@ IF(UNIX) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDIF() +ENDIF() Index: head/databases/mysql56-server/Makefile =================================================================== --- head/databases/mysql56-server/Makefile (revision 438697) +++ head/databases/mysql56-server/Makefile (revision 438698) @@ -1,153 +1,152 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.35 -PORTREVISION?= 7 +PORTVERSION= 5.6.36 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.6 PKGNAMESUFFIX?= 56-server MAINTAINER= mmokhi@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 SLAVEDIRS= databases/mysql56-client USES= bison:build cmake:outsource compiler:c11 compiler:c++11-lib \ cpe libedit localbase perl5 shebangfix ssl USE_PERL5= run MY_DBDIR= /var/db/mysql MY_SECDIR= /var/db/mysql_secure MY_TMPDIR= /var/db/mysql_tmpdir LIB_DEPENDS+= libevent.so:devel/libevent \ liblz4.so:archivers/liblz4 CMAKE_BUILD_TYPE= Release CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \ -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ -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="${MY_DBDIR}" \ -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \ -DWITH_BOOST="${WRKSRC}/boost" \ -DWITH_EDITLINE=system \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ -DWITH_ZLIB=system \ -DWITH_SSL=${OPENSSLBASE} \ -DCRYPTO_LIBRARY=${OPENSSLLIB}/libcrypto.so \ -DOPENSSL_LIBRARY=${OPENSSLLIB}/libssl.so \ -DINSTALL_MYSQLTESTDIR=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} # MySQL-Server part .if !defined(CLIENT_ONLY) USES+= mysql:56 CONFLICTS_INSTALL= mysql5[0-57-9]-server-* \ mysql[0-46-9][0-9]-server-* \ mariadb[0-9][0-9]-server-* \ percona[0-9][0-9]-server-* USE_RC_SUBR= mysql-server SUB_FILES= my.cnf.sample USERS= mysql GROUPS= mysql USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin MMAN1= 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" OPTIONS_GROUP= STORAGE OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA OPTIONS_SUB= YES STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server) ARCHIVE_DESC= Compile "Archive Storage" statically in server BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server EXAMPLE_DESC= Compile "Example Storage" statically in server FEDERATED_DESC= Compile "Federated Storage" statically in server INNOBASE_DESC= Compile "InnoDB Storage" statically in server PARTITION_DESC= Compile "Partitioning support Storage" statically in server PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1 BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1 EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1 FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1 INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1 PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1 PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 OPTIONS_GROUP+= FEATURES OPTIONS_GROUP_FEATURES= PERFSCHM FEATURES_DESC= Default features knobs PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage) OPTIONS_DEFAULT+= PERFSCHM PERFSCHM_SUB_LIST+= PERFSCHEMRC="" PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" FEDERATED_SUB_LIST+= FEDER="--federated" FEDERATED_SUB_LIST_OFF+= FEDER="" .endif .include post-patch: @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt .if !defined(CLIENT_ONLY) post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring ${MKDIR} ${STAGEDIR}${MY_SECDIR} ${MKDIR} ${STAGEDIR}${MY_TMPDIR} .endif .if ${ARCH} == "armv6" EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake .endif .include Index: head/databases/mysql56-server/distinfo =================================================================== --- head/databases/mysql56-server/distinfo (revision 438697) +++ head/databases/mysql56-server/distinfo (revision 438698) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484753208 -SHA256 (mysql-5.6.35.tar.gz) = dddcba169b98844d7c65346cbd791c853edf942d78440381685087b84aa35020 -SIZE (mysql-5.6.35.tar.gz) = 32167628 +TIMESTAMP = 1492102457 +SHA256 (mysql-5.6.36.tar.gz) = 0af81a5538fc7fe2b747295dfa96589ace8831d2a7d4a26660fca456babeb147 +SIZE (mysql-5.6.36.tar.gz) = 32192348 Index: head/databases/mysql56-server/files/patch-client_mysql.cc =================================================================== --- head/databases/mysql56-server/files/patch-client_mysql.cc (revision 438697) +++ head/databases/mysql56-server/files/patch-client_mysql.cc (nonexistent) @@ -1,25 +0,0 @@ ---- client/mysql.cc.orig 2016-09-30 11:41:40 UTC -+++ client/mysql.cc -@@ -2738,9 +2738,11 @@ static void initialize_readline (char *n - #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 - 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); Property changes on: head/databases/mysql56-server/files/patch-client_mysql.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/mysql56-server/files/patch-cmake_readline.cmake =================================================================== --- head/databases/mysql56-server/files/patch-cmake_readline.cmake (revision 438697) +++ head/databases/mysql56-server/files/patch-cmake_readline.cmake (nonexistent) @@ -1,17 +0,0 @@ ---- cmake/readline.cmake.orig 2016-09-30 11:41:40 UTC -+++ cmake/readline.cmake -@@ -173,11 +173,11 @@ MACRO (FIND_SYSTEM_EDITLINE) - #include - int main(int argc, char **argv) - { -- typedef int MYFunction(const char*, int); -+ typedef char *MYFunction(const char*, int); - MYFunction* myf= rl_completion_entry_function; -- int res= (myf)(NULL, 0); -+ char *res= (myf)(NULL, 0); - completion_matches(0,0); -- return res; -+ return (res != NULL); - }" - EDITLINE_HAVE_COMPLETION) - Property changes on: head/databases/mysql56-server/files/patch-cmake_readline.cmake ___________________________________________________________________ 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