From 621788f21da9de99986c0a5f49aa9c54262c69ca Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Thu, 21 Jul 2022 21:50:12 +0200
Subject: [PATCH] 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 53bfb42d10f..00000000000
--- 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 ad3893f3269..00000000000
--- 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 9376a0c0c98..e6d7e3beb97 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
 	}