From 399459fa817e5ee2741d47ad4cf7ac0949498fcd Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 16 Sep 2017 23:02:18 -0500
Subject: main/libxpm: modernise, fix deps, mark no tests

---
 main/libxpm/APKBUILD | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'main/libxpm')

diff --git a/main/libxpm/APKBUILD b/main/libxpm/APKBUILD
index 5ae14b1bfa..aaa20e6501 100644
--- a/main/libxpm/APKBUILD
+++ b/main/libxpm/APKBUILD
@@ -6,27 +6,28 @@ pkgdesc="X11 pixmap library"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom:BELL"
+options="!check"  # No test suite.
 subpackages="$pkgname-dev $pkgname-doc"
 depends=
-makedepends="libxt-dev libxext-dev libx11-dev util-linux-dev"
+makedepends="libxt-dev libxext-dev libx11-dev util-linux-dev util-macros"
 source="http://www.x.org/releases/individual/lib/libXpm-$pkgver.tar.bz2"
 
-depends_dev="libx11-dev"
+builddir="$srcdir"/libXpm-$pkgver
+
 build() {
-	cd "$srcdir"/libXpm-$pkgver
+	cd "$builddir"
 	ac_cv_search_gettext=no \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--sysconfdir=/etc \
-		|| return 1
-	make || return 1
+		--sysconfdir=/etc
+	make
 }
 
 package() {
-	cd "$srcdir"/libXpm-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 md5sums="20f4627672edb2bd06a749f11aa97302  libXpm-3.5.12.tar.bz2"
-- 
cgit v1.2.3