The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=514f4e89acd2e7b1824b261055bef49a3da6a956
commit 514f4e89acd2e7b1824b261055bef49a3da6a956
Author: SHENG-YI HONG <aokbl...@freebsd.org>
AuthorDate: 2024-10-23 20:38:33 +0000
Commit: Li-Wen Hsu <lw...@freebsd.org>
CommitDate: 2024-10-23 20:39:36 +0000
ncurses: Fix codegen for key names and codes
Adding back arguments, which were missed during the import of ncurses
version
6.5, to the code gen awk script.
This is modified from lib_keyname.c and keys.list targets in
contrib/ncurses/ncurses/Makefile.in of
21817992b3314c908ab50f0bb88d2ee750b9c4ac
PR: 280697
Reported by: np
Reviewed by: bapt
Tested by: scf
Fixes: 21817992b331 ncurses: vendor import version 6.5
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D47153
---
lib/ncurses/tinfo/Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/ncurses/tinfo/Makefile b/lib/ncurses/tinfo/Makefile
index 55b24cd3bc97..ea06e7bec03f 100644
--- a/lib/ncurses/tinfo/Makefile
+++ b/lib/ncurses/tinfo/Makefile
@@ -230,7 +230,8 @@ codes.c: MKcodes.awk
${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKcodes.awk
bigstrings=${USE_BIG_STRINGS} ${NCURSES_DIR}/include/Caps > codes.c
lib_keyname.c: keys.list MKkeyname.awk
- ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKkeyname.awk
bigstrings=${USE_BIG_STRINGS} keys.list > lib_keyname.c
+ ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKkeyname.awk
use_sigwinch=${ENABLE_SIGWINCH} \
+ bigstrings=${USE_BIG_STRINGS} keys.list > lib_keyname.c
unctrl.c: MKunctrl.awk
echo | ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKunctrl.awk
bigstrings=${USE_BIG_STRINGS} > unctrl.c
@@ -278,7 +279,7 @@ curses.h: curses.head MKkey_defs.sh Caps Caps-ncurses
# Generated intermediate files
keys.list: MKkeys_list.sh Caps Caps-ncurses
- AWK=${AWK} sh ${NCURSES_DIR}/ncurses/tinfo/MKkeys_list.sh \
+ AWK=${AWK} USE_SIGWINCH=${ENABLE_SIGWINCH} sh
${NCURSES_DIR}/ncurses/tinfo/MKkeys_list.sh \
${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses |
LC_ALL=C sort > keys.list
.if ${MK_DIRDEPS_BUILD} == "yes" && ${MACHINE} != "host"
