ncurses: Bring in patches for ncurses-6.5

Bring in upstream patches for ncurses-6.5. These include various
upstream fixes including allowing ncurses to be built with GCC15. Taken
from https://invisible-island.net/archives/ncurses/6.5/

20250426
	+ expand note on extensions in curs_addch.3x
	+ add illumos, sun-16color, sun-256color, sun-direct -TD
	+ add wyse+cvis -TD
20250419
	+ add note on scrolling and lower-right corner to waddch and wadd_wch
	  manual pages.
20250412
	+ add pangoterm -TD
	+ add kf1 to kf5 to sclp (report by Werner Fink)
	+ add vt100+pf1-pf4 -TD
20250405
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ improve infocmp -E/-e fallback feature (report by Ville Rissanen):
	  + prefix names with "ti_" if they begin with a digit, e.g., 9term
	  + escape backslashes and double-quotes in description fields
	+ modify infocmp -E/-e fallback feature to reduce stricter compiler
	  warnings for the extended capability data.
	+ add sclp -TD
	+ add op to vt525 -TD
	+ update contour -TD
20250329
	+ add XM/xm to ms-terminal, to enable mouse with experimental Windows
	  driver -TD
	+ add -x option to infocmp in MKfallback.sh
	+ improve experimental Windows driver by restoring the scroll buffer
	  and console mode, e.g., when reset_prog_mode or endwin is called
	  (patch by Daniel Starke).
	+ add a buffer-limit check in postprocess_termcap (report/testcase by
	  Yifan Zhang).
20250322
	+ add a null pointer check in mouse-initialization, for the
	  experimental Windows driver (patch by Daniel Starke).
	+ improve makefile dependency in Ada95/src
	+ add note in user_caps.5 addressing a quibble about dates.
20250315
	+ improve formatting/style of manpages (patches by Branden Robinson).
20250308
	+ remove test in wgetch which applied notimeout to the initial read
	  of a character (patch by Branden Robinson).
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ fix a few compiler-warnings in MinGW port.
20250301
	+ add color to vt525 (Branden Robinson)
	+ add vt520-w and vt525-w (Branden Robinson)
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ improve configurability of alloca() as used in Windows ports.
	+ fix some typos in manpages.
	+ modify configure script checks for stdbool.h to fix build with older
	  gcc version.
20250222
	+ modify treatment of "n" parameter for waddnstr, waddnwstr, and
	  wins_nwstr to return OK when "n" is zero, for consistency with other
	  implementations (report by Benjamin Barenblat, cf: 20231118).
	+ formatting improvements for terminfo.5 (Debian #1096164).
20250216
	+ add limit-checks in alloc_entry.c and alloc_ttype.c to avoid indexing
	  errors when using infocmp to compare all capabilities when processing
	  a malformed terminfo binary which has a valid header (testcase by
	  "Ekkosun").
20250215
	+ add gzip option for suppressing filename/timestamp information to an
	  overlooked case (cf: 20240330).
	+ correct spelling errors found with codespell.
	+ fix some typos in manpages (report by Sven Joachim)
	+ amend change to lib_set_term.c to work with thread configuration
	  (report by Rajeev Pillai, cf: 20250208).
20250208
	+ change etip.h.in to include either/both of <new> and <exception>,
	  needed for another old BSD.
	+ update st (report by Alexander Kashpir) -TD
	+ add note for ghostty 1.1.0 -TD
	+ fix a few issues found with coverity.
20250201
	+ add <new> to the possible headers declaring the C++ std::bad_alloc
	  (report by Carl Hansen).
	+ modify check for stdbool.h to be more conservative in case the
	  headers are used with a compiler other than that which was used to
	  configure (Redhat #2342514).
	+ improve MKlib_gen.sh handling of "bool" type, for building link_test
	+ improve formatting/style of manpages (patches by Branden Robinson).
20250125
	+ improve error-handling in c++ binding (report by Mingjie Shen).
	+ strict compiler-warning fixes for upcoming gcc15
20250118
	+ improve pattern used for configure --with-xterm-kbs option (report by
	  Mingyu Wang)
	+ update configure macros, from work on cdk and dialog.
	+ change a parameter name in curs_sp_funcs.3x, for consistency (patch
	  by "WHR").
	> patches by Branden Robinson:
	+ improve formatting/style of manpages
	+ change winwstr() to a generated function, using the macro definition,
	  moving its handling of negative length parameter into winnwstr().
	+ correct actual-function name in a few trace calls.
20250111
	+ add check for infinite loop in tic's use-resolution.
	+ increase limit on use-clauses from 32 to 40, warn but allow entries
	  which exceed the old limit.
	+ add some null-pointer checks after mallocs in test-programs.
20250104
	+ modify tput to warn about capabilities which expect parameters where
	  none are given; also repair the feature where multiple capabilities
	  can be handled on a single line.
	+ cleanup use-clauses -TD
	+ add linux+lockeys, xterm+r5+lockeys, xterm+r5+fkeys -TD
	+ add vt220+ufkeys, vt220+sfkeys
	+ revert man/manlinks.sed change, which loses aliases (cf: 20241228).
	+ modify MKlib_gen.c to allow for Solaris's definition of NULL as 0L
20241228
	+ correct conditional-compile for a case when the C compiler does not
	  have a bool type.
	+ add ghostty -TD
	> patches by Branden Robinson:
	+ add comments to generated term.h to hint the configure options used
	+ use same subdir-convention for term.h, in configure script
	+ improve formatting/style of manpages
20241221
	+ modify ncurses/tinfo/MKfallback.sh to work with MacOS sed, which
	  lacks BSD-style \< and \>
	+ trim padding from sgr expression used in trim_sgr0, to avoid copying
	  the padding into the resulting sgr0 (report by Rajeev Pillai).
	+ strict compiler-warning fixes for upcoming gcc15
20241214
	+ avoid redefining bool in curses.h if the platform already supports
	  that type (cf: 20241123).
	+ move include <curses.h> from etip.h.in to cursesw.h, to work around
	  breakage in Apple's port of ncurses.
	+ strict compiler-warning fixes for upcoming gcc15
20241207
	+ strict compiler-warning fixes for upcoming gcc15
20241130
	+ improve configure check for lint program.
	+ adjust options in test-programs to allow for consistent use of -c/-l
	  for command/logging.
	+ modify win_driver.c for MinGW to handle shift-tab and control-tab as
	  back-tab (report by Axel Reinhold)
20241123
	+ remove dependency on stdbool.h from configure script check for type
	  of bool when C++ binding is omitted (report by Sam James).
	+ compiler-warning fixes
20241109
	+ work around musl header ifdef's (report by Urs Jansen, cf: Gentoo
	  #920266).
	+ improve error-reporting in write_entry.c (report by Changqing Li).
	+ remove unused #include from DJGPP configuration (report by Stas
	  Sergeev).
	+ workaround/fix issues from clang-analyze
20241102
	+ remove djgpp-specific initialization to binary mode (report/patch by
	  Stas Sergeev).
	+ add extended-keys for djgpp 2.05 -TD
20241026
	+ update ms-terminal -TD
	+ add ms-terminal-direct -TD
	+ correct dimensions in test/popup_msg.c, fixing an overrun (patch by
	  Stas Sergeev, cf: 20211219).
20241019
	+ fixes for compiler warnings/cppcheck.
	+ build-fixes for DJGPP configuration (patches by Stas Sergeev)
20241006
	+ fixes for compiler warnings/cppcheck.
	+ use xterm+alt+title in wezterm -TD
20240928
	+ improve error-message from infocmp when a terminal entry cannot be
	  opened (patch by Branden Robinson).
	+ improve filtering of -L options in misc/gen-pkgconfig.in and in
	  misc/ncurses-config.in
	+ add check in wresize() for out-of-range dimensions (report by Peter
	  Bierma).
20240922
	+ add a few null-pointer checks in ncurses
	+ improve test-driver in ncurses/link_test.c
	+ restore background character in manpages as described in X/Open
	  Curses section 3.3.6, and add option "-c" to test programs to
	  illustrate a non-blank character in the window background property.
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ modify ncurses*-config to add -I option in --cflag where needed for
	  --disable-overwrite to match ".pc" files.
	+ disallow directories and block/character devices in safe-open.
	+ amend scr_restore() and scr_init() to remove the target window only
	  after validating the source window which will replace the target
	  (report by Zixi Liu).
20240914
	+ modify _nc_flush() to also flush stderr to help the flash capability
	  to work in bash (patch by Harm te Hennepe, cf: 20201128)
	+ omit -g and -fXXX flags from CFLAGS in misc/ncurses-config.in
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ improve examples in NCURSES-Programming-HOWTO.html
	+ update comments in terminfo.src -TD
20240831
	+ build-fix for a case in msys2 where gettimeofday() was available but
	  the fallback was partly configured.
	> patch by Rafael Kitover:
	+ separate the _NC_WINDOWS platform macro into _NC_WINDOWS_NATIVE,
	  for MinGW and other native Win32 support, and _NC_WINDOWS, to make
	  some Win32 features available under the Cygwin runtime, in this case
	  the term-driver.
	+ make some minor adjustments to allow
	      ./configure --enable-term-driver
	  to also work on Cygwin platforms such as Cygwin and MSYS2.
20240824
	+ modify infocmp and tabs to use actual name in usage and header.
	+ modify test/demo_keyok.c to accept ^Q for quit, for consistency.
20240817
	+ review/update foot for 1.18.1 -TD
	+ add a note about DomTerm 3.2.0 -TD
	+ add new glob-expressions variables to list in config.status script
	  (patch by Werner Fink).
	+ add --enable-install-prefix to modify behavior of $DESTDIR to merge
	  or replace the value set by --prefix (adapted from suggestion by
	  Eli Zaretskii).
20240810
	+ modify misc/Makefile.in and misc/run_tic.in so that $DESTDIR is set
	  and used only in the makefile.
	+ modify CF_WITH_PKG_CONFIG_LIBDIR to allow for pkg-config using
	  DOS/Windows pathname syntax (report by Eli Zaretskii).
	+ improve glob-expressions in configure script
	+ remove unused Get_Menu_Screen() macro from menu.priv.h
	+ update config.guess, config.sub
20240727
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ fixes for compiler warnings/cppcheck.
	+ modify wattron/wattroff calls in form/m_post.c to call wattr_on and
	  wattr_off to omit cast used in the former for X/Open compatibility
	  (patch by Bill Gray).
	+ modify wezterm, omitting its broken left/right margin feature (report
	  by Thayne McCombs) -TD
20240720
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ modify configure script and misc/Makefile to accept glob expressions
	  that include Windows/DOS drive-letters (report by Eli Zaretskii).
	+ fix misspelled ifdef and correct return-value of _nc_mingw_tcflush in
	  win_driver.c (report/patch by Eli Zaretskii).
20240713
	+ modify misc/ncurses-config.in, improved match with pkg-config output.
20240706
	+ update configure script to use macro changes from dialog.
	+ modify CF_NCURSES_PTHREADS to avoid equating package and library
	  names.
20240629
	+ build-fix for ncurses-examples with newer PDCurses, which no longer
	  has stubs for unimplemented features.
	+ add help-popup for test_instr.c, test_inwstr.c
	+ modify checks in delwin to avoid checking if the window is a pad
	  until first checking if it is still on the active window-list
	  (cf: 20211115).
	+ improve -t option of test/gdc.c, allowing hours only, or hours and
	  minutes only.
20240622
	+ improve test/gdc.c (patch by Branden Robinson).
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ adjust naming of mingw *-config scripts to match the pkg-config names
	+ widen pattern in pc/*-config scripts to disallow more linker options
	+ add --cflags-only-I and --cflags-only-other options to
	  misc/ncurses-config.in
	+ revert change to CF_BUILD_CC macro (report by Vassili Courzakis,
	  cf: 20240518).
20240615
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ review/update modules files.
	+ improve install-rules in Ada95 makefiles (report by Branden Robinson).
	+ improve formatting/style of manpages in test-directory.
20240608
	+ change winwstr to return wide character count instead of OK (patch
	  by Branden Robinson).
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ rename testing dpkg's for ncurses6 to resolve a naming conflict with
	  Debian's ncurses packages.
20240601
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ change Ada95/configure to use --with-screen option rather than
	  --enable-widec, to provide more choices of underlying curses library
20240525
	+ build-fix for configure option --disable-ext-funcs
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ review/update iTerm2 for 3.5.0 -TD
20240519
	+ update Ada95/configure to match change for -DTRACE
	+ revert change to include/ncurses_defs, which caused build failure if
	  tracing was not enabled (report by Branden Robinson).
20240518
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ move makefile's -DTRACE into include/ncurses_cfg.h, to simplify use
	  of CFLAGS/CPPFLAGS.
	+ improve check for clock_gettime(), from xterm.
	+ modify configure script to work around broken gnatgcc script found in
	  gcc-13 builds.
20240511
	+ improve formatting/style of manpages (patches by Branden Robinson).
	+ limit value from ESCDELAY environment variable to 30 seconds, like
	  other delay limits.
	+ limit values from LINES and COLUMNS environment variables to 512
	  (report by Miroslav Lichvar).
20240504
	+ update ncurses/wcwidth.c, for MinGW ports, from xterm.
	+ trim obsolete comment about tack from INSTALL.

Signed-off-by: Chris Packham <judge.packham@gmail.com>

1 files changed, 355 insertions, 0 deletions

diff --git a/packages/ncurses/6.5/ncurses-6.5-20240824.patch b/packages/ncurses/6.5/ncurses-6.5-20240824.patch
new file mode 100644
index 00000000..749f95b9
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240824.patch
@@ -0,0 +1,355 @@
+# ncurses 6.5 - patch 20240824 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240824.patch.gz
+# patch by Thomas E. Dickey <dickey@invisible-island.net>
+# created  Sun Aug 25 00:54:42 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                             |    6 +++++-
+# VERSION                          |    2 +-
+# dist.mk                          |    4 ++--
+# package/debian-mingw/changelog   |    4 ++--
+# package/debian-mingw64/changelog |    4 ++--
+# package/debian/changelog         |    4 ++--
+# package/mingw-ncurses.nsi        |    4 ++--
+# package/mingw-ncurses.spec       |    2 +-
+# package/ncurses.spec             |    2 +-
+# package/ncursest.spec            |    2 +-
+# progs/Makefile.in                |    4 ++--
+# progs/infocmp.c                  |   27 ++++++++++++++++++---------
+# progs/tabs.c                     |    9 +++++----
+# test/demo_keyok.c                |    6 ++++--
+# 14 files changed, 48 insertions(+), 32 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4164 
+--- ncurses-6.5-20240817+/NEWS	2024-08-17 22:54:38.000000000 +0000
++++ ncurses-6.5-20240824/NEWS	2024-08-24 20:11:44.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4164 2024/08/17 22:54:38 tom Exp $
++-- $Id: NEWS,v 1.4166 2024/08/24 20:11:44 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,10 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20240824
++	+ modify infocmp and tabs to use actual name in usage and header.
++	+ modify test/demo_keyok.c to accept ^Q for quit, for consistency.
++
+ 20240817
+ 	+ review/update foot for 1.18.1 -TD
+ 	+ add a note about DomTerm 3.2.0 -TD
+Index: VERSION
+--- ncurses-6.5-20240817+/VERSION	2024-08-17 09:37:53.000000000 +0000
++++ ncurses-6.5-20240824/VERSION	2024-08-24 10:17:07.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240817
++5:0:10	6.5	20240824
+Index: dist.mk
+Prereq:  1.1627 
+--- ncurses-6.5-20240817+/dist.mk	2024-08-17 09:37:53.000000000 +0000
++++ ncurses-6.5-20240824/dist.mk	2024-08-24 10:17:07.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1627 2024/08/17 09:37:53 tom Exp $
++# $Id: dist.mk,v 1.1628 2024/08/24 10:17:07 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 5
+-NCURSES_PATCH = 20240817
++NCURSES_PATCH = 20240824
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240817+/package/debian-mingw/changelog	2024-08-11 00:14:44.000000000 +0000
++++ ncurses-6.5-20240824/package/debian-mingw/changelog	2024-08-24 10:17:07.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240817) unstable; urgency=low
++ncurses6td (6.5+20240824) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Aug 2024 20:14:44 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Aug 2024 06:17:07 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240817+/package/debian-mingw64/changelog	2024-08-11 00:14:44.000000000 +0000
++++ ncurses-6.5-20240824/package/debian-mingw64/changelog	2024-08-24 10:17:07.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240817) unstable; urgency=low
++ncurses6td (6.5+20240824) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Aug 2024 20:14:44 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Aug 2024 06:17:07 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240817+/package/debian/changelog	2024-08-11 00:14:44.000000000 +0000
++++ ncurses-6.5-20240824/package/debian/changelog	2024-08-24 10:17:07.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240817) unstable; urgency=low
++ncurses6td (6.5+20240824) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Aug 2024 20:14:44 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Aug 2024 06:17:07 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.662 
+--- ncurses-6.5-20240817+/package/mingw-ncurses.nsi	2024-08-11 00:14:44.000000000 +0000
++++ ncurses-6.5-20240824/package/mingw-ncurses.nsi	2024-08-24 10:17:07.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.662 2024/08/11 00:14:44 tom Exp $

++; $Id: mingw-ncurses.nsi,v 1.663 2024/08/24 10:17:07 tom Exp $

+ 

+ ; TODO add examples

+ ; TODO bump ABI to 6

+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"

+ !define VERSION_MINOR "5"

+ !define VERSION_YYYY  "2024"

+-!define VERSION_MMDD  "0817"

++!define VERSION_MMDD  "0824"

+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

+ 

+ !define MY_ABI   "5"

+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240817+/package/mingw-ncurses.spec	2024-08-11 00:14:44.000000000 +0000
++++ ncurses-6.5-20240824/package/mingw-ncurses.spec	2024-08-24 10:17:07.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240817
++Release: 20240824
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240817+/package/ncurses.spec	2024-08-11 00:14:44.000000000 +0000
++++ ncurses-6.5-20240824/package/ncurses.spec	2024-08-24 10:17:07.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240817
++Release: 20240824
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240817+/package/ncursest.spec	2024-08-11 00:14:44.000000000 +0000
++++ ncurses-6.5-20240824/package/ncursest.spec	2024-08-24 10:17:07.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240817
++Release: 20240824
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/Makefile.in
+Prereq:  1.116 
+--- ncurses-6.5-20240817+/progs/Makefile.in	2024-08-10 18:13:22.000000000 +0000
++++ ncurses-6.5-20240824/progs/Makefile.in	2024-08-24 22:51:58.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.116 2024/08/10 18:13:22 tom Exp $
++# $Id: Makefile.in,v 1.117 2024/08/24 22:51:58 tom Exp $
+ ##############################################################################
+ # Copyright 2020-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2016,2018 Free Software Foundation, Inc.                    #
+@@ -95,7 +95,7 @@
+ 
+ INCDIR		= $(top_srcdir)/include
+ NCUDIR		= $(top_srcdir)/ncurses
+-CPPFLAGS	= -DHAVE_CONFIG_H -I../progs -I../ncurses -I$(top_srcdir)/ncurses @CPPFLAGS@
++CPPFLAGS	= -DHAVE_CONFIG_H -DACTUAL_TIC="\"$(actual_tic)\"" -I../progs -I../ncurses -I$(top_srcdir)/ncurses @CPPFLAGS@
+ 
+ CCFLAGS		= $(CPPFLAGS) $(CFLAGS)
+ 
+Index: progs/infocmp.c
+Prereq:  1.163 
+--- ncurses-6.5-20240817+/progs/infocmp.c	2023-12-16 17:27:47.000000000 +0000
++++ ncurses-6.5-20240824/progs/infocmp.c	2024-08-24 22:57:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -43,7 +43,11 @@
+ 
+ #include <dump_entry.h>
+ 
+-MODULE_ID("$Id: infocmp.c,v 1.163 2023/12/16 17:27:47 tom Exp $")
++MODULE_ID("$Id: infocmp.c,v 1.164 2024/08/24 22:57:24 tom Exp $")
++
++#ifndef ACTUAL_TIC
++#define ACTUAL_TIC "tic"
++#endif
+ 
+ #define MAX_STRING	1024	/* maximum formatted string */
+ 
+@@ -61,6 +65,9 @@
+ static ENTRY *entries;		/* terminfo entries */
+ static int termcount;		/* count of terminal entries */
+ 
++static const char usage_string[] = \
++"Usage: %s [options] [-A directory] [-B directory] [termname...]";
++
+ static bool limited = TRUE;	/* "-r" option is not set */
+ static bool quiet = FALSE;
+ static bool literal = FALSE;
+@@ -1216,7 +1223,6 @@
+ #define DATA(s) s "\n"
+     static const char head[] =
+     {
+-	DATA("Usage: infocmp [options] [-A directory] [-B directory] [termname...]")
+ 	DATA("")
+ 	DATA("Options:")
+     };
+@@ -1271,14 +1277,16 @@
+     const size_t last = SIZEOF(options);
+     const size_t left = (last + 1) / 2;
+     size_t n;
++    FILE *fp = stderr;
+ 
+-    fputs(head, stderr);
++    fprintf(fp, usage_string, _nc_progname);
++    fputs(head, fp);
+     for (n = 0; n < left; n++) {
+ 	size_t m = n + left;
+ 	if (m < last)
+-	    fprintf(stderr, "%-40.40s%s\n", options[n], options[m]);
++	    fprintf(fp, "%-40.40s%s\n", options[n], options[m]);
+ 	else
+-	    fprintf(stderr, "%s\n", options[n]);
++	    fprintf(fp, "%s\n", options[n]);
+     }
+     ExitProgram(EXIT_FAILURE);
+ }
+@@ -1933,8 +1941,8 @@
+ 				   tname[0]);
+ 		if (!quiet)
+ 		    (void)
+-			printf("#\tReconstructed via infocmp from file: %s\n",
+-			       tfile[0]);
++			printf("#\tReconstructed via %s from file: %s\n",
++			       _nc_progname, tfile[0]);
+ 		dump_entry(&entries[0].tterm,
+ 			   suppress_untranslatable,
+ 			   limited,
+@@ -1980,7 +1988,8 @@
+     } else if (compare == C_USEALL) {
+ 	(void) fprintf(stderr, "Sorry, -u doesn't work with -F\n");
+     } else if (compare == C_DEFAULT) {
+-	(void) fprintf(stderr, "Use `tic -[CI] <file>' for this.\n");
++	(void) fprintf(stderr,
++		       "Use `" ACTUAL_TIC " -[CI] <file>' for this.\n");
+     } else if (argc - optind != 2) {
+ 	(void) fprintf(stderr,
+ 		       "File comparison needs exactly two file arguments.\n");
+Index: progs/tabs.c
+Prereq:  1.53 
+--- ncurses-6.5-20240817+/progs/tabs.c	2023-11-04 20:46:09.000000000 +0000
++++ ncurses-6.5-20240824/progs/tabs.c	2024-08-24 22:56:43.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -39,7 +39,7 @@
+ #include <progs.priv.h>
+ #include <tty_settings.h>
+ 
+-MODULE_ID("$Id: tabs.c,v 1.53 2023/11/04 20:46:09 tom Exp $")
++MODULE_ID("$Id: tabs.c,v 1.54 2024/08/24 22:56:43 tom Exp $")
+ 
+ static GCC_NORETURN void usage(void);
+ 
+@@ -445,7 +445,6 @@
+ #define DATA(s) s "\n"
+     static const char msg[] =
+     {
+-	DATA("Usage: tabs [options] [tabstop-list]")
+ 	DATA("")
+ 	DATA("Options:")
+ 	DATA("  -0       reset tabs")
+@@ -468,9 +467,11 @@
+ 	DATA("or 1,+10,+10 which is the same.")
+     };
+ #undef DATA
++    FILE *fp = stderr;
+ 
+     fflush(stdout);
+-    fputs(msg, stderr);
++    fprintf(fp, "Usage: %s [options] [tabstop-list]\n", _nc_progname);
++    fputs(msg, fp);
+     ExitProgram(EXIT_FAILURE);
+ }
+ 
+Index: test/demo_keyok.c
+Prereq:  1.9 
+--- ncurses-6.5-20240817+/test/demo_keyok.c	2022-12-10 23:31:31.000000000 +0000
++++ ncurses-6.5-20240824/test/demo_keyok.c	2024-08-24 17:16:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2002-2006,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_keyok.c,v 1.9 2022/12/10 23:31:31 tom Exp $
++ * $Id: demo_keyok.c,v 1.10 2024/08/24 17:16:49 tom Exp $
+  *
+  * Demonstrate the keyok() function.
+  * Thomas Dickey - 2002/11/23
+@@ -93,6 +93,8 @@
+ 
+     while ((ch = wgetch(win)) != ERR) {
+ 	const char *name = keyname(ch);
++	if (ch == QUIT)
++	    break;
+ 	if (ch == ESCAPE && prior == ch)
+ 	    break;
+ 	prior = ch;