mariadb104: Modify for kqueue changes in NetBSD-current

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Mon Mar 30 15:43:51 2020 +0100
Changeset:	84e0730cd32216e62876d8a5505cd5937040bd58

Modified Files:
	mariadb104-client/distinfo
Added Files:
	mariadb104-client/patches/patch-sql_threadpool__generic.cc

Log Message:
mariadb104: Modify for kqueue changes in NetBSD-current

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=84e0730cd32216e62876d8a5505cd5937040bd58

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mariadb104-client/distinfo                         |  1 +
 .../patches/patch-sql_threadpool__generic.cc       | 31 ++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diffs:
diff --git a/mariadb104-client/distinfo b/mariadb104-client/distinfo
index 1d6b334087..2548c53cb7 100644
--- a/mariadb104-client/distinfo
+++ b/mariadb104-client/distinfo
@@ -12,6 +12,7 @@ SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66
 SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = b941343898ddc175818b161021fb7fccccee3e28
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
 SHA1 (patch-sql_mysqld.cc) = 21f9ea79ca90a78f18598d55f209a1835b95858f
+SHA1 (patch-sql_threadpool__generic.cc) = 73df368457a2e88f3cc3221031e565c4208b87ab
 SHA1 (patch-storage_connect_tabvct.cpp) = 2e3c7cd7e4b0a86d443da47d3cc514b8b276d836
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.h) = d790c092d7d35d014c5ef209635c18614c3a8301
diff --git a/mariadb104-client/patches/patch-sql_threadpool__generic.cc b/mariadb104-client/patches/patch-sql_threadpool__generic.cc
new file mode 100644
index 0000000000..c6cc7c3cd3
--- /dev/null
+++ b/mariadb104-client/patches/patch-sql_threadpool__generic.cc
@@ -0,0 +1,31 @@
+$NetBSD$
+
+Deal with NetBSD kqueue changes.
+
+--- sql/threadpool_generic.cc.orig	2020-01-26 20:43:53.000000000 +0000
++++ sql/threadpool_generic.cc
+@@ -52,6 +52,9 @@ typedef int TP_file_handle;
+ #include <sys/epoll.h>
+ typedef struct epoll_event native_event;
+ #elif defined(HAVE_KQUEUE)
++#ifdef __NetBSD__
++#include <sys/param.h>
++#endif
+ #include <sys/event.h>
+ typedef struct kevent native_event;
+ #elif defined (__sun)
+@@ -343,12 +346,12 @@ static void *native_event_get_userdata(n
+ #elif defined(HAVE_KQUEUE)
+ 
+ /* 
+-  NetBSD is incompatible with other BSDs , last parameter in EV_SET macro
++  NetBSD<=9 is incompatible with other BSDs , last parameter in EV_SET macro
+   (udata, user data) needs to be intptr_t, whereas it needs to be void* 
+   everywhere else.
+ */
+ 
+-#ifdef __NetBSD__
++#if defined(__NetBSD__) && __NetBSD_Version__ < 999001500
+ #define MY_EV_SET(a, b, c, d, e, f, g) EV_SET(a, b, c, d, e, f, (intptr_t)g)
+ #else
+ #define MY_EV_SET(a, b, c, d, e, f, g) EV_SET(a, b, c, d, e, f, g)