CVS commit: pkgsrc/textproc/jsoncpp

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr  9 06:48:18 UTC 2019

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

Log Message:
jsoncpp: build shared library

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/jsoncpp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/jsoncpp/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/jsoncpp/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/jsoncpp/distinfo
cvs rdiff -u -r0 -r1.1 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.8 pkgsrc/textproc/jsoncpp/Makefile:1.9
--- pkgsrc/textproc/jsoncpp/Makefile:1.8        Sun Dec  2 16:41:57 2018
+++ pkgsrc/textproc/jsoncpp/Makefile    Tue Apr  9 06:48:18 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2018/12/02 16:41:57 adam Exp $
+# $NetBSD: Makefile,v 1.9 2019/04/09 06:48:18 wiz Exp $
 
 DISTNAME=      jsoncpp-1.8.4
+PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=open-source-parsers/}
 
@@ -10,6 +11,8 @@ 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++
 PKGCONFIG_OVERRIDE=    pkg-config/jsoncpp.pc.in
 

Index: pkgsrc/textproc/jsoncpp/PLIST
diff -u pkgsrc/textproc/jsoncpp/PLIST:1.2 pkgsrc/textproc/jsoncpp/PLIST:1.3
--- pkgsrc/textproc/jsoncpp/PLIST:1.2   Tue Apr 19 11:16:37 2016
+++ pkgsrc/textproc/jsoncpp/PLIST       Tue Apr  9 06:48:18 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/04/19 11:16:37 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/04/09 06:48:18 wiz Exp $
 include/json/allocator.h
 include/json/assertions.h
 include/json/autolink.h
@@ -10,5 +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.1 pkgsrc/textproc/jsoncpp/buildlink3.mk:1.2
--- pkgsrc/textproc/jsoncpp/buildlink3.mk:1.1   Fri Apr 18 22:26:08 2014
+++ pkgsrc/textproc/jsoncpp/buildlink3.mk       Tue Apr  9 06:48:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/04/18 22:26:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/04/09 06:48:18 wiz Exp $
 
 BUILDLINK_TREE+=       jsoncpp
 
@@ -7,7 +7,6 @@ JSONCPP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.jsoncpp+=        jsoncpp>=0.6.0rc2svn276
 BUILDLINK_PKGSRCDIR.jsoncpp?=  ../../textproc/jsoncpp
-BUILDLINK_DEPMETHOD.jsoncpp?=  build
 .endif # JSONCPP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -jsoncpp

Index: pkgsrc/textproc/jsoncpp/distinfo
diff -u pkgsrc/textproc/jsoncpp/distinfo:1.7 pkgsrc/textproc/jsoncpp/distinfo:1.8
--- pkgsrc/textproc/jsoncpp/distinfo:1.7        Sun Dec  2 16:41:57 2018
+++ pkgsrc/textproc/jsoncpp/distinfo    Tue Apr  9 06:48:18 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2018/12/02 16:41:57 adam Exp $
+$NetBSD: distinfo,v 1.8 2019/04/09 06:48: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

Added files:

Index: pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Tue Apr  9 06:48:18 2019
+++ pkgsrc/textproc/jsoncpp/patches/patch-CMakeLists.txt        Tue Apr  9 06:48:18 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2019/04/09 06:48:18 wiz Exp $
+
+Make so version match symlink versions.
+
+--- CMakeLists.txt.orig        2017-12-20 21:07:10.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" )
+ 
+ MESSAGE(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}")