From 14d58a6fad84737d07530523322dccb870385278 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 Nov 2020 10:36:30 -0500 Subject: [PATCH 1/3] alacritty: prevent ncurses-term from extracting conflicting files --- srcpkgs/alacritty/template | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template index 86626f44080..4bca24d0dc9 100644 --- a/srcpkgs/alacritty/template +++ b/srcpkgs/alacritty/template @@ -1,7 +1,7 @@ # Template file for 'alacritty' pkgname=alacritty version=0.5.0 -revision=2 +revision=3 build_wrksrc="${pkgname}" build_style=cargo hostmakedepends="pkg-config python3" @@ -28,7 +28,18 @@ post_install() { alacritty-terminfo_package() { short_desc+=" - terminfo data" + depends="ncurses" + pkg_install() { vmove usr/share/terminfo + + # Avoid conflicts with ncurses-term + vmkdir usr/share/xbps.d + local _conflicts="${PKGDESTDIR}/usr/share/xbps.d/${pkgname}.conf" + cat > "$_conflicts" <<-EOF + noextract=/usr/share/terminfo/a/alacritty + noextract=/usr/share/terminfo/a/alacritty-direct + EOF + chmod 644 "$_conflicts" } } From 6812c687103c7cee4933393bbefadd2476c87b6f Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 Nov 2020 10:36:30 -0500 Subject: [PATCH 2/3] st: prevent ncurses-term from extracting conflicting files --- srcpkgs/st/template | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/srcpkgs/st/template b/srcpkgs/st/template index 0041346d2b8..4355b1ccb89 100644 --- a/srcpkgs/st/template +++ b/srcpkgs/st/template @@ -1,7 +1,7 @@ # Template file for 'st' pkgname=st version=0.8.4 -revision=2 +revision=3 build_style=gnu-makefile make_use_env=compliant hostmakedepends="pkg-config" @@ -29,7 +29,20 @@ post_install() { st-terminfo_package() { short_desc+=" - terminfo data" + depends="ncurses" + pkg_install() { vmove usr/share/terminfo + + # Avoid conflicts with ncurses-term + vmkdir usr/share/xbps.d + local _conflicts="${PKGDESTDIR}/usr/share/xbps.d/${pkgname}.conf" + cat > "$_conflicts" <<-EOF + noextract=/usr/share/terminfo/s/st + noextract=/usr/share/terminfo/s/st-256color + noextract=/usr/share/terminfo/s/stterm + noextract=/usr/share/terminfo/s/stterm-256color + EOF + chmod 644 "$_conflicts" } } From 8365f130f63a119f19167414aaa63f906d87e812 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 Nov 2020 10:36:30 -0500 Subject: [PATCH 3/3] dvtm: prevent ncurses-term from extracting conflicting files Fixes: #26700. --- srcpkgs/dvtm/template | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/srcpkgs/dvtm/template b/srcpkgs/dvtm/template index a65c17c2d9c..b2e2ee7538d 100644 --- a/srcpkgs/dvtm/template +++ b/srcpkgs/dvtm/template @@ -1,7 +1,7 @@ # Template file for 'dvtm' pkgname=dvtm version=0.15 -revision=2 +revision=3 makedepends="ncurses-devel" depends="ncurses" # needs tic at post-install short_desc="Tiling window manager for the console" @@ -16,8 +16,18 @@ do_build() { sed -i 's,tic,/bin/true,g' Makefile make CC=$CC V=1 } + do_install() { make PREFIX=/usr DESTDIR=${DESTDIR} install vlicense LICENSE vinstall dvtm.info 644 usr/share/terminfo/d + + # Avoid conflicts with ncurses-term + vmkdir usr/share/xbps.d + local _conflicts="${DESTDIR}/usr/share/xbps.d/${pkgname}.conf" + cat > "$_conflicts" <<-EOF + noextract=/usr/share/terminfo/d/dvtm + noextract=/usr/share/terminfo/d/dvtm-256color + EOF + chmod 644 "$_conflicts" }