Index: head/databases/mysql55-server/Makefile =================================================================== --- head/databases/mysql55-server/Makefile (revision 437437) +++ head/databases/mysql55-server/Makefile (revision 437438) @@ -1,93 +1,93 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME?= mysql PORTVERSION= 5.5.54 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.5 PKGNAMESUFFIX?= 55-server MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 SLAVEDIRS= databases/mysql55-client USES= cmake readline shebangfix CXXFLAGS+= ${CPPFLAGS} NO_OPTIONS_SORT=yes OPTIONS_DEFINE= SSL FASTMTX OPTIONS_DEFAULT=SSL FASTMTX_DESC= Replace mutexes with spinlocks 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_UNIT_TESTS=0 \ -DWITH_LIBEDIT=0 \ -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 .include .if ${PORT_OPTIONS:MSSL} CMAKE_ARGS+= -DWITH_SSL=bundled .endif .if ${PORT_OPTIONS:MFASTMTX} CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 .endif # MySQL-Server part .if !defined(CLIENT_ONLY) USE_MYSQL= yes WANT_MYSQL_VER= 55 CONFLICTS_INSTALL= mysql5[0-46-9]-server-* \ mariadb*-server-* \ percona*-server-* USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql 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" .endif post-patch: @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt .include .if ${ARCH} == "armv6" EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake .endif .include Index: head/databases/mysql55-server/files/patch-client_mysql.cc =================================================================== --- head/databases/mysql55-server/files/patch-client_mysql.cc (nonexistent) +++ head/databases/mysql55-server/files/patch-client_mysql.cc (revision 437438) @@ -0,0 +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 + #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/mysql55-server/files/patch-client_mysql.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/mysql55-server/files/patch-cmake_readline.cmake =================================================================== --- head/databases/mysql55-server/files/patch-cmake_readline.cmake (nonexistent) +++ head/databases/mysql55-server/files/patch-cmake_readline.cmake (revision 437438) @@ -0,0 +1,17 @@ +--- 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/mysql55-server/files/patch-cmake_readline.cmake ___________________________________________________________________ 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/mysql56-client/Makefile =================================================================== --- head/databases/mysql56-client/Makefile (revision 437437) +++ head/databases/mysql56-client/Makefile (revision 437438) @@ -1,36 +1,36 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= mysql -PORTREVISION?= 3 +PORTREVISION?= 4 PKGNAMESUFFIX= 56-client COMMENT= Multithreaded SQL database (client) LICENSE+= LGPL21 BROKEN_powerpc64= Does not build 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 (nonexistent) +++ head/databases/mysql56-client/files/patch-client_mysql.cc (revision 437438) @@ -0,0 +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 + #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 ___________________________________________________________________ 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/mysql56-client/files/patch-cmake_readline.cmake =================================================================== --- head/databases/mysql56-client/files/patch-cmake_readline.cmake (nonexistent) +++ head/databases/mysql56-client/files/patch-cmake_readline.cmake (revision 437438) @@ -0,0 +1,17 @@ +--- 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 ___________________________________________________________________ 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/mysql56-server/files/patch-client_mysql.cc =================================================================== --- head/databases/mysql56-server/files/patch-client_mysql.cc (nonexistent) +++ head/databases/mysql56-server/files/patch-client_mysql.cc (revision 437438) @@ -0,0 +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 + #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 ___________________________________________________________________ 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/mysql56-server/files/patch-cmake_readline.cmake =================================================================== --- head/databases/mysql56-server/files/patch-cmake_readline.cmake (nonexistent) +++ head/databases/mysql56-server/files/patch-cmake_readline.cmake (revision 437438) @@ -0,0 +1,17 @@ +--- 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 ___________________________________________________________________ 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/mysqlwsrep56-server/Makefile =================================================================== --- head/databases/mysqlwsrep56-server/Makefile (revision 437437) +++ head/databases/mysqlwsrep56-server/Makefile (revision 437438) @@ -1,79 +1,80 @@ # Created by: Philip Stoev # $FreeBSD$ PORTNAME= mysqlwsrep PORTVERSION= 5.6.35 +PORTREVISION= 1 CATEGORIES= databases ipv6 MASTER_SITES= http://releases.galeracluster.com/source/ PKGNAMESUFFIX= 56-server DISTNAME= mysql-wsrep-5.6.35-25.19 MAINTAINER= info@galeracluster.com COMMENT= MySQL database enhanced with Galera replication (server package) LICENSE= GPLv2 BUILD_DEPENDS= bison:devel/bison RUN_DEPENDS= socat:net/socat lsof:sysutils/lsof netcat:net/netcat rsync:net/rsync DATADIR= ${PREFIX}/share/mysql BROKEN_powerpc64= Does not build USES= cmake:outsource libedit shebangfix perl5 USE_PERL5= run USE_LDCONFIG= yes MY_DBDIR= /var/db/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="${MY_DBDIR}" \ -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 \ -DWITH_WSREP=1 SHEBANG_FILES= scripts/*.pl* scripts/*.sh scripts/wsrep_sst_* .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif CONFLICTS_INSTALL= mysql5[0-9]-server-* \ mariadb*-server-* \ percona*-server-* USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql 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 post-patch: @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt .include .if ${ARCH} == "armv6" EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake .endif .include Index: head/databases/mysqlwsrep56-server/files/patch-client_mysql.cc =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-client_mysql.cc (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-client_mysql.cc (revision 437438) @@ -0,0 +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 + #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/mysqlwsrep56-server/files/patch-client_mysql.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/mysqlwsrep56-server/files/patch-cmake_readline.cmake =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-cmake_readline.cmake (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-cmake_readline.cmake (revision 437438) @@ -0,0 +1,17 @@ +--- 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/mysqlwsrep56-server/files/patch-cmake_readline.cmake ___________________________________________________________________ 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/percona56-client/files/patch-client_mysql.cc =================================================================== --- head/databases/percona56-client/files/patch-client_mysql.cc (nonexistent) +++ head/databases/percona56-client/files/patch-client_mysql.cc (revision 437438) @@ -0,0 +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 + #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/percona56-client/files/patch-client_mysql.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/percona56-client/files/patch-cmake_readline.cmake =================================================================== --- head/databases/percona56-client/files/patch-cmake_readline.cmake (nonexistent) +++ head/databases/percona56-client/files/patch-cmake_readline.cmake (revision 437438) @@ -0,0 +1,17 @@ +--- 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/percona56-client/files/patch-cmake_readline.cmake ___________________________________________________________________ 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/percona56-server/Makefile =================================================================== --- head/databases/percona56-server/Makefile (revision 437437) +++ head/databases/percona56-server/Makefile (revision 437438) @@ -1,110 +1,110 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME?= percona DISTVERSION= 5.6.35-80.0 -PORTREVISION?= 0 +PORTREVISION?= 1 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) BROKEN_powerpc64= Does not build SLAVEDIRS= databases/percona56-client \ databases/percona-pam-for-mysql USES= bison cmake 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=bundled 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 ${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/percona56-server/files/patch-client_mysql.cc =================================================================== --- head/databases/percona56-server/files/patch-client_mysql.cc (nonexistent) +++ head/databases/percona56-server/files/patch-client_mysql.cc (revision 437438) @@ -0,0 +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 + #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/percona56-server/files/patch-client_mysql.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/percona56-server/files/patch-cmake_readline.cmake =================================================================== --- head/databases/percona56-server/files/patch-cmake_readline.cmake (nonexistent) +++ head/databases/percona56-server/files/patch-cmake_readline.cmake (revision 437438) @@ -0,0 +1,17 @@ +--- 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/percona56-server/files/patch-cmake_readline.cmake ___________________________________________________________________ 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/percona57-client/Makefile =================================================================== --- head/databases/percona57-client/Makefile (revision 437437) +++ head/databases/percona57-client/Makefile (revision 437438) @@ -1,43 +1,43 @@ # Created by: Mark Felder # $FreeBSD$ PORTNAME= percona -PORTREVISION?= 2 +PORTREVISION?= 3 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 437437) +++ head/databases/percona57-client/files/patch-client__mysql.cc (revision 437438) @@ -1,16 +1,39 @@ ---- client/mysql.cc.orig 2016-11-27 19:44:54 UTC +--- 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/devel/libedit/files/patch-netbsd-pr-50863 =================================================================== --- head/devel/libedit/files/patch-netbsd-pr-50863 (revision 437437) +++ head/devel/libedit/files/patch-netbsd-pr-50863 (nonexistent) @@ -1,53 +0,0 @@ -http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=50863 - ---- src/tty.c.orig 2014-06-18 19:07:45 UTC -+++ src/tty.c -@@ -499,6 +499,9 @@ tty_setup(EditLine *el) - if (el->el_flags & EDIT_DISABLED) - return 0; - -+ if (el->el_tty.t_initialized) -+ return -1; -+ - if (!isatty(el->el_outfd)) { - #ifdef DEBUG_TTY - (void) fprintf(el->el_errfile, "%s: isatty: %s\n", __func__, -@@ -558,6 +561,7 @@ tty_setup(EditLine *el) - - tty__setchar(&el->el_tty.t_ed, el->el_tty.t_c[ED_IO]); - tty_bind_char(el, 1); -+ el->el_tty.t_initialized = 1; - return 0; - } - -@@ -567,6 +571,7 @@ tty_init(EditLine *el) - - el->el_tty.t_mode = EX_IO; - el->el_tty.t_vdisable = _POSIX_VDISABLE; -+ el->el_tty.t_initialized = 0; - (void) memcpy(el->el_tty.t_t, ttyperm, sizeof(ttyperm_t)); - (void) memcpy(el->el_tty.t_c, ttychar, sizeof(ttychar_t)); - return tty_setup(el); -@@ -580,6 +585,9 @@ protected void - /*ARGSUSED*/ - tty_end(EditLine *el) - { -+ if (!el->el_tty.t_initialized) -+ return; -+ - if (tty_setty(el, TCSAFLUSH, &el->el_tty.t_or) == -1) { - #ifdef DEBUG_TTY - (void) fprintf(el->el_errfile, ---- src/tty.h.orig 2014-06-18 16:05:56 UTC -+++ src/tty.h -@@ -474,8 +474,9 @@ typedef struct { - int t_tabs; - int t_eight; - speed_t t_speed; -- int t_mode; -+ unsigned char t_mode; - unsigned char t_vdisable; -+ unsigned char t_initialized; - } el_tty_t; - - Property changes on: head/devel/libedit/files/patch-netbsd-pr-50863 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/devel/libedit/files/patch-src__chartype.h =================================================================== --- head/devel/libedit/files/patch-src__chartype.h (revision 437437) +++ head/devel/libedit/files/patch-src__chartype.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/chartype.h.orig 2015-03-25 21:02:28.000000000 +0100 -+++ src/chartype.h 2015-03-28 11:37:42.072100000 +0100 -@@ -44,7 +44,7 @@ - * supports non-BMP code points without requiring UTF-16, but nothing - * seems to actually advertise this properly, despite Unicode 3.1 having - * been around since 2001... */ --#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) -+#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) - #ifndef __STDC_ISO_10646__ - /* In many places it is assumed that the first 127 code points are ASCII - * compatible, so ensure wchar_t indeed does ISO 10646 and not some other Property changes on: head/devel/libedit/files/patch-src__chartype.h ___________________________________________________________________ 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/devel/libedit/files/patch-src_eln.c =================================================================== --- head/devel/libedit/files/patch-src_eln.c (revision 437437) +++ head/devel/libedit/files/patch-src_eln.c (nonexistent) @@ -1,21 +0,0 @@ ---- src/eln.c.orig 2015-03-25 21:02:28.000000000 +0100 -+++ src/eln.c 2015-03-28 11:42:29.913925000 +0100 -@@ -75,12 +75,17 @@ public const char * - el_gets(EditLine *el, int *nread) - { - const wchar_t *tmp; -+ int nwread; -+ -+ *nread = 0; - - if (!(el->el_flags & CHARSET_IS_UTF8)) - el->el_flags |= IGNORE_EXTCHARS; -- tmp = el_wgets(el, nread); -+ tmp = el_wgets(el, &nwread); - if (!(el->el_flags & CHARSET_IS_UTF8)) - el->el_flags &= ~IGNORE_EXTCHARS; -+ for (int i = 0; i < nwread; i++) -+ *nread += ct_enc_width(tmp[i]); - return ct_encode_string(tmp, &el->el_lgcyconv); - } - Property changes on: head/devel/libedit/files/patch-src_eln.c ___________________________________________________________________ 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/devel/libedit/Makefile =================================================================== --- head/devel/libedit/Makefile (revision 437437) +++ head/devel/libedit/Makefile (revision 437438) @@ -1,29 +1,32 @@ # Created by: jasone # $FreeBSD$ PORTNAME= libedit PORTVERSION= ${EDITVERSION}.${EDITDATE} DISTVERSION= ${EDITDATE}-${EDITVERSION} PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= http://thrysoee.dk/editline/ MAINTAINER= bapt@FreeBSD.org COMMENT= Command line editor library LICENSE= BSD2CLAUSE USES= libtool ncurses pathfix EDITVERSION= 3.1 -EDITDATE= 20150325 +EDITDATE= 20170329 WRKSRC= ${WRKDIR}/${PORTNAME}-${EDITDATE}-${EDITVERSION} GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip CONFIGURE_ARGS= --enable-widec LDFLAGS+= -L${LOCALBASE}/lib CONFLICTS_INSTALL= editline-* + +post-install: + ${MV} ${STAGEDIR}${PREFIX}/man/man3/history.3 ${STAGEDIR}${PREFIX}/man/man3/el_history.3 .include Index: head/devel/libedit/distinfo =================================================================== --- head/devel/libedit/distinfo (revision 437437) +++ head/devel/libedit/distinfo (revision 437438) @@ -1,2 +1,3 @@ -SHA256 (libedit-20150325-3.1.tar.gz) = c88a5e4af83c5f40dda8455886ac98923a9c33125699742603a88a0253fcc8c5 -SIZE (libedit-20150325-3.1.tar.gz) = 502792 +TIMESTAMP = 1490994397 +SHA256 (libedit-20170329-3.1.tar.gz) = 91f2d90fbd2a048ff6dad7131d9a39e690fd8a8fd982a353f1333dd4017dd4be +SIZE (libedit-20170329-3.1.tar.gz) = 508504 Index: head/devel/libedit/pkg-plist =================================================================== --- head/devel/libedit/pkg-plist (revision 437437) +++ head/devel/libedit/pkg-plist (revision 437438) @@ -1,31 +1,50 @@ include/editline/readline.h include/histedit.h lib/libedit.a lib/libedit.so lib/libedit.so.0 -lib/libedit.so.0.0.53 +lib/libedit.so.0.0.56 libdata/pkgconfig/libedit.pc man/man3/editline.3.gz man/man3/el_deletestr.3.gz man/man3/el_end.3.gz man/man3/el_get.3.gz man/man3/el_getc.3.gz man/man3/el_gets.3.gz -man/man3/el_history.3.gz -man/man3/el_history_end.3.gz -man/man3/el_history_init.3.gz man/man3/el_init.3.gz +man/man3/el_init_fd.3.gz man/man3/el_insertstr.3.gz man/man3/el_line.3.gz man/man3/el_parse.3.gz man/man3/el_push.3.gz man/man3/el_reset.3.gz man/man3/el_resize.3.gz man/man3/el_set.3.gz man/man3/el_source.3.gz -man/man3/el_tok_end.3.gz -man/man3/el_tok_init.3.gz -man/man3/el_tok_line.3.gz -man/man3/el_tok_reset.3.gz -man/man3/el_tok_str.3.gz +man/man3/el_wdeletestr.3.gz +man/man3/el_wget.3.gz +man/man3/el_wgetc.3.gz +man/man3/el_wgets.3.gz +man/man3/el_winsertstr.3.gz +man/man3/el_wline.3.gz +man/man3/el_wparse.3.gz +man/man3/el_wpush.3.gz +man/man3/el_wset.3.gz +man/man3/el_history.3.gz +man/man3/history_end.3.gz +man/man3/history_init.3.gz +man/man3/history_w.3.gz +man/man3/history_wend.3.gz +man/man3/history_winit.3.gz +man/man3/tok_end.3.gz +man/man3/tok_init.3.gz +man/man3/tok_line.3.gz +man/man3/tok_reset.3.gz +man/man3/tok_str.3.gz +man/man3/tok_wend.3.gz +man/man3/tok_winit.3.gz +man/man3/tok_wline.3.gz +man/man3/tok_wreset.3.gz +man/man3/tok_wstr.3.gz man/man5/editrc.5.gz +man/man7/editline.7.gz