Wed May 15 19:21:43 2024 UTC (32d)
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.


(jperkin)
diff -r1.10 -r1.11 pkgsrc/databases/mariadb1011-client/Makefile.common
diff -r1.20 -r1.21 pkgsrc/databases/mariadb104-client/Makefile.common
diff -r1.29 -r1.30 pkgsrc/databases/mariadb105-client/Makefile.common
diff -r1.25 -r1.26 pkgsrc/databases/mariadb106-client/Makefile.common
cvs diff -r1.10 -r1.11 pkgsrc/databases/mariadb1011-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mariadb1011-client/Makefile.common 2024/05/15 15:59:55 1.10
+++ pkgsrc/databases/mariadb1011-client/Makefile.common 2024/05/15 19:21:42 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.10 2024/05/15 15:59:55 nia Exp $ 1# $NetBSD: Makefile.common,v 1.11 2024/05/15 19:21:42 jperkin Exp $
2# 2#
3# used by databases/mariadb1011-client/Makefile 3# used by databases/mariadb1011-client/Makefile
4# used by databases/mariadb1011-server/Makefile 4# used by databases/mariadb1011-server/Makefile
5# used by databases/mariadb1011-embedded/Makefile 5# used by databases/mariadb1011-embedded/Makefile
6 6
7DISTNAME= mariadb-10.11.7 7DISTNAME= mariadb-10.11.7
8CATEGORIES= databases 8CATEGORIES= databases
9MASTER_SITES= https://archive.mariadb.org/${DISTNAME}/source/ 9MASTER_SITES= https://archive.mariadb.org/${DISTNAME}/source/
10 10
11MAINTAINER?= pkgsrc-users@NetBSD.org 11MAINTAINER?= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://mariadb.org/ 12HOMEPAGE= https://mariadb.org/
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -106,27 +106,34 @@ SUBST_STAGE.perl= pre-configure @@ -106,27 +106,34 @@ SUBST_STAGE.perl= pre-configure
106SUBST_FILES.perl= scripts/CMakeLists.txt 106SUBST_FILES.perl= scripts/CMakeLists.txt
107SUBST_SED.perl= -e "s,/usr/bin/perl,${TOOLS_PATH.perl},g" 107SUBST_SED.perl= -e "s,/usr/bin/perl,${TOOLS_PATH.perl},g"
108SUBST_SED.perl+= -e "s,/usr/local/bin/perl,${TOOLS_PATH.perl},g" 108SUBST_SED.perl+= -e "s,/usr/local/bin/perl,${TOOLS_PATH.perl},g"
109 109
110CHECK_INTERPRETER_SKIP+= share/mysql/test/* 110CHECK_INTERPRETER_SKIP+= share/mysql/test/*
111CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/cloud/*.sh.in 111CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/cloud/*.sh.in
112CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/install_scripts/*.sh.in 112CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/install_scripts/*.sh.in
113CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/install_scripts/*.in 113CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/install_scripts/*.in
114CHECK_PORTABILITY_SKIP+= BUILD/compile-pentium-gcov 114CHECK_PORTABILITY_SKIP+= BUILD/compile-pentium-gcov
115 115
116PKGCONFIG_OVERRIDE+= support-files/mariadb.pc.in 116PKGCONFIG_OVERRIDE+= support-files/mariadb.pc.in
117PKGCONFIG_OVERRIDE+= libmariadb/mariadb_config/libmariadb.pc.in 117PKGCONFIG_OVERRIDE+= libmariadb/mariadb_config/libmariadb.pc.in
118 118
 119.include "../../mk/curses.buildlink3.mk"
 120
 121# cmake probes for curses.h but then never passes on HAVE_CURSES_H if it is
 122# found, which breaks the logic in client/mysql.cc
 123.if ${CURSES_TYPE} == "ncurses"
 124CPPFLAGS+= -DHAVE_CURSES_H
 125.endif
 126
119.include "../../archivers/bzip2/buildlink3.mk" 127.include "../../archivers/bzip2/buildlink3.mk"
120.include "../../archivers/zstd/buildlink3.mk" 128.include "../../archivers/zstd/buildlink3.mk"
121.include "../../archivers/xz/buildlink3.mk" 129.include "../../archivers/xz/buildlink3.mk"
122.include "../../devel/pcre2/buildlink3.mk" 130.include "../../devel/pcre2/buildlink3.mk"
123.include "../../devel/zlib/buildlink3.mk" 131.include "../../devel/zlib/buildlink3.mk"
124.include "../../textproc/fmtlib/buildlink3.mk" 132.include "../../textproc/fmtlib/buildlink3.mk"
125.include "../../www/curl/buildlink3.mk" 133.include "../../www/curl/buildlink3.mk"
126.include "../../mk/atomic64.mk" 134.include "../../mk/atomic64.mk"
127.include "../../mk/curses.buildlink3.mk" 
128.include "../../mk/dlopen.buildlink3.mk" 135.include "../../mk/dlopen.buildlink3.mk"
129BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} 136BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
130.include "../../mk/krb5.buildlink3.mk" 137.include "../../mk/krb5.buildlink3.mk"
131.include "../../mk/pam.buildlink3.mk" 138.include "../../mk/pam.buildlink3.mk"
132.include "../../mk/readline.buildlink3.mk" 139.include "../../mk/readline.buildlink3.mk"
cvs diff -r1.20 -r1.21 pkgsrc/databases/mariadb104-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mariadb104-client/Makefile.common 2024/05/06 08:41:57 1.20
+++ pkgsrc/databases/mariadb104-client/Makefile.common 2024/05/15 19:21:43 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.20 2024/05/06 08:41:57 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.21 2024/05/15 19:21:43 jperkin Exp $
2# 2#
3# used by databases/mariadb104-client/Makefile 3# used by databases/mariadb104-client/Makefile
4# used by databases/mariadb104-server/Makefile 4# used by databases/mariadb104-server/Makefile
5 5
6DISTNAME= mariadb-10.4.20 6DISTNAME= mariadb-10.4.20
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= https://archive.mariadb.org/${DISTNAME}/source/ 8MASTER_SITES= https://archive.mariadb.org/${DISTNAME}/source/
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://mariadb.org/ 11HOMEPAGE= https://mariadb.org/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mariadb104-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mariadb104-client/distinfo
@@ -94,22 +94,29 @@ REPLACE_PERL+= sql-bench/*.sh @@ -94,22 +94,29 @@ REPLACE_PERL+= sql-bench/*.sh
94 94
95SUBST_CLASSES+= perl 95SUBST_CLASSES+= perl
96SUBST_STAGE.perl= pre-configure 96SUBST_STAGE.perl= pre-configure
97SUBST_FILES.perl= scripts/CMakeLists.txt 97SUBST_FILES.perl= scripts/CMakeLists.txt
98SUBST_SED.perl= -e "s,/usr/bin/perl,${TOOLS_PATH.perl},g" 98SUBST_SED.perl= -e "s,/usr/bin/perl,${TOOLS_PATH.perl},g"
99SUBST_SED.perl+= -e "s,/usr/local/bin/perl,${TOOLS_PATH.perl},g" 99SUBST_SED.perl+= -e "s,/usr/local/bin/perl,${TOOLS_PATH.perl},g"
100 100
101CHECK_INTERPRETER_SKIP+= share/mysql/test/* 101CHECK_INTERPRETER_SKIP+= share/mysql/test/*
102CHECK_PORTABILITY_SKIP+= BUILD/compile-pentium-gcov 102CHECK_PORTABILITY_SKIP+= BUILD/compile-pentium-gcov
103 103
104PKGCONFIG_OVERRIDE+= support-files/mariadb.pc.in 104PKGCONFIG_OVERRIDE+= support-files/mariadb.pc.in
105PKGCONFIG_OVERRIDE+= libmariadb/mariadb_config/libmariadb.pc.in 105PKGCONFIG_OVERRIDE+= libmariadb/mariadb_config/libmariadb.pc.in
106 106
 107.include "../../mk/curses.buildlink3.mk"
 108
 109# cmake probes for curses.h but then never passes on HAVE_CURSES_H if it is
 110# found, which breaks the logic in client/mysql.cc
 111.if ${CURSES_TYPE} == "ncurses"
 112CPPFLAGS+= -DHAVE_CURSES_H
 113.endif
 114
107.include "../../devel/zlib/buildlink3.mk" 115.include "../../devel/zlib/buildlink3.mk"
108.include "../../www/curl/buildlink3.mk" 116.include "../../www/curl/buildlink3.mk"
109.include "../../mk/atomic64.mk" 117.include "../../mk/atomic64.mk"
110.include "../../mk/curses.buildlink3.mk" 
111.include "../../mk/dlopen.buildlink3.mk" 118.include "../../mk/dlopen.buildlink3.mk"
112BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} 119BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
113.include "../../mk/pam.buildlink3.mk" 120.include "../../mk/pam.buildlink3.mk"
114.include "../../mk/readline.buildlink3.mk" 121.include "../../mk/readline.buildlink3.mk"
115.include "../../mk/krb5.buildlink3.mk" 122.include "../../mk/krb5.buildlink3.mk"
cvs diff -r1.29 -r1.30 pkgsrc/databases/mariadb105-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mariadb105-client/Makefile.common 2024/05/15 15:59:55 1.29
+++ pkgsrc/databases/mariadb105-client/Makefile.common 2024/05/15 19:21:43 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.29 2024/05/15 15:59:55 nia Exp $ 1# $NetBSD: Makefile.common,v 1.30 2024/05/15 19:21:43 jperkin Exp $
2# 2#
3# used by databases/mariadb105-client/Makefile 3# used by databases/mariadb105-client/Makefile
4# used by databases/mariadb105-server/Makefile 4# used by databases/mariadb105-server/Makefile
5 5
6DISTNAME= mariadb-10.5.24 6DISTNAME= mariadb-10.5.24
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= https://archive.mariadb.org/${DISTNAME}/source/ 8MASTER_SITES= https://archive.mariadb.org/${DISTNAME}/source/
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://mariadb.org/ 11HOMEPAGE= https://mariadb.org/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mariadb105-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mariadb105-client/distinfo
@@ -98,23 +98,30 @@ SUBST_CLASSES+= perl @@ -98,23 +98,30 @@ SUBST_CLASSES+= perl
98SUBST_STAGE.perl= pre-configure 98SUBST_STAGE.perl= pre-configure
99SUBST_FILES.perl= scripts/CMakeLists.txt 99SUBST_FILES.perl= scripts/CMakeLists.txt
100SUBST_SED.perl= -e "s,/usr/bin/perl,${TOOLS_PATH.perl},g" 100SUBST_SED.perl= -e "s,/usr/bin/perl,${TOOLS_PATH.perl},g"
101SUBST_SED.perl+= -e "s,/usr/local/bin/perl,${TOOLS_PATH.perl},g" 101SUBST_SED.perl+= -e "s,/usr/local/bin/perl,${TOOLS_PATH.perl},g"
102 102
103CHECK_INTERPRETER_SKIP+= share/mysql/test/* 103CHECK_INTERPRETER_SKIP+= share/mysql/test/*
104CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/cloud/*.sh.in 104CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/cloud/*.sh.in
105CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/install_scripts/*.sh.in 105CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/install_scripts/*.sh.in
106CHECK_PORTABILITY_SKIP+= BUILD/compile-pentium-gcov 106CHECK_PORTABILITY_SKIP+= BUILD/compile-pentium-gcov
107 107
108PKGCONFIG_OVERRIDE+= support-files/mariadb.pc.in 108PKGCONFIG_OVERRIDE+= support-files/mariadb.pc.in
109PKGCONFIG_OVERRIDE+= libmariadb/mariadb_config/libmariadb.pc.in 109PKGCONFIG_OVERRIDE+= libmariadb/mariadb_config/libmariadb.pc.in
110 110
 111.include "../../mk/curses.buildlink3.mk"
 112
 113# cmake probes for curses.h but then never passes on HAVE_CURSES_H if it is
 114# found, which breaks the logic in client/mysql.cc
 115.if ${CURSES_TYPE} == "ncurses"
 116CPPFLAGS+= -DHAVE_CURSES_H
 117.endif
 118
111.include "../../devel/pcre2/buildlink3.mk" 119.include "../../devel/pcre2/buildlink3.mk"
112.include "../../devel/zlib/buildlink3.mk" 120.include "../../devel/zlib/buildlink3.mk"
113.include "../../www/curl/buildlink3.mk" 121.include "../../www/curl/buildlink3.mk"
114.include "../../mk/atomic64.mk" 122.include "../../mk/atomic64.mk"
115.include "../../mk/curses.buildlink3.mk" 
116.include "../../mk/dlopen.buildlink3.mk" 123.include "../../mk/dlopen.buildlink3.mk"
117BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} 124BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
118.include "../../mk/krb5.buildlink3.mk" 125.include "../../mk/krb5.buildlink3.mk"
119.include "../../mk/pam.buildlink3.mk" 126.include "../../mk/pam.buildlink3.mk"
120.include "../../mk/readline.buildlink3.mk" 127.include "../../mk/readline.buildlink3.mk"
cvs diff -r1.25 -r1.26 pkgsrc/databases/mariadb106-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mariadb106-client/Makefile.common 2024/05/15 15:59:55 1.25
+++ pkgsrc/databases/mariadb106-client/Makefile.common 2024/05/15 19:21:43 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.25 2024/05/15 15:59:55 nia Exp $ 1# $NetBSD: Makefile.common,v 1.26 2024/05/15 19:21:43 jperkin Exp $
2# 2#
3# used by databases/mariadb106-client/Makefile 3# used by databases/mariadb106-client/Makefile
4# used by databases/mariadb106-server/Makefile 4# used by databases/mariadb106-server/Makefile
5 5
6DISTNAME= mariadb-10.6.17 6DISTNAME= mariadb-10.6.17
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= https://archive.mariadb.org/${DISTNAME}/source/ 8MASTER_SITES= https://archive.mariadb.org/${DISTNAME}/source/
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://mariadb.org/ 11HOMEPAGE= https://mariadb.org/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mariadb106-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mariadb106-client/distinfo
@@ -99,24 +99,31 @@ SUBST_STAGE.perl= pre-configure @@ -99,24 +99,31 @@ SUBST_STAGE.perl= pre-configure
99SUBST_FILES.perl= scripts/CMakeLists.txt 99SUBST_FILES.perl= scripts/CMakeLists.txt
100SUBST_SED.perl= -e "s,/usr/bin/perl,${TOOLS_PATH.perl},g" 100SUBST_SED.perl= -e "s,/usr/bin/perl,${TOOLS_PATH.perl},g"
101SUBST_SED.perl+= -e "s,/usr/local/bin/perl,${TOOLS_PATH.perl},g" 101SUBST_SED.perl+= -e "s,/usr/local/bin/perl,${TOOLS_PATH.perl},g"
102 102
103CHECK_INTERPRETER_SKIP+= share/mysql/test/* 103CHECK_INTERPRETER_SKIP+= share/mysql/test/*
104CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/cloud/*.sh.in 104CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/cloud/*.sh.in
105CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/install_scripts/*.sh.in 105CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/install_scripts/*.sh.in
106CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/install_scripts/*.in 106CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/install_scripts/*.in
107CHECK_PORTABILITY_SKIP+= BUILD/compile-pentium-gcov 107CHECK_PORTABILITY_SKIP+= BUILD/compile-pentium-gcov
108 108
109PKGCONFIG_OVERRIDE+= support-files/mariadb.pc.in 109PKGCONFIG_OVERRIDE+= support-files/mariadb.pc.in
110PKGCONFIG_OVERRIDE+= libmariadb/mariadb_config/libmariadb.pc.in 110PKGCONFIG_OVERRIDE+= libmariadb/mariadb_config/libmariadb.pc.in
111 111
 112.include "../../mk/curses.buildlink3.mk"
 113
 114# cmake probes for curses.h but then never passes on HAVE_CURSES_H if it is
 115# found, which breaks the logic in client/mysql.cc
 116.if ${CURSES_TYPE} == "ncurses"
 117CPPFLAGS+= -DHAVE_CURSES_H
 118.endif
 119
112.include "../../archivers/zstd/buildlink3.mk" 120.include "../../archivers/zstd/buildlink3.mk"
113.include "../../devel/pcre2/buildlink3.mk" 121.include "../../devel/pcre2/buildlink3.mk"
114.include "../../devel/zlib/buildlink3.mk" 122.include "../../devel/zlib/buildlink3.mk"
115.include "../../www/curl/buildlink3.mk" 123.include "../../www/curl/buildlink3.mk"
116.include "../../mk/atomic64.mk" 124.include "../../mk/atomic64.mk"
117.include "../../mk/curses.buildlink3.mk" 
118.include "../../mk/dlopen.buildlink3.mk" 125.include "../../mk/dlopen.buildlink3.mk"
119BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} 126BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
120.include "../../mk/krb5.buildlink3.mk" 127.include "../../mk/krb5.buildlink3.mk"
121.include "../../mk/pam.buildlink3.mk" 128.include "../../mk/pam.buildlink3.mk"
122.include "../../mk/readline.buildlink3.mk" 129.include "../../mk/readline.buildlink3.mk"