From 63d9336227f86ce8ca0f50654264b7e8cf8cd7b7 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 5 Feb 2018 17:24:39 -0600
Subject: main/fltk: modernise, no tests, fix license/deps

---
 main/fltk/APKBUILD | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'main/fltk/APKBUILD')

diff --git a/main/fltk/APKBUILD b/main/fltk/APKBUILD
index 2895c1d646..5e9e194095 100644
--- a/main/fltk/APKBUILD
+++ b/main/fltk/APKBUILD
@@ -2,14 +2,15 @@
 # Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
 pkgname=fltk
 pkgver=1.3.4
-pkgrel=0
+pkgrel=1
 pkgdesc="A cross-platform C++ GUI toolkit"
 url="http://fltk.org"
 arch="all"
-license="GPL"
+options="!check"  # No test suite.
+license="LGPL-2.0-only WITH FLTK-exception"
 depends=""
 depends_dev="libx11-dev libxext-dev libxft-dev mesa-dev"
-makedepends="$depends_dev libpng-dev libjpeg-turbo-dev"
+makedepends="$depends_dev libpng-dev libjpeg-turbo-dev libxinerama-dev"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-fluid"
 source="http://fltk.org/pub/fltk/$pkgver/$pkgname-$pkgver-source.tar.gz
 	"
@@ -23,18 +24,17 @@ build() {
 		--prefix=/usr \
 		--enable-shared \
 		--enable-threads \
-		--with-optim="$CXXFLAGS" \
-		|| return 1
-	make V=1 || return 1
+		--with-optim="$CXXFLAGS"
+	make V=1
 
 }
 
 
 package() {
-        cd "$builddir"
-        make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	# remove static libs
-	rm "$pkgdir"/usr/lib/*.a || return 1
+	rm "$pkgdir"/usr/lib/*.a
 }
 
 fluid() {
-- 
cgit v1.2.3