libncurses: Import https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.5.tar.gz changes

Change-Id: I3433d30ca01359fd2e3623ede96b531f0b39cbfa
Signed-off-by: micky387 <mickaelsaibi@free.fr>
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 2875a59..cf77730 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,10 +1,10 @@
-ncurses6 (6.0+20150808) unstable; urgency=low
+ncurses6 (6.5+20240427) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 06 Aug 2015 19:13:39 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Apr 2024 09:56:53 -0400
 
-ncurses6 (5.9-20131005) unstable; urgency=low
+ncurses6 (5.9+20131005) unstable; urgency=low
 
   * initial release
 
diff --git a/package/debian-mingw/compat b/package/debian-mingw/compat
index 7ed6ff8..48082f7 100644
--- a/package/debian-mingw/compat
+++ b/package/debian-mingw/compat
@@ -1 +1 @@
-5
+12
diff --git a/package/debian-mingw/control b/package/debian-mingw/control
index b32a33e..6fb213f 100644
--- a/package/debian-mingw/control
+++ b/package/debian-mingw/control
@@ -2,9 +2,12 @@
 Section: libdevel
 Priority: optional
 Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
-Homepage: http://invisible-island.net/ncurses/
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.2
+Homepage: https://invisible-island.net/ncurses/
+Build-Depends: debhelper (>= 7),
+  gcc-mingw-w64-i686,
+  g++-mingw-w64-i686,
+  binutils-mingw-w64-i686
+Standards-Version: 4.6.1.0
 
 Package: mingw32-ncurses6
 Architecture: any
diff --git a/package/debian-mingw/copyright b/package/debian-mingw/copyright
index 43cb3e5..3239664 100644
--- a/package/debian-mingw/copyright
+++ b/package/debian-mingw/copyright
@@ -1,20 +1,21 @@
-Upstream source http://invisible-island.net/ncurses/ncurses.html
+Upstream source https://invisible-island.net/ncurses/ncurses.html
 This package is used for testing builds of ncurses.
 
 Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 1998-2014,2015 Free Software Foundation, Inc.
-Licence: X11
+Copyright: 2017-2023,2024 by Thomas E. Dickey
+Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+License: X11
 
 Files: aclocal.m4 package
-Copyright: 1996-2014,2015 by Thomas E. Dickey
-Licence: X11
+Copyright: 1996-2023,2024 by Thomas E. Dickey
+License: X11
 
 Files: doc/html/NCURSES-Programming-HOWTO.html
 Copyright: 2001 by Pradeep Padala
-Licence: X11
+License: X11
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the
@@ -43,7 +44,7 @@
 -------------------------------------------------------------------------------
 Files: install-sh
 Copyright:  1994 X Consortium
-Licence: X11
+License: X11
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to
diff --git a/package/debian-mingw/mingw32-ncurses6.lintian-overrides b/package/debian-mingw/mingw32-ncurses6.lintian-overrides
new file mode 100644
index 0000000..ed565e4
--- /dev/null
+++ b/package/debian-mingw/mingw32-ncurses6.lintian-overrides
@@ -0,0 +1,7 @@
+mingw32-ncurses6: latest-debian-changelog-entry-changed-to-native
+
+mingw32-ncurses6: non-standard-dir-in-usr
+mingw32-ncurses6: file-in-unusual-dir
+
+mingw32-ncurses6: binary-without-manpage
+mingw32-ncurses6: executable-not-elf-or-script
diff --git a/package/debian-mingw/rules b/package/debian-mingw/rules
index 6ac4c43..8c266a9 100755
--- a/package/debian-mingw/rules
+++ b/package/debian-mingw/rules
@@ -11,6 +11,8 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+MY_ABI=6
+
 BUILD_CC = gcc
 
 CC_NORMAL = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
@@ -19,13 +21,15 @@
 TARGET    = i686-w64-mingw32
 MINGW_BIN = /usr/bin
 MINGW_TOP = /usr/$(TARGET)
-MINGW_TMP = $(CURDIR)/debian/mingw32-ncurses6
+MINGW_TMP = $(CURDIR)/debian/mingw32-ncurses$(MY_ABI)
 
 CFLAGS = $(CC_NORMAL)
 
+verbose = # -v
+
 CONFIG_OPTIONS = \
-	--disable-echo \
 	--disable-db-install \
+	--disable-echo \
 	--disable-getcap \
 	--disable-hard-tabs \
 	--disable-leaks \
@@ -33,15 +37,21 @@
 	--disable-overwrite \
 	--disable-termcap \
 	--enable-interop \
+	--enable-opaque-curses \
+	--enable-opaque-form \
+	--enable-opaque-menu \
+	--enable-opaque-panel \
 	--enable-pc-files \
 	--enable-term-driver \
 	--enable-warnings \
 	--enable-widec \
 	--verbose \
-	--with-abi-version=6 \
+	--with-abi-version=$(MY_ABI) \
 	--with-cxx-shared \
 	--with-develop \
-	--with-fallbacks=unknown,rxvt \
+	--with-fallbacks=unknown,ms-terminal,xterm-256color \
+	--with-tic-path=/usr/bin/tic$(MY_ABI) \
+	--with-infocmp-path=/usr/bin/infocmp$(MY_ABI) \
 	--with-shared \
 	--with-trace \
 	--with-xterm-kbs=DEL \
@@ -73,6 +83,7 @@
 		--target=$(TARGET) \
 		--prefix=$(MINGW_TOP) \
 		--with-build-cc=$(BUILD_CC) \
+		--with-pc-suffix=$(MY_ABI) \
 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig \
 		$(CONFIG_OPTIONS)
 
@@ -100,8 +111,8 @@
 install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
-	dh_clean -k
-	dh_installdirs
+	dh_prep
+	dh_installdirs      $(verbose)
 
 	$(MAKE) install.libs DESTDIR=$(MINGW_TMP)
 
@@ -121,16 +132,18 @@
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
-	dh_testroot
-	dh_installchangelogs NEWS
+	dh_testroot          $(verbose)
+	dh_lintian           $(verbose)
+	dh_installdocs       $(verbose)
+	dh_installchangelogs $(verbose) NEWS
 	# dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_compress          $(verbose)
+	dh_fixperms          $(verbose)
+	dh_installdeb        $(verbose)
+	dh_shlibdeps         $(verbose)
+	dh_gencontrol        $(verbose)
+	dh_md5sums           $(verbose)
+	dh_builddeb          $(verbose)
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install install-stamp
diff --git a/package/debian-mingw/watch b/package/debian-mingw/watch
index 945a996..f6b3987 100644
--- a/package/debian-mingw/watch
+++ b/package/debian-mingw/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://invisible-island.net/ncurses/current/ncurses\.tar.gz \
+opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \
  debian  uupdate
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 2875a59..cf77730 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,10 +1,10 @@
-ncurses6 (6.0+20150808) unstable; urgency=low
+ncurses6 (6.5+20240427) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 06 Aug 2015 19:13:39 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Apr 2024 09:56:53 -0400
 
-ncurses6 (5.9-20131005) unstable; urgency=low
+ncurses6 (5.9+20131005) unstable; urgency=low
 
   * initial release
 
diff --git a/package/debian-mingw64/compat b/package/debian-mingw64/compat
index 7ed6ff8..48082f7 100644
--- a/package/debian-mingw64/compat
+++ b/package/debian-mingw64/compat
@@ -1 +1 @@
-5
+12
diff --git a/package/debian-mingw64/control b/package/debian-mingw64/control
index a17ed1f..74e8136 100644
--- a/package/debian-mingw64/control
+++ b/package/debian-mingw64/control
@@ -2,9 +2,12 @@
 Section: libdevel
 Priority: optional
 Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
-Homepage: http://invisible-island.net/ncurses/
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.2
+Homepage: https://invisible-island.net/ncurses/
+Build-Depends: debhelper (>= 7),
+  gcc-mingw-w64-x86-64,
+  g++-mingw-w64-x86-64,
+  binutils-mingw-w64-x86-64
+Standards-Version: 4.6.1.0
 
 Package: mingw64-ncurses6
 Architecture: any
diff --git a/package/debian-mingw64/copyright b/package/debian-mingw64/copyright
index 43cb3e5..3239664 100644
--- a/package/debian-mingw64/copyright
+++ b/package/debian-mingw64/copyright
@@ -1,20 +1,21 @@
-Upstream source http://invisible-island.net/ncurses/ncurses.html
+Upstream source https://invisible-island.net/ncurses/ncurses.html
 This package is used for testing builds of ncurses.
 
 Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 1998-2014,2015 Free Software Foundation, Inc.
-Licence: X11
+Copyright: 2017-2023,2024 by Thomas E. Dickey
+Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+License: X11
 
 Files: aclocal.m4 package
-Copyright: 1996-2014,2015 by Thomas E. Dickey
-Licence: X11
+Copyright: 1996-2023,2024 by Thomas E. Dickey
+License: X11
 
 Files: doc/html/NCURSES-Programming-HOWTO.html
 Copyright: 2001 by Pradeep Padala
-Licence: X11
+License: X11
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the
@@ -43,7 +44,7 @@
 -------------------------------------------------------------------------------
 Files: install-sh
 Copyright:  1994 X Consortium
-Licence: X11
+License: X11
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to
diff --git a/package/debian-mingw64/mingw64-ncurses6.lintian-overrides b/package/debian-mingw64/mingw64-ncurses6.lintian-overrides
new file mode 100644
index 0000000..9e8f854
--- /dev/null
+++ b/package/debian-mingw64/mingw64-ncurses6.lintian-overrides
@@ -0,0 +1,7 @@
+mingw64-ncurses6: latest-debian-changelog-entry-changed-to-native
+
+mingw64-ncurses6: non-standard-dir-in-usr
+mingw64-ncurses6: file-in-unusual-dir
+
+mingw64-ncurses6: binary-without-manpage
+mingw64-ncurses6: executable-not-elf-or-script
diff --git a/package/debian-mingw64/rules b/package/debian-mingw64/rules
index 04a21a3..3a79517 100755
--- a/package/debian-mingw64/rules
+++ b/package/debian-mingw64/rules
@@ -11,6 +11,8 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+MY_ABI=6
+
 BUILD_CC = gcc
 
 CC_NORMAL = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
@@ -19,13 +21,15 @@
 TARGET    = x86_64-w64-mingw32
 MINGW_BIN = /usr/bin
 MINGW_TOP = /usr/$(TARGET)
-MINGW_TMP = $(CURDIR)/debian/mingw64-ncurses6
+MINGW_TMP = $(CURDIR)/debian/mingw64-ncurses$(MY_ABI)
 
 CFLAGS = $(CC_NORMAL)
 
+verbose = # -v
+
 CONFIG_OPTIONS = \
-	--disable-echo \
 	--disable-db-install \
+	--disable-echo \
 	--disable-getcap \
 	--disable-hard-tabs \
 	--disable-leaks \
@@ -33,15 +37,21 @@
 	--disable-overwrite \
 	--disable-termcap \
 	--enable-interop \
+	--enable-opaque-curses \
+	--enable-opaque-form \
+	--enable-opaque-menu \
+	--enable-opaque-panel \
 	--enable-pc-files \
 	--enable-term-driver \
 	--enable-warnings \
 	--enable-widec \
 	--verbose \
-	--with-abi-version=6 \
+	--with-abi-version=$(MY_ABI) \
 	--with-cxx-shared \
 	--with-develop \
-	--with-fallbacks=unknown,rxvt \
+	--with-fallbacks=unknown,ms-terminal,xterm-256color \
+	--with-tic-path=/usr/bin/tic$(MY_ABI) \
+	--with-infocmp-path=/usr/bin/infocmp$(MY_ABI) \
 	--with-shared \
 	--with-trace \
 	--with-xterm-kbs=DEL \
@@ -73,6 +83,7 @@
 		--target=$(TARGET) \
 		--prefix=$(MINGW_TOP) \
 		--with-build-cc=$(BUILD_CC) \
+		--with-pc-suffix=$(MY_ABI) \
 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig \
 		$(CONFIG_OPTIONS)
 
@@ -100,8 +111,8 @@
 install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
-	dh_clean -k
-	dh_installdirs
+	dh_prep
+	dh_installdirs      $(verbose)
 
 	$(MAKE) install.libs DESTDIR=$(MINGW_TMP)
 
@@ -121,16 +132,18 @@
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
-	dh_testroot
-	dh_installchangelogs NEWS
+	dh_testroot          $(verbose)
+	dh_lintian           $(verbose)
+	dh_installdocs       $(verbose)
+	dh_installchangelogs $(verbose) NEWS
 	# dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_compress          $(verbose)
+	dh_fixperms          $(verbose)
+	dh_installdeb        $(verbose)
+	dh_shlibdeps         $(verbose)
+	dh_gencontrol        $(verbose)
+	dh_md5sums           $(verbose)
+	dh_builddeb          $(verbose)
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install install-stamp
diff --git a/package/debian-mingw64/watch b/package/debian-mingw64/watch
index 945a996..f6b3987 100644
--- a/package/debian-mingw64/watch
+++ b/package/debian-mingw64/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://invisible-island.net/ncurses/current/ncurses\.tar.gz \
+opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \
  debian  uupdate
diff --git a/package/debian/changelog b/package/debian/changelog
index 36464e0..12ba6fb 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,10 +1,10 @@
-ncurses6 (6.0+20150808) unstable; urgency=low
+ncurses6 (6.5+20240427) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 06 Aug 2015 19:13:39 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 27 Apr 2024 09:56:53 -0400
 
-ncurses6 (5.9-20120608) unstable; urgency=low
+ncurses6 (5.9+20120608) unstable; urgency=low
 
   * initial release
 
diff --git a/package/debian/compat b/package/debian/compat
index 7ed6ff8..48082f7 100644
--- a/package/debian/compat
+++ b/package/debian/compat
@@ -1 +1 @@
-5
+12
diff --git a/package/debian/control b/package/debian/control
index 4c6e82c..3592191 100644
--- a/package/debian/control
+++ b/package/debian/control
@@ -2,13 +2,13 @@
 Section: libdevel
 Priority: optional
 Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
-Homepage: http://invisible-island.net/ncurses/
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.2
+Homepage: https://invisible-island.net/ncurses/
+Build-Depends: debhelper (>= 8.1.3)
+Standards-Version: 4.6.1.0
 
 Package: ncurses6
 Architecture: any
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libc6 (>= 2.4)
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
  updating character screens with reasonable optimization.
@@ -17,9 +17,28 @@
 
 Package: ncursest6
 Architecture: any
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libc6 (>= 2.4)
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
  updating character screens with reasonable optimization.
  .
  This package is used for testing ABI 6 with pthreads.
+
+Package: ncurses6-doc
+Section: doc
+Architecture: all
+Depends: groff-base
+Description: shared libraries for terminal handling
+ The ncurses library routines are a terminal-independent method of
+ updating character screens with reasonable optimization.
+ .
+ This package is used for testing ncurses6 document packaging.
+
+Package: ncurses6-doc-html
+Section: doc
+Architecture: all
+Description: shared libraries for terminal handling
+ The ncurses library routines are a terminal-independent method of
+ updating character screens with reasonable optimization.
+ .
+ This package is used for testing ncurses6 document packaging.
diff --git a/package/debian/copyright b/package/debian/copyright
index 43cb3e5..3239664 100644
--- a/package/debian/copyright
+++ b/package/debian/copyright
@@ -1,20 +1,21 @@
-Upstream source http://invisible-island.net/ncurses/ncurses.html
+Upstream source https://invisible-island.net/ncurses/ncurses.html
 This package is used for testing builds of ncurses.
 
 Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 1998-2014,2015 Free Software Foundation, Inc.
-Licence: X11
+Copyright: 2017-2023,2024 by Thomas E. Dickey
+Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+License: X11
 
 Files: aclocal.m4 package
-Copyright: 1996-2014,2015 by Thomas E. Dickey
-Licence: X11
+Copyright: 1996-2023,2024 by Thomas E. Dickey
+License: X11
 
 Files: doc/html/NCURSES-Programming-HOWTO.html
 Copyright: 2001 by Pradeep Padala
-Licence: X11
+License: X11
 
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the
@@ -43,7 +44,7 @@
 -------------------------------------------------------------------------------
 Files: install-sh
 Copyright:  1994 X Consortium
-Licence: X11
+License: X11
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to
diff --git a/package/debian/ncurses6.lintian-overrides b/package/debian/ncurses6.lintian-overrides
new file mode 100644
index 0000000..8bd4945
--- /dev/null
+++ b/package/debian/ncurses6.lintian-overrides
@@ -0,0 +1,9 @@
+# This is intentional.
+ncurses6: package-name-doesnt-match-sonames libformw6-6 libmenuw6-6 libncurses++w6-6 libncursesw6-6 libpanelw6-6 libticw6-6 libtinfow6-6
+
+# This is intentional.
+ncurses6: binary-without-manpage
+ncurses6: non-dev-pkg-with-shlib-symlink
+ncurses6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfow6.so.6.4]
+
+# vile: confmode
diff --git a/package/debian/ncurses6.triggers b/package/debian/ncurses6.triggers
new file mode 100644
index 0000000..dd86603
--- /dev/null
+++ b/package/debian/ncurses6.triggers
@@ -0,0 +1 @@
+activate-noawait ldconfig
diff --git a/package/debian/ncursest6.lintian-overrides b/package/debian/ncursest6.lintian-overrides
new file mode 100644
index 0000000..5a1b83b
--- /dev/null
+++ b/package/debian/ncursest6.lintian-overrides
@@ -0,0 +1,9 @@
+# This is intentional.
+ncursest6: package-name-doesnt-match-sonames libformtw6-6 libmenutw6-6 libncurses++tw6-6 libncursestw6-6 libpaneltw6-6 libtictw6-6 libtinfotw6-6
+
+# This is intentional.
+ncursest6: binary-without-manpage
+ncursest6: non-dev-pkg-with-shlib-symlink
+ncursest6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfotw6.so.6.4]
+
+# vile: confmode
diff --git a/package/debian/ncursest6.triggers b/package/debian/ncursest6.triggers
new file mode 100644
index 0000000..dd86603
--- /dev/null
+++ b/package/debian/ncursest6.triggers
@@ -0,0 +1 @@
+activate-noawait ldconfig
diff --git a/package/debian/rules b/package/debian/rules
index e77fd69..648939b 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -1,35 +1,41 @@
 #!/usr/bin/make -f
-# Made with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Cristoph Lameter.
+# $Id: rules,v 1.53 2024/04/08 15:31:32 tom Exp $
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+SHELL = /bin/bash
+DPKG_EXPORT_BUILDFLAGS = 1
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+include /usr/share/dpkg/buildflags.mk
+
 # packages
-PACKAGES.indep = # ncurses6-docs
+PACKAGES.indep = ncurses6-doc ncurses6-doc-html
 PACKAGES.arch  = ncurses6 ncursest6
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CC_NORMAL = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
 CC_STRICT = $(CC_NORMAL) -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic
 
 MY_ABI=6
 MY_DIR=/usr
+BINDIR=$(MY_DIR)/bin
+LIBDIR=$(MY_DIR)/lib/$(DEB_HOST_MULTIARCH)
 MYDATA=/usr/local/ncurses/share/terminfo
 NORMAL_DIR=$(CURDIR)/debian/ncurses$(MY_ABI)
 THREAD_DIR=$(CURDIR)/debian/ncursest$(MY_ABI)
 
-CFLAGS   = $(shell dpkg-buildflags --get CFLAGS) $(CC_NORMAL)
-CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
-LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS   += $(CC_NORMAL)
 
 ifneq ($(MY_DIR),/usr)
-	RPATH_ENV = RPATH_LIST=../lib:$(MY_DIR)/lib
+	RPATH_ENV = RPATH_LIST=../lib:$(LIBDIR)
 	RPATH_OPT = --enable-rpath
 else
 	RPATH_ENV =
@@ -55,33 +61,47 @@
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=$(MY_DIR) \
-		--with-default-terminfo-dir=$(MYDATA) \
-		--with-terminfo-dirs=$(MYDATA):/usr/share/terminfo \
+		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--disable-echo \
 		--disable-getcap \
 		--disable-leaks \
 		--disable-macros  \
 		--disable-overwrite  \
+		--disable-relink \
+		--disable-root-access \
+		--disable-root-environ \
 		--disable-termcap \
+		--enable-check-size \
 		--enable-hard-tabs \
+		--enable-opaque-curses \
+		--enable-opaque-form \
+		--enable-opaque-menu \
+		--enable-opaque-panel \
 		--enable-pc-files \
+		--enable-stdnoreturn \
 		--enable-warnings \
 		--enable-wgetch-events \
 		--enable-widec \
+		--enable-xmc-glitch \
 		--program-suffix=$(MY_ABI) \
 		--verbose \
 		--with-abi-version=$(MY_ABI) \
+		--with-config-suffix=dev \
+		--with-cxx-shared \
+		--with-default-terminfo-dir=$(MYDATA) \
 		--with-develop \
 		--with-extra-suffix=$(MY_ABI) \
 		--with-shared \
+		--with-terminfo-dirs=$(MYDATA):/lib/terminfo:/usr/share/terminfo \
 		--with-termlib \
 		--with-ticlib \
 		--with-trace \
-		--with-cxx-shared \
 		--with-versioned-syms \
 		--with-xterm-kbs=DEL \
 		--without-ada \
 		--without-debug \
+		--with-manpage-aliases \
+		--with-manpage-symlinks \
 		--without-normal
 
 NCURSES6_DIR = $(CURDIR)/debian/ncurses6
@@ -112,14 +132,29 @@
 install-indep: $(PACKAGES.indep:%=install-%-stamp)
 install-arch: $(PACKAGES.arch:%=install-%-stamp)
 
-config-ncurses6-stamp:
+# make the doc-package installable by renaming everything to avoid clashing
+patch-ncurses6-stamp:
+	dh_testdir
+	sed -i.bak \
+		-e 's/-config\.1$$/dev-config.1/;t' \
+		-e 's/\.3ncurses$$/.3ncurses6/' \
+		-e 's/\.3curses$$/.3curses6/' \
+		-e 's/\.3form$$/.3form6/' \
+		-e 's/\.3menu$$/.3menu6/' \
+		-e 's/\.3panel$$/.3panel6/' \
+		-e 's/\.\([157]\)$$/6.\1/' \
+		man/man_db.renames.in
+	diff -u man/man_db.renames.in.bak man/man_db.renames.in || true
+	touch $@
+
+config-ncurses6-stamp: patch-ncurses6-stamp
 	dh_testdir
 	rm -rf t/ncurses6
 	mkdir -p t/ncurses6
 	cd t/ncurses6; $(configure)
 	touch $@
 
-config-ncursest6-stamp:
+config-ncursest6-stamp: patch-ncurses6-stamp
 	dh_testdir
 	rm -rf t/ncursest6
 	mkdir -p t/ncursest6
@@ -130,6 +165,10 @@
 		--with-pthread
 	touch $@
 
+config-ncurses6-doc-stamp \
+config-ncurses6-doc-html-stamp: config-ncurses6-stamp
+	touch $@
+
 build-ncurses6-stamp: config-ncurses6-stamp
 	dh_testdir
 
@@ -144,6 +183,10 @@
 
 	touch $@
 
+build-ncurses6-doc-stamp \
+build-ncurses6-doc-html-stamp: build-ncurses6-stamp
+	touch $@
+
 install-ncurses6-stamp: build-ncurses6-stamp
 	dh_testdir
 	dh_testroot
@@ -151,9 +194,9 @@
 	dh_prep        $(verbose) -pncurses6
 
 	$(MAKE) -C t/ncurses6 install.libs install.progs DESTDIR=$(NCURSES6_DIR)
-	$(MAKE) -C t/ncurses6/test ncurses LOCAL_LIBDIR=$(MY_DIR)/lib
+	$(MAKE) -C t/ncurses6/test ncurses LOCAL_LIBDIR=$(LIBDIR)
 
-	mv t/ncurses6/test/ncurses $(NCURSES6_DIR)$(MY_DIR)/bin/ncurses$(MY_ABI)
+	mv t/ncurses6/test/ncurses $(NCURSES6_DIR)$(BINDIR)/ncurses$(MY_ABI)
 
 	touch $@
 
@@ -164,9 +207,36 @@
 	dh_prep        $(verbose) -pncursest6
 
 	$(MAKE) -C t/ncursest6 install.libs install.progs DESTDIR=$(NCURSEST6_DIR)
-	$(MAKE) -C t/ncursest6/test ncurses LOCAL_LIBDIR=$(MY_DIR)/lib
+	$(MAKE) -C t/ncursest6/test ncurses LOCAL_LIBDIR=$(LIBDIR)
 
-	mv t/ncursest6/test/ncurses $(NCURSEST6_DIR)$(MY_DIR)/bin/ncursest$(MY_ABI)
+	mv t/ncursest6/test/ncurses $(NCURSEST6_DIR)$(BINDIR)/ncursest$(MY_ABI)
+
+	touch $@
+
+install-ncurses6-doc-stamp: build-ncurses6-stamp
+	dh_testdir
+	dh_testroot
+	dh_installdirs $(verbose)
+	dh_prep        $(verbose) -pncurses6-doc
+
+	$(MAKE) -C t/ncurses6 install.man DESTDIR=$(NCURSES6_DIR)-doc
+	find $(NCURSES6_DIR)-doc -name 'ncursesw6-config.*' -print -delete
+
+	cd $(NCURSES6_DIR)-doc/usr/share/man/man1 && ln -sf tset6.1.gz reset6.1.gz
+
+	touch $@
+
+HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/doc/ncurses6-doc-html
+install-ncurses6-doc-html-stamp: build-ncurses6-stamp
+	dh_testdir
+	dh_testroot
+	dh_installdirs $(verbose)
+	dh_prep        $(verbose) -pncurses6-doc-html
+
+	cd doc/html && find * -type d | sort | xargs -I{} mkdir -p -v $(HTML_DESTDIR)/{}
+	cd doc/html && find * -type f -name '*.html' | sort | xargs -I{} install -m 644 -p -v -T {} $(HTML_DESTDIR)/{}
+	find $(HTML_DESTDIR) -type d -empty -delete -print
+	find $(HTML_DESTDIR) -type d -empty -delete -print
 
 	touch $@
 
@@ -176,6 +246,7 @@
 	rm -f $(PACKAGES.indep:%=install-%-stamp)
 	dh_testdir
 	dh_testroot
+	dh_lintian           $(verbose) $(PACKAGES.arch:%=-p%)
 	dh_installdocs       $(verbose) $(PACKAGES.indep:%=-p%)
 	dh_installman        $(verbose) $(PACKAGES.indep:%=-p%)
 	dh_installexamples   $(verbose) $(PACKAGES.indep:%=-p%)
@@ -194,6 +265,15 @@
 	rm -f $(PACKAGES.arch:%=install-%-stamp)
 	dh_testdir
 	dh_testroot
+
+	version=`set -x; awk 'BEGIN{major=minor=0} /^NCURSES_MAJOR/{major=$$3} /^NCURSES_MINOR/{minor=$$3} END{print major "." minor}' < dist.mk`; \
+	sed -i \
+		-e "s, usr/lib, usr/lib/$(DEB_HOST_MULTIARCH)," \
+		-e "s,6\.1,$${version}," \
+		debian/*.lintian-overrides
+
+	dh_lintian           $(verbose) $(PACKAGES.arch:%=-p%)
+	dh_installdocs       $(verbose) $(PACKAGES.arch:%=-p%)
 	dh_installchangelogs $(verbose) $(PACKAGES.arch:%=-p%)  NEWS
 	dh_strip             $(verbose) $(PACKAGES.arch:%=-p%)
 	dh_compress          $(verbose) $(PACKAGES.arch:%=-p%)
diff --git a/package/debian/watch b/package/debian/watch
index 945a996..f6b3987 100644
--- a/package/debian/watch
+++ b/package/debian/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://invisible-island.net/ncurses/current/ncurses\.tar.gz \
+opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \
  debian  uupdate
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index c53544b..2bbc8cc 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.117 2015/08/06 23:13:39 tom Exp $

+; $Id: mingw-ncurses.nsi,v 1.645 2024/04/27 13:56:53 tom Exp $

 

 ; TODO add examples

 ; TODO bump ABI to 6

@@ -8,9 +8,9 @@
 !define EXENAME "ncurses.exe"

 

 !define VERSION_MAJOR "6"

-!define VERSION_MINOR "0"

-!define VERSION_YYYY  "2015"

-!define VERSION_MMDD  "0808"

+!define VERSION_MINOR "5"

+!define VERSION_YYYY  "2024"

+!define VERSION_MMDD  "0427"

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

 

 !define MY_ABI   "5"

@@ -32,7 +32,7 @@
 SetCompressor /SOLID lzma

 

 VIAddVersionKey ProductName "${SUBKEY}"

-VIAddVersionKey CompanyName "http://invisible-island.net"

+VIAddVersionKey CompanyName "https://invisible-island.net"

 VIAddVersionKey FileDescription "NCurses Installer (MinGW)"

 VIAddVersionKey FileVersion ${VERSION_FULL}

 VIAddVersionKey ProductVersion ${VERSION_FULL}

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 703d685..3635bbc 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -2,12 +2,12 @@
 
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
-Version: 6.0
-Release: 20150808
+Version: 6.5
+Release: 20240427
 License: X11
 Group: Development/Libraries
-Source: ncurses-%{version}-%{release}.tgz
-# URL: http://invisible-island.net/ncurses/
+URL: https://invisible-island.net/ncurses/
+Source: https://invisible-island.net/archives/ncurses/ncurses-%{version}-%{release}.tgz
 
 BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
@@ -17,6 +17,8 @@
 BuildRequires:  mingw64-gcc
 BuildRequires:  mingw64-binutils
 
+%global MY_ABI 6
+
 %define CC_NORMAL -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
 %define CC_STRICT %{CC_NORMAL} -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic
 
@@ -37,39 +39,46 @@
 The ncurses library routines are a terminal-independent method of
 updating character screens with reasonable optimization.
 
-This package is used for testing ABI 6 with cross-compiles to MinGW.
+This package is used for testing ABI %{MY_ABI} with cross-compiles to MinGW.
 
 %prep
 
 %define CFG_OPTS \\\
-	--disable-echo \\\
 	--disable-db-install \\\
+	--disable-echo \\\
 	--disable-getcap \\\
 	--disable-hard-tabs \\\
 	--disable-leaks \\\
 	--disable-macros \\\
 	--disable-overwrite \\\
 	--disable-termcap \\\
-	--enable-const \\\
-	--enable-ext-colors \\\
-	--enable-ext-mouse \\\
-	--enable-ext-putwin \\\
 	--enable-interop \\\
+	--enable-opaque-curses \\\
+	--enable-opaque-form \\\
+	--enable-opaque-menu \\\
+	--enable-opaque-panel \\\
+	--enable-pc-files \\\
 	--enable-sp-funcs \\\
 	--enable-term-driver \\\
 	--enable-warnings \\\
+	--enable-wgetch-events \\\
 	--enable-widec \\\
+	--with-config-suffix=dev \\\
 	--verbose \\\
 	--with-cxx-shared \\\
 	--with-develop \\\
-	--with-fallbacks=unknown,rxvt \\\
+	--with-fallbacks=unknown,xterm \\\
+	--with-tic-path=/usr/bin/tic%{MY_ABI} \\\
+	--with-infocmp-path=/usr/bin/infocmp%{MY_ABI} \\\
+	--with-install-prefix=$RPM_BUILD_ROOT \\\
+	--with-pc-suffix=%{MY_ABI} \\\
+	--with-pcre2 \\\
 	--with-shared \\\
 	--with-tparm-arg=intptr_t \\\
 	--with-trace \\\
 	--with-xterm-kbs=DEL \\\
 	--without-ada \\\
 	--without-debug \\\
-	--with-install-prefix=$RPM_BUILD_ROOT \\\
 	--without-manpages \\\
 	--without-progs \\\
 	--without-tests
@@ -82,7 +91,8 @@
 pushd BUILD-W32
 CFLAGS="%{CC_NORMAL}" \
 CC=%{mingw32_cc} \
-%mingw32_configure %{CFG_OPTS}
+%mingw32_configure %{CFG_OPTS} \
+	--with-pkg-config-libdir=%{mingw32_libdir}/pkgconfig
 make
 popd
 
@@ -90,7 +100,8 @@
 pushd BUILD-W64
 CFLAGS="%{CC_NORMAL}" \
 CC=%{mingw64_cc} \
-%mingw64_configure %{CFG_OPTS}
+%mingw64_configure %{CFG_OPTS} \
+	--with-pkg-config-libdir=%{mingw64_libdir}/pkgconfig
 make
 popd
 
@@ -117,9 +128,6 @@
 	done
 popd
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -n mingw32-ncurses6
 %defattr(-,root,root,-)
 %{_bindir}/%{mingw32_target}-*
@@ -136,6 +144,18 @@
 
 %changelog
 
+* Sat Feb 25 2023 Thomas Dickey
+- amend URLs per rpmlint
+
+* Sun Jun 30 2019 Thomas E. Dickey
+- use tic-path and infocmp-path options for fallbacks
+
+* Sat Feb 10 2018 Thomas E. Dickey
+- add several development features
+
+* Tue Dec 26 2017 Thomas E. Dickey
+- add --with-config-suffix option
+
 * Sat Sep 20 2014 Thomas E. Dickey
 - adjust install-rules for ncurses*-config
 
diff --git a/package/ncurses.map b/package/ncurses.map
index a59484f..68de9c4 100644
--- a/package/ncurses.map
+++ b/package/ncurses.map
@@ -1,4 +1,4 @@
-# $Id: ncurses.map,v 1.34 2015/06/27 22:28:50 tom Exp $
+# $Id: ncurses.map,v 1.58 2024/04/27 14:33:24 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -740,12 +740,47 @@
 	global:
 		wgetdelay;
 	local:
-		_*;
 		_nc_mvcur;
 		_nc_mvcur_sp;
 		_nc_trace_mmask_t;
 } NCURSES_5.8.20110226;
 
+NCURSES_6.1.20171230 {
+	global:
+		alloc_pair;
+		alloc_pair_sp;
+		extended_color_content;
+		extended_color_content_sp;
+		extended_pair_content;
+		extended_pair_content_sp;
+		find_pair;
+		find_pair_sp;
+		free_pair;
+		free_pair_sp;
+		init_extended_color;
+		init_extended_color_sp;
+		init_extended_pair;
+		init_extended_pair_sp;
+		reset_color_pairs;
+		reset_color_pairs_sp;
+		unfocus_current_field;
+	local:
+		_nc_Unset_Current_Field;
+		_nc_change_pair;
+		_nc_init_color;
+		_nc_init_pair;
+		_nc_pair_content;
+		_nc_reset_color_pair;
+		_nc_set_color_pair;
+} NCURSES_5.9.20150530;
+
+NCURSES_6.2.20200212 {
+	global:
+		exit_curses;
+	local:
+		_*;
+} NCURSES_6.1.20171230;
+
 NCURSES_TIC_5.0.19991023 {
 	global:
 		_nc_capcmp;
@@ -806,6 +841,14 @@
 		_nc_strict_bsd;
 } NCURSES_TIC_5.7.20081102;
 
+NCURSES_TIC_6.1.20171230 {
+	global:
+		_nc_read_entry2;
+		_nc_write_object;
+	local:
+		_*;
+} NCURSES_TIC_5.9.20150530;
+
 NCURSES_TINFO_5.0.19991023 {
 	global:
 		BC;
@@ -1100,6 +1143,7 @@
 		keyname_sp;
 		keyok_sp;
 		killchar_sp;
+		longname_sp;
 		napms_sp;
 		new_prescr;
 		nocbreak_sp;
@@ -1142,8 +1186,48 @@
 		use_tioctl;
 		use_tioctl_sp;
 	local:
-		_*;
 		_nc_comp_error_leaks;
 		_nc_db_iterator_leaks;
 		_nc_setenv_num;
 } NCURSES_TINFO_5.8.20110226;
+
+NCURSES_TINFO_6.1.20171230 {
+	global:
+		_nc_copy_termtype2;
+		_nc_export_termtype2;
+		_nc_fallback2;
+		_nc_free_termtype2;
+} NCURSES_TINFO_5.9.20150530;
+
+NCURSES_TINFO_6.2.20200212 {
+	global:
+		_nc_find_user_entry;
+		_nc_fmt_funcptr;
+		_nc_wacs_width;
+		curses_trace;
+		exit_terminfo;
+} NCURSES_TINFO_6.1.20171230;
+
+NCURSES_TINFO_6.2.20211010 {
+	global:
+		_nc_reset_tparm;
+		_nc_safe_fopen;
+		_nc_safe_open3;
+		_nc_tiparm;
+} NCURSES_TINFO_6.2.20200212;
+
+NCURSES_TINFO_6.5.20240427 {
+	global:
+		is_cbreak;
+		is_cbreak_sp;
+		is_echo;
+		is_echo_sp;
+		is_nl;
+		is_nl_sp;
+		is_raw;
+		is_raw_sp;
+		tiparm_s;
+		tiscan_s;
+	local:
+		_*;
+} NCURSES_TINFO_6.2.20211010;
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 305c70a..a4a915c 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,14 +1,11 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
-Version: 6.0
-Release: 20150808
+Version: 6.5
+Release: 20240427
 License: X11
 Group: Development/Libraries
-Source: ncurses-%{version}-%{release}.tgz
-# URL: http://invisible-island.net/ncurses/
-
-%define CC_NORMAL -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
-%define CC_STRICT %{CC_NORMAL} -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic
+URL: https://invisible-island.net/ncurses/
+Source: https://invisible-island.net/archives/ncurses/ncurses-%{version}-%{release}.tgz
 
 %global MY_ABI 6
 
@@ -29,48 +26,88 @@
 
 %prep
 
+%global is_mandriva %(test -f /etc/mandriva-release && echo 1 || echo 0)
+%global is_fedora   %(test -f /usr/bin/dnf && echo 1 || echo 0)
+%global is_centos   %(test -f /etc/centos-release && echo 1 || echo 0)
+%global is_redhat   %(test -f /etc/redhat-release && echo 1 || echo 0)
+%global is_scilinux %(test -f /etc/sl-release && echo 1 || echo 0)
+%global is_suse     %(test -f /etc/SuSE-release && echo 1 || echo 0)
+
+%if %{is_redhat}
+# generate debug/debug-source packages.
+%else
 %define debug_package %{nil}
+%endif
+
+%if %{is_mandriva}
+%define _disable_ld_as_needed 1
+%define _disable_ld_no_undefined 1
+# libtool is not used here...
+%define _disable_libtoolize 1
+%define _disable_ld_build_id 1
+%endif
+
+%if %{is_fedora} || %{is_scilinux} || %{is_centos}
+# workaround for toolset breakage in Fedora 28
+%define _test_relink --enable-relink
+%else
+%define _test_relink --disable-relink
+%endif
+
 %setup -q -n ncurses-%{version}-%{release}
 
 %build
-CFLAGS="%{CC_NORMAL}" \
-RPATH_LIST=../lib:%{_prefix}/lib \
-%configure \
-	--target %{_target_platform} \
-	--prefix=%{_prefix} \
-	--includedir='${prefix}/include' \
-	--with-default-terminfo-dir=%{MYDATA} \
-	--with-install-prefix=$RPM_BUILD_ROOT \
-	--with-terminfo-dirs=%{MYDATA}:/usr/share/terminfo \
-	--disable-echo \
-	--disable-getcap \
-	--disable-leaks \
-	--disable-macros  \
-	--disable-overwrite  \
-	--disable-termcap \
-	--enable-hard-tabs \
-	--enable-pc-files \
-	--enable-rpath \
-	--enable-warnings \
-	--enable-wgetch-events \
-	--enable-widec \
-	--verbose \
-	--program-suffix=%{MY_ABI} \
-	--with-abi-version=%{MY_ABI} \
-	--with-develop \
-	--with-shared \
-	--with-termlib \
-	--with-ticlib \
-	--with-trace \
-	--with-cxx-shared \
-	--with-extra-suffix=%{MY_ABI} \
-	--with-pkg-config-libdir=%{MY_PKG} \
-	--with-versioned-syms \
-	--with-xterm-kbs=DEL \
-	--without-ada \
-	--without-debug \
+%define CFG_OPTS \\\
+	--target %{_target_platform} \\\
+	--prefix=%{_prefix} \\\
+	--bindir=%{_bindir} \\\
+	--includedir=%{_includedir} \\\
+	--libdir=%{_libdir} \\\
+	--includedir='${prefix}/include' \\\
+	--disable-echo \\\
+	--disable-getcap \\\
+	--disable-leaks \\\
+	--disable-macros  \\\
+	--disable-overwrite  \\\
+	--disable-root-access \\\
+	--disable-root-environ \\\
+	--disable-rpath \\\
+	--disable-termcap \\\
+	%{_test_relink}  \\\
+	--enable-hard-tabs \\\
+	--enable-opaque-curses \\\
+	--enable-opaque-form \\\
+	--enable-opaque-menu \\\
+	--enable-opaque-panel \\\
+	--enable-pc-files \\\
+	--enable-stdnoreturn \\\
+	--enable-warnings \\\
+	--enable-wgetch-events \\\
+	--enable-widec \\\
+	--enable-xmc-glitch \\\
+	--program-suffix=%{MY_ABI} \\\
+	--verbose \\\
+	--with-abi-version=%{MY_ABI} \\\
+	--with-config-suffix=dev \\\
+	--with-cxx-shared \\\
+	--with-default-terminfo-dir=%{MYDATA} \\\
+	--with-develop \\\
+	--with-extra-suffix=%{MY_ABI} \\\
+	--with-install-prefix=$RPM_BUILD_ROOT \\\
+	--with-pkg-config-libdir=%{MY_PKG} \\\
+	--with-shared \\\
+	--with-terminfo-dirs=%{MYDATA}:/usr/share/terminfo \\\
+	--with-termlib \\\
+	--with-ticlib \\\
+	--with-trace \\\
+	--with-versioned-syms \\\
+	--with-xterm-kbs=DEL \\\
+	--without-ada \\\
+	--without-debug \\\
 	--without-normal
 
+%configure %{CFG_OPTS}
+
 make
 
 %install
@@ -80,18 +117,58 @@
 rm -f test/ncurses
 ( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncurses%{MY_ABI} )
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%if %{is_mandriva}
+# check this first because Mageia has the /etc/redhat-release file...
+%else
+%if %{is_fedora}
+%ldconfig_scriptlets libs
+%ldconfig_scriptlets c++-libs
+%endif
+%endif
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_includedir}/*
 %{_libdir}/*
-%{MY_PKG}/*.pc
 
 %changelog
 
+* Sat Feb 25 2023 Thomas Dickey
+- amend URLs per rpmlint
+
+* Sat Oct 16 2021 Thomas Dickey
+- disable rpath to address QA_RPATHS=1 warning.
+
+* Tue Dec 24 2019 Thomas Dickey
+- drop custom CC_NORMAL warning flags because setting CFLAGS interferes with
+  matching Fedora's PIE/PIC configuration.  Also, generate debug/debug-source
+  packages.
+
+* Sat Nov 16 2019 Thomas Dickey
+- modify clean-rule to work around Fedora NFS bugs.
+
+* Sat Aug 25 2018 Thomas E. Dickey
+- split spec-file into ncurses6 and ncursest6 to work around toolset breakage
+  in Fedora 28
+
+* Sat Jun 02 2018 Thomas E. Dickey
+- build-fix for Mageia
+
+* Sat May 26 2018 Thomas E. Dickey
+- use predefined configure-macro
+- separate ncurses6/ncursest6 packages
+
+* Sat Feb 10 2018 Thomas E. Dickey
+- add ncursest6 package
+- add several development features
+
+* Mon Jan 01 2018 Thomas E. Dickey
+- drop redundant files pattern for "*.pc"
+
+* Tue Dec 26 2017 Thomas E. Dickey
+- add --with-config-suffix option
+
 * Sun Apr 26 2015 Thomas E. Dickey
 - move package to /usr
 
diff --git a/package/ncurses.sym b/package/ncurses.sym
index 1e2cbf8..aaa1621 100644
--- a/package/ncurses.sym
+++ b/package/ncurses.sym
@@ -1,4 +1,4 @@
-# $Id: ncurses.sym,v 1.23 2015/06/27 22:30:44 tom Exp $
+# $Id: ncurses.sym,v 1.39 2023/08/12 15:29:01 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -51,7 +51,7 @@
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --with-termlib --with-trace
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-wgetch-events --with-hashed-db --with-termlib --with-ticlib --with-trace
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --with-broken_linker --with-termlib --with-ticlib --with-trace
-# Configure options (6.0.current)
+# Configure options (6.0.20161029)
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-getcap --enable-getcap-cache --enable-hard-tabs --enable-termcap --with-termlib --with-trace
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-interop --with-termlib --with-trace
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --with-broken_linker --with-hashed-db --with-termlib --with-trace
@@ -90,6 +90,7 @@
 _nc_check_termtype2
 _nc_comp_scan_leaks
 _nc_copy_termtype
+_nc_copy_termtype2
 _nc_curr_col
 _nc_curr_line
 _nc_db_close
@@ -104,16 +105,21 @@
 _nc_env_access
 _nc_err_abort
 _nc_eventlist_timeout
+_nc_export_termtype2
 _nc_fallback
+_nc_fallback2
 _nc_find_entry
 _nc_find_type_entry
+_nc_find_user_entry
 _nc_first_db
 _nc_first_name
 _nc_flush
 _nc_flush_sp
+_nc_fmt_funcptr
 _nc_free_and_exit
 _nc_free_entries
 _nc_free_termtype
+_nc_free_termtype2
 _nc_free_tic
 _nc_free_tinfo
 _nc_free_tparm
@@ -165,10 +171,12 @@
 _nc_putp_flush_sp
 _nc_putp_sp
 _nc_read_entry
+_nc_read_entry2
 _nc_read_entry_source
 _nc_read_file_entry
 _nc_read_termtype
 _nc_reset_input
+_nc_reset_tparm
 _nc_resolve_uses
 _nc_resolve_uses2
 _nc_retrace_attr_t
@@ -185,6 +193,8 @@
 _nc_retrace_win
 _nc_ripoffline
 _nc_rootname
+_nc_safe_fopen
+_nc_safe_open3
 _nc_safe_strcat
 _nc_safe_strcpy
 _nc_screen_chain
@@ -213,6 +223,7 @@
 _nc_timed_wait
 _nc_tinfo_fkeys
 _nc_tinfo_fkeysf
+_nc_tiparm
 _nc_tparm_analyze
 _nc_tparm_err
 _nc_tputs_trace
@@ -229,8 +240,10 @@
 _nc_visbuf2
 _nc_visbufn
 _nc_viscbuf
+_nc_wacs_width
 _nc_warning
 _nc_write_entry
+_nc_write_object
 _traceattr
 _traceattr2
 _tracechar
@@ -243,6 +256,8 @@
 addchstr
 addnstr
 addstr
+alloc_pair
+alloc_pair_sp
 assume_default_colors
 assume_default_colors_sp
 attr_get
@@ -284,6 +299,7 @@
 curs_set
 curs_set_sp
 curscr
+curses_trace
 curses_version
 data_ahead
 data_behind
@@ -316,6 +332,12 @@
 erase
 erasechar
 erasechar_sp
+exit_curses
+exit_terminfo
+extended_color_content
+extended_color_content_sp
+extended_pair_content
+extended_pair_content_sp
 field_arg
 field_back
 field_buffer
@@ -335,6 +357,8 @@
 field_userptr
 filter
 filter_sp
+find_pair
+find_pair_sp
 flash
 flash_sp
 flushinp
@@ -357,6 +381,8 @@
 free_form
 free_item
 free_menu
+free_pair
+free_pair_sp
 get_escdelay
 get_escdelay_sp
 getattrs
@@ -399,6 +425,10 @@
 inchstr
 init_color
 init_color_sp
+init_extended_color
+init_extended_color_sp
+init_extended_pair
+init_extended_pair_sp
 init_pair
 init_pair_sp
 initscr
@@ -411,16 +441,24 @@
 instr
 intrflush
 intrflush_sp
+is_cbreak
+is_cbreak_sp
 is_cleared
+is_echo
+is_echo_sp
 is_idcok
 is_idlok
 is_immedok
 is_keypad
 is_leaveok
 is_linetouched
+is_nl
+is_nl_sp
 is_nodelay
 is_notimeout
 is_pad
+is_raw
+is_raw_sp
 is_scrollok
 is_subwin
 is_syncok
@@ -456,6 +494,7 @@
 link_field
 link_fieldtype
 longname
+longname_sp
 mcprint
 mcprint_sp
 menu_back
@@ -601,6 +640,8 @@
 redrawwin
 refresh
 replace_panel
+reset_color_pairs
+reset_color_pairs_sp
 reset_prog_mode
 reset_prog_mode_sp
 reset_shell_mode
@@ -749,6 +790,8 @@
 tigetstr_sp
 timeout
 tiparm
+tiparm_s
+tiscan_s
 top_panel
 top_row
 touchline
@@ -762,6 +805,7 @@
 typeahead_sp
 unctrl
 unctrl_sp
+unfocus_current_field
 ungetch
 ungetch_sp
 ungetmouse
diff --git a/package/ncursest.map b/package/ncursest.map
index 766b80d..1dfbe53 100644
--- a/package/ncursest.map
+++ b/package/ncursest.map
@@ -1,4 +1,4 @@
-# $Id: ncursest.map,v 1.30 2015/07/11 13:01:10 tom Exp $
+# $Id: ncursest.map,v 1.56 2024/04/27 14:33:24 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -54,6 +54,7 @@
 		_nc_read_entry_source;
 		_nc_reset_input;
 		_nc_resolve_uses;
+		_nc_screen;
 		_nc_set_writedir;
 		_nc_syntax;
 		_nc_tic_expand;
@@ -105,6 +106,14 @@
 		_nc_strict_bsd;
 } NCURSES_TIC_5.7.20081102;
 
+NCURSES_TIC_6.1.20171230 {
+	global:
+		_nc_read_entry2;
+		_nc_write_object;
+	local:
+		_*;
+} NCURSES_TIC_5.9.20150530;
+
 NCURSES_TINFO_5.0.19991023 {
 	global:
 		BC;
@@ -150,6 +159,7 @@
 		_nc_tail;
 		_nc_tic_dir;
 		_nc_timed_wait;
+		_nc_tinfo_fkeysf;
 		_nc_trace_buf;
 		_nc_tracing;
 		_nc_update_screensize;
@@ -453,12 +463,54 @@
 		use_tioctl;
 		use_tioctl_sp;
 	local:
-		_*;
 		_nc_comp_error_leaks;
 		_nc_db_iterator_leaks;
 		_nc_setenv_num;
 } NCURSES_TINFO_5.8.20110226;
 
+NCURSES_TINFO_6.1.20171230 {
+	global:
+		_nc_copy_termtype2;
+		_nc_export_termtype2;
+		_nc_fallback2;
+		_nc_find_prescr;
+		_nc_forget_prescr;
+		_nc_free_termtype2;
+} NCURSES_TINFO_5.9.20150530;
+
+NCURSES_TINFO_6.2.20200212 {
+	global:
+		_nc_find_user_entry;
+		_nc_fmt_funcptr;
+		_nc_wacs_width;
+		curses_trace;
+		exit_terminfo;
+} NCURSES_TINFO_6.1.20171230;
+
+NCURSES_TINFO_6.2.20211010 {
+	global:
+		_nc_reset_tparm;
+		_nc_safe_fopen;
+		_nc_safe_open3;
+		_nc_tiparm;
+} NCURSES_TINFO_6.2.20200212;
+
+NCURSES_TINFO_6.5.20240427 {
+	global:
+		is_cbreak;
+		is_cbreak_sp;
+		is_echo;
+		is_echo_sp;
+		is_nl;
+		is_nl_sp;
+		is_raw;
+		is_raw_sp;
+		tiparm_s;
+		tiscan_s;
+	local:
+		_*;
+} NCURSES_TINFO_6.2.20211010;
+
 NCURSEST_5.7.20081102 {
 	global:
 		COLOR_PAIR;
@@ -1104,8 +1156,44 @@
 	global:
 		wgetdelay;
 	local:
-		_*;
 		_nc_mvcur;
 		_nc_mvcur_sp;
 		_nc_trace_mmask_t;
 } NCURSEST_5.8.20110226;
+
+NCURSEST_6.1.20171230 {
+	global:
+		alloc_pair;
+		alloc_pair_sp;
+		extended_color_content;
+		extended_color_content_sp;
+		extended_pair_content;
+		extended_pair_content_sp;
+		find_pair;
+		find_pair_sp;
+		free_pair;
+		free_pair_sp;
+		init_extended_color;
+		init_extended_color_sp;
+		init_extended_pair;
+		init_extended_pair_sp;
+		reset_color_pairs;
+		reset_color_pairs_sp;
+		unfocus_current_field;
+	local:
+		_nc_Unset_Current_Field;
+		_nc_change_pair;
+		_nc_init_color;
+		_nc_init_pair;
+		_nc_pair_content;
+		_nc_reset_color_pair;
+		_nc_set_color_pair;
+} NCURSEST_5.9.20150530;
+
+NCURSEST_6.2.20200212 {
+	global:
+		exit_curses;
+	local:
+		_*;
+} NCURSEST_6.1.20171230;
+
diff --git a/package/ncursest.spec b/package/ncursest.spec
new file mode 100644
index 0000000..8427530
--- /dev/null
+++ b/package/ncursest.spec
@@ -0,0 +1,187 @@
+Summary: Curses library with POSIX thread support.
+Name: ncursest6
+Version: 6.5
+Release: 20240427
+License: X11
+Group: Development/Libraries
+Source: ncurses-%{version}-%{release}.tgz
+# URL: https://invisible-island.net/ncurses/
+
+%global MY_ABI 6
+
+# save value before redefining
+%global sys_libdir %{_libdir}
+
+# was redefined...
+#global _prefix /usr/local/ncurses#{MY_ABI}
+
+%global MY_PKG %{sys_libdir}/pkgconfig
+%define MYDATA /usr/local/ncurses/share/terminfo
+
+%description
+The ncurses library routines are a terminal-independent method of
+updating character screens with reasonable optimization.
+
+This package is used for testing ABI %{MY_ABI} with POSIX threads.
+
+%prep
+
+%global is_mandriva %(test -f /etc/mandriva-release && echo 1 || echo 0)
+%global is_fedora   %(test -f /usr/bin/dnf && echo 1 || echo 0)
+%global is_centos   %(test -f /etc/centos-release && echo 1 || echo 0)
+%global is_redhat   %(test -f /etc/redhat-release && echo 1 || echo 0)
+%global is_scilinux %(test -f /etc/sl-release && echo 1 || echo 0)
+%global is_suse     %(test -f /etc/SuSE-release && echo 1 || echo 0)
+
+%if %{is_redhat}
+# generate debug/debug-source packages.
+%else
+%define debug_package %{nil}
+%endif
+
+%if %{is_mandriva}
+%define _disable_ld_as_needed 1
+%define _disable_ld_no_undefined 1
+# libtool is not used here...
+%define _disable_libtoolize 1
+%define _disable_ld_build_id 1
+%endif
+
+%if %{is_fedora} || %{is_scilinux} || %{is_centos}
+# workaround for toolset breakage in Fedora 28
+%define _test_relink --enable-relink
+%else
+%define _test_relink --disable-relink
+%endif
+
+%setup -q -n ncurses-%{version}-%{release}
+
+%build
+%define CFG_OPTS \\\
+	--target %{_target_platform} \\\
+	--prefix=%{_prefix} \\\
+	--bindir=%{_bindir} \\\
+	--includedir=%{_includedir} \\\
+	--libdir=%{_libdir} \\\
+	--includedir='${prefix}/include' \\\
+	--disable-echo \\\
+	--disable-getcap \\\
+	--disable-leaks \\\
+	--disable-macros  \\\
+	--disable-overwrite  \\\
+	%{_test_relink}  \\\
+	--disable-termcap \\\
+	--enable-hard-tabs \\\
+	--enable-opaque-curses \\\
+	--enable-opaque-form \\\
+	--enable-opaque-menu \\\
+	--enable-opaque-panel \\\
+	--enable-pc-files \\\
+	--enable-rpath \\\
+	--enable-warnings \\\
+	--enable-wgetch-events \\\
+	--enable-widec \\\
+	--enable-xmc-glitch \\\
+	--program-suffix=%{MY_ABI} \\\
+	--verbose \\\
+	--with-abi-version=%{MY_ABI} \\\
+	--with-config-suffix=dev \\\
+	--with-cxx-shared \\\
+	--with-default-terminfo-dir=%{MYDATA} \\\
+	--with-develop \\\
+	--with-extra-suffix=%{MY_ABI} \\\
+	--with-install-prefix=$RPM_BUILD_ROOT \\\
+	--with-pkg-config-libdir=%{MY_PKG} \\\
+	--with-shared \\\
+	--with-terminfo-dirs=%{MYDATA}:/usr/share/terminfo \\\
+	--with-termlib \\\
+	--with-ticlib \\\
+	--with-trace \\\
+	--with-versioned-syms \\\
+	--with-xterm-kbs=DEL \\\
+	--without-ada \\\
+	--without-debug \\\
+	--without-normal
+
+%configure %{CFG_OPTS} \
+	--enable-interop \
+	--enable-sp-funcs \
+	--program-suffix=t%{MY_ABI} \
+	--with-pthread
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install.libs install.progs
+rm -f test/ncurses
+( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncursest%{MY_ABI} )
+
+%if %{is_mandriva}
+# check this first because Mageia has the /etc/redhat-release file...
+%else
+%if %{is_fedora}
+%ldconfig_scriptlets libs
+%ldconfig_scriptlets c++-libs
+%endif
+%endif
+
+%clean
+if rm -rf $RPM_BUILD_ROOT; then
+  echo OK
+else
+  find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1
+fi
+exit 0
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/*
+%{_includedir}/*
+%{_libdir}/*
+
+%changelog
+
+* Tue Dec 24 2019 Thomas Dickey
+- drop custom CC_NORMAL warning flags because setting CFLAGS interferes with
+  matching Fedora's PIE/PIC configuration.  Also, generate debug/debug-source
+  packages.
+
+* Sat Nov 16 2019 Thomas Dickey
+- modify clean-rule to work around Fedora NFS bugs.
+
+* Sat Aug 25 2018 Thomas E. Dickey
+- split spec-file into ncurses6 and ncursest6 to work around toolset breakage
+  in Fedora 28
+
+* Sat Jun 02 2018 Thomas E. Dickey
+- build-fix for Mageia
+
+* Sat May 26 2018 Thomas E. Dickey
+- use predefined configure-macro
+- separate ncurses6/ncursest6 packages
+
+* Sat Feb 10 2018 Thomas E. Dickey
+- add ncursest6 package
+- add several development features
+
+* Mon Jan 01 2018 Thomas E. Dickey
+- drop redundant files pattern for "*.pc"
+
+* Tue Dec 26 2017 Thomas E. Dickey
+- add --with-config-suffix option
+
+* Sun Apr 26 2015 Thomas E. Dickey
+- move package to /usr
+
+* Sun Apr 12 2015 Thomas E. Dickey
+- factor-out MY_ABI
+
+* Sat Mar 09 2013 Thomas E. Dickey
+- add --with-cxx-shared option to demonstrate c++ binding as shared library
+
+* Sat Oct 27 2012 Thomas E. Dickey
+- add ncurses program as "ncurses6" to provide demonstration.
+
+* Fri Jun 08 2012 Thomas E. Dickey
+- initial version.
diff --git a/package/ncursest.sym b/package/ncursest.sym
index 4c2f209..9423d37 100644
--- a/package/ncursest.sym
+++ b/package/ncursest.sym
@@ -1,4 +1,4 @@
-# $Id: ncursest.sym,v 1.25 2015/07/11 23:33:50 tom Exp $
+# $Id: ncursest.sym,v 1.43 2023/08/12 15:28:50 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -35,7 +35,7 @@
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --enable-weak-symbols --with-pthread --with-termlib --with-trace
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-weak-symbols --enable-wgetch-events --with-hashed-db --with-pthread --with-termlib --with-ticlib --with-trace
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-weak-symbols --with-broken_linker --with-pthread --with-termlib --with-ticlib --with-trace
-# Configure options (6.0.current)
+# Configure options (6.0.20161029)
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-getcap --enable-getcap-cache --enable-hard-tabs --enable-termcap --enable-weak-symbols --with-pthread --with-termlib --with-trace
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-interop --enable-weak-symbols --with-pthread --with-termlib --with-trace
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-reentrant --enable-sp-funcs --enable-weak-symbols --with-pthread --with-termlib --with-trace
@@ -70,14 +70,19 @@
 _nc_acs_map
 _nc_add_to_try
 _nc_align_termtype
+_nc_alloc_entry_leaks
 _nc_basename
 _nc_boolcodes
 _nc_boolfnames
 _nc_boolnames
 _nc_capcmp
+_nc_captoinfo_leaks
+_nc_check_termtype
 _nc_check_termtype2
 _nc_codes_leaks
+_nc_comp_scan_leaks
 _nc_copy_termtype
+_nc_copy_termtype2
 _nc_count_outchars
 _nc_cur_term
 _nc_curr_col
@@ -95,18 +100,26 @@
 _nc_env_access
 _nc_err_abort
 _nc_eventlist_timeout
+_nc_export_termtype2
 _nc_fallback
+_nc_fallback2
 _nc_find_entry
+_nc_find_prescr
 _nc_find_type_entry
+_nc_find_user_entry
 _nc_first_db
 _nc_first_name
 _nc_flush
 _nc_flush_sp
+_nc_fmt_funcptr
+_nc_forget_prescr
 _nc_free_and_exit
 _nc_free_entries
 _nc_free_termtype
+_nc_free_termtype2
 _nc_free_tic
 _nc_free_tinfo
+_nc_free_tparm
 _nc_freeall
 _nc_get_alias_table
 _nc_get_hash_table
@@ -132,6 +145,7 @@
 _nc_is_dir_path
 _nc_is_file_path
 _nc_keep_tic_dir
+_nc_keyname_leaks
 _nc_keypad
 _nc_last_db
 _nc_leaks_tinfo
@@ -164,10 +178,13 @@
 _nc_putp_flush_sp
 _nc_putp_sp
 _nc_read_entry
+_nc_read_entry2
 _nc_read_entry_source
 _nc_read_file_entry
 _nc_read_termtype
 _nc_reset_input
+_nc_reset_tparm
+_nc_resolve_uses
 _nc_resolve_uses2
 _nc_retrace_attr_t
 _nc_retrace_bool
@@ -183,8 +200,11 @@
 _nc_retrace_win
 _nc_ripoffline
 _nc_rootname
+_nc_safe_fopen
+_nc_safe_open3
 _nc_safe_strcat
 _nc_safe_strcpy
+_nc_screen
 _nc_screen_chain
 _nc_screen_of
 _nc_set_buffer
@@ -210,14 +230,18 @@
 _nc_syntax
 _nc_syserr_abort
 _nc_tail
+_nc_tgetent_leaks
 _nc_tic_dir
 _nc_tic_expand
 _nc_tic_written
 _nc_timed_wait
 _nc_tinfo_fkeys
+_nc_tinfo_fkeysf
+_nc_tiparm
 _nc_tparm_analyze
 _nc_tparm_err
 _nc_trace_buf
+_nc_trace_bufcat
 _nc_tracechar
 _nc_tracing
 _nc_trans_string
@@ -231,10 +255,13 @@
 _nc_visbuf2
 _nc_visbufn
 _nc_viscbuf
+_nc_wacs_width
 _nc_warning
 _nc_write_entry
+_nc_write_object
 _traceattr
 _traceattr2
+_tracechar
 _tracechtype
 _tracechtype2
 _tracef
@@ -243,6 +270,8 @@
 addchstr
 addnstr
 addstr
+alloc_pair
+alloc_pair_sp
 assume_default_colors
 assume_default_colors_sp
 attr_get
@@ -279,6 +308,7 @@
 current_item
 curs_set
 curs_set_sp
+curses_trace
 curses_version
 data_ahead
 data_behind
@@ -311,6 +341,12 @@
 erase
 erasechar
 erasechar_sp
+exit_curses
+exit_terminfo
+extended_color_content
+extended_color_content_sp
+extended_pair_content
+extended_pair_content_sp
 field_arg
 field_back
 field_buffer
@@ -330,6 +366,8 @@
 field_userptr
 filter
 filter_sp
+find_pair
+find_pair_sp
 flash
 flash_sp
 flushinp
@@ -352,6 +390,8 @@
 free_form
 free_item
 free_menu
+free_pair
+free_pair_sp
 get_escdelay
 get_escdelay_sp
 getattrs
@@ -394,6 +434,10 @@
 inchstr
 init_color
 init_color_sp
+init_extended_color
+init_extended_color_sp
+init_extended_pair
+init_extended_pair_sp
 init_pair
 init_pair_sp
 initscr
@@ -406,16 +450,24 @@
 instr
 intrflush
 intrflush_sp
+is_cbreak
+is_cbreak_sp
 is_cleared
+is_echo
+is_echo_sp
 is_idcok
 is_idlok
 is_immedok
 is_keypad
 is_leaveok
 is_linetouched
+is_nl
+is_nl_sp
 is_nodelay
 is_notimeout
 is_pad
+is_raw
+is_raw_sp
 is_scrollok
 is_subwin
 is_syncok
@@ -593,6 +645,8 @@
 redrawwin
 refresh
 replace_panel
+reset_color_pairs
+reset_color_pairs_sp
 reset_prog_mode
 reset_prog_mode_sp
 reset_shell_mode
@@ -735,6 +789,8 @@
 tigetstr_sp
 timeout
 tiparm
+tiparm_s
+tiscan_s
 top_panel
 top_row
 touchline
@@ -747,6 +803,7 @@
 typeahead_sp
 unctrl
 unctrl_sp
+unfocus_current_field
 ungetch
 ungetch_sp
 ungetmouse
diff --git a/package/ncursestw.map b/package/ncursestw.map
index 7e6789b..116957f 100644
--- a/package/ncursestw.map
+++ b/package/ncursestw.map
@@ -1,4 +1,4 @@
-# $Id: ncursestw.map,v 1.31 2015/07/11 13:02:44 tom Exp $
+# $Id: ncursestw.map,v 1.59 2024/04/27 14:33:24 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -54,6 +54,7 @@
 		_nc_read_entry_source;
 		_nc_reset_input;
 		_nc_resolve_uses;
+		_nc_screen;
 		_nc_set_writedir;
 		_nc_syntax;
 		_nc_tic_expand;
@@ -105,6 +106,14 @@
 		_nc_strict_bsd;
 } NCURSES_TIC_5.7.20081102;
 
+NCURSES_TIC_6.1.20171230 {
+	global:
+		_nc_read_entry2;
+		_nc_write_object;
+	local:
+		_*;
+} NCURSES_TIC_5.9.20150530;
+
 NCURSES_TINFO_5.0.19991023 {
 	global:
 		BC;
@@ -150,6 +159,7 @@
 		_nc_tail;
 		_nc_tic_dir;
 		_nc_timed_wait;
+		_nc_tinfo_fkeysf;
 		_nc_trace_buf;
 		_nc_tracing;
 		_nc_update_screensize;
@@ -459,12 +469,56 @@
 		use_tioctl;
 		use_tioctl_sp;
 	local:
-		_*;
 		_nc_comp_error_leaks;
 		_nc_db_iterator_leaks;
 		_nc_setenv_num;
 } NCURSES_TINFO_5.8.20110226;
 
+NCURSES_TINFO_6.1.20171230 {
+	global:
+		_nc_copy_termtype2;
+		_nc_export_termtype2;
+		_nc_fallback2;
+		_nc_find_prescr;
+		_nc_forget_prescr;
+		_nc_free_termtype2;
+} NCURSES_TINFO_5.9.20150530;
+
+NCURSES_TINFO_6.2.20200212 {
+	global:
+		_nc_find_user_entry;
+		_nc_fmt_funcptr;
+		_nc_wacs_width;
+		curses_trace;
+		exit_terminfo;
+} NCURSES_TINFO_6.1.20171230;
+
+NCURSES_TINFO_6.2.20211010 {
+	global:
+		_nc_reset_tparm;
+		_nc_tiparm;
+		_nc_safe_fopen;
+		_nc_safe_open3;
+		erasewchar_sp;
+		killwchar_sp;
+} NCURSES_TINFO_6.2.20200212;
+
+NCURSES_TINFO_6.5.20240427 {
+	global:
+		is_cbreak;
+		is_cbreak_sp;
+		is_echo;
+		is_echo_sp;
+		is_nl;
+		is_nl_sp;
+		is_raw;
+		is_raw_sp;
+		tiparm_s;
+		tiscan_s;
+	local:
+		_*;
+} NCURSES_TINFO_6.2.20211010;
+
 NCURSESTW_5.7.20081102 {
 	global:
 		COLOR_PAIR;
@@ -1223,8 +1277,45 @@
 		form_driver_w;
 		wgetdelay;
 	local:
-		_*;
 		_nc_mvcur;
 		_nc_mvcur_sp;
 		_nc_trace_mmask_t;
 } NCURSESTW_5.8.20110226;
+
+NCURSESTW_6.1.20171230 {
+	global:
+		alloc_pair;
+		alloc_pair_sp;
+		extended_color_content;
+		extended_color_content_sp;
+		extended_pair_content;
+		extended_pair_content_sp;
+		extended_slk_color;
+		extended_slk_color_sp;
+		find_pair;
+		find_pair_sp;
+		free_pair;
+		free_pair_sp;
+		init_extended_color;
+		init_extended_color_sp;
+		init_extended_pair;
+		init_extended_pair_sp;
+		reset_color_pairs;
+		reset_color_pairs_sp;
+		unfocus_current_field;
+	local:
+		_nc_Unset_Current_Field;
+		_nc_change_pair;
+		_nc_init_color;
+		_nc_init_pair;
+		_nc_pair_content;
+		_nc_reset_color_pair;
+		_nc_set_color_pair;
+} NCURSESTW_5.9.20150530;
+
+NCURSESTW_6.2.20200212 {
+	global:
+		exit_curses;
+	local:
+		_*;
+} NCURSESTW_6.1.20171230;
diff --git a/package/ncursestw.sym b/package/ncursestw.sym
index a175653..b05baec 100644
--- a/package/ncursestw.sym
+++ b/package/ncursestw.sym
@@ -1,4 +1,4 @@
-# $Id: ncursestw.sym,v 1.23 2015/07/11 23:33:35 tom Exp $
+# $Id: ncursestw.sym,v 1.43 2023/08/12 15:29:11 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -35,7 +35,7 @@
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --enable-weak-symbols --enable-widec --with-pthread --with-termlib --with-trace
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-weak-symbols --enable-wgetch-events --enable-widec --with-hashed-db --with-pthread --with-termlib --with-ticlib --with-trace
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-weak-symbols --enable-widec --with-broken_linker --with-pthread --with-termlib --with-ticlib --with-trace
-# Configure options (6.0.current)
+# Configure options (6.0.20161029)
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-getcap --enable-getcap-cache --enable-hard-tabs --enable-termcap --enable-weak-symbols --enable-widec --with-pthread --with-termlib --with-trace
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-interop --enable-weak-symbols --enable-widec --with-pthread --with-termlib --with-trace
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-reentrant --enable-sp-funcs --enable-weak-symbols --enable-widec --with-pthread --with-termlib --with-trace
@@ -70,14 +70,19 @@
 _nc_acs_map
 _nc_add_to_try
 _nc_align_termtype
+_nc_alloc_entry_leaks
 _nc_basename
 _nc_boolcodes
 _nc_boolfnames
 _nc_boolnames
 _nc_capcmp
+_nc_captoinfo_leaks
+_nc_check_termtype
 _nc_check_termtype2
 _nc_codes_leaks
+_nc_comp_scan_leaks
 _nc_copy_termtype
+_nc_copy_termtype2
 _nc_count_outchars
 _nc_cur_term
 _nc_curr_col
@@ -95,18 +100,26 @@
 _nc_env_access
 _nc_err_abort
 _nc_eventlist_timeout
+_nc_export_termtype2
 _nc_fallback
+_nc_fallback2
 _nc_find_entry
+_nc_find_prescr
 _nc_find_type_entry
+_nc_find_user_entry
 _nc_first_db
 _nc_first_name
 _nc_flush
 _nc_flush_sp
+_nc_fmt_funcptr
+_nc_forget_prescr
 _nc_free_and_exit
 _nc_free_entries
 _nc_free_termtype
+_nc_free_termtype2
 _nc_free_tic
 _nc_free_tinfo
+_nc_free_tparm
 _nc_freeall
 _nc_get_alias_table
 _nc_get_hash_table
@@ -132,6 +145,7 @@
 _nc_is_dir_path
 _nc_is_file_path
 _nc_keep_tic_dir
+_nc_keyname_leaks
 _nc_keypad
 _nc_last_db
 _nc_leaks_tinfo
@@ -164,10 +178,13 @@
 _nc_putp_flush_sp
 _nc_putp_sp
 _nc_read_entry
+_nc_read_entry2
 _nc_read_entry_source
 _nc_read_file_entry
 _nc_read_termtype
 _nc_reset_input
+_nc_reset_tparm
+_nc_resolve_uses
 _nc_resolve_uses2
 _nc_retrace_attr_t
 _nc_retrace_bool
@@ -183,8 +200,11 @@
 _nc_retrace_win
 _nc_ripoffline
 _nc_rootname
+_nc_safe_fopen
+_nc_safe_open3
 _nc_safe_strcat
 _nc_safe_strcpy
+_nc_screen
 _nc_screen_chain
 _nc_screen_of
 _nc_set_buffer
@@ -210,14 +230,18 @@
 _nc_syntax
 _nc_syserr_abort
 _nc_tail
+_nc_tgetent_leaks
 _nc_tic_dir
 _nc_tic_expand
 _nc_tic_written
 _nc_timed_wait
 _nc_tinfo_fkeys
+_nc_tinfo_fkeysf
+_nc_tiparm
 _nc_tparm_analyze
 _nc_tparm_err
 _nc_trace_buf
+_nc_trace_bufcat
 _nc_tracechar
 _nc_tracing
 _nc_trans_string
@@ -235,13 +259,16 @@
 _nc_viswbufn
 _nc_viswibuf
 _nc_wacs
+_nc_wacs_width
 _nc_warning
 _nc_wcrtomb
 _nc_write_entry
+_nc_write_object
 _traceattr
 _traceattr2
 _tracecchar_t
 _tracecchar_t2
+_tracechar
 _tracechtype
 _tracechtype2
 _tracef
@@ -255,6 +282,8 @@
 addnwstr
 addstr
 addwstr
+alloc_pair
+alloc_pair_sp
 assume_default_colors
 assume_default_colors_sp
 attr_get
@@ -295,6 +324,7 @@
 current_item
 curs_set
 curs_set_sp
+curses_trace
 curses_version
 data_ahead
 data_behind
@@ -329,6 +359,15 @@
 erasechar
 erasechar_sp
 erasewchar
+erasewchar_sp
+exit_curses
+exit_terminfo
+extended_color_content
+extended_color_content_sp
+extended_pair_content
+extended_pair_content_sp
+extended_slk_color
+extended_slk_color_sp
 field_arg
 field_back
 field_buffer
@@ -348,6 +387,8 @@
 field_userptr
 filter
 filter_sp
+find_pair
+find_pair_sp
 flash
 flash_sp
 flushinp
@@ -371,6 +412,8 @@
 free_form
 free_item
 free_menu
+free_pair
+free_pair_sp
 get_escdelay
 get_escdelay_sp
 get_wch
@@ -422,6 +465,10 @@
 inchstr
 init_color
 init_color_sp
+init_extended_color
+init_extended_color_sp
+init_extended_pair
+init_extended_pair_sp
 init_pair
 init_pair_sp
 initscr
@@ -439,16 +486,24 @@
 intrflush
 intrflush_sp
 inwstr
+is_cbreak
+is_cbreak_sp
 is_cleared
+is_echo
+is_echo_sp
 is_idcok
 is_idlok
 is_immedok
 is_keypad
 is_leaveok
 is_linetouched
+is_nl
+is_nl_sp
 is_nodelay
 is_notimeout
 is_pad
+is_raw
+is_raw_sp
 is_scrollok
 is_subwin
 is_syncok
@@ -482,6 +537,7 @@
 killchar
 killchar_sp
 killwchar
+killwchar_sp
 leaveok
 link_field
 link_fieldtype
@@ -665,6 +721,8 @@
 redrawwin
 refresh
 replace_panel
+reset_color_pairs
+reset_color_pairs_sp
 reset_prog_mode
 reset_prog_mode_sp
 reset_shell_mode
@@ -813,6 +871,8 @@
 tigetstr_sp
 timeout
 tiparm
+tiparm_s
+tiscan_s
 top_panel
 top_row
 touchline
@@ -825,6 +885,7 @@
 typeahead_sp
 unctrl
 unctrl_sp
+unfocus_current_field
 unget_wch
 unget_wch_sp
 ungetch
diff --git a/package/ncursesw.map b/package/ncursesw.map
index d18776e..5583418 100644
--- a/package/ncursesw.map
+++ b/package/ncursesw.map
@@ -1,4 +1,4 @@
-# $Id: ncursesw.map,v 1.36 2015/06/27 22:26:52 tom Exp $
+# $Id: ncursesw.map,v 1.62 2024/04/27 14:33:24 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -114,6 +114,14 @@
 		_nc_strict_bsd;
 } NCURSES_TIC_5.7.20081102;
 
+NCURSES_TIC_6.1.20171230 {
+	global:
+		_nc_read_entry2;
+		_nc_write_object;
+	local:
+		_*;
+} NCURSES_TIC_5.9.20150530;
+
 NCURSES_TINFO_5.0.19991023 {
 	global:
 		BC;
@@ -414,6 +422,7 @@
 		keyname_sp;
 		keyok_sp;
 		killchar_sp;
+		longname_sp;
 		napms_sp;
 		new_prescr;
 		nocbreak_sp;
@@ -456,12 +465,54 @@
 		use_tioctl;
 		use_tioctl_sp;
 	local:
-		_*;
 		_nc_comp_error_leaks;
 		_nc_db_iterator_leaks;
 		_nc_setenv_num;
 } NCURSES_TINFO_5.8.20110226;
 
+NCURSES_TINFO_6.1.20171230 {
+	global:
+		_nc_copy_termtype2;
+		_nc_export_termtype2;
+		_nc_fallback2;
+		_nc_free_termtype2;
+} NCURSES_TINFO_5.9.20150530;
+
+NCURSES_TINFO_6.2.20200212 {
+	global:
+		_nc_find_user_entry;
+		_nc_fmt_funcptr;
+		_nc_wacs_width;
+		curses_trace;
+		exit_terminfo;
+} NCURSES_TINFO_6.1.20171230;
+
+NCURSES_TINFO_6.2.20211010 {
+	global:
+		_nc_reset_tparm;
+		_nc_tiparm;
+		_nc_safe_fopen;
+		_nc_safe_open3;
+		erasewchar_sp;
+		killwchar_sp;
+} NCURSES_TINFO_6.2.20200212;
+
+NCURSES_TINFO_6.5.20240427 {
+	global:
+		is_cbreak;
+		is_cbreak_sp;
+		is_echo;
+		is_echo_sp;
+		is_nl;
+		is_nl_sp;
+		is_raw;
+		is_raw_sp;
+		tiparm_s;
+		tiscan_s;
+	local:
+		_*;
+} NCURSES_TINFO_6.2.20211010;
+
 NCURSESW_5.1.20000708 {
 	global:
 		COLORS;
@@ -1247,8 +1298,45 @@
 		form_driver_w;
 		wgetdelay;
 	local:
-		_*;
 		_nc_mvcur;
 		_nc_mvcur_sp;
 		_nc_trace_mmask_t;
 } NCURSESW_5.8.20110226;
+
+NCURSESW_6.1.20171230 {
+	global:
+		alloc_pair;
+		alloc_pair_sp;
+		extended_color_content;
+		extended_color_content_sp;
+		extended_pair_content;
+		extended_pair_content_sp;
+		extended_slk_color;
+		extended_slk_color_sp;
+		find_pair;
+		find_pair_sp;
+		free_pair;
+		free_pair_sp;
+		init_extended_color;
+		init_extended_color_sp;
+		init_extended_pair;
+		init_extended_pair_sp;
+		reset_color_pairs;
+		reset_color_pairs_sp;
+		unfocus_current_field;
+	local:
+		_nc_Unset_Current_Field;
+		_nc_change_pair;
+		_nc_init_color;
+		_nc_init_pair;
+		_nc_pair_content;
+		_nc_reset_color_pair;
+		_nc_set_color_pair;
+} NCURSESW_5.9.20150530;
+
+NCURSESW_6.2.20200212 {
+	global:
+		exit_curses;
+	local:
+		_*;
+} NCURSESW_6.1.20171230;
diff --git a/package/ncursesw.sym b/package/ncursesw.sym
index dfeba4f..8ef771f 100644
--- a/package/ncursesw.sym
+++ b/package/ncursesw.sym
@@ -1,4 +1,4 @@
-# $Id: ncursesw.sym,v 1.24 2015/06/27 22:30:29 tom Exp $
+# $Id: ncursesw.sym,v 1.42 2023/08/12 15:28:30 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -46,7 +46,7 @@
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --enable-widec --with-termlib --with-trace
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-wgetch-events --enable-widec --with-hashed-db --with-termlib --with-ticlib --with-trace
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-widec --with-broken_linker --with-termlib --with-ticlib --with-trace
-# Configure options (6.0.current)
+# Configure options (6.0.20161029)
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-getcap --enable-getcap-cache --enable-hard-tabs --enable-termcap --enable-widec --with-termlib --with-trace
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-interop --enable-widec --with-termlib --with-trace
 #	--disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --enable-widec --with-broken_linker --with-hashed-db --with-termlib --with-trace
@@ -86,6 +86,7 @@
 _nc_check_termtype2
 _nc_comp_scan_leaks
 _nc_copy_termtype
+_nc_copy_termtype2
 _nc_curr_col
 _nc_curr_line
 _nc_db_close
@@ -100,16 +101,21 @@
 _nc_env_access
 _nc_err_abort
 _nc_eventlist_timeout
+_nc_export_termtype2
 _nc_fallback
+_nc_fallback2
 _nc_find_entry
 _nc_find_type_entry
+_nc_find_user_entry
 _nc_first_db
 _nc_first_name
 _nc_flush
 _nc_flush_sp
+_nc_fmt_funcptr
 _nc_free_and_exit
 _nc_free_entries
 _nc_free_termtype
+_nc_free_termtype2
 _nc_free_tic
 _nc_free_tinfo
 _nc_free_tparm
@@ -161,10 +167,12 @@
 _nc_putp_flush_sp
 _nc_putp_sp
 _nc_read_entry
+_nc_read_entry2
 _nc_read_entry_source
 _nc_read_file_entry
 _nc_read_termtype
 _nc_reset_input
+_nc_reset_tparm
 _nc_resolve_uses
 _nc_resolve_uses2
 _nc_retrace_attr_t
@@ -181,6 +189,8 @@
 _nc_retrace_win
 _nc_ripoffline
 _nc_rootname
+_nc_safe_fopen
+_nc_safe_open3
 _nc_safe_strcat
 _nc_safe_strcpy
 _nc_screen_chain
@@ -208,6 +218,7 @@
 _nc_tic_written
 _nc_timed_wait
 _nc_tinfo_fkeys
+_nc_tiparm
 _nc_tparm_analyze
 _nc_tparm_err
 _nc_tputs_trace
@@ -229,10 +240,12 @@
 _nc_viswbufn
 _nc_viswibuf
 _nc_wacs
+_nc_wacs_width
 _nc_warning
 _nc_wchstrlen
 _nc_wcrtomb
 _nc_write_entry
+_nc_write_object
 _traceattr
 _traceattr2
 _tracecchar_t
@@ -252,6 +265,8 @@
 addnwstr
 addstr
 addwstr
+alloc_pair
+alloc_pair_sp
 assume_default_colors
 assume_default_colors_sp
 attr_get
@@ -297,6 +312,7 @@
 curs_set
 curs_set_sp
 curscr
+curses_trace
 curses_version
 data_ahead
 data_behind
@@ -331,6 +347,15 @@
 erasechar
 erasechar_sp
 erasewchar
+erasewchar_sp
+exit_curses
+exit_terminfo
+extended_color_content
+extended_color_content_sp
+extended_pair_content
+extended_pair_content_sp
+extended_slk_color
+extended_slk_color_sp
 field_arg
 field_back
 field_buffer
@@ -350,6 +375,8 @@
 field_userptr
 filter
 filter_sp
+find_pair
+find_pair_sp
 flash
 flash_sp
 flushinp
@@ -373,6 +400,8 @@
 free_form
 free_item
 free_menu
+free_pair
+free_pair_sp
 get_escdelay
 get_escdelay_sp
 get_wch
@@ -424,6 +453,10 @@
 inchstr
 init_color
 init_color_sp
+init_extended_color
+init_extended_color_sp
+init_extended_pair
+init_extended_pair_sp
 init_pair
 init_pair_sp
 initscr
@@ -441,16 +474,24 @@
 intrflush
 intrflush_sp
 inwstr
+is_cbreak
+is_cbreak_sp
 is_cleared
+is_echo
+is_echo_sp
 is_idcok
 is_idlok
 is_immedok
 is_keypad
 is_leaveok
 is_linetouched
+is_nl
+is_nl_sp
 is_nodelay
 is_notimeout
 is_pad
+is_raw
+is_raw_sp
 is_scrollok
 is_subwin
 is_syncok
@@ -484,10 +525,12 @@
 killchar
 killchar_sp
 killwchar
+killwchar_sp
 leaveok
 link_field
 link_fieldtype
 longname
+longname_sp
 mcprint
 mcprint_sp
 menu_back
@@ -670,6 +713,8 @@
 redrawwin
 refresh
 replace_panel
+reset_color_pairs
+reset_color_pairs_sp
 reset_prog_mode
 reset_prog_mode_sp
 reset_shell_mode
@@ -822,6 +867,8 @@
 tigetstr_sp
 timeout
 tiparm
+tiparm_s
+tiscan_s
 top_panel
 top_row
 touchline
@@ -835,6 +882,7 @@
 typeahead_sp
 unctrl
 unctrl_sp
+unfocus_current_field
 unget_wch
 unget_wch_sp
 ungetch