CVS commit: pkgsrc/databases

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May  6 08:41:57 UTC 2024

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*: Remove ncurses workarounds.

It's unclear what they were required for previously, but with the new
ncurses package they are now actively harmful, and removing them fixes
the build.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/mariadb1011-client/Makefile.common
cvs rdiff -u -r1.19 -r1.20 pkgsrc/databases/mariadb104-client/Makefile.common
cvs rdiff -u -r1.27 -r1.28 pkgsrc/databases/mariadb105-client/Makefile.common
cvs rdiff -u -r1.23 -r1.24 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.7 pkgsrc/databases/mariadb1011-client/Makefile.common:1.8
--- pkgsrc/databases/mariadb1011-client/Makefile.common:1.7     Mon May  6 08:27:50 2024
+++ pkgsrc/databases/mariadb1011-client/Makefile.common Mon May  6 08:41:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2024/05/06 08:27:50 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.8 2024/05/06 08:41:56 jperkin Exp $
 #
 # used by databases/mariadb1011-client/Makefile
 # used by databases/mariadb1011-server/Makefile
@@ -86,14 +86,6 @@ 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
-CMAKE_ARGS+=           -DCURSES_NEED_WIDE=ON
-CPPFLAGS+=             -DHAVE_CURSES_H
-.endif
-
 # We don't clone MariaDB from git, so avoid peeking into
 # the parent repository.
 CMAKE_ARGS+=           -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
@@ -129,6 +121,7 @@ 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.19 pkgsrc/databases/mariadb104-client/Makefile.common:1.20
--- pkgsrc/databases/mariadb104-client/Makefile.common:1.19     Mon May  6 08:27:50 2024
+++ pkgsrc/databases/mariadb104-client/Makefile.common  Mon May  6 08:41:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2024/05/06 08:27:50 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.20 2024/05/06 08:41:57 jperkin Exp $
 #
 # used by databases/mariadb104-client/Makefile
 # used by databases/mariadb104-server/Makefile
@@ -87,14 +87,6 @@ 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
-CMAKE_ARGS+=           -DCURSES_NEED_WIDE=ON
-CPPFLAGS+=             -DHAVE_CURSES_H
-.endif
-
 CFLAGS.SunOS+=         -fPIC
 
 REPLACE_PERL+=         scripts/mytop.sh
@@ -115,6 +107,7 @@ 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.27 pkgsrc/databases/mariadb105-client/Makefile.common:1.28
--- pkgsrc/databases/mariadb105-client/Makefile.common:1.27     Mon May  6 08:27:50 2024
+++ pkgsrc/databases/mariadb105-client/Makefile.common  Mon May  6 08:41:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2024/05/06 08:27:50 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.28 2024/05/06 08:41:57 jperkin Exp $
 #
 # used by databases/mariadb105-client/Makefile
 # used by databases/mariadb105-server/Makefile
@@ -86,14 +86,6 @@ 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
-CMAKE_ARGS+=           -DCURSES_NEED_WIDE=ON
-CPPFLAGS+=             -DHAVE_CURSES_H
-.endif
-
 CFLAGS.SunOS+=         -fPIC
 CFLAGS.NetBSD+=                -DIOAPI_NO_64
 
@@ -118,6 +110,7 @@ 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.23 pkgsrc/databases/mariadb106-client/Makefile.common:1.24
--- pkgsrc/databases/mariadb106-client/Makefile.common:1.23     Mon May  6 08:27:50 2024
+++ pkgsrc/databases/mariadb106-client/Makefile.common  Mon May  6 08:41:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2024/05/06 08:27:50 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.24 2024/05/06 08:41:57 jperkin Exp $
 #
 # used by databases/mariadb106-client/Makefile
 # used by databases/mariadb106-server/Makefile
@@ -84,14 +84,6 @@ 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
-CMAKE_ARGS+=           -DCURSES_NEED_WIDE=ON
-CPPFLAGS+=             -DHAVE_CURSES_H
-.endif
-
 # https://github.com/MariaDB/server/pull/2326
 # https://github.com/MariaDB/server/pull/2321
 CFLAGS.SunOS+=         -fPIC -DHAVE_ALLOCA_H=1
@@ -120,6 +112,7 @@ 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"