Patches for aports can be sent to this list

[alpine-aports] [PATCH] testing/vice: Add check(), remove returns

Jean-Louis Fuchs
Details
Message ID
<20170323123901.10048-1-ganwell@fangorn.ch>
Sender timestamp
1490272741
DKIM signature
missing
Download raw message
Patch: +14 -12
---
 testing/vice/APKBUILD | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/testing/vice/APKBUILD b/testing/vice/APKBUILD
index cba38c709c..5d64921c3b 100644
--- a/testing/vice/APKBUILD
+++ b/testing/vice/APKBUILD
@@ -2,26 +2,24 @@
 # Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
 pkgname=vice
 pkgver=3.0
-pkgrel=0
+pkgrel=1
 pkgdesc="emulates the C64/DTV, C128, VIC20, almost all PETs, PLUS4 and CBM-II"
 url="http://vice-emu.sourceforge.net/"
 arch="all"
 license="GPL"
-depends=""
 makedepends="sdl2-dev giflib-dev ffmpeg-dev jpeg-dev alsa-lib-dev
 	linux-headers texinfo automake autoconf bison flex"
-install=""
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/vice-emu/vice-$pkgver.tar.gz
 	disable-fc-cache.patch
 	fix__u_char.patch"
-builddir="$srcdir"/$pkgname-$pkgver
+builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
-	sed -i 's/\r//' "$builddir"/src/opencbm.h || return 1
-	default_prepare || return 1
-	sed -i 's/lib64/lib/g' configure.ac || return 1
-	autoreconf -fi || return 1
+	sed -i 's/\r//' "$builddir/src/opencbm.h"
+	default_prepare
+	sed -i 's/lib64/lib/g' configure.ac
+	autoreconf -fi
 }
 
 build() {
@@ -30,15 +28,19 @@ build() {
 		--libdir=/usr/lib \
 		--enable-sdlui2 \
 		--disable-no-pic \
-		--enable-external-ffmpeg \
-		|| return 1
-	make || return 1
+		--enable-external-ffmpeg
+	make
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" realdocdir="/usr/share/doc/vice" install || return 1
+	make DESTDIR="$pkgdir" realdocdir="/usr/share/doc/vice" install
 }
+
+check() {
+	make -C "$builddir" check
+}
+
 md5sums="c732d76a70ac1232a43456dae540b43a  vice-3.0.tar.gz
 b1dee4fef59f835534683fabbe1fbbce  disable-fc-cache.patch
 f562fcd4ce5b6a72008cc46d9ed19881  fix__u_char.patch"
-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---