CVS commit: pkgsrc/databases

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed May 15 19:21:43 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*: Restore part of curses handling.

Add a comment to explain why this specifically is required.  It was the
other lines that were causing breakage.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
    pkgsrc/databases/mariadb1011-client/Makefile.common
cvs rdiff -u -r1.20 -r1.21 pkgsrc/databases/mariadb104-client/Makefile.common
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/mariadb105-client/Makefile.common
cvs rdiff -u -r1.25 -r1.26 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.10 pkgsrc/databases/mariadb1011-client/Makefile.common:1.11
--- pkgsrc/databases/mariadb1011-client/Makefile.common:1.10    Wed May 15 15:59:55 2024
+++ pkgsrc/databases/mariadb1011-client/Makefile.common Wed May 15 19:21:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2024/05/15 15:59:55 nia Exp $
+# $NetBSD: Makefile.common,v 1.11 2024/05/15 19:21:42 jperkin Exp $
 #
 # used by databases/mariadb1011-client/Makefile
 # used by databases/mariadb1011-server/Makefile
@@ -116,6 +116,14 @@ CHECK_PORTABILITY_SKIP+=   BUILD/compile-p
 PKGCONFIG_OVERRIDE+=   support-files/mariadb.pc.in
 PKGCONFIG_OVERRIDE+=   libmariadb/mariadb_config/libmariadb.pc.in
 
+.include "../../mk/curses.buildlink3.mk"
+
+# cmake probes for curses.h but then never passes on HAVE_CURSES_H if it is
+# found, which breaks the logic in client/mysql.cc
+.if ${CURSES_TYPE} == "ncurses"
+CPPFLAGS+=     -DHAVE_CURSES_H
+.endif
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
@@ -124,7 +132,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.20 pkgsrc/databases/mariadb104-client/Makefile.common:1.21
--- pkgsrc/databases/mariadb104-client/Makefile.common:1.20     Mon May  6 08:41:57 2024
+++ pkgsrc/databases/mariadb104-client/Makefile.common  Wed May 15 19:21:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2024/05/06 08:41:57 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.21 2024/05/15 19:21:43 jperkin Exp $
 #
 # used by databases/mariadb104-client/Makefile
 # used by databases/mariadb104-server/Makefile
@@ -104,10 +104,17 @@ CHECK_PORTABILITY_SKIP+=  BUILD/compile-p
 PKGCONFIG_OVERRIDE+=   support-files/mariadb.pc.in
 PKGCONFIG_OVERRIDE+=   libmariadb/mariadb_config/libmariadb.pc.in
 
+.include "../../mk/curses.buildlink3.mk"
+
+# cmake probes for curses.h but then never passes on HAVE_CURSES_H if it is
+# found, which breaks the logic in client/mysql.cc
+.if ${CURSES_TYPE} == "ncurses"
+CPPFLAGS+=     -DHAVE_CURSES_H
+.endif
+
 .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.29 pkgsrc/databases/mariadb105-client/Makefile.common:1.30
--- pkgsrc/databases/mariadb105-client/Makefile.common:1.29     Wed May 15 15:59:55 2024
+++ pkgsrc/databases/mariadb105-client/Makefile.common  Wed May 15 19:21:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2024/05/15 15:59:55 nia Exp $
+# $NetBSD: Makefile.common,v 1.30 2024/05/15 19:21:43 jperkin Exp $
 #
 # used by databases/mariadb105-client/Makefile
 # used by databases/mariadb105-server/Makefile
@@ -108,11 +108,18 @@ CHECK_PORTABILITY_SKIP+=  BUILD/compile-p
 PKGCONFIG_OVERRIDE+=   support-files/mariadb.pc.in
 PKGCONFIG_OVERRIDE+=   libmariadb/mariadb_config/libmariadb.pc.in
 
+.include "../../mk/curses.buildlink3.mk"
+
+# cmake probes for curses.h but then never passes on HAVE_CURSES_H if it is
+# found, which breaks the logic in client/mysql.cc
+.if ${CURSES_TYPE} == "ncurses"
+CPPFLAGS+=     -DHAVE_CURSES_H
+.endif
+
 .include "../../devel/pcre2/buildlink3.mk"
 .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.25 pkgsrc/databases/mariadb106-client/Makefile.common:1.26
--- pkgsrc/databases/mariadb106-client/Makefile.common:1.25     Wed May 15 15:59:55 2024
+++ pkgsrc/databases/mariadb106-client/Makefile.common  Wed May 15 19:21:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2024/05/15 15:59:55 nia Exp $
+# $NetBSD: Makefile.common,v 1.26 2024/05/15 19:21:43 jperkin Exp $
 #
 # used by databases/mariadb106-client/Makefile
 # used by databases/mariadb106-server/Makefile
@@ -109,12 +109,19 @@ CHECK_PORTABILITY_SKIP+=  BUILD/compile-p
 PKGCONFIG_OVERRIDE+=   support-files/mariadb.pc.in
 PKGCONFIG_OVERRIDE+=   libmariadb/mariadb_config/libmariadb.pc.in
 
+.include "../../mk/curses.buildlink3.mk"
+
+# cmake probes for curses.h but then never passes on HAVE_CURSES_H if it is
+# found, which breaks the logic in client/mysql.cc
+.if ${CURSES_TYPE} == "ncurses"
+CPPFLAGS+=     -DHAVE_CURSES_H
+.endif
+
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/pcre2/buildlink3.mk"
 .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"