Pullup ticket #5857 - requested by taca

databases/mysql57-client: build fix

Revisions pulled up:
- databases/mysql57-client/distinfo                             1.23
- databases/mysql57-client/patches/patch-cmd-line-utils_libedit_chartype.h 1.1
- databases/mysql57-client/patches/patch-cmd-line-utils_libedit_vi.c 1.1

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	sevan
   Date:		Mon Oct  1 00:11:29 UTC 2018

   Modified Files:
   	pkgsrc/databases/mysql57-client: distinfo
   Added Files:
   	pkgsrc/databases/mysql57-client/patches:
   	    patch-cmd-line-utils_libedit_chartype.h
   	    patch-cmd-line-utils_libedit_vi.c

   Log Message:
   Unbreak build on DragonFly BSD.
   Add OpenBSD to the exclusion list in chartype.h as with upstream version.


   To generate a diff of this commit:
   cvs rdiff -u -r1.22 -r1.23 pkgsrc/databases/mysql57-client/distinfo
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/databases/mysql57-client/patches/patch-cmd-line-utils_libedit_chartype.h \
       pkgsrc/databases/mysql57-client/patches/patch-cmd-line-utils_libedit_vi.c

3 files changed, 43 insertions, 1 deletions

diff --git a/databases/mysql57-client/distinfo b/databases/mysql57-client/distinfo
index e020470dcf9..3beba576e03 100644
--- a/databases/mysql57-client/distinfo
+++ b/databases/mysql57-client/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2018/08/16 16:06:09 adam Exp $
+$NetBSD: distinfo,v 1.22.2.1 2018/10/29 18:31:33 spz Exp $
 
 SHA1 (mysql-5.7.23.tar.gz) = 0c07dd1670f3749c482180227717738c031bb5b4
 RMD160 (mysql-5.7.23.tar.gz) = 20021aa73537f4630b72931925bec78c251b06e6
@@ -12,6 +12,8 @@ SHA1 (patch-cmake_boost.cmake) = e7f54245959154386634bf2412c890647fc1405e
 SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320
 SHA1 (patch-cmake_plugin.cmake) = 92267182d4ec559a312a5a38826b9047c99b122f
 SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
+SHA1 (patch-cmd-line-utils_libedit_chartype.h) = 6b1453df648001ed1fc81190106e15872a69a04c
+SHA1 (patch-cmd-line-utils_libedit_vi.c) = 7c5ce1d07f650815d028e435a59e5d078ec74c2f
 SHA1 (patch-include_CMakeLists.txt) = 944991702f046ea7a5e2b6ea4dc390f17426e55a
 SHA1 (patch-include_my__compare.h) = f45bac4b488332a668b0005751856279b67401f5
 SHA1 (patch-include_my__global.h) = 3870266cb1dd2cd0d58417dfe21bab19b62100e2
diff --git a/databases/mysql57-client/patches/patch-cmd-line-utils_libedit_chartype.h b/databases/mysql57-client/patches/patch-cmd-line-utils_libedit_chartype.h
new file mode 100644
index 00000000000..ed33e2daacd
--- /dev/null
+++ b/databases/mysql57-client/patches/patch-cmd-line-utils_libedit_chartype.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-cmd-line-utils_libedit_chartype.h,v 1.1.2.2 2018/10/29 18:31:33 spz Exp $
+
+Exclude DragonFly & OpenBSD
+
+--- cmd-line-utils/libedit/chartype.h.orig	2018-09-30 16:10:45.673504000 -0700
++++ cmd-line-utils/libedit/chartype.h	2018-09-30 16:12:19.519385000 -0700
+@@ -49,7 +49,8 @@
+   TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
+ #if !defined(__NetBSD__) && !defined(__sun) \
+   && !(defined(__APPLE__) && defined(__MACH__)) \
+-  && !defined(__FreeBSD__) && !defined(_AIX)
++  && !defined(__FreeBSD__) && !defined(_AIX) \
++  && !defined(__DragonFly__) && !defined(__OpenBSD__)
+ #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
diff --git a/databases/mysql57-client/patches/patch-cmd-line-utils_libedit_vi.c b/databases/mysql57-client/patches/patch-cmd-line-utils_libedit_vi.c
new file mode 100644
index 00000000000..c01ecd3f36c
--- /dev/null
+++ b/databases/mysql57-client/patches/patch-cmd-line-utils_libedit_vi.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-cmd-line-utils_libedit_vi.c,v 1.1.2.2 2018/10/29 18:31:33 spz Exp $
+
+DragonFly BSD build fix
+
+--- cmd-line-utils/libedit/vi.c.orig	2018-09-30 16:47:49.075991000 -0700
++++ cmd-line-utils/libedit/vi.c	2018-09-30 16:48:41.343701000 -0700
+@@ -919,7 +919,7 @@
+  * NB: posix implies that we should enter insert mode, however
+  * this is against historical precedent...
+  */
+-#if defined(__weak_reference) && !defined(__FreeBSD__)
++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
+ __weakref_visible char *my_get_alias_text(const char *)
+     __weak_reference(get_alias_text);
+ #endif
+@@ -928,7 +928,7 @@
+ vi_alias(EditLine *el __attribute__((__unused__)),
+ 	 Int c __attribute__((__unused__)))
+ {
+-#if defined(__weak_reference) && !defined(__FreeBSD__)
++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
+ 	char alias_name[3];
+ 	char *alias_text;
+