From 749150d8e138bc814dce8034c6d3f02535bcba7e Mon Sep 17 00:00:00 2001
From: Larry Hajali <larryhaja[at]gmail[dot]com>
Date: Wed, 9 Sep 2015 23:05:58 +0700
Subject: libraries/jsoncpp: Updated for version 1.6.5.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/jsoncpp/jsoncpp.SlackBuild | 13 +++++--------
 libraries/jsoncpp/jsoncpp.info       |  6 +++---
 2 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'libraries')

diff --git a/libraries/jsoncpp/jsoncpp.SlackBuild b/libraries/jsoncpp/jsoncpp.SlackBuild
index 21aa3146a9..11fe74a521 100644
--- a/libraries/jsoncpp/jsoncpp.SlackBuild
+++ b/libraries/jsoncpp/jsoncpp.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jsoncpp
-VERSION=${VERSION:-1.6.2}
+VERSION=${VERSION:-1.6.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,13 +73,14 @@ mkdir -p build
 cd build
   cmake -G "Unix Makefiles" \
     -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
-    -DLIB_SUFFIX="$LIBDIRSUFFIX" \
+    -DLIB_SUFFIX:STRING="$LIBDIRSUFFIX" \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DJSONCPP_WITH_CMAKE_PACKAGE:BOOL=ON \
-    -DJSONCPP_LIB_BUILD_SHARED:BOOL=ON \
-    -DJSONCPP_LIB_BUILD_STATIC:BOOL=OFF \
+    -DBUILD_STATIC_LIBS:BOOL=OFF \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
     -DJSONCPP_WITH_TESTS:BOOL=OFF \
+    -DINCLUDE_INSTALL_DIR=/usr/include/$PRGNAM \
     -DCMAKE_BUILD_TYPE=Release ..
 
   make VERBOSE=1
@@ -89,10 +90,6 @@ cd -
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Move incude directory because it conflicts with json-c.
-# This is how Arch, Fedora, Ubuntu and Gentoo do it.
-[ -d $PKG/usr/include/json ] && mv $PKG/usr/include/json $PKG/usr/include/$PRGNAM
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS LICENSE NEWS.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/jsoncpp/jsoncpp.info b/libraries/jsoncpp/jsoncpp.info
index ef793196d1..85be13d115 100644
--- a/libraries/jsoncpp/jsoncpp.info
+++ b/libraries/jsoncpp/jsoncpp.info
@@ -1,8 +1,8 @@
 PRGNAM="jsoncpp"
-VERSION="1.6.2"
+VERSION="1.6.5"
 HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
-DOWNLOAD="https://github.com/open-source-parsers/jsoncpp/archive/1.6.2.tar.gz"
-MD5SUM="5a62da8b5c5b0e46a0e782e7363aee3d"
+DOWNLOAD="https://github.com/open-source-parsers/jsoncpp/archive/1.6.5.tar.gz"
+MD5SUM="2bb16bb8d2b867acbdd71d1855062a89"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3