gnunet: fix mysql detection.

[nikita <nikita%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Fri Apr 8 12:36:06 2022 +0200
Changeset:	44975fccc11b26d6b22b163933f1ebf3f865a801

Modified Files:
	gnunet/distinfo
	gnunet/options.mk
Added Files:
	gnunet/patches/patch-configure

Log Message:
gnunet: fix mysql detection.

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

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

diffstat:
 gnunet/distinfo                |  1 +
 gnunet/options.mk              |  5 +++--
 gnunet/patches/patch-configure | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diffs:
diff --git a/gnunet/distinfo b/gnunet/distinfo
index bc8e89637a..c1b20671f7 100644
--- a/gnunet/distinfo
+++ b/gnunet/distinfo
@@ -3,4 +3,5 @@ $NetBSD$
 BLAKE2s (gnunet-0.16.3.tar.gz) = 693612916e9c777bffe64533cb54a0011279ccaedfbbf84c66bd6148bc29bdcb
 SHA512 (gnunet-0.16.3.tar.gz) = fad8fcdb4b8058f17aef13a6176d8f19ab88d77fc5fcc709a4bbda463b2217ed2342f3e858c634114b9e4cf8651082af19ca1d490b1dce5e4302c421e1f88664
 Size (gnunet-0.16.3.tar.gz) = 9392002 bytes
+SHA1 (patch-configure) = 98e52ee2ee281ec54392aef307c67091c0b94dbe
 SHA1 (patch-src_setu_gnunet-service-setu.c) = 2e6c8eb895544fe79e27edec85e37379ec9b3783
diff --git a/gnunet/options.mk b/gnunet/options.mk
index 81325c5c0f..d9f47de52d 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -81,8 +81,9 @@ CONFIGURE_ARGS+=	--without-sqlite3
 # checking for mysql version... < 4.1
 # mysql version >= 4.1 required. Will not use MySQL
 .if ${PKG_OPTIONS:Mmysql}
-.include "../../mk/mysql.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql}
+.include "../../databases/mysql80-client/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
+CONFIGURE_ENV+=		MYSQL_LIBDIR=${BUILDLINK_PREFIX.mysql-client}/lib
 PLIST_SRC+=		PLIST.mysql
 .else
 CONFIGURE_ARGS+=	--without-mysql
diff --git a/gnunet/patches/patch-configure b/gnunet/patches/patch-configure
new file mode 100644
index 0000000000..ff56f70678
--- /dev/null
+++ b/gnunet/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix mysql version detection.
+
+--- configure.orig	2022-04-08 12:31:53.471282883 +0200
++++ configure	2022-04-08 12:33:13.084608511 +0200
+@@ -25579,7 +25579,7 @@
+ $as_echo_n "checking for mysql version... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-include <mysql/mysql_version.h>
++#include <mysql/mysql_version.h>
+ int
+ main ()
+ {