testing/log4cplus: simplify abuild

1 files changed, 9 insertions, 19 deletions

diff --git a/testing/log4cplus/APKBUILD b/testing/log4cplus/APKBUILD
index 4959bfb5cf..43c91c77f8 100644
--- a/testing/log4cplus/APKBUILD
+++ b/testing/log4cplus/APKBUILD
@@ -3,9 +3,6 @@
 pkgname=log4cplus
 pkgver=2.0.4
 pkgrel=0
-_ver=${pkgver%%_rc*}
-_rc=${pkgver##*_rc}
-[ "$_rc" = "$pkgver" ] || _ver="${_ver}-rc$_rc"
 pkgdesc="Logging Framework for C++"
 url="https://sourceforge.net/p/log4cplus/wiki/Home/"
 # tests/testsuite.dir/58/testsuite.log
@@ -13,17 +10,12 @@ url="https://sourceforge.net/p/log4cplus/wiki/Home/"
 # 5 Aborted (core dumped)
 arch="all !armhf !armv7" # test 50 dumps core
 license="Apache-2.0"
-depends=""
-depends_dev=""
 checkdepends="findutils"
-makedepends="$depends_dev"
-install=""
 subpackages="$pkgname-dev"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$_ver.tar.xz"
-builddir="$srcdir/$pkgname-$_ver"
+source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz"
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -36,19 +28,17 @@ build() {
 	make
 }
 
-_cat_found_file() {
-       local _rc="$?"
-       find -name "$1" -type f -ls -printf '%P {{{\n' -exec cat -v -n '{}' ';' -printf '}}} %P\n'
-       return "$_rc"
-}
-
 check() {
-	cd "$builddir"
-	make check || _cat_found_file testsuite.log
+	make check || {
+		find -name testsuite.log -type f -ls \
+			-printf '%P {{{\n' \
+			-exec cat -v -n '{}' ';' \
+			-printf '}}} %P\n'
+		return 1
+	}
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }