From adba317480e87b329b52297d48f3b49433d49bc1 Mon Sep 17 00:00:00 2001
From: Governikus <ausweisapp2@governikus.de>
Date: Mon, 3 Jul 2017 10:45:03 +0200
Subject: main/jsoncpp: upgrade to 1.8.1

Modernize abuild
---
 main/jsoncpp/APKBUILD | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

(limited to 'main/jsoncpp')

diff --git a/main/jsoncpp/APKBUILD b/main/jsoncpp/APKBUILD
index 51fc6cbfb7..5941a1f20b 100644
--- a/main/jsoncpp/APKBUILD
+++ b/main/jsoncpp/APKBUILD
@@ -1,35 +1,22 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=jsoncpp
-pkgver=1.8.0
+pkgver=1.8.1
 pkgrel=0
 pkgdesc="JSON C++ library"
 url="https://github.com/open-source-parsers/jsoncpp"
 arch="all"
 license="PublicDomain"
-depends=
-depends_dev=
-makedepends="$depends_dev scons"
-install=""
+makedepends="scons"
 subpackages="$pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/open-source-parsers/jsoncpp/archive/$pkgver.tar.gz"
 builddir="$srcdir"/jsoncpp-$pkgver
 
-prepare() {
-	local i
-	cd "$builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
 build() {
 	cd "$builddir"
 	# we cannot use cmake since jsoncpp is a dependency for cmake which
 	# means we would get circular buildtime deps
-	scons platform=linux-gcc || return 1
+	scons platform=linux-gcc
 
 	# build a proper shared lib
 	g++ -o libjsoncpp.so.0.0.0 -shared -Wl,-soname,libjsoncpp.so.0 \
@@ -40,13 +27,12 @@ package() {
 	cd "$builddir"
 
 	mkdir -p "$pkgdir"/usr/lib
-	cp "$builddir"/libjsoncpp.so.0.0.0 "$pkgdir"/usr/lib/ || return 1
-	ln -s libjsoncpp.so.0.0.0 "$pkgdir"/usr/lib/libjsoncpp.so.0 || return 1
-	ln -s libjsoncpp.so.0.0.0 "$pkgdir"/usr/lib/libjsoncpp.so || return 1
+	cp "$builddir"/libjsoncpp.so.0.0.0 "$pkgdir"/usr/lib/
+	ln -s libjsoncpp.so.0.0.0 "$pkgdir"/usr/lib/libjsoncpp.so.0
+	ln -s libjsoncpp.so.0.0.0 "$pkgdir"/usr/lib/libjsoncpp.so
 
 	mkdir -p "$pkgdir"/usr/include/jsoncpp
-	cp -r "$builddir"/include/json/* "$pkgdir"/usr/include/jsoncpp/ \
-		|| return 1
+	cp -r "$builddir"/include/json/* "$pkgdir"/usr/include/jsoncpp/
 	ln -s jsoncpp "$pkgdir"/usr/include/json
 
 	mkdir -p "$pkgdir"/usr/lib/pkgconfig
@@ -55,9 +41,7 @@ package() {
 		-e 's:@INCLUDE_INSTALL_DIR@:include/jsoncpp:g'\
 		-e "s:@JSONCPP_VERSION@:$pkgver:g"\
 		pkg-config/jsoncpp.pc.in \
-		> "$pkgdir"/usr/lib/pkgconfig/jsoncpp.pc || return 1
+		> "$pkgdir"/usr/lib/pkgconfig/jsoncpp.pc
 }
 
-md5sums="6d6cbd82b5fe4a9cbae4ffef01f9e9fc  jsoncpp-1.8.0.tar.gz"
-sha256sums="5deb2462cbf0c0121c9d6c9823ec72fe71417e34242e3509bc7c003d526465bc  jsoncpp-1.8.0.tar.gz"
-sha512sums="bd0aa56827932e5b50231216c9f501da12053bf9eed6e83210b5c52afb9aff610e71995446a7e2f5f4580ff37762956a307867d3eaa1aebd6ca31e574c9e4d4c  jsoncpp-1.8.0.tar.gz"
+sha512sums="4203826fca4c366b51d28ffc928399c914ffaba8be1cada64ff118b5742e6b469d3fc3e59344587d851447857b479794c5697d4fd11a9a55b32a3a7a801b745b  jsoncpp-1.8.1.tar.gz"
-- 
cgit v1.2.3