Update libedit to 20170329

18 files changed, 281 insertions, 5 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)
+ 
diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile
index 7da918eb3d9c..8071882371ee 100644
--- a/databases/mysql56-client/Makefile
+++ b/databases/mysql56-client/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTREVISION?=	3
+PORTREVISION?=	4
 PKGNAMESUFFIX=	56-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql56-client/files/patch-client_mysql.cc b/databases/mysql56-client/files/patch-client_mysql.cc
new file mode 100644
index 000000000000..5a03f22b249f
--- /dev/null
+++ b/databases/mysql56-client/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/mysql56-client/files/patch-cmake_readline.cmake b/databases/mysql56-client/files/patch-cmake_readline.cmake
new file mode 100644
index 000000000000..4c251b15fc56
--- /dev/null
+++ b/databases/mysql56-client/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)
+ 
diff --git a/databases/mysql56-server/files/patch-client_mysql.cc b/databases/mysql56-server/files/patch-client_mysql.cc
new file mode 100644
index 000000000000..5a03f22b249f
--- /dev/null
+++ b/databases/mysql56-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/mysql56-server/files/patch-cmake_readline.cmake b/databases/mysql56-server/files/patch-cmake_readline.cmake
new file mode 100644
index 000000000000..4c251b15fc56
--- /dev/null
+++ b/databases/mysql56-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)
+ 
diff --git a/databases/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile
index a047fae6b78f..8614ec8c28a0 100644
--- a/databases/mysqlwsrep56-server/Makefile
+++ b/databases/mysqlwsrep56-server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mysqlwsrep
 PORTVERSION=	5.6.35
+PORTREVISION=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://releases.galeracluster.com/source/
 PKGNAMESUFFIX=	56-server
diff --git a/databases/mysqlwsrep56-server/files/patch-client_mysql.cc b/databases/mysqlwsrep56-server/files/patch-client_mysql.cc
new file mode 100644
index 000000000000..5a03f22b249f
--- /dev/null
+++ b/databases/mysqlwsrep56-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/mysqlwsrep56-server/files/patch-cmake_readline.cmake b/databases/mysqlwsrep56-server/files/patch-cmake_readline.cmake
new file mode 100644
index 000000000000..4c251b15fc56
--- /dev/null
+++ b/databases/mysqlwsrep56-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)
+ 
diff --git a/databases/percona56-client/files/patch-client_mysql.cc b/databases/percona56-client/files/patch-client_mysql.cc
new file mode 100644
index 000000000000..5a03f22b249f
--- /dev/null
+++ b/databases/percona56-client/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/percona56-client/files/patch-cmake_readline.cmake b/databases/percona56-client/files/patch-cmake_readline.cmake
new file mode 100644
index 000000000000..4c251b15fc56
--- /dev/null
+++ b/databases/percona56-client/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)
+ 
diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile
index de961f613197..9fd4a23c83f0 100644
--- a/databases/percona56-server/Makefile
+++ b/databases/percona56-server/Makefile
@@ -3,7 +3,7 @@
 
 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
diff --git a/databases/percona56-server/files/patch-client_mysql.cc b/databases/percona56-server/files/patch-client_mysql.cc
new file mode 100644
index 000000000000..5a03f22b249f
--- /dev/null
+++ b/databases/percona56-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/percona56-server/files/patch-cmake_readline.cmake b/databases/percona56-server/files/patch-cmake_readline.cmake
new file mode 100644
index 000000000000..4c251b15fc56
--- /dev/null
+++ b/databases/percona56-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)
+ 
diff --git a/databases/percona57-client/Makefile b/databases/percona57-client/Makefile
index 96eb22a7c580..65b97d41c50b 100644
--- a/databases/percona57-client/Makefile
+++ b/databases/percona57-client/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	percona
-PORTREVISION?=	2
+PORTREVISION?=	3
 PKGNAMESUFFIX=	57-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/percona57-client/files/patch-client__mysql.cc b/databases/percona57-client/files/patch-client__mysql.cc
index 26b9650400bf..d15700aa095f 100644
--- a/databases/percona57-client/files/patch-client__mysql.cc
+++ b/databases/percona57-client/files/patch-client__mysql.cc
@@ -1,4 +1,4 @@
---- 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
@@ -14,3 +14,26 @@
  	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);