CVS commit: pkgsrc/textproc/jsoncpp

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Nov  3 20:52:23 UTC 2021

Modified Files:
        pkgsrc/textproc/jsoncpp: Makefile PLIST distinfo
        pkgsrc/textproc/jsoncpp/patches: patch-CMakeLists.txt

Log Message:
jsoncpp: updated to 1.9.5

1.9.5:
Minor bug-fixes (including for cmake)
Support for Bazel
Dropped compile-time deprecation warnings


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/jsoncpp/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/jsoncpp/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/jsoncpp/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/jsoncpp/Makefile
diff -u pkgsrc/textproc/jsoncpp/Makefile:1.15 pkgsrc/textproc/jsoncpp/Makefile:1.16
--- pkgsrc/textproc/jsoncpp/Makefile:1.15       Tue Sep 29 16:49:15 2020
+++ pkgsrc/textproc/jsoncpp/Makefile    Wed Nov  3 20:52:23 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2020/09/29 16:49:15 adam Exp $
+# $NetBSD: Makefile,v 1.16 2021/11/03 20:52:23 adam Exp $
 
-DISTNAME=      jsoncpp-1.9.4
+DISTNAME=      jsoncpp-1.9.5
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=open-source-parsers/}
 
@@ -15,5 +15,10 @@ CMAKE_ARGS+=         -DBUILD_STATIC_LIBS=OFF
 CMAKE_ARGS+=           -DBUILD_OBJECT_LIBS=OFF
 CMAKE_ARGS+=           -DJSONCPP_WITH_TESTS=OFF
 PKGCONFIG_OVERRIDE=    pkg-config/jsoncpp.pc.in
+CONFIGURE_DIRS=                ${WRKDIR}/build
+CMAKE_ARG_PATH=                ${WRKSRC}
+
+post-extract:
+       ${MKDIR} ${WRKDIR}/build
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/jsoncpp/PLIST
diff -u pkgsrc/textproc/jsoncpp/PLIST:1.8 pkgsrc/textproc/jsoncpp/PLIST:1.9
--- pkgsrc/textproc/jsoncpp/PLIST:1.8   Sat May 30 06:09:47 2020
+++ pkgsrc/textproc/jsoncpp/PLIST       Wed Nov  3 20:52:23 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2020/05/30 06:09:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2021/11/03 20:52:23 adam Exp $
 include/json/allocator.h
 include/json/assertions.h
 include/json/config.h
@@ -9,7 +9,9 @@ include/json/reader.h
 include/json/value.h
 include/json/version.h
 include/json/writer.h
-lib/cmake/jsoncpp/jsoncppConfig-release.cmake
+lib/cmake/jsoncpp/jsoncpp-namespaced-targets.cmake
+lib/cmake/jsoncpp/jsoncpp-targets-release.cmake
+lib/cmake/jsoncpp/jsoncpp-targets.cmake
 lib/cmake/jsoncpp/jsoncppConfig.cmake
 lib/cmake/jsoncpp/jsoncppConfigVersion.cmake
 lib/libjsoncpp.so

Index: pkgsrc/textproc/jsoncpp/distinfo
diff -u pkgsrc/textproc/jsoncpp/distinfo:1.16 pkgsrc/textproc/jsoncpp/distinfo:1.17
--- pkgsrc/textproc/jsoncpp/distinfo:1.16       Tue Oct 26 11:22:13 2021
+++ pkgsrc/textproc/jsoncpp/distinfo    Wed Nov  3 20:52:23 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 11:22:13 nia Exp $
+$NetBSD: distinfo,v 1.17 2021/11/03 20:52:23 adam Exp $
 
-BLAKE2s (jsoncpp-1.9.4.tar.gz) = 83b41ae0b6e3b09d87389c6e94de705dc11e3a2ba722d03f3f724a7e67814f6b
-SHA512 (jsoncpp-1.9.4.tar.gz) = adfd4afbdf6b79bd37edcf0e248f07864994f1c4bcb7431f3b44102490ce467f72381908066655fa486dec12f467af0a11f42f859bbf719895974c7339db7d22
-Size (jsoncpp-1.9.4.tar.gz) = 214057 bytes
-SHA1 (patch-CMakeLists.txt) = 8f7ca8b24647eb28de220796b2721051bc4f49ec
+BLAKE2s (jsoncpp-1.9.5.tar.gz) = e10152d14c86b9f20b6da5a0bac484322728e445d5368724457c59c0f2c4092e
+SHA512 (jsoncpp-1.9.5.tar.gz) = 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873
+Size (jsoncpp-1.9.5.tar.gz) = 216055 bytes
+SHA1 (patch-CMakeLists.txt) = ccd72520cea8293d2fc0300e15b81be2505cd719

Index: pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt
diff -u pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt:1.5 pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt:1.6
--- pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt:1.5    Tue Sep 29 16:49:15 2020
+++ pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt        Wed Nov  3 20:52:23 2021
@@ -1,25 +1,15 @@
-$NetBSD: patch-CMakeLists.txt,v 1.5 2020/09/29 16:49:15 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.6 2021/11/03 20:52:23 adam Exp $
 
 Make so version match symlink versions.
-Remove -Werror=conversion.
 
---- CMakeLists.txt.orig        2020-09-26 02:19:16.000000000 +0000
+--- CMakeLists.txt.orig        2021-11-03 17:53:28.000000000 +0000
 +++ CMakeLists.txt
-@@ -73,7 +73,7 @@ project(jsoncpp
+@@ -76,7 +76,7 @@ project(jsoncpp
          LANGUAGES CXX)
  
  message(STATUS "JsonCpp Version: ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
--set(PROJECT_SOVERSION 24)
+-set(PROJECT_SOVERSION 25)
 +set(PROJECT_SOVERSION ${PROJECT_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)
-@@ -124,7 +124,7 @@ endif()
- 
- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-     # using regular Clang or AppleClang
--    add_compile_options(-Wall -Wconversion -Wshadow -Werror=conversion -Werror=sign-compare)
-+    add_compile_options(-Wall -Wconversion -Wshadow -Werror=sign-compare)
- elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-     # using GCC
-     add_compile_options(-Wall -Wconversion -Wshadow -Wextra)
+ include(${CMAKE_CURRENT_SOURCE_DIR}/include/PreventInSourceBuilds.cmake)
+ include(${CMAKE_CURRENT_SOURCE_DIR}/include/PreventInBuildInstalls.cmake)