git: f7e42ce5d5a3 - main - devel/protobuf: Update to 3.19.4

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Mon, 28 Feb 2022 12:54:13 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f7e42ce5d5a3f11265d1e253b04212001992eca2

commit f7e42ce5d5a3f11265d1e253b04212001992eca2
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-02-28 12:33:39 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-02-28 12:46:46 +0000

    devel/protobuf: Update to 3.19.4
    
    - Bump PORTREVISION of dependent ports for shlib change
    
    Changes:        https://github.com/protocolbuffers/protobuf/releases
---
 astro/kosmindoormap/Makefile         |  1 +
 astro/libosmpbf/Makefile             |  2 +-
 astro/merkaartor/Makefile            |  2 +-
 audio/clementine-player/Makefile     |  2 +-
 audio/mixxx/Makefile                 |  2 +-
 audio/mixxx22/Makefile               |  2 +-
 audio/mumble/Makefile                |  2 +-
 audio/murmur/Makefile                |  2 +-
 audio/strawberry/Makefile            |  1 +
 cad/cura-engine/Makefile             |  2 +-
 databases/arrow/Makefile             |  2 +-
 databases/mysql57-client/Makefile    |  2 +-
 databases/mysql57-server/Makefile    |  2 +-
 databases/mysql80-client/Makefile    |  2 +-
 databases/mysql80-server/Makefile    |  2 +-
 devel/bear/Makefile                  |  1 +
 devel/bloaty/Makefile                |  2 +-
 devel/google-cloud-cpp/Makefile      |  2 +-
 devel/google-cloud-cpp117/Makefile   |  2 +-
 devel/grpc/Makefile                  |  1 +
 devel/grpc130/Makefile               |  1 +
 devel/grpc134/Makefile               |  1 +
 devel/grpc142/Makefile               |  1 +
 devel/ignition-msgs/Makefile         |  2 +-
 devel/kpublictransport/Makefile      |  1 +
 devel/libphonenumber/Makefile        |  1 +
 devel/protobuf-c/Makefile            |  2 +-
 devel/protobuf/Makefile              |  7 ++++---
 devel/protobuf/distinfo              |  6 +++---
 devel/protobuf/files/patch-nodiscard | 27 +++++++++++++++++++++++++++
 devel/protobuf/pkg-plist             | 23 ++++++++++++++++-------
 devel/py-mypy-protobuf/Makefile      |  1 +
 dns/knot-resolver/Makefile           |  1 +
 games/cockatrice/Makefile            |  2 +-
 games/pink-pony/Makefile             |  2 +-
 games/pokerth/Makefile               |  2 +-
 graphics/opencv/Makefile             |  2 +-
 graphics/osgearth/Makefile           |  2 +-
 graphics/qgis-ltr/Makefile           |  2 +-
 graphics/qgis/Makefile               |  1 +
 graphics/qtpbfimageplugin/Makefile   |  2 +-
 japanese/mozc-server/Makefile        |  2 +-
 mail/astroid/Makefile                |  2 +-
 math/or-tools/Makefile               |  2 +-
 math/py-or-tools/Makefile            |  2 +-
 misc/glow/Makefile                   |  2 +-
 misc/mnn/Makefile                    |  2 +-
 misc/py-onnx/Makefile                |  1 +
 multimedia/libopenshot/Makefile      |  2 +-
 multimedia/vlc/Makefile              |  2 +-
 net-im/ricochet/Makefile             |  2 +-
 net-mgmt/collectd5/Makefile          |  2 +-
 net-mgmt/netdata/Makefile            |  2 +-
 net-p2p/bitcoin/Makefile             |  2 +-
 net-p2p/litecoin/Makefile            |  2 +-
 net-p2p/namecoin/Makefile            |  2 +-
 net-p2p/qtum/Makefile                |  2 +-
 net-p2p/zetacoin/Makefile            |  2 +-
 net/eternalterminal/Makefile         |  2 +-
 net/gamenetworkingsockets/Makefile   |  2 +-
 net/libarcus/Makefile                |  1 +
 net/mosh/Makefile                    |  2 +-
 net/spoofer/Makefile                 |  2 +-
 science/py-chainer/Makefile          |  1 +
 sysutils/apache-mesos/Makefile       |  2 +-
 sysutils/zbackup/Makefile            |  2 +-
 textproc/rubygem-cld3/Makefile       |  1 +
 www/envoy/Makefile                   |  2 +-
 68 files changed, 114 insertions(+), 61 deletions(-)

diff --git a/astro/kosmindoormap/Makefile b/astro/kosmindoormap/Makefile
index c4bb3c747dfb..e1b9bcd21c55 100644
--- a/astro/kosmindoormap/Makefile
+++ b/astro/kosmindoormap/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kosmindoormap
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	astro kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/astro/libosmpbf/Makefile b/astro/libosmpbf/Makefile
index 816f897ffce2..b7facbb1c34f 100644
--- a/astro/libosmpbf/Makefile
+++ b/astro/libosmpbf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libosmpbf
 PORTVERSION=	1.5.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro geography devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index b379aea32880..b971b0fba8e7 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	merkaartor
 PORTVERSION=	0.19.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 
 MAINTAINER=	dev2@heesakkers.info
diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile
index 75e2b60d3d4f..5aac10ddae87 100644
--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	clementine
 DISTVERSION=	1.4.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-player
 
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index a68b9b7fa63a..17550a80a199 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mixxx
 DISTVERSION=	2.3.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 
 MAINTAINER=	acm@FreeBSD.org
diff --git a/audio/mixxx22/Makefile b/audio/mixxx22/Makefile
index 16493f3bc077..1b5f36381aa1 100644
--- a/audio/mixxx22/Makefile
+++ b/audio/mixxx22/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	mixxx
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	2.2.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio
 PKGNAMESUFFIX?=	22
 
diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index 775f1cf37518..07794bd5b489 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mumble
 PORTVERSION=	1.3.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 
 MAINTAINER=	feld@FreeBSD.org
diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index c3147e378321..3835083797db 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	murmur
 PORTVERSION=	1.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio net
 
 MAINTAINER=	feld@FreeBSD.org
diff --git a/audio/strawberry/Makefile b/audio/strawberry/Makefile
index ed60c21fb162..ca5327adb774 100644
--- a/audio/strawberry/Makefile
+++ b/audio/strawberry/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	strawberry
 DISTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/strawberrymusicplayer/${PORTNAME}/releases/download/${DISTVERSION}/ \
 		https://files.jkvinge.net/packages/strawberry/
diff --git a/cad/cura-engine/Makefile b/cad/cura-engine/Makefile
index 9fe76fc24634..6d4b279278a1 100644
--- a/cad/cura-engine/Makefile
+++ b/cad/cura-engine/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=		CuraEngine
 DISTVERSION=		4.8
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=		1
 CATEGORIES=		cad
 DIST_SUBDIR=		Ultimaker
diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile
index ad44c0565cd8..9619d7e9c74f 100644
--- a/databases/arrow/Makefile
+++ b/databases/arrow/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	arrow
 DISTVERSION=	6.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION} \
 		https://github.com/apache/orc/archive/rel/:orc
diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
index e1c3afe69b57..81ae8401f36a 100644
--- a/databases/mysql57-client/Makefile
+++ b/databases/mysql57-client/Makefile
@@ -1,7 +1,7 @@
 # Created by: "Mahdi Mokhtari <mokhi64@gmail.com>"
 
 PORTNAME=	mysql
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	57-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index 992b39745e99..5ddcc713c76e 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.7.37
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/MySQL-5.7
 PKGNAMESUFFIX?=	57-server
diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile
index 17516ff51626..0c8c8dd4ee7f 100644
--- a/databases/mysql80-client/Makefile
+++ b/databases/mysql80-client/Makefile
@@ -1,7 +1,7 @@
 # Created by: "Mahdi Mokhtari <mokhi64@gmail.com>"
 
 PORTNAME=	mysql
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	80-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index d7c5c133cc6f..64797e3f0842 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME?=		mysql
 PORTVERSION=		8.0.28
-PORTREVISION?=		1
+PORTREVISION?=		2
 CATEGORIES=		databases
 MASTER_SITES=		MYSQL/MySQL-8.0
 PKGNAMESUFFIX?=		80-server
diff --git a/devel/bear/Makefile b/devel/bear/Makefile
index 88dee1f09583..550cd706a5bf 100644
--- a/devel/bear/Makefile
+++ b/devel/bear/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	bear
 DISTVERSION=	3.0.18
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	jrm@FreeBSD.org
diff --git a/devel/bloaty/Makefile b/devel/bloaty/Makefile
index bd1542bc42f5..49c2f22ff035 100644
--- a/devel/bloaty/Makefile
+++ b/devel/bloaty/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bloaty
 PORTVERSION=	1.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 
 MAINTAINER=	swills@FreeBSD.org
diff --git a/devel/google-cloud-cpp/Makefile b/devel/google-cloud-cpp/Makefile
index 4185b992cc03..87a803e8069c 100644
--- a/devel/google-cloud-cpp/Makefile
+++ b/devel/google-cloud-cpp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	google-cloud-cpp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.21.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/devel/google-cloud-cpp117/Makefile b/devel/google-cloud-cpp117/Makefile
index 1c0bc9f68499..8a7f6eda69a5 100644
--- a/devel/google-cloud-cpp117/Makefile
+++ b/devel/google-cloud-cpp117/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	google-cloud-cpp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.17.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 PKGNAMESUFFIX=	117
 DIST_SUBDIR=	${PORTNAME}
diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
index 742c4d43abb2..376067bf2dd5 100644
--- a/devel/grpc/Makefile
+++ b/devel/grpc/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	grpc
 PORTVERSION=	1.43.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	2
 CATEGORIES=	devel
diff --git a/devel/grpc130/Makefile b/devel/grpc130/Makefile
index a516ef386526..626ddc439a77 100644
--- a/devel/grpc130/Makefile
+++ b/devel/grpc130/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	grpc
 PORTVERSION=	1.30.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMESUFFIX=	130
diff --git a/devel/grpc134/Makefile b/devel/grpc134/Makefile
index 6952a8297bac..e384c7e9951e 100644
--- a/devel/grpc134/Makefile
+++ b/devel/grpc134/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	grpc
 PORTVERSION=	1.34.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMESUFFIX=	134
diff --git a/devel/grpc142/Makefile b/devel/grpc142/Makefile
index 43593bb92a1e..6bd1249a6b01 100644
--- a/devel/grpc142/Makefile
+++ b/devel/grpc142/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	grpc
 PORTVERSION=	1.42.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMESUFFIX=	142
diff --git a/devel/ignition-msgs/Makefile b/devel/ignition-msgs/Makefile
index 85b7340c2e00..f446966ce3ff 100644
--- a/devel/ignition-msgs/Makefile
+++ b/devel/ignition-msgs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ignition-msgs
 DISTVERSION=	3.0.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 
diff --git a/devel/kpublictransport/Makefile b/devel/kpublictransport/Makefile
index ce085e7cecd9..1c6acd25bdd1 100644
--- a/devel/kpublictransport/Makefile
+++ b/devel/kpublictransport/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kpublictransport
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/libphonenumber/Makefile b/devel/libphonenumber/Makefile
index de6ae2369886..e2dbf9d890f8 100644
--- a/devel/libphonenumber/Makefile
+++ b/devel/libphonenumber/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	libphonenumber
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.12.44
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/protobuf-c/Makefile b/devel/protobuf-c/Makefile
index 66f99a5964ed..4703bb392889 100644
--- a/devel/protobuf-c/Makefile
+++ b/devel/protobuf-c/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=		protobuf-c
 PORTVERSION=		1.4.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		devel
 
 MAINTAINER=	truckman@FreeBSD.org
diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile
index 94375bbf830c..735a03b3a599 100644
--- a/devel/protobuf/Makefile
+++ b/devel/protobuf/Makefile
@@ -1,7 +1,7 @@
 # Created by: vanilla
 
 PORTNAME=	protobuf
-PORTVERSION=	3.17.3
+PORTVERSION=	3.19.4
 DISTVERSIONPREFIX=	cpp-
 PORTEPOCH=	1
 CATEGORIES=	devel
@@ -19,8 +19,6 @@ TEST_DEPENDS=	googletest>=0:devel/googletest
 
 USES=		compiler:c++11-lang cpe gmake libtool localbase pathfix pkgconfig
 
-CPE_VENDOR=	google
-
 CFLAGS+=	-D_THREAD_SAFE -DGOOGLE_PROTOBUF_NO_RTTI -I${WRKSRC}/src
 CONFIGURE_ENV=	CC_FOR_BUILD="${CC}" \
 		CFLAGS_FOR_BUILD="${CFLAGS}" \
@@ -34,8 +32,11 @@ TEST_ARGS=	${MAKE_ARGS} ${_MAKE_JOBS}
 TEST_TARGET=	check
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+CPE_VENDOR=	google
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|^check-local:|disabled-&|' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -Ee 's,[^ 	]*lib(gtest|gmock.*)\.la,-l\1,' ${WRKSRC}/src/Makefile.in
diff --git a/devel/protobuf/distinfo b/devel/protobuf/distinfo
index 6426c1560bd3..0e73e72c9e6d 100644
--- a/devel/protobuf/distinfo
+++ b/devel/protobuf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623686454
-SHA256 (protobuf-cpp-3.17.3.tar.gz) = 51cec99f108b83422b7af1170afd7aeb2dd77d2bcbb7b6bad1f92509e9ccf8cb
-SIZE (protobuf-cpp-3.17.3.tar.gz) = 4710418
+TIMESTAMP = 1643440466
+SHA256 (protobuf-cpp-3.19.4.tar.gz) = 89ac31a93832e204db6d73b1e80f39f142d5747b290f17340adce5be5b122f94
+SIZE (protobuf-cpp-3.19.4.tar.gz) = 4803263
diff --git a/devel/protobuf/files/patch-nodiscard b/devel/protobuf/files/patch-nodiscard
new file mode 100644
index 000000000000..93f8b4bb5deb
--- /dev/null
+++ b/devel/protobuf/files/patch-nodiscard
@@ -0,0 +1,27 @@
+Fix build for devel/protozero (at least)
+
+FAILED: test/CMakeFiles/writer_tests.dir/t/bytes/bytes_testcase.pb.cc.o 
+/usr/local/libexec/ccache/c++  -I/wrkdirs/usr/ports/devel/protozero/work/protozero-1.7.1/include -I/wrkdirs/usr/ports/devel/protozero/work/protozero-1.7.1/test/include -isystem /wrkdirs/usr/ports/devel/protozero/work/protozero-1.7.1/test/catch -isystem /usr/local/include -isystem /wrkdirs/usr/ports/devel/protozero/work/.build/test -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -pthread -Wall -Wextra -pedantic -Wsign-compare -Wunused-parameter -Wno-float-equal -Wno-covered-switch-default -Werror -std=c++11 -MD -MT test/CMakeFiles/writer_tests.dir/t/bytes/bytes_testcase.pb.cc.o -MF test/CMakeFiles/writer_tests.dir/t/bytes/bytes_testcase.pb.cc.o.d -o test/CMakeFiles/writer_tests.dir/t/bytes/bytes_testcase.pb.cc.o -c /wrkdirs/usr/ports/devel/protozero/work/.build/test/t/bytes/bytes_testcase.pb.cc
+In file included from /wrkdirs/usr/ports/devel/protozero/work/.build/test/t/bytes/bytes_testcase.pb.cc:4:
+/wrkdirs/usr/ports/devel/protozero/work/.build/test/t/bytes/bytes_testcase.pb.h:190:3: error: use of the 'nodiscard' attribute is a C++17 extension [-Werror,-Wc++17-extensions]
+  PROTOBUF_NODISCARD std::string* release_s();
+  ^
+/usr/local/include/google/protobuf/port_def.inc:463:30: note: expanded from macro 'PROTOBUF_NODISCARD'
+#define PROTOBUF_NODISCARD [[nodiscard]]
+                             ^
+1 error generated.
+
+Obtained from:	https://github.com/protocolbuffers/protobuf/commit/ab4585a6956675ce14a1cba5d321fde980bbf12b (part of)
+Reference:	https://github.com/protocolbuffers/protobuf/issues/9181
+
+--- src/google/protobuf/port_def.inc.orig	2022-01-28 16:33:11 UTC
++++ src/google/protobuf/port_def.inc
+@@ -459,7 +459,7 @@
+ #ifdef PROTOBUF_NODISCARD
+ #error PROTOBUF_NODISCARD was previously defined
+ #endif
+-#if __has_cpp_attribute(nodiscard)
++#if __has_cpp_attribute(nodiscard) && PROTOBUF_CPLUSPLUS_MIN(201703L)
+ #define PROTOBUF_NODISCARD [[nodiscard]]
+ #elif __has_attribute(warn_unused_result) || PROTOBUF_GNUC_MIN(4, 8)
+ #define PROTOBUF_NODISCARD __attribute__((warn_unused_result))
diff --git a/devel/protobuf/pkg-plist b/devel/protobuf/pkg-plist
index df1d777ec98b..10c7c6fc9607 100644
--- a/devel/protobuf/pkg-plist
+++ b/devel/protobuf/pkg-plist
@@ -9,15 +9,19 @@ include/google/protobuf/arena_impl.h
 include/google/protobuf/arenastring.h
 include/google/protobuf/compiler/code_generator.h
 include/google/protobuf/compiler/command_line_interface.h
+include/google/protobuf/compiler/cpp/cpp_file.h
 include/google/protobuf/compiler/cpp/cpp_generator.h
+include/google/protobuf/compiler/cpp/cpp_helpers.h
+include/google/protobuf/compiler/cpp/cpp_names.h
+include/google/protobuf/compiler/csharp/csharp_doc_comment.h
 include/google/protobuf/compiler/csharp/csharp_generator.h
 include/google/protobuf/compiler/csharp/csharp_names.h
+include/google/protobuf/compiler/csharp/csharp_options.h
 include/google/protobuf/compiler/importer.h
 include/google/protobuf/compiler/java/java_generator.h
 include/google/protobuf/compiler/java/java_kotlin_generator.h
 include/google/protobuf/compiler/java/java_names.h
 include/google/protobuf/compiler/js/js_generator.h
-include/google/protobuf/compiler/js/well_known_types_embed.h
 include/google/protobuf/compiler/objectivec/objectivec_generator.h
 include/google/protobuf/compiler/objectivec/objectivec_helpers.h
 include/google/protobuf/compiler/parser.h
@@ -36,6 +40,7 @@ include/google/protobuf/duration.proto
 include/google/protobuf/dynamic_message.h
 include/google/protobuf/empty.pb.h
 include/google/protobuf/empty.proto
+include/google/protobuf/explicitly_constructed.h
 include/google/protobuf/extension_set.h
 include/google/protobuf/extension_set_inl.h
 include/google/protobuf/field_access_listener.h
@@ -43,14 +48,17 @@ include/google/protobuf/field_mask.pb.h
 include/google/protobuf/field_mask.proto
 include/google/protobuf/generated_enum_reflection.h
 include/google/protobuf/generated_enum_util.h
+include/google/protobuf/generated_message_bases.h
 include/google/protobuf/generated_message_reflection.h
 include/google/protobuf/generated_message_table_driven.h
+include/google/protobuf/generated_message_table_driven_lite.h
 include/google/protobuf/generated_message_tctable_decl.h
 include/google/protobuf/generated_message_tctable_impl.h
 include/google/protobuf/generated_message_tctable_impl.inc
 include/google/protobuf/generated_message_util.h
 include/google/protobuf/has_bits.h
 include/google/protobuf/implicit_weak_message.h
+include/google/protobuf/inlined_string_field.h
 include/google/protobuf/io/coded_stream.h
 include/google/protobuf/io/gzip_stream.h
 include/google/protobuf/io/io_win32.h
@@ -78,6 +86,7 @@ include/google/protobuf/port_undef.inc
 include/google/protobuf/reflection.h
 include/google/protobuf/reflection_ops.h
 include/google/protobuf/repeated_field.h
+include/google/protobuf/repeated_ptr_field.h
 include/google/protobuf/service.h
 include/google/protobuf/source_context.pb.h
 include/google/protobuf/source_context.proto
@@ -120,15 +129,15 @@ include/google/protobuf/wrappers.pb.h
 include/google/protobuf/wrappers.proto
 lib/libprotobuf-lite.a
 lib/libprotobuf-lite.so
-lib/libprotobuf-lite.so.28
-lib/libprotobuf-lite.so.28.0.3
+lib/libprotobuf-lite.so.30
+lib/libprotobuf-lite.so.30.0.4
 lib/libprotobuf.a
 lib/libprotobuf.so
-lib/libprotobuf.so.28
-lib/libprotobuf.so.28.0.3
+lib/libprotobuf.so.30
+lib/libprotobuf.so.30.0.4
 lib/libprotoc.a
 lib/libprotoc.so
-lib/libprotoc.so.28
-lib/libprotoc.so.28.0.3
+lib/libprotoc.so.30
+lib/libprotoc.so.30.0.4
 libdata/pkgconfig/protobuf-lite.pc
 libdata/pkgconfig/protobuf.pc
diff --git a/devel/py-mypy-protobuf/Makefile b/devel/py-mypy-protobuf/Makefile
index 66c66abb2244..b10c2eee5edf 100644
--- a/devel/py-mypy-protobuf/Makefile
+++ b/devel/py-mypy-protobuf/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	mypy-protobuf
 PORTVERSION=	3.2.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile
index b9e3cfa60dd2..124b39831d53 100644
--- a/dns/knot-resolver/Makefile
+++ b/dns/knot-resolver/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	knot-resolver
 DISTVERSION=	5.4.4
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
 		https://dns.company/downloads/knot-resolver/
diff --git a/games/cockatrice/Makefile b/games/cockatrice/Makefile
index 63cfd89e0e71..7fd02dca4aa4 100644
--- a/games/cockatrice/Makefile
+++ b/games/cockatrice/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Cockatrice
 PORTVERSION=	2.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 
 MAINTAINER=	sbruno@FreeBSD.org
diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile
index 0e0b1457f5f4..b41a35d7d842 100644
--- a/games/pink-pony/Makefile
+++ b/games/pink-pony/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pink-pony
 PORTVERSION=	1.4.1
-PORTREVISION=	34
+PORTREVISION=	35
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
index 340fff166cea..89de2aa2bbdf 100644
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pokerth
 PORTVERSION=	1.1.2
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	games
 MASTER_SITES=	SF
 
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 180d1a26afc7..e229ffb095ca 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	opencv
 DISTVERSION=	4.5.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 MAINTAINER=	tcberner@FreeBSD.org
diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile
index 12326e5753dc..2123b3bc089e 100644
--- a/graphics/osgearth/Makefile
+++ b/graphics/osgearth/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	osgearth
 PORTVERSION=	2.10.1
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	graphics geography
 
 MAINTAINER=	lbartoletti@FreeBSD.org
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index fa3a60a9f493..b47b1bec8858 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	qgis
 DISTVERSION=	3.16.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 PKGNAMESUFFIX=	-ltr
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index d1b3fdc55e2a..f5c326094abc 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	qgis
 DISTVERSION=	3.24.0
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 
diff --git a/graphics/qtpbfimageplugin/Makefile b/graphics/qtpbfimageplugin/Makefile
index 94f5736b9a1a..f4aed9fc910c 100644
--- a/graphics/qtpbfimageplugin/Makefile
+++ b/graphics/qtpbfimageplugin/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	qtpbfimageplugin
 PORTVERSION=	2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 
 MAINTAINER=	sikmir@gmail.com
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index fa7d9a8a6ee7..79e601112420 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	mozc
 PORTVERSION=	2.23.2815.102.01
 DISTVERSIONPREFIX=	v
-PORTREVISION?=	5
+PORTREVISION?=	6
 CATEGORIES=	japanese
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/mail/astroid/Makefile b/mail/astroid/Makefile
index 8b2124260f0a..3f2773f529ee 100644
--- a/mail/astroid/Makefile
+++ b/mail/astroid/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	astroid
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.15
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail
 
 MAINTAINER=	mylan.connolly@gmail.com
diff --git a/math/or-tools/Makefile b/math/or-tools/Makefile
index 8f912670004c..fdb75dd6e32d 100644
--- a/math/or-tools/Makefile
+++ b/math/or-tools/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	or-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/math/py-or-tools/Makefile b/math/py-or-tools/Makefile
index 5a8538f1310c..0f80bff9a2d4 100644
--- a/math/py-or-tools/Makefile
+++ b/math/py-or-tools/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	or-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/misc/glow/Makefile b/misc/glow/Makefile
index 6220aa5993be..4c2c646fef18 100644
--- a/misc/glow/Makefile
+++ b/misc/glow/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	glow
 DISTVERSION=	g20200721
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc # machine-learning
 PKGNAMESUFFIX=	-nn-compiler
 
diff --git a/misc/mnn/Makefile b/misc/mnn/Makefile
index 156afa64fa6d..2394ee78b0d2 100644
--- a/misc/mnn/Makefile
+++ b/misc/mnn/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mnn
 DISTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/misc/py-onnx/Makefile b/misc/py-onnx/Makefile
index e1af059d5c57..339624289f71 100644
--- a/misc/py-onnx/Makefile
+++ b/misc/py-onnx/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	onnx
 DISTVERSION=	1.11.0
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/multimedia/libopenshot/Makefile b/multimedia/libopenshot/Makefile
index 2d9846bd34d2..a29eb883b971 100644
--- a/multimedia/libopenshot/Makefile
+++ b/multimedia/libopenshot/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libopenshot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 45629b387bac..a9050061823a 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	3.0.16
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
diff --git a/net-im/ricochet/Makefile b/net-im/ricochet/Makefile
index 906f20f14006..1110c31d3448 100644
--- a/net-im/ricochet/Makefile
+++ b/net-im/ricochet/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	ricochet
 PORTVERSION=	1.1.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	26
+PORTREVISION=	27
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index b41f9b389654..f0fe3f3bd385 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	5.12.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://storage.googleapis.com/collectd-tarballs/
 PKGNAMESUFFIX=	5
diff --git a/net-mgmt/netdata/Makefile b/net-mgmt/netdata/Makefile
index eae0d56815a5..7a224ad3733a 100644
--- a/net-mgmt/netdata/Makefile
+++ b/net-mgmt/netdata/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	netdata
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.33.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \
 		https://github.com/forkbomb9/netdata/commit/:dashboard
diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile
index 0730c99f4ad8..dbe9d19ba380 100644
--- a/net-p2p/bitcoin/Makefile
+++ b/net-p2p/bitcoin/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bitcoin
 PORTVERSION=	22.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	net-p2p finance
 MASTER_SITES=	https://bitcoincore.org/bin/bitcoin-core-${PORTVERSION}/ \
 		LOCAL/swills:icon
diff --git a/net-p2p/litecoin/Makefile b/net-p2p/litecoin/Makefile
index 028534ebc5d1..3dad75c6ba65 100644
--- a/net-p2p/litecoin/Makefile
+++ b/net-p2p/litecoin/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	litecoin
 PORTVERSION=	0.18.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	hsw@bitmark.com
diff --git a/net-p2p/namecoin/Makefile b/net-p2p/namecoin/Makefile
index 08f407c93d71..926f209e646b 100644
--- a/net-p2p/namecoin/Makefile
+++ b/net-p2p/namecoin/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	namecoin
 PORTVERSION=	0.21.0.1
 DISTVERSIONPREFIX=	nc
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net-p2p dns
 
diff --git a/net-p2p/qtum/Makefile b/net-p2p/qtum/Makefile
index c2c7dffe44ae..2df040e5b456 100644
--- a/net-p2p/qtum/Makefile
+++ b/net-p2p/qtum/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	qtum
 PORTVERSION=	0.20.3
 DISTVERSIONPREFIX=	mainnet-fastlane-v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	vd@FreeBSD.org
diff --git a/net-p2p/zetacoin/Makefile b/net-p2p/zetacoin/Makefile
index ebed7507ca52..c75206b781fc 100644
--- a/net-p2p/zetacoin/Makefile
+++ b/net-p2p/zetacoin/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	zetacoin
 PORTVERSION=	0.13.2.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	daniel@morante.net
diff --git a/net/eternalterminal/Makefile b/net/eternalterminal/Makefile
index d9d7bb608f55..14295486da4e 100644
--- a/net/eternalterminal/Makefile
+++ b/net/eternalterminal/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	eternalterminal
 DISTVERSIONPREFIX=	et-v
 DISTVERSION=	6.1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	willtisdale@gmail.com
diff --git a/net/gamenetworkingsockets/Makefile b/net/gamenetworkingsockets/Makefile
index 8e1a5b983669..943a5d7cca34 100644
--- a/net/gamenetworkingsockets/Makefile
+++ b/net/gamenetworkingsockets/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	gamenetworkingsockets
 PORTVERSION=	1.3.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	kpedersen@disroot.org
diff --git a/net/libarcus/Makefile b/net/libarcus/Makefile
index 2cb75d2cb01f..81b1e96cb350 100644
--- a/net/libarcus/Makefile
+++ b/net/libarcus/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libArcus
 PORTVERSION=	4.12.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net cad
 DIST_SUBDIR=	Ultimaker
diff --git a/net/mosh/Makefile b/net/mosh/Makefile
index 10a0e5a635fc..5bbf4aef9423 100644
--- a/net/mosh/Makefile
+++ b/net/mosh/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mosh
 PORTVERSION=	1.3.2
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	net
 MASTER_SITES=	https://mosh.org/ \
 		ZI
diff --git a/net/spoofer/Makefile b/net/spoofer/Makefile
index df155a3b9274..c9c1fa85f28c 100644
--- a/net/spoofer/Makefile
+++ b/net/spoofer/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	spoofer
 DISTVERSION=	1.4.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	https://www.caida.org/projects/spoofer/downloads/
 
diff --git a/science/py-chainer/Makefile b/science/py-chainer/Makefile
index ec157bbcad7f..a56f540f3bce 100644
*** 57 LINES SKIPPED ***