Received: by mail.netbsd.org (Postfix, from userid 605) id 0BA1884D4C; Mon, 8 Jul 2019 18:42:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 84FDF84D4B for ; Mon, 8 Jul 2019 18:42:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id TCaKIdI0bdkG for ; Mon, 8 Jul 2019 18:42:19 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id B724B84CDA for ; Mon, 8 Jul 2019 18:42:19 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B033DFBF4; Mon, 8 Jul 2019 18:42:19 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1562611339219890" MIME-Version: 1.0 Date: Mon, 8 Jul 2019 18:42:19 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/textproc/jsoncpp To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20190708184219.B033DFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1562611339219890 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Mon Jul 8 18:42:19 UTC 2019 Modified Files: pkgsrc/textproc/jsoncpp: Makefile PLIST distinfo pkgsrc/textproc/jsoncpp/patches: patch-CMakeLists.txt Log Message: jsoncpp: updated to 1.9.0 1.9.0: It's been ~2 years since the last release, so this has quite a few changes. Some highlights: Build optimizations and updates. Now needs at least Meson 0.50.0, bot support for VS 2013 dropped in favor of VS 2017 Lots of bug fixes Lots of enhancements Lots of cleanup To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/jsoncpp/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/jsoncpp/PLIST cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/jsoncpp/distinfo cvs rdiff -u -r1.1 -r1.2 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. --_----------=_1562611339219890 Content-Disposition: inline Content-Length: 4732 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/jsoncpp/Makefile diff -u pkgsrc/textproc/jsoncpp/Makefile:1.10 pkgsrc/textproc/jsoncpp/Makefile:1.11 --- pkgsrc/textproc/jsoncpp/Makefile:1.10 Tue Apr 9 07:08:18 2019 +++ pkgsrc/textproc/jsoncpp/Makefile Mon Jul 8 18:42:19 2019 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2019/04/09 07:08:18 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2019/07/08 18:42:19 adam Exp $ -DISTNAME= jsoncpp-1.8.4 -PKGREVISION= 2 +DISTNAME= jsoncpp-1.9.0 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GITHUB:=open-source-parsers/} @@ -11,9 +10,9 @@ COMMENT= JSON reader and writer in C++ LICENSE= public-domain OR mit USE_CMAKE= yes -CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON -CMAKE_ARGS+= -DJSONCPP_WITH_TESTS:BOOL=OFF USE_LANGUAGES= c c++ +CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON +CMAKE_ARGS+= -DJSONCPP_WITH_TESTS=OFF PKGCONFIG_OVERRIDE= pkg-config/jsoncpp.pc.in .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/jsoncpp/PLIST diff -u pkgsrc/textproc/jsoncpp/PLIST:1.4 pkgsrc/textproc/jsoncpp/PLIST:1.5 --- pkgsrc/textproc/jsoncpp/PLIST:1.4 Tue Apr 9 07:08:18 2019 +++ pkgsrc/textproc/jsoncpp/PLIST Mon Jul 8 18:42:19 2019 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2019/04/09 07:08:18 wiz Exp $ +@comment $NetBSD: PLIST,v 1.5 2019/07/08 18:42:19 adam Exp $ include/json/allocator.h include/json/assertions.h include/json/autolink.h @@ -10,8 +10,10 @@ include/json/reader.h include/json/value.h include/json/version.h include/json/writer.h -lib/libjsoncpp.a +lib/cmake/jsoncpp/jsoncppConfig-release.cmake +lib/cmake/jsoncpp/jsoncppConfig.cmake +lib/cmake/jsoncpp/jsoncppConfigVersion.cmake lib/libjsoncpp.so -lib/libjsoncpp.so.1 lib/libjsoncpp.so.${PKGVERSION} +lib/libjsoncpp.so.1 lib/pkgconfig/jsoncpp.pc Index: pkgsrc/textproc/jsoncpp/distinfo diff -u pkgsrc/textproc/jsoncpp/distinfo:1.9 pkgsrc/textproc/jsoncpp/distinfo:1.10 --- pkgsrc/textproc/jsoncpp/distinfo:1.9 Tue Apr 9 07:08:18 2019 +++ pkgsrc/textproc/jsoncpp/distinfo Mon Jul 8 18:42:19 2019 @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.9 2019/04/09 07:08:18 wiz Exp $ +$NetBSD: distinfo,v 1.10 2019/07/08 18:42:19 adam Exp $ -SHA1 (jsoncpp-1.8.4.tar.gz) = 98a56dba0cc6378c91668b6e1c120a657820c45e -RMD160 (jsoncpp-1.8.4.tar.gz) = 5444cc199daef95c3297aacafb7471d1a4e2b3bf -SHA512 (jsoncpp-1.8.4.tar.gz) = f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1 -Size (jsoncpp-1.8.4.tar.gz) = 200226 bytes -SHA1 (patch-CMakeLists.txt) = ce873c2fb1a1c6df0748613f0d1fe8441ceb1132 -SHA1 (patch-src_lib__json_CMakeLists.txt) = 13cd2b4fb864644bc67a493d00acc9c32822aa38 +SHA1 (jsoncpp-1.9.0.tar.gz) = 2a61b81cba7c5a1c83b5e5fcce6193716f1f7304 +RMD160 (jsoncpp-1.9.0.tar.gz) = 201f2650e679acf1bb4d97b6e16714cd80241f21 +SHA512 (jsoncpp-1.9.0.tar.gz) = b1da96c12d9ad4c7e002ed84b6c0ff24a7c86034f462a4eb29d93be2f81d7961a03d6f7aa3e7fa58366a2ed76242f6c72e8c3c6d34bdf562c86ca9951f5f3785 +Size (jsoncpp-1.9.0.tar.gz) = 203176 bytes +SHA1 (patch-CMakeLists.txt) = 43a6e243cc6aebb4bd2cb21c4657cdac14ce9d18 Index: pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt diff -u pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt:1.1 pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt:1.2 --- pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt:1.1 Tue Apr 9 06:48:18 2019 +++ pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt Mon Jul 8 18:42:19 2019 @@ -1,15 +1,15 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2019/04/09 06:48:18 wiz Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2019/07/08 18:42:19 adam Exp $ Make so version match symlink versions. ---- CMakeLists.txt.orig 2017-12-20 21:07:10.000000000 +0000 +--- CMakeLists.txt.orig 2019-07-08 12:02:29.000000000 +0000 +++ CMakeLists.txt -@@ -64,7 +64,7 @@ jsoncpp_parse_version( ${JSONCPP_VERSION - #IF(NOT JSONCPP_VERSION_FOUND) - # MESSAGE(FATAL_ERROR "Failed to parse version string properly. Expect X.Y.Z") - #ENDIF(NOT JSONCPP_VERSION_FOUND) --SET( JSONCPP_SOVERSION 19 ) -+SET( JSONCPP_SOVERSION ${JSONCPP_VERSION_MAJOR} ) - SET( JSONCPP_USE_SECURE_MEMORY "0" CACHE STRING "-D...=1 to use memory-wiping allocator for STL" ) +@@ -67,7 +67,7 @@ project(JSONCPP + LANGUAGES CXX) - MESSAGE(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}") + message(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}") +-set( JSONCPP_SOVERSION 21 ) ++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) --_----------=_1562611339219890--