CVS commit: pkgsrc/databases/mysql80-client

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun May 28 16:44:25 UTC 2023

Modified Files:
        pkgsrc/databases/mysql80-client: Makefile distinfo
        pkgsrc/databases/mysql80-client/patches: patch-scripts_CMakeLists.txt

Log Message:
mysql-client: fix zlib library name in pkg-config file

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/mysql80-client/Makefile \
    pkgsrc/databases/mysql80-client/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/mysql80-client/patches/patch-scripts_CMakeLists.txt

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

Modified files:

Index: pkgsrc/databases/mysql80-client/Makefile
diff -u pkgsrc/databases/mysql80-client/Makefile:1.10 pkgsrc/databases/mysql80-client/Makefile:1.11
--- pkgsrc/databases/mysql80-client/Makefile:1.10       Tue May 23 21:01:11 2023
+++ pkgsrc/databases/mysql80-client/Makefile    Sun May 28 16:44:25 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2023/05/23 21:01:11 adam Exp $
+# $NetBSD: Makefile,v 1.11 2023/05/28 16:44:25 wiz Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
+PKGREVISION=   1
 COMMENT=       MySQL 8, a free SQL database (client)
 
 CONFLICTS=     mysql3-client-[0-9]* mariadb-client-[0-9]*
Index: pkgsrc/databases/mysql80-client/distinfo
diff -u pkgsrc/databases/mysql80-client/distinfo:1.10 pkgsrc/databases/mysql80-client/distinfo:1.11
--- pkgsrc/databases/mysql80-client/distinfo:1.10       Fri May 26 11:13:52 2023
+++ pkgsrc/databases/mysql80-client/distinfo    Sun May 28 16:44:25 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2023/05/26 11:13:52 jperkin Exp $
+$NetBSD: distinfo,v 1.11 2023/05/28 16:44:25 wiz Exp $
 
 BLAKE2s (mysql-boost-8.0.33.tar.gz) = 6b64fb998afe1854c6a9168b82a11e4254d30d439d4730914863e86ea4ff9071
 SHA512 (mysql-boost-8.0.33.tar.gz) = 47f76819004c7c545d1b0b6b6646d8816899976f92d35c5564b1255b144b597ff7d3e674c721a45bcbb13cc0da3f4474fb29221c0e21d2ff91a1892cd42c636c
@@ -28,7 +28,7 @@ SHA1 (patch-router_src_harness_include_m
 SHA1 (patch-router_src_harness_include_mysql_harness_net_ts_local.h) = d2149f9840dc8b65a4d9d8332bcd5088b4f9b919
 SHA1 (patch-router_src_harness_include_mysql_harness_tty.h) = ca883b2ed83b623922b58cf96f896de9847d37cb
 SHA1 (patch-router_src_harness_src_stdx_io_file_handle.cc) = 5349b05663179e4ef049cfb1532514e48a3885c9
-SHA1 (patch-scripts_CMakeLists.txt) = 15be14619275f0dc39c216901b2cabc6ee517300
+SHA1 (patch-scripts_CMakeLists.txt) = d60000b5213d70b42c61a704c4f36581588f5c84
 SHA1 (patch-scripts_mysqld_safe.sh) = 3d10c84e6fef391b5e7cd9a3ed0223bd8b18c42e
 SHA1 (patch-sql_CMakeLists.txt) = 94809ea12966392b9ea317da42f2b84219d36cc0
 SHA1 (patch-sql_conn__handler_socket__connection.cc) = 91f2f707576618396579809b83f931e51385d2a2

Index: pkgsrc/databases/mysql80-client/patches/patch-scripts_CMakeLists.txt
diff -u pkgsrc/databases/mysql80-client/patches/patch-scripts_CMakeLists.txt:1.1 pkgsrc/databases/mysql80-client/patches/patch-scripts_CMakeLists.txt:1.2
--- pkgsrc/databases/mysql80-client/patches/patch-scripts_CMakeLists.txt:1.1    Thu May 13 15:25:20 2021
+++ pkgsrc/databases/mysql80-client/patches/patch-scripts_CMakeLists.txt        Sun May 28 16:44:25 2023
@@ -1,10 +1,21 @@
-$NetBSD: patch-scripts_CMakeLists.txt,v 1.1 2021/05/13 15:25:20 jdolecek Exp $
+$NetBSD: patch-scripts_CMakeLists.txt,v 1.2 2023/05/28 16:44:25 wiz Exp $
 
 Split configuration between mysql-client and mysql-server.
 
---- scripts/CMakeLists.txt.orig        2021-03-22 08:44:50.000000000 +0000
+--- scripts/CMakeLists.txt.orig        2023-03-16 17:22:37.000000000 +0000
 +++ scripts/CMakeLists.txt
-@@ -398,7 +398,7 @@ ELSE()
+@@ -315,6 +315,10 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+     FOREACH(lib ${TARGET_LIB_DEPENDS})
+       IF (lib MATCHES "^\\-l")
+         SET(${var} "${${var}} ${lib} ")
++      ELSEIF (lib MATCHES "^ext::zlib")
++        STRING(REGEX MATCH "ext::([a-z]+)" MATCH_LIB "${lib}")
++        SET(SYSTEM_LIB z)
++        SET(${var} "${${var}} -lz ")
+       ELSEIF (lib MATCHES "^ext::")
+         STRING(REGEX MATCH "ext::([a-z]+)" MATCH_LIB "${lib}")
+         SET(SYSTEM_LIB ${CMAKE_MATCH_1})
+@@ -409,7 +413,7 @@ ELSE()
      ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
      ESCAPE_QUOTES @ONLY)
  
@@ -13,7 +24,7 @@ Split configuration between mysql-client
      MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
      INSTALL(FILES
        ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
-@@ -411,19 +411,24 @@ ELSE()
+@@ -422,19 +426,24 @@ ELSE()
    # mysqld_safe used in mtr even for systemd platforms
    IF(WITH_SYSTEMD)
      SET(BIN_SCRIPTS