Change the way readline/editline support is patched, based on what

mysql57-client has. This fixes at least SmartOS builds, no changes for
NetBSD (and presumably elsewhere).

4 files changed, 19 insertions, 48 deletions

diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common
index 265fb36469c..23de00189de 100644
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2016/09/07 12:58:25 adam Exp $
+# $NetBSD: Makefile.common,v 1.36 2016/09/30 11:54:49 fhajny Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
@@ -124,8 +124,10 @@ USE_BUILTIN.editline=	no
 .endif
 
 .include "../../mk/readline.buildlink3.mk"
-
-CMAKE_ARGS+=	-DWITH_EDITLINE=system
-CMAKE_ARGS+=	-DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editlinereadline}/include/readline
+.if ${READLINE_TYPE} == "readline"
+CMAKE_ARGS+=		-DWITH_READLINE="system"
+.else
+CMAKE_ARGS+=		-DWITH_EDITLINE="system"
+.endif
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo
index 04bed090fe8..1b99dd27c2d 100644
--- a/databases/mysql56-client/distinfo
+++ b/databases/mysql56-client/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2016/09/07 12:58:25 adam Exp $
+$NetBSD: distinfo,v 1.38 2016/09/30 11:54:49 fhajny Exp $
 
 SHA1 (mysql-5.6.33.tar.gz) = 4f1c2e25ce681f92862a75ad52012fbe4017bf42
 RMD160 (mysql-5.6.33.tar.gz) = 2fa192fa1cec9d791cfa9b7347cb5cd9adc7944f
@@ -10,13 +10,12 @@ SHA512 (sphinx-2.2.11-release.tar.gz) = cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce8
 Size (sphinx-2.2.11-release.tar.gz) = 3061998 bytes
 SHA1 (patch-CMakeLists.txt) = cc14caabcb6ca55eba33595f98ad4b3db14504da
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
-SHA1 (patch-client_mysql.cc) = 8f1fabf6f975dbffbeaef13426a43f9b7f4d5336
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
 SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52
 SHA1 (patch-cmake_dtrace.cmake) = d953fdf976f3a7e7f0c2c16a9a2d2615f2777396
 SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
 SHA1 (patch-cmake_plugin.cmake) = 03e7a7debd61e870bd76d5c5b253a620662b3595
-SHA1 (patch-cmake_readline.cmake) = 5436d4bf4148e97deef2a9811a09e54503a4e744
+SHA1 (patch-cmake_readline.cmake) = 6bec6ca87b45c739d0614493477a18bb7c56d981
 SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247
 SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4
 SHA1 (patch-include_my__global.h) = 843b9527faf880eee59cf02239ba601f5985ddfb
diff --git a/databases/mysql56-client/patches/patch-client_mysql.cc b/databases/mysql56-client/patches/patch-client_mysql.cc
deleted file mode 100644
index 4f941559364..00000000000
--- a/databases/mysql56-client/patches/patch-client_mysql.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-client_mysql.cc,v 1.1 2015/10/07 11:22:00 adam Exp $
-
---- client/mysql.cc.orig	2015-10-07 10:53:49.000000000 +0000
-+++ client/mysql.cc
-@@ -97,7 +97,7 @@ extern "C" {
- #if defined(__WIN__)
- #include <conio.h>
- #else
--#include <readline.h>
-+#include <readline/readline.h>
- #define HAVE_READLINE
- #define USE_POPEN
- #endif
diff --git a/databases/mysql56-client/patches/patch-cmake_readline.cmake b/databases/mysql56-client/patches/patch-cmake_readline.cmake
index a5697e0387c..3e500901c2e 100644
--- a/databases/mysql56-client/patches/patch-cmake_readline.cmake
+++ b/databases/mysql56-client/patches/patch-cmake_readline.cmake
@@ -1,36 +1,19 @@
-$NetBSD: patch-cmake_readline.cmake,v 1.3 2015/10/07 11:22:00 adam Exp $
+$NetBSD: patch-cmake_readline.cmake,v 1.4 2016/09/30 11:54:49 fhajny Exp $
 
-* If devel/editline is installed and use base libedit, cmake
-  readline.h detection fails. Disable mis-detection of
-  /usr/pkg/include/editline/readline.h.
+Fix for pkgsrc editline.
 
---- cmake/readline.cmake.orig	2013-05-21 15:18:39.000000000 +0000
+--- cmake/readline.cmake.orig	2016-08-26 11:22:35.000000000 +0000
 +++ cmake/readline.cmake
-@@ -130,9 +130,6 @@ MACRO (MYSQL_USE_BUNDLED_EDITLINE)
- ENDMACRO()
+@@ -131,10 +131,10 @@ ENDMACRO()
  
  MACRO (FIND_SYSTEM_EDITLINE)
--  FIND_PATH(FOUND_EDITLINE_READLINE
+   FIND_PATH(FOUND_EDITLINE_READLINE
 -    NAMES editline/readline.h
--  )
++    NAMES readline/readline.h
+   )
    IF(FOUND_EDITLINE_READLINE)
-     SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/editline")
+-    SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/editline")
++    SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/readline")
    ELSE()
-@@ -160,7 +157,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
-     SET(CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
-     CHECK_CXX_SOURCE_COMPILES("
-     #include <stdio.h>
--    #include <readline.h>
-+    #include <readline/readline.h>
-     int main(int argc, char **argv)
-     {
-        HIST_ENTRY entry;
-@@ -170,7 +167,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
- 
-     CHECK_CXX_SOURCE_COMPILES("
-     #include <stdio.h>
--    #include <readline.h>
-+    #include <readline/readline.h>
-     int main(int argc, char **argv)
-     {
-       typedef int MYFunction(const char*, int);
+     # Different path on FreeBSD
+     FIND_PATH(FOUND_EDIT_READLINE_READLINE