CVS commit: pkgsrc/databases

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jul 19 21:53:19 UTC 2023

Modified Files:
        pkgsrc/databases/mariadb1011-client: Makefile.common
        pkgsrc/databases/mariadb104-client: Makefile.common
        pkgsrc/databases/mariadb105-client: Makefile.common
        pkgsrc/databases/mariadb106-client: Makefile.common

Log Message:
mariadb*-client: Ensure the wide ncurses library is picked if the user chose it


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb1011-client/Makefile.common
cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/mariadb104-client/Makefile.common
cvs rdiff -u -r1.21 -r1.22 pkgsrc/databases/mariadb105-client/Makefile.common
cvs rdiff -u -r1.17 -r1.18 pkgsrc/databases/mariadb106-client/Makefile.common

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

Modified files:

Index: pkgsrc/databases/mariadb1011-client/Makefile.common
diff -u pkgsrc/databases/mariadb1011-client/Makefile.common:1.1 pkgsrc/databases/mariadb1011-client/Makefile.common:1.2
--- pkgsrc/databases/mariadb1011-client/Makefile.common:1.1     Mon Jul 10 22:55:49 2023
+++ pkgsrc/databases/mariadb1011-client/Makefile.common Wed Jul 19 21:53:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2023/07/10 22:55:49 nia Exp $
+# $NetBSD: Makefile.common,v 1.2 2023/07/19 21:53:19 nia Exp $
 #
 # used by databases/mariadb1011-client/Makefile
 # used by databases/mariadb1011-server/Makefile
@@ -86,6 +86,10 @@ CMAKE_ARGS+=         -DENABLE_DTRACE=OFF
 CMAKE_ARGS+=           -DDTRACE_FLAGS="-${ABI}"
 .endif
 
+.if !empty(CURSES_TYPE:M*ncursesw*)
+CMAKE_ARGS+=           -DCURSES_NEED_WIDE=ON
+.endif
+
 # We don't clone MariaDB from git, so avoid peeking into
 # the parent repository.
 CMAKE_ARGS+=           -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON

Index: pkgsrc/databases/mariadb104-client/Makefile.common
diff -u pkgsrc/databases/mariadb104-client/Makefile.common:1.15 pkgsrc/databases/mariadb104-client/Makefile.common:1.16
--- pkgsrc/databases/mariadb104-client/Makefile.common:1.15     Sat Apr 23 22:52:46 2022
+++ pkgsrc/databases/mariadb104-client/Makefile.common  Wed Jul 19 21:53:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2022/04/23 22:52:46 tnn Exp $
+# $NetBSD: Makefile.common,v 1.16 2023/07/19 21:53:19 nia Exp $
 #
 # used by databases/mariadb104-client/Makefile
 # used by databases/mariadb104-server/Makefile
@@ -87,6 +87,10 @@ CMAKE_ARGS+=         -DTOKUDB_OK=OFF
 CMAKE_ARGS+=           -DDTRACE_FLAGS="-${ABI}"
 .endif
 
+.if !empty(CURSES_TYPE:M*ncursesw*)
+CMAKE_ARGS+=           -DCURSES_NEED_WIDE=ON
+.endif
+
 CFLAGS.SunOS+=         -fPIC
 
 REPLACE_PERL+=         scripts/mytop.sh

Index: pkgsrc/databases/mariadb105-client/Makefile.common
diff -u pkgsrc/databases/mariadb105-client/Makefile.common:1.21 pkgsrc/databases/mariadb105-client/Makefile.common:1.22
--- pkgsrc/databases/mariadb105-client/Makefile.common:1.21     Sat Jul  1 16:02:04 2023
+++ pkgsrc/databases/mariadb105-client/Makefile.common  Wed Jul 19 21:53:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2023/07/01 16:02:04 nia Exp $
+# $NetBSD: Makefile.common,v 1.22 2023/07/19 21:53:19 nia Exp $
 #
 # used by databases/mariadb105-client/Makefile
 # used by databases/mariadb105-server/Makefile
@@ -86,6 +86,10 @@ CMAKE_ARGS+=         -DTOKUDB_OK=OFF
 CMAKE_ARGS+=           -DDTRACE_FLAGS="-${ABI}"
 .endif
 
+.if !empty(CURSES_TYPE:M*ncursesw*)
+CMAKE_ARGS+=           -DCURSES_NEED_WIDE=ON
+.endif
+
 CFLAGS.SunOS+=         -fPIC
 CFLAGS.NetBSD+=                -DIOAPI_NO_64
 

Index: pkgsrc/databases/mariadb106-client/Makefile.common
diff -u pkgsrc/databases/mariadb106-client/Makefile.common:1.17 pkgsrc/databases/mariadb106-client/Makefile.common:1.18
--- pkgsrc/databases/mariadb106-client/Makefile.common:1.17     Sat Jul  1 13:56:17 2023
+++ pkgsrc/databases/mariadb106-client/Makefile.common  Wed Jul 19 21:53:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2023/07/01 13:56:17 nia Exp $
+# $NetBSD: Makefile.common,v 1.18 2023/07/19 21:53:19 nia Exp $
 #
 # used by databases/mariadb106-client/Makefile
 # used by databases/mariadb106-server/Makefile
@@ -84,6 +84,10 @@ CMAKE_ARGS+=         -DENABLE_DTRACE=OFF
 CMAKE_ARGS+=           -DDTRACE_FLAGS="-${ABI}"
 .endif
 
+.if !empty(CURSES_TYPE:M*ncursesw*)
+CMAKE_ARGS+=           -DCURSES_NEED_WIDE=ON
+.endif
+
 # https://github.com/MariaDB/server/pull/2326
 # https://github.com/MariaDB/server/pull/2321
 CFLAGS.SunOS+=         -fPIC -DHAVE_ALLOCA_H=1