From e1307e151429c4cb7ec261912dd9c104b8d40a86 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 8 Sep 2017 19:41:58 -0500
Subject: main/libxkbui: modernise, fix deps, mark as having no test suite

---
 main/libxkbui/APKBUILD | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'main')

diff --git a/main/libxkbui/APKBUILD b/main/libxkbui/APKBUILD
index f1159a08a2..3f971f53c8 100644
--- a/main/libxkbui/APKBUILD
+++ b/main/libxkbui/APKBUILD
@@ -1,35 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxkbui
 pkgver=1.0.2
-pkgrel=7
+pkgrel=8
 pkgdesc="X11 keyboard UI presentation library"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
+options="!check"  # No test suite.
 subpackages="$pkgname-dev"
 depends=
-depends_dev="libx11-dev xproto libxt-dev"
-makedepends="$depends_dev libsm-dev libice-dev libxkbfile-dev"
+depends_dev="xproto"
+makedepends="$depends_dev libsm-dev libice-dev libx11-dev libxkbfile-dev libxt-dev"
 source="http://www.x.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
 
-_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
+	cd "$builddir"
+	update_config_sub
+	default_prepare
 }
 
-build () {
-	cd "$_builddir"
+build() {
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 }
 sha512sums="ccfa2c8f740ae66e5b7c2ed19a8243696a34fb60d45d8d01bb540eb925d69c95ebe16b7a54f4362acc3170b1543f44eea8910135b11c4af88abce3637726062d  libxkbui-1.0.2.tar.bz2"
-- 
cgit v1.2.3