CVS commit: pkgsrc/databases

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jul 23 09:29:52 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: Correct include order for broken curses detection workarounds.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mariadb1011-client/Makefile.common
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/mariadb104-client/Makefile.common
cvs rdiff -u -r1.22 -r1.23 pkgsrc/databases/mariadb105-client/Makefile.common
cvs rdiff -u -r1.18 -r1.19 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.2 pkgsrc/databases/mariadb1011-client/Makefile.common:1.3
--- pkgsrc/databases/mariadb1011-client/Makefile.common:1.2     Wed Jul 19 21:53:19 2023
+++ pkgsrc/databases/mariadb1011-client/Makefile.common Sun Jul 23 09:29:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2023/07/19 21:53:19 nia Exp $
+# $NetBSD: Makefile.common,v 1.3 2023/07/23 09:29:51 nia Exp $
 #
 # used by databases/mariadb1011-client/Makefile
 # used by databases/mariadb1011-server/Makefile
@@ -86,6 +86,12 @@ CMAKE_ARGS+=         -DENABLE_DTRACE=OFF
 CMAKE_ARGS+=           -DDTRACE_FLAGS="-${ABI}"
 .endif
 
+.include "../../mk/curses.buildlink3.mk"
+
+.if !empty(CURSES_TYPE:M*ncurses*)
+CMAKE_ARGS+=           -DCURSES_NEED_NCURSES=ON
+.endif
+
 .if !empty(CURSES_TYPE:M*ncursesw*)
 CMAKE_ARGS+=           -DCURSES_NEED_WIDE=ON
 .endif
@@ -94,7 +100,6 @@ CMAKE_ARGS+=         -DCURSES_NEED_WIDE=ON
 # the parent repository.
 CMAKE_ARGS+=           -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
 
-
 # https://github.com/MariaDB/server/pull/2326
 # https://github.com/MariaDB/server/pull/2321
 CFLAGS.SunOS+=         -fPIC -DHAVE_ALLOCA_H=1
@@ -126,7 +131,6 @@ PKGCONFIG_OVERRIDE+=        libmariadb/mariadb_
 .include "../../textproc/fmtlib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/atomic64.mk"
-.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 .include "../../mk/krb5.buildlink3.mk"

Index: pkgsrc/databases/mariadb104-client/Makefile.common
diff -u pkgsrc/databases/mariadb104-client/Makefile.common:1.16 pkgsrc/databases/mariadb104-client/Makefile.common:1.17
--- pkgsrc/databases/mariadb104-client/Makefile.common:1.16     Wed Jul 19 21:53:19 2023
+++ pkgsrc/databases/mariadb104-client/Makefile.common  Sun Jul 23 09:29:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2023/07/19 21:53:19 nia Exp $
+# $NetBSD: Makefile.common,v 1.17 2023/07/23 09:29:51 nia Exp $
 #
 # used by databases/mariadb104-client/Makefile
 # used by databases/mariadb104-server/Makefile
@@ -87,6 +87,12 @@ CMAKE_ARGS+=         -DTOKUDB_OK=OFF
 CMAKE_ARGS+=           -DDTRACE_FLAGS="-${ABI}"
 .endif
 
+.include "../../mk/curses.buildlink3.mk"
+
+.if !empty(CURSES_TYPE:M*ncurses*)
+CMAKE_ARGS+=           -DCURSES_NEED_NCURSES=ON
+.endif
+
 .if !empty(CURSES_TYPE:M*ncursesw*)
 CMAKE_ARGS+=           -DCURSES_NEED_WIDE=ON
 .endif
@@ -111,7 +117,6 @@ PKGCONFIG_OVERRIDE+=        libmariadb/mariadb_
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/atomic64.mk"
-.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 .include "../../mk/pam.buildlink3.mk"

Index: pkgsrc/databases/mariadb105-client/Makefile.common
diff -u pkgsrc/databases/mariadb105-client/Makefile.common:1.22 pkgsrc/databases/mariadb105-client/Makefile.common:1.23
--- pkgsrc/databases/mariadb105-client/Makefile.common:1.22     Wed Jul 19 21:53:19 2023
+++ pkgsrc/databases/mariadb105-client/Makefile.common  Sun Jul 23 09:29:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2023/07/19 21:53:19 nia Exp $
+# $NetBSD: Makefile.common,v 1.23 2023/07/23 09:29:51 nia Exp $
 #
 # used by databases/mariadb105-client/Makefile
 # used by databases/mariadb105-server/Makefile
@@ -86,6 +86,12 @@ CMAKE_ARGS+=         -DTOKUDB_OK=OFF
 CMAKE_ARGS+=           -DDTRACE_FLAGS="-${ABI}"
 .endif
 
+.include "../../mk/curses.buildlink3.mk"
+
+.if !empty(CURSES_TYPE:M*ncurses*)
+CMAKE_ARGS+=           -DCURSES_NEED_NCURSES=ON
+.endif
+
 .if !empty(CURSES_TYPE:M*ncursesw*)
 CMAKE_ARGS+=           -DCURSES_NEED_WIDE=ON
 .endif
@@ -114,7 +120,6 @@ PKGCONFIG_OVERRIDE+=        libmariadb/mariadb_
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/atomic64.mk"
-.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 .include "../../mk/krb5.buildlink3.mk"

Index: pkgsrc/databases/mariadb106-client/Makefile.common
diff -u pkgsrc/databases/mariadb106-client/Makefile.common:1.18 pkgsrc/databases/mariadb106-client/Makefile.common:1.19
--- pkgsrc/databases/mariadb106-client/Makefile.common:1.18     Wed Jul 19 21:53:19 2023
+++ pkgsrc/databases/mariadb106-client/Makefile.common  Sun Jul 23 09:29:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2023/07/19 21:53:19 nia Exp $
+# $NetBSD: Makefile.common,v 1.19 2023/07/23 09:29:52 nia Exp $
 #
 # used by databases/mariadb106-client/Makefile
 # used by databases/mariadb106-server/Makefile
@@ -84,6 +84,12 @@ CMAKE_ARGS+=         -DENABLE_DTRACE=OFF
 CMAKE_ARGS+=           -DDTRACE_FLAGS="-${ABI}"
 .endif
 
+.include "../../mk/curses.buildlink3.mk"
+
+.if !empty(CURSES_TYPE:M*ncurses*)
+CMAKE_ARGS+=           -DCURSES_NEED_NCURSES=ON
+.endif
+
 .if !empty(CURSES_TYPE:M*ncursesw*)
 CMAKE_ARGS+=           -DCURSES_NEED_WIDE=ON
 .endif
@@ -116,7 +122,6 @@ PKGCONFIG_OVERRIDE+=        libmariadb/mariadb_
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/atomic64.mk"
-.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 .include "../../mk/krb5.buildlink3.mk"