diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-04-01 15:11:14 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-04-01 15:11:14 +0000 |
| commit | b85734e5a8a8069eb9cdd9e433d87a48ad56cd2e (patch) | |
| tree | cf36ee99baf262132ed098112ce81365db1c7f5b /databases/mysql55-server | |
| parent | d39ad836d1ab4367b3bc4d8e47ea54824d74bc1b (diff) | |
| download | freebsd-ports-b85734e5a8a8069eb9cdd9e433d87a48ad56cd2e.zip | |
Update libedit to 20170329
Diffstat (limited to 'databases/mysql55-server')
| -rw-r--r-- | databases/mysql55-server/Makefile | 2 | ||||
| -rw-r--r-- | databases/mysql55-server/files/patch-client_mysql.cc | 25 | ||||
| -rw-r--r-- | databases/mysql55-server/files/patch-cmake_readline.cmake | 17 |
3 files changed, 43 insertions, 1 deletions
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 14a9f27abb58..82f88d28ae52 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= mysql PORTVERSION= 5.5.54 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.5 PKGNAMESUFFIX?= 55-server diff --git a/databases/mysql55-server/files/patch-client_mysql.cc b/databases/mysql55-server/files/patch-client_mysql.cc new file mode 100644 index 000000000000..5a03f22b249f --- /dev/null +++ b/databases/mysql55-server/files/patch-client_mysql.cc @@ -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); diff --git a/databases/mysql55-server/files/patch-cmake_readline.cmake b/databases/mysql55-server/files/patch-cmake_readline.cmake new file mode 100644 index 000000000000..4c251b15fc56 --- /dev/null +++ b/databases/mysql55-server/files/patch-cmake_readline.cmake @@ -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 <readline.h> + 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) + |