From 0697c8001bfa8c96ecc2aa281bbd2c50309c30f0 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 11 Mar 2020 15:33:19 +0100
Subject: testing/windowmaker: move conf to /etc and cleanup

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

diff --git a/testing/windowmaker/APKBUILD b/testing/windowmaker/APKBUILD
index 33d1b2eb88..c943225fa9 100644
--- a/testing/windowmaker/APKBUILD
+++ b/testing/windowmaker/APKBUILD
@@ -2,35 +2,34 @@
 # Maintainer: Emily Ingalls <emily@ingalls.rocks>
 pkgname=windowmaker
 pkgver=0.95.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Window manager for X emulating the NeXTSTEP user interface"
-url="https://www.windowmaker.org/"
+url="https://windowmaker.org/"
 arch="all"
-license="GPL-2.0"
-depends=""
-depends_dev="libx11-dev libxmu-dev libxft-dev"
-makedepends="$depends_dev"
-install=""
+license="GPL-2.0-or-later"
+depends_dev="libxmu-dev libxft-dev"
+makedepends="$depends_dev libx11-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz"
-
-builddir="$srcdir"/WindowMaker-$pkgver
+builddir="$srcdir/WindowMaker-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
+		--sysconfdir=/etc \
 		--disable-static \
-		--enable-modelock \
-		|| return 1
-	make || return 1
+		--enable-modelock
+	make
+}
+
+check() {
+	make check
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	rmdir "$pkgdir"/usr/share/locale/
 }
 
-- 
cgit v1.2.3