jsoncpp: build shared library

Bump PKGREVISION.

5 files changed, 27 insertions, 6 deletions

diff --git a/textproc/jsoncpp/Makefile b/textproc/jsoncpp/Makefile
index c3ec98d5328..ef6576e971c 100644
--- a/textproc/jsoncpp/Makefile
+++ b/textproc/jsoncpp/Makefile
@@ -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
 
diff --git a/textproc/jsoncpp/PLIST b/textproc/jsoncpp/PLIST
index fe51021c790..e3a1812be86 100644
--- a/textproc/jsoncpp/PLIST
+++ b/textproc/jsoncpp/PLIST
@@ -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
diff --git a/textproc/jsoncpp/buildlink3.mk b/textproc/jsoncpp/buildlink3.mk
index 4539b615a3a..d47146863de 100644
--- a/textproc/jsoncpp/buildlink3.mk
+++ b/textproc/jsoncpp/buildlink3.mk
@@ -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
diff --git a/textproc/jsoncpp/distinfo b/textproc/jsoncpp/distinfo
index 03f4854aabf..d7bfcc5b183 100644
--- a/textproc/jsoncpp/distinfo
+++ b/textproc/jsoncpp/distinfo
@@ -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
diff --git a/textproc/jsoncpp/patches/patch-CMakeLists.txt b/textproc/jsoncpp/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..95108bf29d9
--- /dev/null
+++ b/textproc/jsoncpp/patches/patch-CMakeLists.txt
@@ -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}")