24 files changed, 59 insertions, 129 deletions

diff --git a/biology/bamtools/Makefile b/biology/bamtools/Makefile
index ae18f4c0ae1b..92194e7ab18b 100644
--- a/biology/bamtools/Makefile
+++ b/biology/bamtools/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	bamtools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	biology
 
 MAINTAINER=	jwb@FreeBSD.org
diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
index 0e0b51791daf..e9b1912ef3a8 100644
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@@ -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
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 733001b05f9e..f698f1c926d2 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -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}/
diff --git a/devel/jsoncpp/Makefile b/devel/jsoncpp/Makefile
index 4b2a8f55454c..2999875456c7 100644
--- a/devel/jsoncpp/Makefile
+++ b/devel/jsoncpp/Makefile
@@ -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>
diff --git a/devel/jsoncpp/distinfo b/devel/jsoncpp/distinfo
index be0d9470dfea..791d70e1544c 100644
--- a/devel/jsoncpp/distinfo
+++ b/devel/jsoncpp/distinfo
@@ -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
diff --git a/devel/jsoncpp/files/patch-SConstruct b/devel/jsoncpp/files/patch-SConstruct
deleted file mode 100644
index 02cb53edee00..000000000000
--- a/devel/jsoncpp/files/patch-SConstruct
+++ /dev/null
@@ -1,72 +0,0 @@
---- SConstruct.orig	2016-05-09 23:15:49 UTC
-+++ SConstruct
-@@ -26,7 +26,7 @@ try:
-     if platform == 'linux-gcc':
-         CXX = 'g++' # not quite right, but env is not yet available.
-         import commands
--        version = commands.getoutput('%s -dumpversion' %CXX)
-+        version = 'FreeBSD'
-         platform = 'linux-gcc-%s' %version
-         print "Using platform '%s'" %platform
-         LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '')
-@@ -65,7 +65,7 @@ def make_environ_vars():
- 	return vars
- 	
- 
--env = Environment( ENV = make_environ_vars(),
-+env = Environment( ENV = os.environ,
-                    toolpath = ['scons-tools'],
-                    tools=[] ) #, tools=['default'] )
- 
-@@ -121,6 +121,7 @@ elif platform.startswith('linux-gcc'):
-     env.Tool( 'default' )
-     env.Append( LIBS = ['pthread'], CCFLAGS = os.environ.get("CXXFLAGS", "-Wall"), LINKFLAGS=os.environ.get("LDFLAGS", "") )
-     env['SHARED_LIB_ENABLED'] = True
-+    env['CXX'] = os.environ['CXX']
- else:
-     print "UNSUPPORTED PLATFORM."
-     env.Exit(1)
-@@ -147,6 +148,11 @@ env['JSONCPP_VERSION'] = JSONCPP_VERSION
- env['BUILD_DIR'] = env.Dir(build_dir)
- env['ROOTBUILD_DIR'] = env.Dir(rootbuild_dir)
- env['DIST_DIR'] = DIST_DIR
-+
-+# Set SHLIBVERSION for env.InstallVersionedLib(). We use the version number
-+# without the "-rcXX" part.
-+env['SHLIBVERSION'] = JSONCPP_VERSION.partition('-')[0]
-+
- if 'TarGz' in env['BUILDERS']:
- 	class SrcDistAdder:
- 		def __init__( self, env ):
-@@ -164,11 +170,11 @@ env['SRCDIST_ADD'] = SrcDistAdder( env )
- env['SRCDIST_TARGET'] = os.path.join( DIST_DIR, 'jsoncpp-src-%s.tar.gz' % env['JSONCPP_VERSION'] )
-                       
- env_testing = env.Clone( )
--env_testing.Append( LIBS = ['json_${LIB_NAME_SUFFIX}'] )
-+env_testing.Append( LIBS = ['jsoncpp'] )
- 
- def buildJSONExample( env, target_sources, target_name ):
-     env = env.Clone()
--    env.Append( CPPPATH = ['#'] )
-+    #env.Append( CPPPATH = ['#'] )
-     exe = env.Program( target=target_name,
-                        source=target_sources )
-     env['SRCDIST_ADD']( source=[target_sources] )
-@@ -187,14 +193,14 @@ def buildUnitTests( env, target_sources,
-     env.AlwaysBuild( check_alias_target )
- 
- def buildLibrary( env, target_sources, target_name ):
--    static_lib = env.StaticLibrary( target=target_name + '_${LIB_NAME_SUFFIX}',
-+    static_lib = env.StaticLibrary( target=target_name,
-                                     source=target_sources )
-     global lib_dir
-     env.Install( lib_dir, static_lib )
-     if env['SHARED_LIB_ENABLED']:
--        shared_lib = env.SharedLibrary( target=target_name + '_${LIB_NAME_SUFFIX}',
-+        shared_lib = env.SharedLibrary( target=target_name,
-                                         source=target_sources )
--        env.Install( lib_dir, shared_lib )
-+        env.InstallVersionedLib( lib_dir, shared_lib )
-     env['SRCDIST_ADD']( source=[target_sources] )
- 
- Export( 'env env_testing buildJSONExample buildLibrary buildJSONTests buildUnitTests' )
diff --git a/devel/jsoncpp/files/patch-src_lib__json_sconscript b/devel/jsoncpp/files/patch-src_lib__json_sconscript
deleted file mode 100644
index c29bec06bc1e..000000000000
--- a/devel/jsoncpp/files/patch-src_lib__json_sconscript
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/lib_json/sconscript.orig	2016-05-09 23:15:49 UTC
-+++ src/lib_json/sconscript
-@@ -5,4 +5,4 @@ buildLibrary( env, Split( """
-     json_value.cpp 
-     json_writer.cpp
-      """ ),
--    'json' )
-+    'jsoncpp' )
diff --git a/devel/jsoncpp/pkg-plist b/devel/jsoncpp/pkg-plist
index 48b457ae3567..5c3a6eb90f87 100644
--- a/devel/jsoncpp/pkg-plist
+++ b/devel/jsoncpp/pkg-plist
@@ -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
diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile
index 85124530644b..cf285de53f44 100644
--- a/devel/opendht/Makefile
+++ b/devel/opendht/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	opendht
 DISTVERSION=	1.10.1
+PORTREVISION=	1
 CATEGORIES=	devel net
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/graphics/open3d/Makefile b/graphics/open3d/Makefile
index 014c234cd40a..32547fb41031 100644
--- a/graphics/open3d/Makefile
+++ b/graphics/open3d/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	Open3D
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/graphics/ossim/Makefile b/graphics/ossim/Makefile
index 859858884095..0486f92fed55 100644
--- a/graphics/ossim/Makefile
+++ b/graphics/ossim/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	ossim
 DISTVERSIONPREFIX=	Neptune-
 DISTVERSION=	2.10.1
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 
 MAINTAINER=	lbartoletti@tuxfamily.org
diff --git a/lang/solidity/Makefile b/lang/solidity/Makefile
index 53508c275d41..c2124edc4e40 100644
--- a/lang/solidity/Makefile
+++ b/lang/solidity/Makefile
@@ -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}
diff --git a/math/cadabra2/Makefile b/math/cadabra2/Makefile
index 596793b0026e..d2492b80c09f 100644
--- a/math/cadabra2/Makefile
+++ b/math/cadabra2/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cadabra2
 DISTVERSION=	2.2.8
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/misc/ignition-fuel-tools/Makefile b/misc/ignition-fuel-tools/Makefile
index d87176aa5968..5d84ce7a967f 100644
--- a/misc/ignition-fuel-tools/Makefile
+++ b/misc/ignition-fuel-tools/Makefile
@@ -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=/
 
diff --git a/multimedia/libopenshot/Makefile b/multimedia/libopenshot/Makefile
index f58dc3e86260..b2f71da0e828 100644
--- a/multimedia/libopenshot/Makefile
+++ b/multimedia/libopenshot/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	libopenshot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.3-595
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-ga1158ee
 CATEGORIES=	multimedia
 
diff --git a/net/flower/Makefile b/net/flower/Makefile
index 84766f33bb26..336e86e878de 100644
--- a/net/flower/Makefile
+++ b/net/flower/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	flower
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 
 MAINTAINER=	ed@FreeBSD.org
diff --git a/net/libjson-rpc-cpp/Makefile b/net/libjson-rpc-cpp/Makefile
index d62d24dc9b95..6ae5a7a6afd1 100644
--- a/net/libjson-rpc-cpp/Makefile
+++ b/net/libjson-rpc-cpp/Makefile
@@ -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
diff --git a/science/py-tensorflow/Makefile b/science/py-tensorflow/Makefile
index 256cff97d112..3d9f16483e00 100644
--- a/science/py-tensorflow/Makefile
+++ b/science/py-tensorflow/Makefile
@@ -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}
diff --git a/science/py-tensorflow/files/patch-third__party_systemlibs_jsoncpp.build b/science/py-tensorflow/files/patch-third__party_systemlibs_jsoncpp.build
new file mode 100644
index 000000000000..46e94bc92977
--- /dev/null
+++ b/science/py-tensorflow/files/patch-third__party_systemlibs_jsoncpp.build
@@ -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
+     """,
+ )
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index e30a439e0fab..43ccb97d0664 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -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
diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index bae5ae0155fb..d62f619d37bd 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -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
diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile
index c301dc37f755..4d7eab7cba0e 100644
--- a/www/qt5-webengine/Makefile
+++ b/www/qt5-webengine/Makefile
@@ -18,6 +18,7 @@
 
 PORTNAME=	webengine
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	qt5-
 
diff --git a/x11/polybar/Makefile b/x11/polybar/Makefile
index ec7fb39fc179..fb2c4671e79a 100644
--- a/x11/polybar/Makefile
+++ b/x11/polybar/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	polybar
 DISTVERSION=	3.4.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	https://github.com/polybar/polybar/releases/download/${DISTVERSION}/
 
diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile
index 3adefa08798f..a4b69eb376fd 100644
--- a/x11/waybar/Makefile
+++ b/x11/waybar/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	waybar
 DISTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	x11
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/