From 90b1b69a5ed4246d2fd35aaecbed2fd3593e628d Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 17 Aug 2017 04:22:59 +0000
Subject: [PATCH] main/libxkbfile: add test suite, modernise

---
 main/libxkbfile/APKBUILD | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/main/libxkbfile/APKBUILD b/main/libxkbfile/APKBUILD
index 1342b4b8bca..a1030dac490 100644
--- a/main/libxkbfile/APKBUILD
+++ b/main/libxkbfile/APKBUILD
@@ -1,39 +1,38 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxkbfile
 pkgver=1.0.9
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 keyboard file manipulation library"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends=
-makedepends="libx11-dev"
+makedepends="libx11-dev util-macros"
 subpackages="$pkgname-dev"
 source="http://www.x.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
 
-_builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-}
+builddir="$srcdir/$pkgname-$pkgver"
 
 build () {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--sysconfdir=/etc \
-		|| return 1
-	make || return 1
+		--sysconfdir=/etc
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	install -D -m644 "$srcdir"/$pkgname-$pkgver/COPYING \
 		"$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="4a4cfeaf24dab1b991903455d6d7d404  libxkbfile-1.0.9.tar.bz2"
-sha256sums="51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a  libxkbfile-1.0.9.tar.bz2"
+
 sha512sums="5fa268f10d7c4bd7b1e0c9f12adaa53d86b149f193d228fc620b3b81d360b37e4ede0192f5a0dc715bf830a57bd1388af01399fb33609413fc64623ee91cb8d1  libxkbfile-1.0.9.tar.bz2"