switch mysql80-* to bundled boost library instead of pkgsrc one

[Jaromir Dolecek <jdolecek%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jaromir Dolecek <jdolecek%NetBSD.org@localhost>
Pushed By:	jdolecek
Date:		Thu May 13 16:52:34 2021 +0200
Changeset:	d5c77592057ae32e866c21ca35374a7bdf01beca

Modified Files:
	mysql80-client/Makefile.common
	mysql80-client/TODO
	mysql80-client/distinfo
Removed Files:
	mysql80-client/patches/patch-storage_ndb_include_ndb__global.h

Log Message:
switch mysql80-* to bundled boost library instead of pkgsrc one

this avoids forcing dependency on old version of boost - now the package
can be built and works on system with installed boost 1.76

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

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

diffstat:
 mysql80-client/Makefile.common                          |  6 ++----
 mysql80-client/TODO                                     |  3 ---
 mysql80-client/distinfo                                 |  8 ++++----
 .../patches/patch-storage_ndb_include_ndb__global.h     | 17 -----------------
 4 files changed, 6 insertions(+), 28 deletions(-)

diffs:
diff --git a/mysql80-client/Makefile.common b/mysql80-client/Makefile.common
index be46a72762..b340264959 100644
--- a/mysql80-client/Makefile.common
+++ b/mysql80-client/Makefile.common
@@ -6,6 +6,7 @@
 DISTNAME=	mysql-8.0.24
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-8.0/}
+DISTFILES=	mysql-boost-${PKGVERSION_NOREV}${EXTRACT_SUFX}
 
 MAINTAINER?=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://www.mysql.com/
@@ -16,8 +17,6 @@ PATCHDIR?=	${.CURDIR}/../../wip/mysql80-client/patches
 MESSAGE_SRC+=	${.CURDIR}/../../databases/mariadb104-client/MESSAGE
 
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.11
-# XXX requires boost-lib 1.73, doesn't compile with 1.76
-BUILDLINK_API_DEPENDS.boost-libs+=      boost-libs-1.73.*
 
 USE_CMAKE=		yes
 USE_LANGUAGES=		c c++ c++14 # 1.75+ boost requires c++14
@@ -68,7 +67,7 @@ CMAKE_ARGS+=		-DMYSQL_DATADIR=${MYSQL_DATADIR}
 
 CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
 
-CMAKE_ARGS+=		-DWITH_BOOST="system"
+CMAKE_ARGS+=		-DWITH_BOOST="${WRKSRC}/boost"
 CMAKE_ARGS+=		-DWITH_ICU="system"
 CMAKE_ARGS+=		-DWITH_LIBEVENT="system"
 CMAKE_ARGS+=		-DWITH_LZ4="system"
@@ -138,7 +137,6 @@ post-patch:
 .include "../../mk/curses.buildlink3.mk"
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/editline/buildlink3.mk"
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/mysql80-client/TODO b/mysql80-client/TODO
index 104168db8b..ea4e89614d 100644
--- a/mysql80-client/TODO
+++ b/mysql80-client/TODO
@@ -1,4 +1 @@
 perhaps implement thread affinity for netbsd and irix
-
-server:
-requires boost-lib 1.73, doesn't compile with 1.76.0
diff --git a/mysql80-client/distinfo b/mysql80-client/distinfo
index 336e028987..4a2af5f304 100644
--- a/mysql80-client/distinfo
+++ b/mysql80-client/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.35 2019/12/06 14:05:11 jperkin Exp $
 
-SHA1 (mysql-8.0.24.tar.gz) = ad9789c74d08092a5cf95de56de2dd1947e8d873
-RMD160 (mysql-8.0.24.tar.gz) = 6472fe5880efc656f90367bef12ecd3a24ae6923
-SHA512 (mysql-8.0.24.tar.gz) = 7bf1143c7e48d6541e78f1a92138f9dc64f43243cb28975aa7ad4b8ac2c9dea2b664261bc2726fd5bddec294f879f7ac517a3a62c8f1c39ec37fe39ec51e5f48
-Size (mysql-8.0.24.tar.gz) = 283589702 bytes
+SHA1 (mysql-boost-8.0.24.tar.gz) = e640d9851c1721a0550bdca38f03cb8681d61862
+RMD160 (mysql-boost-8.0.24.tar.gz) = 2577eb94d5b8651f3520706be9c40c3e924980d4
+SHA512 (mysql-boost-8.0.24.tar.gz) = ad8510614251c056f0963f8e51b9ed5e75452ccbf2728254d662fcc3a7ee1bdc177d1d34e958ddc31c7e6b5b3af9377ef2d9cbdc0353676b3026619673447deb
+Size (mysql-boost-8.0.24.tar.gz) = 290263082 bytes
 SHA1 (patch-CMakeLists.txt) = 16ca9bcbcaefdc8bd1bc0e8dc89ca7a347d14675
 SHA1 (patch-client_CMakeLists.txt) = f96d0d2e5ad8c1c8f5d6a9eabbd1c706bee852c0
 SHA1 (patch-client_mysqladmin.cc) = e3459bd009ef7ac0b7acece6bbcb82777a384db3
diff --git a/mysql80-client/patches/patch-storage_ndb_include_ndb__global.h b/mysql80-client/patches/patch-storage_ndb_include_ndb__global.h
deleted file mode 100644
index 188cb13082..0000000000
--- a/mysql80-client/patches/patch-storage_ndb_include_ndb__global.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* bstring.h is needed for bzero on some platforms
-
---- storage/ndb/include/ndb_global.h.orig	2020-01-21 17:16:34.989126305 +0000
-+++ storage/ndb/include/ndb_global.h
-@@ -126,6 +126,10 @@
- #include <strings.h>
- #endif
- 
-+#ifdef HAVE_BSTRING_H
-+#include <bstring.h>  // defines bzero on some platforms
-+#endif
-+
- #if !defined(bzero) && !defined(HAVE_BZERO)
- #define bzero(A,B) memset((A),0,(B))
- #endif