diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2020-04-29 16:16:20 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-04-29 16:20:03 +0200 |
commit | 25f0bae76247fa5eb76faae67f179ea8b758f828 (patch) | |
tree | 0e14943c8021fb52ea94f5b11a8a9591f929a3ee | |
parent | 8feb2f8d2ca6162ef60e6a1d319ec46129c70252 (diff) | |
download | aports-25f0bae76247fa5eb76faae67f179ea8b758f828.tar.bz2 aports-25f0bae76247fa5eb76faae67f179ea8b758f828.tar.xz |
Revert "main/ncurses: fix missing vtXXX terminfo in ncurses-terminfo-base"
revert commit that broke ncurses-terminfo and left it empty.
This reverts commit 67ff3d44c974487c6b5594e274f686dc3d898a51.
-rw-r--r-- | main/ncurses/APKBUILD | 45 |
1 files changed, 33 insertions, 12 deletions
diff --git a/main/ncurses/APKBUILD b/main/ncurses/APKBUILD index f77448e191..0c60d216fc 100644 --- a/main/ncurses/APKBUILD +++ b/main/ncurses/APKBUILD @@ -2,7 +2,7 @@ pkgname=ncurses pkgver=6.1_p20200118 _ver=${pkgver/_p/-} -pkgrel=3 +pkgrel=4 pkgdesc="Console display library" url="https://invisible-island.net/ncurses/" arch="all" @@ -11,7 +11,7 @@ license="MIT" makedepends_build="ncurses" subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-terminfo-base:base:noarch $pkgname-terminfo:terminfo:noarch" -source="https://dev.alpinelinux.org/archive/ncurses/ncurses-$_ver.tgz" +source="https://invisible-mirror.net/archives/ncurses/current/ncurses-$_ver.tgz" builddir="$srcdir"/ncurses-$_ver # secfixes: @@ -46,18 +46,14 @@ package() { # Install basic terms in /etc/terminfo for i in ansi console dumb linux rxvt screen sun vt52 vt100 vt102 \ - vt200 vt220 xterm xterm-color xterm-xfree86 xterm-256color \ - alacritty tmux tmux-256color terminator terminology* \ - vte vte-256color gnome gnome-256color kitty konsole konsole-256color \ - konsole-linux putty putty-256color rxvt-256color st-* \ - screen-256color; do + vt200 vt220 xterm xterm-color xterm-xfree86; do local termfile=$(find "$pkgdir"/usr/share/terminfo/ -name "$i" 2>/dev/null) || true local basedir=$(basename "$(dirname "$termfile")") [ -z "$termfile" ] && continue install -d "$pkgdir"/etc/terminfo/$basedir - mv $termfile "$pkgdir"/etc/terminfo/$basedir/ + mv ${termfile} "$pkgdir"/etc/terminfo/$basedir/ ln -s ../../../../etc/terminfo/$basedir/$i \ "$pkgdir"/usr/share/terminfo/$basedir/$i done @@ -80,8 +76,9 @@ terminfo() { pkgdesc="$pkgdesc (other terminfo files)" depends="$pkgname-terminfo-base=$pkgver-r$pkgrel" - mkdir -p $subpkgdir/usr/share $subpkgdir/usr/lib - mv $pkgdir/usr/lib/terminfo $subpkgdir/usr/lib + amove etc/terminfo + amove usr/share/terminfo + amove usr/lib/terminfo } libs() { @@ -97,8 +94,32 @@ base() { depends="" pkgdesc="Descriptions of common terminals" - mkdir -p "$subpkgdir"/etc/terminfo - mv "$pkgdir"/etc/terminfo/ "$subpkgdir"/etc/ + amove usr/share/terminfo/x/xterm-256color + amove usr/share/terminfo/a/alacritty + amove usr/share/terminfo/t/tmux + amove usr/share/terminfo/t/tmux-256color + amove usr/share/terminfo/t/terminator + amove usr/share/terminfo/t/terminology* + amove usr/share/terminfo/v/vte + amove usr/share/terminfo/v/vte-256color + amove usr/share/terminfo/g/gnome + amove usr/share/terminfo/g/gnome-256color + amove usr/share/terminfo/k/kitty + amove usr/share/terminfo/k/konsole + amove usr/share/terminfo/k/konsole-256color + amove usr/share/terminfo/k/konsole-linux + amove usr/share/terminfo/p/putty + amove usr/share/terminfo/p/putty-256color + amove usr/share/terminfo/r/rxvt + amove usr/share/terminfo/r/rxvt-256color + amove usr/share/terminfo/s/st-0* + amove usr/share/terminfo/s/st-256color + amove usr/share/terminfo/s/screen-256color + amove etc/terminfo + + mkdir -p "$pkgdir"/etc/terminfo/s + mv "$subpkgdir"/etc/terminfo/s/sun "$pkgdir"/etc/terminfo/s + mv "$subpkgdir"/etc/terminfo/v "$pkgdir"/etc/terminfo } static() { |