Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Jan 2020 21:38:36 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r522975 - in head: biology/bamtools devel/cmake devel/cmake-gui devel/jsoncpp devel/jsoncpp/files devel/opendht graphics/open3d graphics/ossim lang/solidity math/cadabra2 misc/ignition-...
Message-ID:  <202001132138.00DLcaiM031127@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Mon Jan 13 21:38:35 2020
New Revision: 522975
URL: https://svnweb.freebsd.org/changeset/ports/522975

Log:
  devel/jsoncpp: Update 1.8.1 -> 1.9.2
  
  PR:		229677
  Differential Revision:	D22905

Added:
  head/science/py-tensorflow/files/patch-third__party_systemlibs_jsoncpp.build   (contents, props changed)
Deleted:
  head/devel/jsoncpp/files/
Modified:
  head/biology/bamtools/Makefile
  head/devel/cmake-gui/Makefile
  head/devel/cmake/Makefile
  head/devel/jsoncpp/Makefile
  head/devel/jsoncpp/distinfo
  head/devel/jsoncpp/pkg-plist
  head/devel/opendht/Makefile
  head/graphics/open3d/Makefile
  head/graphics/ossim/Makefile
  head/lang/solidity/Makefile
  head/math/cadabra2/Makefile
  head/misc/ignition-fuel-tools/Makefile
  head/multimedia/libopenshot/Makefile
  head/net/flower/Makefile
  head/net/libjson-rpc-cpp/Makefile
  head/science/py-tensorflow/Makefile
  head/www/chromium/Makefile
  head/www/iridium/Makefile
  head/www/qt5-webengine/Makefile
  head/x11/polybar/Makefile
  head/x11/waybar/Makefile

Modified: head/biology/bamtools/Makefile
==============================================================================
--- head/biology/bamtools/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/biology/bamtools/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -3,6 +3,7 @@
 PORTNAME=	bamtools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	biology
 
 MAINTAINER=	jwb@FreeBSD.org

Modified: head/devel/cmake-gui/Makefile
==============================================================================
--- head/devel/cmake-gui/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/devel/cmake-gui/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -2,6 +2,7 @@
 
 PORTNAME=	cmake
 DISTVERSION=	3.16.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-gui

Modified: head/devel/cmake/Makefile
==============================================================================
--- head/devel/cmake/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/devel/cmake/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -4,6 +4,7 @@
 PORTNAME=	cmake
 # Remember to update devel/cmake-doc and devel/cmake-gui as well.
 DISTVERSION=	3.16.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \
 		https://www.cmake.org/files/v${PORTVERSION}/

Modified: head/devel/jsoncpp/Makefile
==============================================================================
--- head/devel/jsoncpp/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/devel/jsoncpp/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jsoncpp
-PORTVERSION=	1.8.1
-PORTREVISION=	7
+PORTVERSION=	1.9.2
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -12,33 +11,10 @@ COMMENT=	JSON reader and writer library for C++
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		compiler:c++11-lang meson pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	open-source-parsers
-
-USES=		compiler:c++11-lang dos2unix scons
+MESON_ARGS=	--default-library=both
 USE_LDCONFIG=	yes
-
-PLATFORM=	linux-gcc-FreeBSD
-MAKE_ARGS=	platform=${PLATFORM}
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp
-	(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)
-	${INSTALL_DATA} ${WRKSRC}/libs/${PLATFORM}/libjsoncpp.a \
-		${STAGEDIR}${PREFIX}/lib
-	${INSTALL_LIB} ${WRKSRC}/libs/${PLATFORM}/libjsoncpp.so.${DISTVERSION} \
-		${STAGEDIR}${PREFIX}/lib
-	${LN} -s libjsoncpp.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so.1
-	${LN} -s libjsoncpp.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so
-	${CP} ${WRKSRC}/pkg-config/jsoncpp.pc.in ${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc
-	@${REINPLACE_CMD} -i '' \
-		-e 's|@CMAKE_INSTALL_FULL_LIBDIR@|${PREFIX}/lib|g' \
-		-e 's|@CMAKE_INSTALL_FULL_INCLUDEDIR@|${PREFIX}/include/jsoncpp|g' \
-		-e 's|@JSONCPP_VERSION@|${DISTVERSION}|g' \
-		${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc
-
-do-test:
-	@${ECHO} "Please note that 3 testcases are known to fail: https://github.com/open-source-parsers/jsoncpp/issues/628"
-	@cd ${WRKSRC} && CXX=${CXX} ${SCONS} platform=${PLATFORM} check
 
 .include <bsd.port.mk>

Modified: head/devel/jsoncpp/distinfo
==============================================================================
--- head/devel/jsoncpp/distinfo	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/devel/jsoncpp/distinfo	Mon Jan 13 21:38:35 2020	(r522975)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498626054
-SHA256 (open-source-parsers-jsoncpp-1.8.1_GH0.tar.gz) = 858db2faf348f89fdf1062bd3e79256772e897e7f17df73e0624edf004f2f9ac
-SIZE (open-source-parsers-jsoncpp-1.8.1_GH0.tar.gz) = 210629
+TIMESTAMP = 1577016318
+SHA256 (open-source-parsers-jsoncpp-1.9.2_GH0.tar.gz) = 77a402fb577b2e0e5d0bdc1cf9c65278915cdb25171e3452c68b6da8a561f8f0
+SIZE (open-source-parsers-jsoncpp-1.9.2_GH0.tar.gz) = 211341

Modified: head/devel/jsoncpp/pkg-plist
==============================================================================
--- head/devel/jsoncpp/pkg-plist	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/devel/jsoncpp/pkg-plist	Mon Jan 13 21:38:35 2020	(r522975)
@@ -1,16 +1,15 @@
-include/jsoncpp/json/allocator.h
-include/jsoncpp/json/assertions.h
-include/jsoncpp/json/autolink.h
-include/jsoncpp/json/config.h
-include/jsoncpp/json/features.h
-include/jsoncpp/json/forwards.h
-include/jsoncpp/json/json.h
-include/jsoncpp/json/reader.h
-include/jsoncpp/json/value.h
-include/jsoncpp/json/version.h
-include/jsoncpp/json/writer.h
+include/json/allocator.h
+include/json/assertions.h
+include/json/autolink.h
+include/json/config.h
+include/json/forwards.h
+include/json/json.h
+include/json/json_features.h
+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.1.8.1
+lib/libjsoncpp.so.22
 libdata/pkgconfig/jsoncpp.pc

Modified: head/devel/opendht/Makefile
==============================================================================
--- head/devel/opendht/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/devel/opendht/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -3,6 +3,7 @@
 
 PORTNAME=	opendht
 DISTVERSION=	1.10.1
+PORTREVISION=	1
 CATEGORIES=	devel net
 
 MAINTAINER=	yuri@FreeBSD.org

Modified: head/graphics/open3d/Makefile
==============================================================================
--- head/graphics/open3d/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/graphics/open3d/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -3,7 +3,7 @@
 PORTNAME=	Open3D
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org

Modified: head/graphics/ossim/Makefile
==============================================================================
--- head/graphics/ossim/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/graphics/ossim/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -3,6 +3,7 @@
 PORTNAME=	ossim
 DISTVERSIONPREFIX=	Neptune-
 DISTVERSION=	2.10.1
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 
 MAINTAINER=	lbartoletti@tuxfamily.org

Modified: head/lang/solidity/Makefile
==============================================================================
--- head/lang/solidity/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/lang/solidity/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -3,6 +3,7 @@
 
 PORTNAME=	solidity
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	https://github.com/ethereum/solidity/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}_${PORTVERSION}

Modified: head/math/cadabra2/Makefile
==============================================================================
--- head/math/cadabra2/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/math/cadabra2/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -2,6 +2,7 @@
 
 PORTNAME=	cadabra2
 DISTVERSION=	2.2.8
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org

Modified: head/misc/ignition-fuel-tools/Makefile
==============================================================================
--- head/misc/ignition-fuel-tools/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/misc/ignition-fuel-tools/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -2,7 +2,7 @@
 
 PORTNAME=	ignition-fuel-tools
 DISTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 

Modified: head/multimedia/libopenshot/Makefile
==============================================================================
--- head/multimedia/libopenshot/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/multimedia/libopenshot/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -3,6 +3,7 @@
 PORTNAME=	libopenshot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.3-595
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-ga1158ee
 CATEGORIES=	multimedia
 

Modified: head/net/flower/Makefile
==============================================================================
--- head/net/flower/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/net/flower/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -4,7 +4,7 @@
 PORTNAME=	flower
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 
 MAINTAINER=	ed@FreeBSD.org

Modified: head/net/libjson-rpc-cpp/Makefile
==============================================================================
--- head/net/libjson-rpc-cpp/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/net/libjson-rpc-cpp/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -3,7 +3,7 @@
 PORTNAME=		libjson-rpc-cpp
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.1.0
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		net www devel
 
 MAINTAINER=	greg@unrelenting.technology

Modified: head/science/py-tensorflow/Makefile
==============================================================================
--- head/science/py-tensorflow/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/science/py-tensorflow/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -3,7 +3,7 @@
 PORTNAME=	tensorflow
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.14.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	${PORTNAME}

Added: head/science/py-tensorflow/files/patch-third__party_systemlibs_jsoncpp.build
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/py-tensorflow/files/patch-third__party_systemlibs_jsoncpp.build	Mon Jan 13 21:38:35 2020	(r522975)
@@ -0,0 +1,23 @@
+--- third_party/systemlibs/jsoncpp.BUILD.orig	2019-06-19 00:48:23.000000000 +0200
++++ third_party/systemlibs/jsoncpp.BUILD	2020-01-13 00:12:53.470881000 +0100
+@@ -7,8 +7,10 @@
+ 
+ HEADERS = [
+     "include/json/autolink.h",
++    "include/json/allocator.h",
++    "include/json/assertions.h",
+     "include/json/config.h",
+-    "include/json/features.h",
++    "include/json/json_features.h",
+     "include/json/forwards.h",
+     "include/json/json.h",
+     "include/json/reader.h",
+@@ -23,7 +25,7 @@
+     cmd = """
+       for i in $(OUTS); do
+         i=$${i##*/}
+-        ln -sf $(INCLUDEDIR)/jsoncpp/json/$$i $(@D)/include/json/$$i
++        ln -sf $(INCLUDEDIR)/json/$$i $(@D)/include/json/$$i
+       done
+     """,
+ )

Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/www/chromium/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -3,6 +3,7 @@
 
 PORTNAME=	chromium
 PORTVERSION=	78.0.3904.108
+PORTREVISION=	1
 CATEGORIES?=	www
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		LOCAL/cpm/chromium/:fonts

Modified: head/www/iridium/Makefile
==============================================================================
--- head/www/iridium/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/www/iridium/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -3,7 +3,7 @@
 
 PORTNAME=	iridium
 PORTVERSION=	2019.04.73
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	https://downloads.iridiumbrowser.de/source/
 PKGNAMESUFFIX=	-browser

Modified: head/www/qt5-webengine/Makefile
==============================================================================
--- head/www/qt5-webengine/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/www/qt5-webengine/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -18,6 +18,7 @@
 
 PORTNAME=	webengine
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	qt5-
 

Modified: head/x11/polybar/Makefile
==============================================================================
--- head/x11/polybar/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/x11/polybar/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -2,6 +2,7 @@
 
 PORTNAME=	polybar
 DISTVERSION=	3.4.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	https://github.com/polybar/polybar/releases/download/${DISTVERSION}/
 

Modified: head/x11/waybar/Makefile
==============================================================================
--- head/x11/waybar/Makefile	Mon Jan 13 20:23:02 2020	(r522974)
+++ head/x11/waybar/Makefile	Mon Jan 13 21:38:35 2020	(r522975)
@@ -2,6 +2,7 @@
 
 PORTNAME=	waybar
 DISTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	x11
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001132138.00DLcaiM031127>