aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Klitzing <aklitzing@gmail.com>2017-08-08 17:11:00 +0200
committerJakub Jirutka <jakub@jirutka.cz>2017-08-15 20:53:52 +0200
commit859cf05b4e8569435f065e3133c9537763446875 (patch)
treeaa2e7fb59c611e688cf467be4dcfb8819048c6e0
parent8c318f59e1b13bde5ed4e41a0edd78f3f657b743 (diff)
downloadaports-859cf05b4e8569435f065e3133c9537763446875.tar.bz2
aports-859cf05b4e8569435f065e3133c9537763446875.tar.xz
main/zsh: upgrade to 5.4.1 and modernize abuild
-rw-r--r--main/zsh/APKBUILD27
1 files changed, 11 insertions, 16 deletions
diff --git a/main/zsh/APKBUILD b/main/zsh/APKBUILD
index 7a42ecf776..68d236b205 100644
--- a/main/zsh/APKBUILD
+++ b/main/zsh/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=zsh
-pkgver=5.3.1
+pkgver=5.4.1
pkgrel=0
pkgdesc="A very advanced and programmable command interpreter (shell)"
url="http://www.zsh.org/"
@@ -34,14 +34,14 @@ _comps="android-tools:Unix/_adb
tmux:Unix/_tmux
zfs:Unix/_zfs*:Unix/_zpool"
for _i in $_comps; do
- subpackages="$subpackages ${_i%%:*}-zsh-completion:_completion"
+ subpackages="$subpackages ${_i%%:*}-zsh-completion:_completion:noarch"
done
prepare() {
cd "$builddir"
- default_prepare || return 1
- update_config_sub || return 1
+ default_prepare
+ update_config_sub
# Remove completions for other systems.
cd Completion
@@ -81,20 +81,19 @@ build() {
--sysconfdir=/etc \
--with-tcsetpgrp \
--mandir=/usr/share/man \
- --infodir=/usr/share/info \
- || return 1
- make || return 1
+ --infodir=/usr/share/info
+ make
}
package() {
cd "$builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
install -Dm644 "$srcdir"/zprofile "$pkgdir"/etc/zsh/zprofile
}
doc() {
- default_doc || return 1
+ default_doc
_submv $_sharedir/help
}
@@ -116,7 +115,7 @@ zftp() {
pkgdesc="Zftp Function System for ZSH"
depends="$pkgname"
- _submv $_libdir/zsh/zftp.so || return 1
+ _submv $_libdir/zsh/zftp.so
_submv $_sharedir/functions/Zftp
}
@@ -131,7 +130,7 @@ _completion() {
test -n "$files" || { echo "$name not found in \$_comps" >&2; return 1; }
local f; for f in $files; do
- _submv $_sharedir/functions/Completion/$f || return 1
+ _submv $_sharedir/functions/Completion/$f
done
}
@@ -141,9 +140,5 @@ _submv() {
mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/
}
-md5sums="67d3e5ed99de68340c16aef613b0ecf7 zsh-5.3.1.tar.xz
-a5e93cd6880da04a63fc4fcaaa03987f zprofile"
-sha256sums="fc886cb2ade032d006da8322c09a7e92b2309177811428b121192d44832920da zsh-5.3.1.tar.xz
-e3c3625d966c8277274798f26241857df5fc520e18674deba6cc356f6b022d63 zprofile"
-sha512sums="25f723c76d2779c3cb53de2e0dbb1163ec289f76282bec49757880d0ce32bf64a001a6b40c54c290d342aa09f92319af5c597bff99de8dbd1fc895c11836f304 zsh-5.3.1.tar.xz
+sha512sums="c666c54b05e2707e3a3cf9a87a17863792f0c89ec14f5fdc85a3064f26249cfba42a2953bc76bb90205fb87a08c203a165a5240c9fd6c489c13d8cc82ee6e979 zsh-5.4.1.tar.xz
59182b99447872ded8adf0d890e9359ee47fce0b7acb2808f4308f945885fbf6d977a0917bbb5c0f21454caf3ba06ab092127732da4f84292d6ab0989a0110fe zprofile"