Fix build with clang and libedit.

2 files changed, 30 insertions, 88 deletions

diff --git a/databases/mariadb55-client/patches/patch-client_mysql.cc b/databases/mariadb55-client/patches/patch-client_mysql.cc
index 71c4552a74d..8c7649e3d9e 100644
--- a/databases/mariadb55-client/patches/patch-client_mysql.cc
+++ b/databases/mariadb55-client/patches/patch-client_mysql.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-client_mysql.cc,v 1.2 2015/05/07 12:45:29 fhajny Exp $
+$NetBSD: patch-client_mysql.cc,v 1.3 2017/02/03 16:20:18 roy Exp $
 
---- client/mysql.cc.orig	2015-02-13 12:07:00.000000000 +0000
+--- client/mysql.cc.orig	2016-09-12 14:54:54.000000000 +0000
 +++ client/mysql.cc
 @@ -89,7 +89,7 @@ extern "C" {
  #if defined(__WIN__)
@@ -11,9 +11,26 @@ $NetBSD: patch-client_mysql.cc,v 1.2 2015/05/07 12:45:29 fhajny Exp $
  #define HAVE_READLINE
  #define USE_POPEN
  #endif
-@@ -2640,7 +2640,11 @@ static void initialize_readline (char *n
-   rl_completion_entry_function= &no_completion;
-   rl_add_defun("magic-space", (Function*)&fake_magic_space, -1);
+@@ -2634,20 +2634,20 @@ static void initialize_readline (char *n
+   rl_readline_name = name;
+ 
+   /* Tell the completer that we want a crack first. */
+-#if defined(USE_NEW_READLINE_INTERFACE)
++#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE)
++#if defined(USE_LIBEDIT_INTERFACE) && defined(HAVE_LOCALE_H)
++  setlocale(LC_ALL,""); /* so as libedit use isprint */
++#endif
+   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", (rl_command_func_t *)&fake_magic_space, -1);
+-#elif defined(USE_LIBEDIT_INTERFACE)
+-#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_add_defun("magic-space", (Function*)&fake_magic_space, -1);
  #else
 +# if defined(USE_READLINE_V6)
 +  rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
@@ -23,12 +40,12 @@ $NetBSD: patch-client_mysql.cc,v 1.2 2015/05/07 12:45:29 fhajny Exp $
    rl_completion_entry_function= &no_completion;
  #endif
  }
-@@ -2657,7 +2661,7 @@ static char **new_mysql_completion(const
+@@ -2664,7 +2664,7 @@ static char **new_mysql_completion(const
                                     int end __attribute__((unused)))
  {
    if (!status.batch && !quick)
 -#if defined(USE_NEW_READLINE_INTERFACE)
-+#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_READLINE_V6)
++#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE) || defined(USE_READLINE_V6)
      return rl_completion_matches(text, new_command_generator);
  #else
      return completion_matches((char *)text, (CPFunction *)new_command_generator);
diff --git a/databases/mariadb55-client/patches/patch-cmake_readline.cmake b/databases/mariadb55-client/patches/patch-cmake_readline.cmake
index d867e5f624b..ce091c114a9 100644
--- a/databases/mariadb55-client/patches/patch-cmake_readline.cmake
+++ b/databases/mariadb55-client/patches/patch-cmake_readline.cmake
@@ -1,92 +1,17 @@
-$NetBSD: patch-cmake_readline.cmake,v 1.2 2015/05/07 12:45:29 fhajny Exp $
+$NetBSD: patch-cmake_readline.cmake,v 1.3 2017/02/03 16:20:18 roy Exp $
 
-Fix cmake's check build error. Borrowed from mysql56's readline.cmake.
-Fi build with pkgsrc readline>=6 that removed some deprecated symbols.
---- cmake/readline.cmake.orig	2015-02-13 12:07:00.000000000 +0000
+--- cmake/readline.cmake.orig	2016-09-12 14:54:54.000000000 +0000
 +++ cmake/readline.cmake
-@@ -132,7 +132,7 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
-     SET(CMAKE_REQUIRED_INCLUDES ${READLINE_INCLUDE_DIR})
-     CHECK_CXX_SOURCE_COMPILES("
-     #include <stdio.h>
--    #include <readline.h>
-+    #include <readline/readline.h>
-     int main(int argc, char **argv)
-     {
-       rl_completion_func_t *func1= (rl_completion_func_t*)0;
-@@ -142,7 +142,7 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
- 
-     CHECK_C_SOURCE_COMPILES("
-     #include <stdio.h>
--    #include <readline.h>
-+    #include <readline/readline.h>
-     #if RL_VERSION_MAJOR > 5
-     #error
-     #endif
-@@ -152,6 +152,19 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
-     }"
-     READLINE_V5)
- 
-+    CHECK_C_SOURCE_COMPILES("
-+    #include <stdio.h>
-+    #include <readline/readline.h>
-+    #if RL_VERSION_MAJOR < 6
-+    #error
-+    #endif
-+    int main(int argc, char **argv)
-+    {
-+      return 0;
-+    }"
-+    READLINE_V6)
-+    SET(USE_READLINE_V6 ${READLINE_V6})
-+
-     IF(NEW_READLINE_INTERFACE)
-       IF (READLINE_V5)
-         SET(USE_NEW_READLINE_INTERFACE 1)
-@@ -180,8 +193,11 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT)
+@@ -180,8 +180,11 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT)
      #include <readline.h>
      int main(int argc, char **argv)
      {
 -      int res= (*rl_completion_entry_function)(0,0);
-+      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 0;
      }"
      LIBEDIT_INTERFACE)
      SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE})
-@@ -195,32 +211,13 @@ MACRO (MYSQL_CHECK_READLINE)
-     SET(WITH_READLINE OFF CACHE BOOL "Use bundled readline")
-     FIND_CURSES()
- 
--    IF(WITH_READLINE)
--      MYSQL_USE_BUNDLED_READLINE()
--    ELSE()
--      # OSX includes incompatible readline lib
--      IF (NOT APPLE)
--        MYSQL_FIND_SYSTEM_READLINE()
--      ENDIF()
--      IF(USE_NEW_READLINE_INTERFACE)
--        SET(MY_READLINE_INCLUDE_DIR ${READLINE_INCLUDE_DIR})
--        SET(MY_READLINE_LIBRARY ${READLINE_LIBRARY} ${CURSES_LIBRARY})
--      ELSE()
--        MYSQL_FIND_SYSTEM_LIBEDIT()
--        IF(USE_LIBEDIT_INTERFACE)
--          SET(MY_READLINE_INCLUDE_DIR ${LIBEDIT_INCLUDE_DIR})
--          SET(MY_READLINE_LIBRARY ${LIBEDIT_LIBRARY} ${CURSES_LIBRARY})
--        ELSE()
--          MYSQL_USE_BUNDLED_READLINE()
--        ENDIF()
--      ENDIF()
--    ENDIF()
-+    MYSQL_FIND_SYSTEM_READLINE()
- 
-     SET(CMAKE_REQUIRED_LIBRARIES ${MY_READLINE_LIBRARY})
-     SET(CMAKE_REQUIRED_INCLUDES ${MY_READLINE_INCLUDE_DIR})
-     CHECK_CXX_SOURCE_COMPILES("
-     #include <stdio.h>
--    #include <readline.h>
-+    #include <readline/readline.h>
-     int main(int argc, char **argv)
-     {
-        HIST_ENTRY entry;