jsoncpp: updated to 1.9.2

1.9.2:
Medium size pre-release containing lots of build fixes.

4 files changed, 35 insertions, 15 deletions

diff --git a/textproc/jsoncpp/Makefile b/textproc/jsoncpp/Makefile
index ce63f509cb0..c8543733efa 100644
--- a/textproc/jsoncpp/Makefile
+++ b/textproc/jsoncpp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2019/08/11 17:53:27 adam Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/27 22:25:21 adam Exp $
 
-DISTNAME=	jsoncpp-1.9.1
+DISTNAME=	jsoncpp-1.9.2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=open-source-parsers/}
 
diff --git a/textproc/jsoncpp/PLIST b/textproc/jsoncpp/PLIST
index e3b413c7ac6..c953d7ce3b4 100644
--- a/textproc/jsoncpp/PLIST
+++ b/textproc/jsoncpp/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.6 2019/08/11 17:53:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/11/27 22:25:21 adam Exp $
 include/json/allocator.h
 include/json/assertions.h
 include/json/autolink.h
 include/json/config.h
-include/json/features.h
 include/json/forwards.h
 include/json/json.h
+include/json/json_features.h
 include/json/reader.h
 include/json/value.h
 include/json/version.h
@@ -14,6 +14,6 @@ lib/cmake/jsoncpp/jsoncppConfig-release.cmake
 lib/cmake/jsoncpp/jsoncppConfig.cmake
 lib/cmake/jsoncpp/jsoncppConfigVersion.cmake
 lib/libjsoncpp.so
+lib/libjsoncpp.so.${PKGVERSION}
 lib/libjsoncpp.so.1
-lib/libjsoncpp.so.1.9.0
 lib/pkgconfig/jsoncpp.pc
diff --git a/textproc/jsoncpp/distinfo b/textproc/jsoncpp/distinfo
index 6b007a32ea1..25ef5672c66 100644
--- a/textproc/jsoncpp/distinfo
+++ b/textproc/jsoncpp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2019/08/11 17:53:27 adam Exp $
+$NetBSD: distinfo,v 1.12 2019/11/27 22:25:21 adam Exp $
 
-SHA1 (jsoncpp-1.9.1.tar.gz) = 142c4c8092991483425893e77158f0dff3657d70
-RMD160 (jsoncpp-1.9.1.tar.gz) = 083f26acb866faeefd368966ab7928dcf1fb3abb
-SHA512 (jsoncpp-1.9.1.tar.gz) = 4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766
-Size (jsoncpp-1.9.1.tar.gz) = 203067 bytes
-SHA1 (patch-CMakeLists.txt) = 43a6e243cc6aebb4bd2cb21c4657cdac14ce9d18
+SHA1 (jsoncpp-1.9.2.tar.gz) = 6a546eeeea6e31fe8ab746491a3189c0844a0f79
+RMD160 (jsoncpp-1.9.2.tar.gz) = 16f332ae761b94b86ba7748c1be25e33dc58e428
+SHA512 (jsoncpp-1.9.2.tar.gz) = 7c7188199d62ae040d458d507ba62f0370c53f39c580760ee5485cae5c08e5ced0c9aea7c14f54dfd041999a7291e4d0f67f8ccd8b1030622c85590774688640
+Size (jsoncpp-1.9.2.tar.gz) = 211341 bytes
+SHA1 (patch-CMakeLists.txt) = d0a83a9c681f9048fc0569e888380adc945705c2
diff --git a/textproc/jsoncpp/patches/patch-CMakeLists.txt b/textproc/jsoncpp/patches/patch-CMakeLists.txt
index e9e78ac3fea..8079b6ea1a5 100644
--- a/textproc/jsoncpp/patches/patch-CMakeLists.txt
+++ b/textproc/jsoncpp/patches/patch-CMakeLists.txt
@@ -1,15 +1,35 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2019/07/08 18:42:19 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2019/11/27 22:25:21 adam Exp $
 
 Make so version match symlink versions.
+Remove -Werror=conversion.
+Do not build examples.
 
---- CMakeLists.txt.orig	2019-07-08 12:02:29.000000000 +0000
+--- CMakeLists.txt.orig	2019-11-12 07:16:54.000000000 +0000
 +++ CMakeLists.txt
-@@ -67,7 +67,7 @@ project(JSONCPP
+@@ -74,7 +74,7 @@ project(JSONCPP
          LANGUAGES CXX)
  
  message(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}")
--set( JSONCPP_SOVERSION 21 )
+-set( JSONCPP_SOVERSION 22 )
 +set( JSONCPP_SOVERSION ${JSONCPP_VERSION_MAJOR} )
  
  option(JSONCPP_WITH_TESTS "Compile and (for jsoncpp_check) run JsonCpp test executables" ON)
  option(JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" ON)
+@@ -141,9 +141,9 @@ endif()
+ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+     # using regular Clang or AppleClang
+     if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12.0)
+-      add_compile_options(-Wall -Wconversion -Wshadow -Werror=conversion -Werror=sign-compare)
++      add_compile_options(-Wall -Wconversion -Wshadow -Werror=sign-compare)
+     else()
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wconversion -Wshadow -Werror=conversion -Werror=sign-compare")
++      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wconversion -Wshadow -Werror=sign-compare")
+     endif()
+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+     # using GCC
+@@ -227,5 +227,3 @@ add_subdirectory( src )
+ #install the includes
+ add_subdirectory( include )
+ 
+-#install the example
+-add_subdirectory( example )