[pkgsrc/trunk]: pkgsrc/databases/mariadb104-client mariadb104-client: ensure ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2fc0cac03686
branches:  trunk
changeset: 452518:2fc0cac03686
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed May 12 11:20:29 2021 +0000

description:
mariadb104-client: ensure mysql_upgrade gets installed

pointed out by abs

diffstat:

 databases/mariadb104-client/Makefile                            |   4 +-
 databases/mariadb104-client/PLIST                               |   4 +-
 databases/mariadb104-client/distinfo                            |   3 +-
 databases/mariadb104-client/patches/patch-client_CMakeLists.txt |  16 ++++++++++
 4 files changed, 23 insertions(+), 4 deletions(-)

diffs (74 lines):

diff -r 218b31209816 -r 2fc0cac03686 databases/mariadb104-client/Makefile
--- a/databases/mariadb104-client/Makefile      Wed May 12 10:14:24 2021 +0000
+++ b/databases/mariadb104-client/Makefile      Wed May 12 11:20:29 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2021/05/10 14:15:55 nia Exp $
+# $NetBSD: Makefile,v 1.3 2021/05/12 11:20:29 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       MariaDB 10.4, a free SQL database (client)
 
 CONFLICTS=     mysql-client-[0-9]*
diff -r 218b31209816 -r 2fc0cac03686 databases/mariadb104-client/PLIST
--- a/databases/mariadb104-client/PLIST Wed May 12 10:14:24 2021 +0000
+++ b/databases/mariadb104-client/PLIST Wed May 12 11:20:29 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/05/08 19:47:16 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/05/12 11:20:29 nia Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -11,12 +11,14 @@
 bin/mariadb-show
 bin/mariadb-slap
 bin/mariadb-test
+bin/mariadb-upgrade
 bin/mariadb_config
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
 bin/mysql_find_rows
 bin/mysql_plugin
+bin/mysql_upgrade
 bin/mysqlaccess
 bin/mysqladmin
 bin/mysqlbinlog
diff -r 218b31209816 -r 2fc0cac03686 databases/mariadb104-client/distinfo
--- a/databases/mariadb104-client/distinfo      Wed May 12 10:14:24 2021 +0000
+++ b/databases/mariadb104-client/distinfo      Wed May 12 11:20:29 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2021/05/08 19:47:16 jdolecek Exp $
+$NetBSD: distinfo,v 1.2 2021/05/12 11:20:29 nia Exp $
 
 SHA1 (mariadb-10.4.18.tar.gz) = 82454d8f04c8728ba9df3cefd25747da7dfc25bb
 RMD160 (mariadb-10.4.18.tar.gz) = b60d4820bab723851510e873daef8dae42b120bd
@@ -6,6 +6,7 @@
 Size (mariadb-10.4.18.tar.gz) = 81733656 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = 9d11b3d80b4b32558cd284de060975791708f0fc
+SHA1 (patch-client_CMakeLists.txt) = 54a2b8797c133417de572cd8d9930d6934a5c937
 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
 SHA1 (patch-libmariadb_cmake_ConnectorName.cmake) = 57f891c4bd035afb4aa0b03c269ce859456e9f46
diff -r 218b31209816 -r 2fc0cac03686 databases/mariadb104-client/patches/patch-client_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mariadb104-client/patches/patch-client_CMakeLists.txt   Wed May 12 11:20:29 2021 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-client_CMakeLists.txt,v 1.1 2021/05/12 11:20:29 nia Exp $
+
+Ensure that mysql_upgrade gets installed in a client-only build, where
+its man page is also installed.
+
+--- client/CMakeLists.txt.orig 2021-02-18 23:22:28.000000000 +0000
++++ client/CMakeLists.txt
+@@ -60,7 +60,7 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim
+ SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
+ TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB})
+ 
+-MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
++MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
+ TARGET_LINK_LIBRARIES(mysql_upgrade ${CLIENT_LIB})
+ ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
+