From a2ce7716e4e2dc1e242e6b134bf960f66530f38a Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Fri, 31 Jul 2015 10:25:23 +0200
Subject: [PATCH] jsoncpp: update to 1.6.5.

---
 common/shlibs                                 |  2 +-
 srcpkgs/jsoncpp/files/jsoncpp.pc              | 11 -------
 .../patches/jsoncpp_cross-compile.patch       | 16 ---------
 srcpkgs/jsoncpp/template                      | 33 +++++--------------
 4 files changed, 9 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/jsoncpp/files/jsoncpp.pc
 delete mode 100644 srcpkgs/jsoncpp/patches/jsoncpp_cross-compile.patch

diff --git a/common/shlibs b/common/shlibs
index d5fea935269..8d9db027ef5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1200,7 +1200,7 @@ libspeechd.so.2 speech-dispatcher-0.8_1
 libre2.so.0 re2-20130115_1
 libminizip.so.1 minizip-1.2.7_1
 libsrtp.so.0 libsrtp-1.4.4_1
-libjsoncpp.so.0 jsoncpp-0.6.0rc2_1
+libjsoncpp.so.1 jsoncpp-1.6.5_1
 libesmtp.so.6 libesmtp-1.0.6_4
 libcaca.so.0 libcaca-0.99.beta18_3
 libcaca++.so.0 libcaca-0.99.beta18_3
diff --git a/srcpkgs/jsoncpp/files/jsoncpp.pc b/srcpkgs/jsoncpp/files/jsoncpp.pc
deleted file mode 100644
index 3900f20e9a0..00000000000
--- a/srcpkgs/jsoncpp/files/jsoncpp.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: jsoncpp
-Description: API for manipulating JSON
-Version: 0.6.0
-URL: http://jsoncpp.sourceforge.net/
-Libs: -L${libdir} -ljsoncpp
-Cflags: -I${includedir}/jsoncpp/
diff --git a/srcpkgs/jsoncpp/patches/jsoncpp_cross-compile.patch b/srcpkgs/jsoncpp/patches/jsoncpp_cross-compile.patch
deleted file mode 100644
index 0a104efa4ad..00000000000
--- a/srcpkgs/jsoncpp/patches/jsoncpp_cross-compile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- SConstruct.orig	2010-03-13 13:59:50.000000000 +0300
-+++ SConstruct	2013-04-23 19:31:39.042439981 +0400
-@@ -119,6 +119,13 @@
-     env.Append( CPPDEFINES=[ "WIN32", "NDEBUG", "_MT" ] )
- elif platform.startswith('linux-gcc'):
-     env.Tool( 'default' )
-+    env.Replace(AS = os.environ['AS'])
-+    env.Replace(AR = os.environ['AR'])
-+    env.Replace(NM = os.environ['NM'])
-+    env.Replace(CPP = os.environ['CPP'])
-+    env.Replace(LD = os.environ['LD'])
-+    env.Replace(CXX = os.environ['CXX'])
-+    env.Replace(GCC = os.environ['GCC'])
-     env.Append( LIBS = ['pthread'], CCFLAGS = "-Wall" )
-     env['SHARED_LIB_ENABLED'] = True
- else:
diff --git a/srcpkgs/jsoncpp/template b/srcpkgs/jsoncpp/template
index b9b51888e39..9243ecc656b 100644
--- a/srcpkgs/jsoncpp/template
+++ b/srcpkgs/jsoncpp/template
@@ -1,34 +1,17 @@
 # Template build file for 'jsoncpp'.
 pkgname=jsoncpp
-version=0.6.0rc2
-_srcversion=0.6.0-rc2
-revision=5
-hostmakedepends="scons"
-wrksrc="${pkgname}-src-${_srcversion}"
+version=1.6.5
+revision=1
+build_style="cmake"
+hostmakedepends="cmake"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC_LIBS=ON
+ -DBUILD_SHARED_LIBS=ON -DJSONCPP_WITH_TESTS=OFF"
 short_desc="A JSON implementation in C++"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="Public Domain or MIT"
 homepage="http://jsoncpp.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-src-${_srcversion}.tar.gz"
-checksum=d4d193d163f520b08b9155cba978615892ca1359d77e3fb261fce2f86d09b283
-
-do_build() {
-	sed -i SConstruct -e "s/g++/${CXX}/g"
-	scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS} " \
-		DESTDIR="${DESTDIR}" platform=linux-gcc
-	${CXX} -o libjsoncpp.so.0.0.0 -shared -Wl,-soname,libjsoncpp.so.0 \
-		buildscons/linux-gcc-*/src/lib_json/*.os -lpthread
-}
-
-do_install() {
-	vmkdir usr/lib
-	cp libjsoncpp.so.0.0.0 ${DESTDIR}/usr/lib/
-	ln -sf libjsoncpp.so.0.0.0 ${DESTDIR}/usr/lib/libjsoncpp.so
-	ln -sf libjsoncpp.so.0.0.0 ${DESTDIR}/usr/lib/libjsoncpp.so.0
-	vmkdir usr/include/jsoncpp/json
-	install -p -m 0644 include/json/*.h ${DESTDIR}/usr/include/jsoncpp/json
-	vinstall ${FILESDIR}/jsoncpp.pc 644 usr/lib/pkgconfig
-}
+distfiles="https://github.com/open-source-parsers/${pkgname}/archive/${version}.tar.gz"
+checksum=a2b121eaff56ec88cfd034d17685821a908d0d87bc319329b04f91a6552c1ac2
 
 jsoncpp-devel_package() {
 	depends="jsoncpp>=${version}_${revision}"