From 88352b4cf7add3974e712af6161d92bb06e36256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Sat, 15 Apr 2017 11:32:09 +0200
Subject: testing/farbfeld: upgrade to 3, modernize APKBUILD

---
 testing/farbfeld/APKBUILD         | 26 +++++++++++---------------
 testing/farbfeld/gcc6-fixes.patch | 18 +++++++++---------
 2 files changed, 20 insertions(+), 24 deletions(-)

(limited to 'testing')

diff --git a/testing/farbfeld/APKBUILD b/testing/farbfeld/APKBUILD
index 2b3252c3c3..f37efd5db0 100644
--- a/testing/farbfeld/APKBUILD
+++ b/testing/farbfeld/APKBUILD
@@ -1,46 +1,42 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
 pkgname=farbfeld
-pkgver=2
+pkgver=3
 pkgrel=0
 pkgdesc="Lossless image format which is easy to parse, pipe and compress"
 url="http://tools.suckless.org/farbfeld/"
 arch="all"
-license="MIT"
+license="ISC"
 depends=""
 makedepends="libpng-dev libjpeg-turbo-dev"
 install=""
+options="!check"
 subpackages="$pkgname-doc"
 source="http://dl.suckless.org/$pkgname/$pkgname-$pkgver.tar.gz
 	gcc6-fixes.patch"
 builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 	sed -i -e '/CFLAGS/{s/-Os//;s/=/+=/}' \
-		-e '/LDFLAGS/{s/-s//;s/=/+=/}' \
+		-e '/^LDFLAGS  = -s$/d' \
 		-e 's|/usr/local|/usr|g' \
-		"$builddir"/config.mk || return 1
+		"$builddir"/config.mk
 }
 
 build() {
-	make -C "$builddir" || return 1
+	make -C "$builddir"
 }
 
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" PREFIX=/usr \
-		MANPREFIX=/usr/share/man install || return 1
+		MANPREFIX=/usr/share/man install
 
 	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
 	install -m644 README FORMAT \
-		"$pkgdir"/usr/share/doc/$pkgname/ \
-		|| return 1
+		"$pkgdir"/usr/share/doc/$pkgname/
 }
 
-md5sums="9b2b2328c39cc8ab7656e90471b4367f  farbfeld-2.tar.gz
-441d0cf658b9b33f471cb23a98efb041  gcc6-fixes.patch"
-sha256sums="a366e7628274fb9b4dc9508a7340a32b5e7557d99895b7ed7b5165241d613f58  farbfeld-2.tar.gz
-16a67495743a8811a446c0a980e20aee7637ea98271cd432318e969e2a29c03e  gcc6-fixes.patch"
-sha512sums="04471f0d6092433083b1441c17fb80db27fcedea6a12ddab3b08eaf9731da06f48560cf49124b56e1e27d7de2b69109b0ce38513ee90c735ac966dc2132e000f  farbfeld-2.tar.gz
-0fd87266cc57b4986d3353250f1fe92fbd7971322de583726e4aa9d7d165b94855d6b4af1c9aaae42faef7f27a63a291bf3144f89fa2b281889c50bb1d35a2b6  gcc6-fixes.patch"
+sha512sums="4f1e44282810bd2724f78857bcde401b82945375c5472b31e39250d660efffd425e0a2da5aecf0133ad3d414c31214d073d00f519bc83960b5bbfd53df3b1c49  farbfeld-3.tar.gz
+884bf16aa5e88de6d538f8acd5011326dddee4e5a35ca95b70691d012b9238e88325c2cf69acae072960347146972161a40e0c540d0ec7dd4e536426143c8c83  gcc6-fixes.patch"
diff --git a/testing/farbfeld/gcc6-fixes.patch b/testing/farbfeld/gcc6-fixes.patch
index 33aa9fd9a6..6cd8a287be 100644
--- a/testing/farbfeld/gcc6-fixes.patch
+++ b/testing/farbfeld/gcc6-fixes.patch
@@ -1,12 +1,12 @@
-diff -upr farbfeld-2.orig/Makefile farbfeld-2/Makefile
---- farbfeld-2.orig/Makefile	2016-12-02 18:23:51.647145080 +0100
-+++ farbfeld-2/Makefile	2016-12-02 18:24:19.977222457 +0100
-@@ -11,7 +11,7 @@ all: png2ff ff2png jpg2ff
+diff -upr farbfeld-3.orig/Makefile farbfeld-3/Makefile
+--- farbfeld-3.orig/Makefile	2017-04-15 11:29:09.298371171 +0200
++++ farbfeld-3/Makefile	2017-04-15 11:30:24.244786006 +0200
+@@ -23,7 +23,7 @@ $(BIN): $(REQ:=.o)
+ $(BIN:=.o): config.mk $(HDR) $(REQ:=.h)
  
- .c:
- 	@echo CC $<
--	@${CC} -o $@ ${CFLAGS} ${LIBS} ${LDFLAGS} $<
-+	@${CC} $< -o $@ ${CFLAGS} ${LIBS} ${LDFLAGS}
+ .o:
+-	$(CC) $(LDFLAGS) $($*-LDFLAGS) -o $@ $< $(REQ:=.o)
++	$(CC) $< $(REQ:=.o) -o $@ $(LDFLAGS) $($*-LDFLAGS)
  
  clean:
- 	@echo cleaning
+ 	rm -f $(BIN) $(BIN:=.o) $(REQ:=.o)
-- 
cgit v1.2.3