From 5d96790d0eec23d3e83ee7588a932eeabbc6a9e8 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Thu, 21 Jul 2022 19:58:31 +0200
Subject: [PATCH 1/7] alacritty: generate terminfo when building

---
 srcpkgs/alacritty/alacritty-terminfo.INSTALL | 6 ------
 srcpkgs/alacritty/alacritty-terminfo.REMOVE  | 7 -------
 srcpkgs/alacritty/template                   | 5 ++---
 3 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/alacritty/alacritty-terminfo.INSTALL
 delete mode 100644 srcpkgs/alacritty/alacritty-terminfo.REMOVE

diff --git a/srcpkgs/alacritty/alacritty-terminfo.INSTALL b/srcpkgs/alacritty/alacritty-terminfo.INSTALL
deleted file mode 100644
index 71e122147942..000000000000
--- a/srcpkgs/alacritty/alacritty-terminfo.INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "$ACTION" in
-post)
-	# Compile the terminfo description.
-	tic -xe alacritty,alacritty-direct usr/share/terminfo/a/alacritty.info
-	;;
-esac
diff --git a/srcpkgs/alacritty/alacritty-terminfo.REMOVE b/srcpkgs/alacritty/alacritty-terminfo.REMOVE
deleted file mode 100644
index 572df4e79ba9..000000000000
--- a/srcpkgs/alacritty/alacritty-terminfo.REMOVE
+++ /dev/null
@@ -1,7 +0,0 @@
-case "$ACTION" in
-pre)
-	# Remove compiled terminfo files.
-	rm -f usr/share/terminfo/a/alacritty
-	rm -f usr/share/terminfo/a/alacritty-direct
-	;;
-esac
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 94bf361be18d..ed74956d0f52 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,7 +1,7 @@
 # Template file for 'alacritty'
 pkgname=alacritty
 version=0.10.1
-revision=1
+revision=2
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
@@ -31,14 +31,13 @@ post_install() {
 	vinstall ../extra/completions/alacritty.bash 644 usr/share/bash-completion/completions alacritty
 	vinstall ../extra/completions/_alacritty 644 usr/share/zsh/site-functions
 	vinstall ../extra/completions/alacritty.fish 644 usr/share/fish/vendor_completions.d
-	vinstall ../extra/alacritty.info 644 usr/share/terminfo/a
+	tic -o ${DESTDIR}/usr/share/terminfo -xe alacritty,alacritty-direct ../extra/alacritty.info
 	vman ../extra/alacritty.man alacritty.1
 	vsconf ../alacritty.yml
 }
 
 alacritty-terminfo_package() {
 	short_desc+=" - terminfo data"
-	depends="ncurses"
 	pkg_install() {
 		vmove usr/share/terminfo
 	}

From a5c9b929b4ad2ce981aa6eb9455ce3a9a4e0611a Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Thu, 21 Jul 2022 10:56:03 +0200
Subject: [PATCH 2/7] dvtm: generate terminfo when building & simplify

Generating terminfo in INSTALL is unnecessary and leaves .info file in
/usr/share/terminfo which can confuse some programs.

Dvtm now also uses proper build_style=gnu_makefile instead of calling
make explicitly.
---
 srcpkgs/dvtm/INSTALL  |  6 ------
 srcpkgs/dvtm/REMOVE   |  7 -------
 srcpkgs/dvtm/template | 15 +++++----------
 3 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/dvtm/INSTALL
 delete mode 100644 srcpkgs/dvtm/REMOVE

diff --git a/srcpkgs/dvtm/INSTALL b/srcpkgs/dvtm/INSTALL
deleted file mode 100644
index 61fb79d9537d..000000000000
--- a/srcpkgs/dvtm/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "$ACTION" in
-post)
-	# Compile the terminfo description.
-	tic -s usr/share/terminfo/d/dvtm.info
-	;;
-esac
diff --git a/srcpkgs/dvtm/REMOVE b/srcpkgs/dvtm/REMOVE
deleted file mode 100644
index 7ea17f65f6c1..000000000000
--- a/srcpkgs/dvtm/REMOVE
+++ /dev/null
@@ -1,7 +0,0 @@
-case "$ACTION" in
-pre)
-	# Remove compiled terminfo files.
-	rm -f usr/share/terminfo/d/dvtm-256color
-	rm -f usr/share/terminfo/d/dvtm
-	;;
-esac
diff --git a/srcpkgs/dvtm/template b/srcpkgs/dvtm/template
index a65c17c2d9c2..e16b36bd8677 100644
--- a/srcpkgs/dvtm/template
+++ b/srcpkgs/dvtm/template
@@ -1,9 +1,11 @@
 # Template file for 'dvtm'
 pkgname=dvtm
 version=0.15
-revision=2
+revision=3
+build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="ncurses"
 makedepends="ncurses-devel"
-depends="ncurses" # needs tic at post-install
 short_desc="Tiling window manager for the console"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
@@ -11,13 +13,6 @@ homepage="http://www.brain-dump.org/projects/dvtm/"
 distfiles="http://www.brain-dump.org/projects/dvtm/$pkgname-$version.tar.gz"
 checksum=8f2015c05e2ad82f12ae4cf12b363d34f527a4bbc8c369667f239e4542e1e510
 
-do_build() {
-	# Do not run tic, useless in build environment.
-	sed -i 's,tic,/bin/true,g' Makefile
-	make CC=$CC V=1
-}
-do_install() {
-	make PREFIX=/usr DESTDIR=${DESTDIR} install
+post_install() {
 	vlicense LICENSE
-	vinstall dvtm.info 644 usr/share/terminfo/d
 }

From 6c5cfe3d4de17f20eb487043f114ffa1712c1f74 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Thu, 21 Jul 2022 21:33:12 +0200
Subject: [PATCH 3/7] mtm: generate terminfo when building

This commit also removes build_style=gnu-makefile because do_build() and
do_install() are defined anyway.
---
 srcpkgs/mtm/mtm-terminfo.INSTALL | 5 -----
 srcpkgs/mtm/mtm-terminfo.REMOVE  | 7 -------
 srcpkgs/mtm/template             | 9 ++++-----
 3 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/mtm/mtm-terminfo.INSTALL
 delete mode 100644 srcpkgs/mtm/mtm-terminfo.REMOVE

diff --git a/srcpkgs/mtm/mtm-terminfo.INSTALL b/srcpkgs/mtm/mtm-terminfo.INSTALL
deleted file mode 100644
index 4c2d03b145ca..000000000000
--- a/srcpkgs/mtm/mtm-terminfo.INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-post)
-	tic -sx usr/share/terminfo/m/mtm.ti
-	;;
-esac
diff --git a/srcpkgs/mtm/mtm-terminfo.REMOVE b/srcpkgs/mtm/mtm-terminfo.REMOVE
deleted file mode 100644
index 767b67b2bee4..000000000000
--- a/srcpkgs/mtm/mtm-terminfo.REMOVE
+++ /dev/null
@@ -1,7 +0,0 @@
-case "${ACTION}" in
-pre)
-	rm usr/share/terminfo/m/mtm
-	rm usr/share/terminfo/m/mtm-256color
-	rm usr/share/terminfo/m/mtm-noutf
-	;;
-esac
diff --git a/srcpkgs/mtm/template b/srcpkgs/mtm/template
index a6cfd2c104ce..599fa463410d 100644
--- a/srcpkgs/mtm/template
+++ b/srcpkgs/mtm/template
@@ -1,10 +1,9 @@
 # Template file for 'mtm'
 pkgname=mtm
 version=1.2.0
-revision=3
-build_style=gnu-makefile
+revision=4
+hostmakedepends="ncurses"
 makedepends="ncurses-devel ncurses-libs"
-depends="ncurses"
 short_desc="Micro Terminal Multiplexer"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -18,13 +17,13 @@ do_build() {
 
 do_install() {
 	vbin mtm
-	vinstall mtm.ti 644 usr/share/terminfo/m
+	mkdir -p ${DESTDIR}/usr/share/terminfo
+	tic -sx -o ${DESTDIR}/usr/share/terminfo mtm.ti
 	vman mtm.1
 }
 
 mtm-terminfo_package() {
 	short_desc+=" - terminfo data"
-	depends="ncurses"
 	pkg_install() {
 		vmove usr/share/terminfo
 	}

From 6878a2c0e6a326b8d9b1d38cd47fdb825c55fd02 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Thu, 21 Jul 2022 21:38:59 +0200
Subject: [PATCH 4/7] rxvt-unicode: do not include .terminfo file

xrvt-unicode already compiles the terminfo descriptions so having the
raw version in /usr/share/terminfo is unnecessary.
---
 srcpkgs/rxvt-unicode/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template
index 1ad3c47e2448..6593340186ef 100644
--- a/srcpkgs/rxvt-unicode/template
+++ b/srcpkgs/rxvt-unicode/template
@@ -1,7 +1,7 @@
 # Template file for 'rxvt-unicode'
 pkgname=rxvt-unicode
 version=9.30
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="
  --with-terminfo=/usr/share/terminfo --enable-256-color
@@ -69,7 +69,6 @@ pre_install() {
 }
 
 post_install() {
-	vinstall doc/etc/rxvt-unicode.terminfo 644 usr/share/terminfo/r
 	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
 	vinstall ${FILESDIR}/${pkgname}.png 644 usr/share/pixmaps
 }

From 57ff42e9ca59845292f7819d1293df24db5a0585 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Thu, 21 Jul 2022 21:50:12 +0200
Subject: [PATCH 5/7] st: generate terminfo when building & adopt

---
 srcpkgs/st/st-terminfo.INSTALL |  5 -----
 srcpkgs/st/st-terminfo.REMOVE  | 11 -----------
 srcpkgs/st/template            | 13 +++++++------
 3 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/st/st-terminfo.INSTALL
 delete mode 100644 srcpkgs/st/st-terminfo.REMOVE

diff --git a/srcpkgs/st/st-terminfo.INSTALL b/srcpkgs/st/st-terminfo.INSTALL
deleted file mode 100644
index 53bfb42d10f8..000000000000
--- a/srcpkgs/st/st-terminfo.INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-post)
-	tic -sx usr/share/terminfo/s/st.terminfo
-	;;
-esac
diff --git a/srcpkgs/st/st-terminfo.REMOVE b/srcpkgs/st/st-terminfo.REMOVE
deleted file mode 100644
index ad3893f3269a..000000000000
--- a/srcpkgs/st/st-terminfo.REMOVE
+++ /dev/null
@@ -1,11 +0,0 @@
-case "${ACTION}" in
-pre)
-	rm usr/share/terminfo/s/st
-	rm usr/share/terminfo/s/st-bs
-	rm usr/share/terminfo/s/st-bs-256color
-	rm usr/share/terminfo/s/st-mono
-	rm usr/share/terminfo/s/st-meta
-	rm usr/share/terminfo/s/st-meta-256color
-	rm usr/share/terminfo/s/st-256color
-	;;
-esac
diff --git a/srcpkgs/st/template b/srcpkgs/st/template
index 9376a0c0c983..e6d7e3beb977 100644
--- a/srcpkgs/st/template
+++ b/srcpkgs/st/template
@@ -1,14 +1,14 @@
 # Template file for 'st'
 pkgname=st
 version=0.8.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_use_env=compliant
 hostmakedepends="pkg-config"
 makedepends="fontconfig-devel libX11-devel libXft-devel"
 depends="ncurses st-terminfo-${version}_${revision}"
 short_desc="Simple terminal implementation for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="meator <meator.dev@gmail.com>"
 license="MIT"
 homepage="https://st.suckless.org"
 distfiles="https://dl.suckless.org/${pkgname}/${pkgname}-${version}.tar.gz"
@@ -17,19 +17,20 @@ checksum=ea6832203ed02ff74182bcb8adaa9ec454c8f989e79232cb859665e2f544ab37
 pre_build() {
 	sed -i 's|Liberation Mono|Monospace|g' config.def.h
 	[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
-	# We will use tic after install. See INSTALL.
-	vsed -i Makefile -e '/tic/d'
+	mkdir -p ${DESTDIR}/usr/share/terminfo
+}
+
+pre_install() {
+	export TERMINFO=${DESTDIR}/usr/share/terminfo
 }
 
 post_install() {
-	vinstall st.info 644 usr/share/terminfo/s st.terminfo
 	vdoc README
 	vlicense LICENSE
 }
 
 st-terminfo_package() {
 	short_desc+=" - terminfo data"
-	depends="ncurses"
 	pkg_install() {
 		vmove usr/share/terminfo
 	}

From 6af489f4a5603cb89ed885234388ca5053d30f37 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Thu, 21 Jul 2022 21:56:28 +0200
Subject: [PATCH 6/7] xst: generate terminfo when building & simplify

---
 srcpkgs/xst/INSTALL  | 5 -----
 srcpkgs/xst/REMOVE   | 8 --------
 srcpkgs/xst/template | 8 ++------
 3 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/xst/INSTALL
 delete mode 100644 srcpkgs/xst/REMOVE

diff --git a/srcpkgs/xst/INSTALL b/srcpkgs/xst/INSTALL
deleted file mode 100644
index fcad0563b681..000000000000
--- a/srcpkgs/xst/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-post)
-	tic -sx usr/share/terminfo/x/xst.terminfo
-	;;
-esac
diff --git a/srcpkgs/xst/REMOVE b/srcpkgs/xst/REMOVE
deleted file mode 100644
index b46f677d7fdf..000000000000
--- a/srcpkgs/xst/REMOVE
+++ /dev/null
@@ -1,8 +0,0 @@
-case "${ACTION}" in
-pre)
-	rm usr/share/terminfo/x/xst
-	rm usr/share/terminfo/x/xst-meta
-	rm usr/share/terminfo/x/xst-meta-256color
-	rm usr/share/terminfo/x/xst-256color
-	;;
-esac
diff --git a/srcpkgs/xst/template b/srcpkgs/xst/template
index 8600c680ae36..f06dbed9b3d5 100644
--- a/srcpkgs/xst/template
+++ b/srcpkgs/xst/template
@@ -1,7 +1,7 @@
 # Template file for 'xst'
 pkgname=xst
 version=0.8.4.1
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=compliant
 hostmakedepends="pkg-config"
@@ -14,11 +14,7 @@ homepage="https://github.com/gnotclub/xst"
 distfiles="https://github.com/gnotclub/xst/archive/v${version}.tar.gz"
 checksum=cbeb2da6c289415d1168559c6f58b4ce47fd266edefbabc38fd59e8b7c87226d
 
-do_install() {
-	vbin xst
-	vman st.1 xst.1
-
-	vinstall st.info 644 usr/share/terminfo/x xst.terminfo
+post_install() {
 	vdoc README
 	vdoc FAQ
 	vdoc .Xresources Xresources

From 4306cf094bb5ce6f5705e223d162b682abc935e1 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Fri, 22 Jul 2022 19:35:48 +0200
Subject: [PATCH 7/7] nurses: Resolve conflicts with -terminfo packages

ncurses-term provides terminfo entries only for terminals which don't
have their own -terminfo subackage now.
---
 srcpkgs/ncurses/patches/alacritty.patch | 77 +++++++++++++++++++++++++
 srcpkgs/ncurses/patches/dvtm.patch      | 75 ++++++++++++++++++++++++
 srcpkgs/ncurses/patches/st.patch        | 28 +++++++++
 srcpkgs/ncurses/template                |  2 +-
 4 files changed, 181 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/ncurses/patches/alacritty.patch
 create mode 100644 srcpkgs/ncurses/patches/dvtm.patch
 create mode 100644 srcpkgs/ncurses/patches/st.patch

diff --git a/srcpkgs/ncurses/patches/alacritty.patch b/srcpkgs/ncurses/patches/alacritty.patch
new file mode 100644
index 000000000000..453aa2d8c5c5
--- /dev/null
+++ b/srcpkgs/ncurses/patches/alacritty.patch
@@ -0,0 +1,77 @@
+--- a/misc/terminfo.src	2021-10-14 00:40:38.000000000 +0000
++++ b/misc/terminfo.src	2022-07-22 16:38:50.070152052 +0000
+@@ -7422,74 +7422,6 @@
+ 
+ ######## OPENGL CLIENTS
+ 
+-#### Alacritty
+-# https://github.com/jwilm/alacritty
+-# Version 0.6.0 (2020/11/25)
+-# Version 0.4.0 (2019/11/25)
+-# Version 0.3.3 (2019/08/03)
+-# Version 0.2.1 (2018/10/03)
+-# Project started in 2016/02, uses Rust and OpenGL, and in contrast to (most X
+-# terminal programs) is not designed to run with a remote server.
+-#
+-# Packaged in Arch Linux -
+-# vttest:
+-#	initial screensize 24x80
+-#	no DECCOLM (does not switch between 80/132 columns)
+-#	otherwise, passes wrapping test
+-#	no DECSCNM
+-#	identifies as a vt102
+-#	numeric keypad does not send expected codes (seen in 0.4.0)
+-#	passes bce test
+-#	vt220:
+-#		ECH works in 0.3.3 (0.2.1 left text on right margin)
+-#		no SRM, DECSCA
+-#	vt320:
+-#		fails DECXCPR
+-#		does not implement any of the DECRQM/DECRPM controls
+-#		does not implement any of the DECRQSS controls
+-#	vt420:
+-#		no DECLRMM
+-#		no DECBI, DECFI
+-#	other:
+-#		fails CHT, otherwise ECMA-48 cursor movement ok
+-#		fails ERM/SPA, SL, SR, passes REP, SD, SU
+-#	xterm:
+-#		no X10 mouse
+-#		has normal and highlight mouse
+-#		has any-event and button-event mouse
+-#		+ does support SGR-mouse
+-#		+ does not correctly support focus in/out events (seen in 0.4.0)
+-#		cursor-position wrong after alternate-screen (fixed in 0.4.0)
+-#		none of the dtterm controls work
+-# tack:
+-#	bell and flash do not work
+-#	blink does not work
+-#	italics and crossed-out work (latter did not work in 0.2.1)
+-#	function-keys work up (tested combinations which window manager allows)
+-#	treats meta as escape-prefix
+-#
+-# The program sources include "alacritty" and "alacritty-direct", which are
+-# copied from "xterm-256color" and "xterm-direct" (but using semicolon for
+-# subparameter delimiter).  Refactored here to use ncurses building blocks -TD
+-alacritty|alacritty terminal emulator,
+-	rs1=\Ec\E]104\007, use=xterm+256color,
+-	use=alacritty+common,
+-
+-alacritty-direct|alacritty with direct color indexing,
+-	use=xterm+indirect, use=alacritty+common,
+-
+-# cancel km, since it is not actually meta mode -TD
+-# added ecma+strikeout in 0.3.3 -TD
+-# added xterm+sl-twm in 0.3.3 -TD
+-alacritty+common|base fragment for alacritty,
+-	km@, npc,
+-	kb2=\EOE, kbs=^?, kcbt=\E[Z, kent=\EOM, Se=\E[0 q,
+-	Smulx=\E[4:%p1%dm, use=ecma+index, use=xterm+sm+1006,
+-	use=xterm-basic, use=xterm+app, use=ansi+rep,
+-	use=xterm+tmux, use=ecma+strikeout, use=xterm+sl-twm,
+-	use=ecma+italics, use=xterm+pce2, use=xterm+pcc2,
+-	use=xterm+pcf2,
+-
+ #### Kitty
+ # https://github.com/kovidgoyal/kitty
+ # Project started in 2016/10 (see alacritty), but is a Python script rather
diff --git a/srcpkgs/ncurses/patches/dvtm.patch b/srcpkgs/ncurses/patches/dvtm.patch
new file mode 100644
index 000000000000..f17576d52c9d
--- /dev/null
+++ b/srcpkgs/ncurses/patches/dvtm.patch
@@ -0,0 +1,75 @@
+--- a/misc/terminfo.src	2021-10-14 00:40:38.000000000 +0000
++++ b/misc/terminfo.src	2022-07-22 16:40:42.188396399 +0000
+@@ -8186,72 +8186,6 @@
+ 	      %{256}%/%{255}%&%d:%p1%{255}%&%d%;m,
+ 	use=xterm+direct, use=tmux,
+ 
+-#### Dvtm
+-
+-# dvtwm 0.15
+-# http://www.brain-dump.org/projects/dvtm/
+-#
+-# + This uses ncurses to manage the display, including support for italics and
+-#   default-colors.
+-# + However, default-colors are incomplete: do not set bce.
+-# + It does not implement flash (since no \e[?5h)
+-# + Do not set XT: dvtm knows about OSC 0 and 2, but not 1.
+-#   Oddly enough, if $TERM contains "linux", it attempts to set the title.
+-# + Some of the program is cut/paste from rxvt-unicode, e.g., the ACS table.
+-# + The built-in table of function-keys (based on rxvt) is incomplete (ends
+-#   with kf22).
+-# + It also omits the shifted cursor- and editing-keypad keys.
+-#   However, it is confused by xterm's shifted cursor- and editing-keypad keys
+-#   (and passes those through without interpretation)
+-#   and may simply pass-through rxvt's, making it appear to work.
+-#   In other cases such as kf23 and up, no pass-through is done.
+-# + Most of the mode-settings in the initialization/reset strings are not
+-#   implemented; dvtm copies its description from rxvt.
+-dvtm|dynamic virtual terminal manager,
+-	am, eo, mir, msgr, xenl, AX,
+-	colors#8, cols#80, it#8, lines#24, ncv@, pairs#64,
+-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
+-	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+-	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+-	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
+-	enacs=\E(B\E)0, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
+-	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
+-	is1=\E[?47l\E=\E[?1l,
+-	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
+-	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
+-	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy,
+-	kb2=\EOu, kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E[Z, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kel=\E[8\^, kend=\E[8~,
+-	kent=\EOM, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~,
+-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
+-	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
+-	kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, kf21=\E[23$,
+-	kf22=\E[24$, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
+-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	khome=\E[7~, kind=\E[a, kmous=\E[M, kri=\E[b, op=\E[39;49m,
+-	rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E[2J\E[?47l\E8,
+-	rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+-	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
+-	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?
+-	    25h,
+-	s0ds=\E(B, s1ds=\E(0, sc=\E7, setab=\E[4%p1%dm,
+-	setaf=\E[3%p1%dm,
+-	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
+-	    %p9%t\016%e\017%;,
+-	sgr0=\E[m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h,
+-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
+-	use=vt220+vtedit, use=vt220+cvis, use=ecma+italics,
+-
+-dvtm-256color|dynamic virtual terminal manager with 256 colors,
+-	colors#0x100, pairs#0x10000,
+-	setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;
+-	      5;%p1%d%;m,
+-	setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5
+-	      ;%p1%d%;m,
+-	use=dvtm,
+-
+ #### NCSA Telnet
+ 
+ # Francesco Potorti <F.Potorti@cnuce.cnr.it>:
diff --git a/srcpkgs/ncurses/patches/st.patch b/srcpkgs/ncurses/patches/st.patch
new file mode 100644
index 000000000000..94d481f91e0f
--- /dev/null
+++ b/srcpkgs/ncurses/patches/st.patch
@@ -0,0 +1,28 @@
+--- a/misc/terminfo.src	2021-10-14 00:40:38.000000000 +0000
++++ b/misc/terminfo.src	2022-07-22 17:22:30.492083295 +0000
+@@ -7020,9 +7020,6 @@
+ #### SIMPLETERM
+ # st.suckless.org
+ 
+-st|stterm| simpleterm,
+-	use=st-0.8,
+-
+ # Reviewed 0.8.2:
+ # In tack,
+ #	there is some problem turning off line-drawing
+@@ -7193,15 +7190,6 @@
+ 	use=vt220+cvis, use=ecma+index,
+ st-16color|stterm-16color|simpleterm with 16-colors,
+ 	use=ibm+16color, use=st,
+-# Tested with st 0.8.2
+-# The issue with the titlebar is fixed, though st is very slow.
+-# In st 0.7, 256 colors "works", but when running xterm's test-scripts, some
+-# garbage is shown in the titlebar.
+-#
+-# terminal wants to use TERM=stterm-256color, but that is longer than 14
+-# characters, making the choice nonportable.
+-st-256color|stterm-256color|simpleterm with 256 colors,
+-	use=xterm+256color, use=st,
+ 
+ #### TERMINATOR
+ # https://github.com/software-jessies-org/jessies/wiki/Terminator
diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template
index 8386760db22f..7893422b750b 100644
--- a/srcpkgs/ncurses/template
+++ b/srcpkgs/ncurses/template
@@ -1,7 +1,7 @@
 # Template file for 'ncurses'
 pkgname=ncurses
 version=6.3
-revision=2
+revision=3
 bootstrap=yes
 configure_args="--enable-big-core"
 short_desc="System V Release 4.0 curses emulation library"