CVS commit: pkgsrc/databases/mariadb105-client

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Aug 12 10:50:20 UTC 2021

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

Log Message:
mariadb105-client: install missing scripts, PR pkg/56317

Matches later MariaDB versions.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mariadb105-client/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb105-client/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/mariadb105-client/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/mariadb105-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/mariadb105-client/Makefile
diff -u pkgsrc/databases/mariadb105-client/Makefile:1.4 pkgsrc/databases/mariadb105-client/Makefile:1.5
--- pkgsrc/databases/mariadb105-client/Makefile:1.4     Sat Jul 24 10:10:03 2021
+++ pkgsrc/databases/mariadb105-client/Makefile Thu Aug 12 10:50:19 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2021/07/24 10:10:03 nia Exp $
+# $NetBSD: Makefile,v 1.5 2021/08/12 10:50:19 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
+PKGREVISION=   1
 COMMENT=       MariaDB 10.5, a free MySQL compatible database (client)
 
 CONFLICTS=     mysql-client-[0-9]*

Index: pkgsrc/databases/mariadb105-client/PLIST
diff -u pkgsrc/databases/mariadb105-client/PLIST:1.1 pkgsrc/databases/mariadb105-client/PLIST:1.2
--- pkgsrc/databases/mariadb105-client/PLIST:1.1        Sun May 23 15:32:47 2021
+++ pkgsrc/databases/mariadb105-client/PLIST    Thu Aug 12 10:50:19 2021
@@ -1,14 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1 2021/05/23 15:32:47 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/08/12 10:50:19 nia Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
 bin/mariadb-binlog
 bin/mariadb-check
 bin/mariadb-conv
+bin/mariadb-convert-table-format
 bin/mariadb-dump
 bin/mariadb-find-rows
 bin/mariadb-import
 bin/mariadb-plugin
+bin/mariadb-secure-installation
+bin/mariadb-setpermission
 bin/mariadb-show
 bin/mariadb-slap
 bin/mariadb-test

Index: pkgsrc/databases/mariadb105-client/distinfo
diff -u pkgsrc/databases/mariadb105-client/distinfo:1.6 pkgsrc/databases/mariadb105-client/distinfo:1.7
--- pkgsrc/databases/mariadb105-client/distinfo:1.6     Sat Aug  7 09:24:07 2021
+++ pkgsrc/databases/mariadb105-client/distinfo Thu Aug 12 10:50:19 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2021/08/07 09:24:07 nia Exp $
+$NetBSD: distinfo,v 1.7 2021/08/12 10:50:19 nia Exp $
 
 SHA1 (mariadb-10.5.12.tar.gz) = 0e2ca328fdd2821c7a4400f7759cd6882a2c5840
 RMD160 (mariadb-10.5.12.tar.gz) = cfac6715b84ce1ed8e073fefad90c47875a0346b
@@ -13,7 +13,7 @@ SHA1 (patch-mysys_my__context.c) = f9c7e
 SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = 033f01c64014c0e61bc635d5fbe686f7a4b7f317
 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = 00cfaf5826cc97084bc77033985e6686e1ce1628
 SHA1 (patch-plugin_auth__socket_auth__socket.c) = 850e94faff382a7e962f6d4d6ff960ddddc624c4
-SHA1 (patch-scripts_CMakeLists.txt) = b11f36e845716fccd455832b648f20413cd9de1f
+SHA1 (patch-scripts_CMakeLists.txt) = bc55b8de1eb44e5516eed9ce4b5b1d0cc1a8f0af
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
 SHA1 (patch-sql_mysqld.cc) = 19d325124cde1b45376c9710cdd104dc460f4bea
 SHA1 (patch-storage_connect_ioapi.c) = 804e2d9d3722fbe4d5ed773cc98a4114fe4cf8a3

Index: pkgsrc/databases/mariadb105-client/patches/patch-scripts_CMakeLists.txt
diff -u pkgsrc/databases/mariadb105-client/patches/patch-scripts_CMakeLists.txt:1.1 pkgsrc/databases/mariadb105-client/patches/patch-scripts_CMakeLists.txt:1.2
--- pkgsrc/databases/mariadb105-client/patches/patch-scripts_CMakeLists.txt:1.1 Sun May 23 15:32:47 2021
+++ pkgsrc/databases/mariadb105-client/patches/patch-scripts_CMakeLists.txt     Thu Aug 12 10:50:20 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-scripts_CMakeLists.txt,v 1.1 2021/05/23 15:32:47 nia Exp $
+$NetBSD: patch-scripts_CMakeLists.txt,v 1.2 2021/08/12 10:50:20 nia Exp $
 
 Allow building a server-only configuration.
 
---- scripts/CMakeLists.txt.orig        2021-05-05 21:00:19.000000000 +0000
+--- scripts/CMakeLists.txt.orig        2021-08-03 08:29:08.000000000 +0000
 +++ scripts/CMakeLists.txt
 @@ -208,7 +208,7 @@ SET(pkgdata_locations "$basedir/${INSTAL
  # install mysql_install_db.sh at this point since it needs
@@ -13,7 +13,18 @@ Allow building a server-only configurati
    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
      ${CMAKE_CURRENT_BINARY_DIR}/mariadb-install-db ESCAPE_QUOTES @ONLY)
    EXECUTE_PROCESS(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/mariadb-install-db)
-@@ -314,21 +314,21 @@ ELSE()
+@@ -251,7 +251,10 @@ ENDIF()
+ 
+ SET(mysql_config_COMPONENT Development)
+ SET(msql2mysql_COMPONENT Client)
++SET(mariadb-setpermission_COMPONENT Client)
++SET(mariadb-secure-installation_COMPONENT Client)
+ SET(mariadb-access_COMPONENT Client)
++SET(mariadb-convert-table-format_COMPONENT Client)
+ SET(mariadb-find-rows_COMPONENT Client)
+ SET(mytop_COMPONENT Mytop)
+ 
+@@ -314,21 +317,21 @@ ELSE()
        mariadbd-safe
        mariadb-dumpslow
      )