From 3016b313c633246c5c7d968eb7bcb045edfe75c8 Mon Sep 17 00:00:00 2001
From: TBK <tbk@jjtc.dk>
Date: Thu, 3 May 2018 17:30:31 +0200
Subject: community/cmus: improve aport

---
 community/cmus/APKBUILD | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'community/cmus/APKBUILD')

diff --git a/community/cmus/APKBUILD b/community/cmus/APKBUILD
index 2c1a7e96fa..cabba2627c 100644
--- a/community/cmus/APKBUILD
+++ b/community/cmus/APKBUILD
@@ -3,37 +3,33 @@
 # Maintainer:
 pkgname=cmus
 pkgver=2.8.0_rc0
+_pkgver=${pkgver/_rc/-rc}
 pkgrel=0
-_ver=${pkgver/_rc/-rc}
 pkgdesc="A very feature-rich ncurses-based music player"
-url="http://cmus.sourceforge.net/"
+url="https://cmus.github.io/"
 arch="all"
 license="GPL-2.0-or-later"
-depends=""
-depends_dev=""
+options="!check" # No test suite
 makedepends="alsa-lib-dev faad2-dev flac-dev libmad-dev opusfile-dev
 	libogg-dev libvorbis-dev ncurses-dev wavpack-dev ffmpeg-dev
 	linux-headers"
-install=""
-subpackages="
-	$pkgname-doc
-	$pkgname-zsh-completion:zshcomp:noarch
+subpackages="$pkgname-doc $pkgname-zsh-completion:zshcomp:noarch
 	$pkgname-bash-completion:bashcomp:noarch"
-source="$pkgname-$_ver.tar.gz::https://github.com/cmus/cmus/archive/v${_ver}.tar.gz"
+source="$pkgname-$_pkgver.tar.gz::https://github.com/cmus/cmus/archive/v$_pkgver.tar.gz"
+builddir="$srcdir"/$pkgname-$_pkgver
 
-builddir="$srcdir"/$pkgname-$_ver
 build() {
 	cd "$builddir"
-	./configure prefix=/usr || return 1
-	make || return 1
+	./configure prefix=/usr
+	make
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 
 	for file in AUTHORS README.md; do
-		install -Dm644 "${file}" "$pkgdir"/usr/share/doc/$pkgname/ || return 1
+		install -Dm644 "${file}" "$pkgdir"/usr/share/doc/$pkgname/
 	done
 }
 
-- 
cgit v1.2.3