st: add ncurses to st-terminfo dependencies + fix

st-terminfo.INSTALL uses tic to compile terminfo entries, but there's no
guarantee that tic is actually installed. This commit adds ncurses (the
provider of tic) to the dependencies of st-terminfo. It also adds
missing terminfo entries to st-terminfo.REMOVE and replaces sed with
vsed.
This commit is contained in:
meator 2021-09-25 14:22:43 +02:00 committed by Érico Nogueira Rolim
parent 6042aa21ed
commit a64f7becd2
2 changed files with 6 additions and 2 deletions

View file

@ -1,6 +1,9 @@
case "${ACTION}" in case "${ACTION}" in
pre) pre)
rm usr/share/terminfo/s/st 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
rm usr/share/terminfo/s/st-meta-256color rm usr/share/terminfo/s/st-meta-256color
rm usr/share/terminfo/s/st-256color rm usr/share/terminfo/s/st-256color

View file

@ -1,7 +1,7 @@
# Template file for 'st' # Template file for 'st'
pkgname=st pkgname=st
version=0.8.4 version=0.8.4
revision=2 revision=3
build_style=gnu-makefile build_style=gnu-makefile
make_use_env=compliant make_use_env=compliant
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
@ -18,7 +18,7 @@ pre_build() {
sed -i 's|Liberation Mono|Monospace|g' config.def.h sed -i 's|Liberation Mono|Monospace|g' config.def.h
[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h [ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
# We will use tic after install. See INSTALL. # We will use tic after install. See INSTALL.
sed -i '/tic/d' Makefile vsed -i Makefile -e '/tic/d'
} }
post_install() { post_install() {
@ -29,6 +29,7 @@ post_install() {
st-terminfo_package() { st-terminfo_package() {
short_desc+=" - terminfo data" short_desc+=" - terminfo data"
depends="ncurses"
pkg_install() { pkg_install() {
vmove usr/share/terminfo vmove usr/share/terminfo
} }