CVS commit: pkgsrc/textproc/jsoncpp

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr  9 07:08:18 UTC 2019

Modified Files:
        pkgsrc/textproc/jsoncpp: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/textproc/jsoncpp/patches: patch-src_lib__json_CMakeLists.txt

Log Message:
jsoncpp: update to 1.8.4nb2.

Give static library the same name as the shared one.

Bump dependency in bl3.mk to a version with shared libraries.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/jsoncpp/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/jsoncpp/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/jsoncpp/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/jsoncpp/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/jsoncpp/patches/patch-src_lib__json_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.9 pkgsrc/textproc/jsoncpp/Makefile:1.10
--- pkgsrc/textproc/jsoncpp/Makefile:1.9        Tue Apr  9 06:48:18 2019
+++ pkgsrc/textproc/jsoncpp/Makefile    Tue Apr  9 07:08:18 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2019/04/09 06:48:18 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/04/09 07:08:18 wiz Exp $
 
 DISTNAME=      jsoncpp-1.8.4
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=open-source-parsers/}
 

Index: pkgsrc/textproc/jsoncpp/PLIST
diff -u pkgsrc/textproc/jsoncpp/PLIST:1.3 pkgsrc/textproc/jsoncpp/PLIST:1.4
--- pkgsrc/textproc/jsoncpp/PLIST:1.3   Tue Apr  9 06:48:18 2019
+++ pkgsrc/textproc/jsoncpp/PLIST       Tue Apr  9 07:08:18 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2019/04/09 06:48:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/04/09 07:08:18 wiz Exp $
 include/json/allocator.h
 include/json/assertions.h
 include/json/autolink.h
@@ -10,8 +10,8 @@ include/json/reader.h
 include/json/value.h
 include/json/version.h
 include/json/writer.h
+lib/libjsoncpp.a
 lib/libjsoncpp.so
 lib/libjsoncpp.so.1
 lib/libjsoncpp.so.${PKGVERSION}
-lib/libjsoncpp_static.a
 lib/pkgconfig/jsoncpp.pc

Index: pkgsrc/textproc/jsoncpp/buildlink3.mk
diff -u pkgsrc/textproc/jsoncpp/buildlink3.mk:1.2 pkgsrc/textproc/jsoncpp/buildlink3.mk:1.3
--- pkgsrc/textproc/jsoncpp/buildlink3.mk:1.2   Tue Apr  9 06:48:18 2019
+++ pkgsrc/textproc/jsoncpp/buildlink3.mk       Tue Apr  9 07:08:18 2019
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2019/04/09 06:48:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2019/04/09 07:08:18 wiz Exp $
 
 BUILDLINK_TREE+=       jsoncpp
 
 .if !defined(JSONCPP_BUILDLINK3_MK)
 JSONCPP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.jsoncpp+=        jsoncpp>=0.6.0rc2svn276
+BUILDLINK_API_DEPENDS.jsoncpp+=        jsoncpp>=1.8.4nb1
 BUILDLINK_PKGSRCDIR.jsoncpp?=  ../../textproc/jsoncpp
 .endif # JSONCPP_BUILDLINK3_MK
 

Index: pkgsrc/textproc/jsoncpp/distinfo
diff -u pkgsrc/textproc/jsoncpp/distinfo:1.8 pkgsrc/textproc/jsoncpp/distinfo:1.9
--- pkgsrc/textproc/jsoncpp/distinfo:1.8        Tue Apr  9 06:48:18 2019
+++ pkgsrc/textproc/jsoncpp/distinfo    Tue Apr  9 07:08:18 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2019/04/09 06:48:18 wiz Exp $
+$NetBSD: distinfo,v 1.9 2019/04/09 07:08:18 wiz 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

Added files:

Index: pkgsrc/textproc/jsoncpp/patches/patch-src_lib__json_CMakeLists.txt
diff -u /dev/null pkgsrc/textproc/jsoncpp/patches/patch-src_lib__json_CMakeLists.txt:1.1
--- /dev/null   Tue Apr  9 07:08:18 2019
+++ pkgsrc/textproc/jsoncpp/patches/patch-src_lib__json_CMakeLists.txt  Tue Apr  9 07:08:18 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_lib__json_CMakeLists.txt,v 1.1 2019/04/09 07:08:18 wiz Exp $
+
+We're not on Windows, so static libraries can have the same name as shared ones.
+
+--- src/lib_json/CMakeLists.txt.orig   2017-12-20 21:07:10.000000000 +0000
++++ src/lib_json/CMakeLists.txt
+@@ -96,7 +96,7 @@ IF(BUILD_STATIC_LIBS)
+     ADD_LIBRARY(jsoncpp_lib_static STATIC ${PUBLIC_HEADERS} ${jsoncpp_sources})
+     SET_TARGET_PROPERTIES( jsoncpp_lib_static PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_SOVERSION})
+     # avoid name clashes on windows as the shared import lib is also named jsoncpp.lib
+-    if (NOT DEFINED STATIC_SUFFIX AND BUILD_SHARED_LIBS)
++    if (WINDOWS AND NOT DEFINED STATIC_SUFFIX AND BUILD_SHARED_LIBS)
+       set (STATIC_SUFFIX "_static")
+     endif ()
+     set_target_properties (jsoncpp_lib_static PROPERTIES OUTPUT_NAME jsoncpp${STATIC_SUFFIX}