{main,community,testing}: make terminals depend on ncurses-terminfo-base

6 files changed, 13 insertions, 17 deletions

diff --git a/community/alacritty/APKBUILD b/community/alacritty/APKBUILD
index 66c9befe1d..8fe57dcb85 100644
--- a/community/alacritty/APKBUILD
+++ b/community/alacritty/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Drew DeVault <sir@cmpwn.com>
 pkgname=alacritty
 pkgver=0.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform, GPU-accelerated terminal emulator"
 url="https://github.com/jwilm/alacritty"
 arch="x86_64 armv7 armhf aarch64 x86 ppc64le" # limited by rust/cargo
 license="Apache-2.0"
-depends="ncurses-terminfo"
+depends="ncurses-terminfo-base"
 makedepends="
 	rust cargo cmake fontconfig-dev freetype-dev pkgconfig libxcb-dev python3
 	"
diff --git a/community/gnome-terminal/APKBUILD b/community/gnome-terminal/APKBUILD
index c20e3a7e2c..1bf7881e27 100644
--- a/community/gnome-terminal/APKBUILD
+++ b/community/gnome-terminal/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=gnome-terminal
 pkgver=3.34.2
-pkgrel=2
+pkgrel=3
 pkgdesc="GNOME terminal emulator application"
 url="https://wiki.gnome.org/Apps/Terminal"
 arch="all !s390x !armhf !ppc64le" # limited by gnome-shell
 license="GPL-2.0-or-later AND GFDL-1.3-only"
-depends="dbus desktop-file-utils gsettings-desktop-schemas ncurses-terminfo"
+depends="dbus desktop-file-utils gsettings-desktop-schemas ncurses-terminfo-base"
 makedepends="dconf-dev gnome-shell gsettings-desktop-schemas-dev nautilus-dev vte3-dev
 	glib-dev intltool itstool pcre2-dev"
 subpackages="$pkgname-doc $pkgname-lang"
diff --git a/community/konsole/APKBUILD b/community/konsole/APKBUILD
index e04fdc7ff5..296e3acd3c 100644
--- a/community/konsole/APKBUILD
+++ b/community/konsole/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=konsole
 pkgver=19.08.3
-pkgrel=1
+pkgrel=2
 arch="all"
 url="https://kde.org/applications/system/konsole"
 pkgdesc="KDE's terminal emulator"
 license="GPL-2.0-only AND LGPL-2.1-or-later AND Unicode-DFS-2016"
-depends="ncurses-terminfo"
+depends="ncurses-terminfo-base"
 makedepends="extra-cmake-modules qt5-qtbase-dev kbookmarks-dev kcompletion-dev
 	kconfig-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev kguiaddons-dev
 	kdbusaddons-dev ki18n-dev kiconthemes-dev kinit-dev kio-dev knewstuff-dev
diff --git a/community/xterm/APKBUILD b/community/xterm/APKBUILD
index ab559f1376..761faa99f3 100644
--- a/community/xterm/APKBUILD
+++ b/community/xterm/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=xterm
 pkgver=351
-pkgrel=1
+pkgrel=2
 pkgdesc="X Terminal Emulator"
 options="!check" # Requires vttest
 url="http://invisible-island.net/xterm"
 arch="all"
 license="MIT"
-depends="ncurses-terminfo"
+depends="ncurses-terminfo-base"
 makedepends="libxaw-dev libxft-dev ncurses-dev"
 subpackages="$pkgname-doc"
 source="ftp://ftp.invisible-island.net/xterm/xterm-$pkgver.tgz
diff --git a/main/putty/APKBUILD b/main/putty/APKBUILD
index dd8ab2bc0f..01e9151d29 100644
--- a/main/putty/APKBUILD
+++ b/main/putty/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Jeff Bilyk <jbilyk@alpinelinux.org>
 pkgname=putty
 pkgver=0.73
-pkgrel=1
+pkgrel=2
 pkgdesc="SSH and telnet client"
 url="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
 arch="all"
 license="MIT"
-depends="ncurses-terminfo"
+depends="ncurses-terminfo-base"
 makedepends="linux-headers"
 subpackages="$pkgname-doc"
 source="http://the.earth.li/~sgtatham/putty/$pkgver/putty-$pkgver.tar.gz
diff --git a/main/tmux/APKBUILD b/main/tmux/APKBUILD
index d7b6627da6..9d53b8d64f 100644
--- a/main/tmux/APKBUILD
+++ b/main/tmux/APKBUILD
@@ -2,20 +2,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tmux
 pkgver=3.0a
-pkgrel=0
+pkgrel=1
 pkgdesc="Tool to control multiple terminals from a single terminal"
 url="https://tmux.github.io"
 arch="all"
 license="ISC"
-depends="ncurses-terminfo"
+depends="ncurses-terminfo-base"
 makedepends="autoconf automake bsd-compat-headers libevent-dev ncurses-dev"
 subpackages="$pkgname-doc"
-source="https://github.com/tmux/tmux/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
+source="https://github.com/tmux/tmux/releases/download/$pkgver/tmux-$pkgver.tar.gz"
 
-builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -D -m644 example_tmux.conf \