git: 69e2e87fa56b - main - devel/protobuf: Update to 24.4
Date: Thu, 14 Dec 2023 17:03:55 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=69e2e87fa56b54e267429b326f7f6188a7baaa71
commit 69e2e87fa56b54e267429b326f7f6188a7baaa71
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-12-14 16:35:30 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-12-14 17:03:10 +0000
devel/protobuf: Update to 24.4
- Use USES=pathfix to fix .pc installation
- 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/mixxx/Makefile | 2 +-
audio/mumble/Makefile | 2 +-
audio/murmur/Makefile | 2 +-
audio/py-torchaudio/Makefile | 1 +
audio/strawberry/Makefile | 1 +
cad/cura-engine/Makefile | 2 +-
databases/arrow/Makefile | 2 +-
databases/mysql-connector-c++/Makefile | 1 +
databases/mysql57-client/Makefile | 2 +-
databases/mysql57-server/Makefile | 2 +-
databases/xtrabackup8/Makefile | 2 +-
devel/android-tools/Makefile | 2 +-
devel/bear/Makefile | 2 +-
devel/bloaty/Makefile | 2 +-
devel/google-cloud-cpp/Makefile | 2 +-
devel/grpc/Makefile | 2 +-
devel/grpc142/Makefile | 2 +-
devel/ignition-msgs/Makefile | 2 +-
devel/kpublictransport/Makefile | 1 +
devel/libphonenumber/Makefile | 1 +
devel/protobuf-c/Makefile | 2 +-
devel/protobuf/Makefile | 49 +++++----
devel/protobuf/distinfo | 6 +-
devel/protobuf/files/patch-Makefile.in | 11 --
devel/protobuf/files/patch-i386 | 13 ---
devel/protobuf/files/patch-src-Makefile.in | 124 ----------------------
devel/protobuf/pkg-plist | 164 ++++++++++++++++++++++++-----
dns/knot-resolver/Makefile | 1 +
games/pink-pony/Makefile | 2 +-
games/pokerth/Makefile | 2 +-
graphics/opencv/Makefile | 2 +-
graphics/osgearth/Makefile | 1 +
graphics/qgis-ltr/Makefile | 2 +-
graphics/qgis/Makefile | 2 +-
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/caffe/Makefile | 2 +-
misc/lbann/Makefile | 2 +-
misc/mnn/Makefile | 1 +
misc/ncnn/Makefile | 1 +
misc/ola/Makefile | 2 +-
misc/onnx/Makefile | 1 +
misc/py-onnx/Makefile | 1 +
misc/py-pytorch/Makefile | 2 +-
misc/pytorch/Makefile | 1 +
multimedia/libopenshot/Makefile | 2 +-
multimedia/vlc/Makefile | 1 +
net-im/ricochet/Makefile | 2 +-
net-im/telegram-desktop/Makefile | 2 +-
net-mgmt/collectd5/Makefile | 2 +-
net-mgmt/fastnetmon/Makefile | 2 +-
net-mgmt/netdata/Makefile | 1 +
net-p2p/bitcoin/Makefile | 1 +
net-p2p/litecoin/Makefile | 2 +-
net-p2p/namecoin/Makefile | 2 +-
net/ecal/Makefile | 2 +-
net/eternalterminal/Makefile | 2 +-
net/gamenetworkingsockets/Makefile | 2 +-
net/libarcus/Makefile | 2 +-
net/mosh/Makefile | 1 +
net/spoofer/Makefile | 2 +-
science/paraview/Makefile | 2 +-
science/py-chainer/Makefile | 2 +-
science/py-tensorflow/Makefile | 2 +-
sysutils/zbackup/Makefile | 2 +-
www/nginx-devel/Makefile | 2 +-
72 files changed, 234 insertions(+), 248 deletions(-)
diff --git a/astro/kosmindoormap/Makefile b/astro/kosmindoormap/Makefile
index 575436a32b13..b9ad65a68a43 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 ef91f55e6cde..9f44c474b3a5 100644
--- a/astro/libosmpbf/Makefile
+++ b/astro/libosmpbf/Makefile
@@ -1,7 +1,7 @@
PORTNAME= libosmpbf
PORTVERSION= 1.5.0
DISTVERSIONPREFIX= v
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= astro geography devel
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 278fce6be377..7ec2c13c5958 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -1,6 +1,6 @@
PORTNAME= merkaartor
PORTVERSION= 0.19.0
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= astro
MAINTAINER= dev2@heesakkers.info
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index 613aa71d7b3d..cc11711f4682 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -1,6 +1,6 @@
PORTNAME= mixxx
DISTVERSION= 2.3.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio
MAINTAINER= acm@FreeBSD.org
diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index cefc7827c665..aed5ba9b4aad 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -1,6 +1,6 @@
PORTNAME= mumble
DISTVERSION= 1.5.517
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= https://github.com/${PORTNAME}-voip/${PORTNAME}/releases/download/v${DISTVERSION}/
diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index d1cec5937837..2602f43f0652 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -1,6 +1,6 @@
PORTNAME= murmur
PORTVERSION= 1.3.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio net
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/py-torchaudio/Makefile b/audio/py-torchaudio/Makefile
index 2f623ef56c63..589bd104921b 100644
--- a/audio/py-torchaudio/Makefile
+++ b/audio/py-torchaudio/Makefile
@@ -1,6 +1,7 @@
PORTNAME= torchaudio
DISTVERSIONPREFIX= v
DISTVERSION= 2.1.1
+PORTREVISION= 1
CATEGORIES= audio python # machine-learning
MASTER_SITES= https://downloads.sourceforge.net/project/sox/sox/14.4.2/:sox
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/audio/strawberry/Makefile b/audio/strawberry/Makefile
index 7b9bb025a72e..3ba69c9b3128 100644
--- a/audio/strawberry/Makefile
+++ b/audio/strawberry/Makefile
@@ -1,5 +1,6 @@
PORTNAME= strawberry
DISTVERSION= 1.0.22
+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 eb5381f103ef..5fc42fe36a9c 100644
--- a/cad/cura-engine/Makefile
+++ b/cad/cura-engine/Makefile
@@ -1,7 +1,7 @@
PORTNAME= CuraEngine
PORTEPOCH= 1
DISTVERSION= 4.13.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= cad
DIST_SUBDIR= Ultimaker
diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile
index 7f38dbb74b9b..515536f4221c 100644
--- a/databases/arrow/Makefile
+++ b/databases/arrow/Makefile
@@ -1,6 +1,6 @@
PORTNAME= arrow
DISTVERSION= 13.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases
MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION} \
https://github.com/apache/orc/archive/rel/:orc
diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index af43cf00a22f..d80ab20e274b 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -1,5 +1,6 @@
PORTNAME= mysql-connector-c++
PORTVERSION= 8.0.33
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= MYSQL/Connector-C++
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
index 3fbe5dcb7a63..3d09cc0edbd5 100644
--- a/databases/mysql57-client/Makefile
+++ b/databases/mysql57-client/Makefile
@@ -1,5 +1,5 @@
PORTNAME= mysql
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= 57-client
COMMENT= Multithreaded SQL database (client)
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index 0aae5a5ded25..e855bca8f3cc 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -1,6 +1,6 @@
PORTNAME?= mysql
PORTVERSION= 5.7.44
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= databases
MASTER_SITES= MYSQL/MySQL-5.7
PKGNAMESUFFIX?= 57-server
diff --git a/databases/xtrabackup8/Makefile b/databases/xtrabackup8/Makefile
index e1d47b5599db..f056ee9d1ac3 100644
--- a/databases/xtrabackup8/Makefile
+++ b/databases/xtrabackup8/Makefile
@@ -1,7 +1,7 @@
PORTNAME= xtrabackup
PORTVERSION= 8.0.31
DISTVERSIONSUFFIX= -24
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases
MASTER_SITES= https://github.com/percona/percona-xtrabackup/archive/:percona \
SF/boost/boost/${BOOST_VERSION}:boost
diff --git a/devel/android-tools/Makefile b/devel/android-tools/Makefile
index 34635918b5b2..9890ad1ee988 100644
--- a/devel/android-tools/Makefile
+++ b/devel/android-tools/Makefile
@@ -1,6 +1,6 @@
PORTNAME= android-tools
PORTVERSION= 31.0.3p2.0
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= devel
MASTER_SITES= GH
diff --git a/devel/bear/Makefile b/devel/bear/Makefile
index 482662740192..818783393330 100644
--- a/devel/bear/Makefile
+++ b/devel/bear/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bear
DISTVERSION= 3.1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MAINTAINER= jrm@FreeBSD.org
diff --git a/devel/bloaty/Makefile b/devel/bloaty/Makefile
index e389036eb248..3f7ff28b5461 100644
--- a/devel/bloaty/Makefile
+++ b/devel/bloaty/Makefile
@@ -1,7 +1,7 @@
PORTNAME= bloaty
PORTVERSION= 1.1
DISTVERSIONPREFIX= v
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel
MAINTAINER= bofh@FreeBSD.org
diff --git a/devel/google-cloud-cpp/Makefile b/devel/google-cloud-cpp/Makefile
index caad75870cad..8b82b46cf95d 100644
--- a/devel/google-cloud-cpp/Makefile
+++ b/devel/google-cloud-cpp/Makefile
@@ -1,7 +1,7 @@
PORTNAME= google-cloud-cpp
DISTVERSIONPREFIX= v
DISTVERSION= 2.13.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
index 40417f3d0cb0..939f4b9c415d 100644
--- a/devel/grpc/Makefile
+++ b/devel/grpc/Makefile
@@ -1,7 +1,7 @@
PORTNAME= grpc
PORTVERSION= 1.54.2
DISTVERSIONPREFIX= v
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= devel
diff --git a/devel/grpc142/Makefile b/devel/grpc142/Makefile
index b35e035b5647..82d92b337229 100644
--- a/devel/grpc142/Makefile
+++ b/devel/grpc142/Makefile
@@ -1,7 +1,7 @@
PORTNAME= grpc
PORTVERSION= 1.42.0
DISTVERSIONPREFIX= v
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel
PKGNAMESUFFIX= 142
diff --git a/devel/ignition-msgs/Makefile b/devel/ignition-msgs/Makefile
index d2f4ccd52c79..99a30477fdb3 100644
--- a/devel/ignition-msgs/Makefile
+++ b/devel/ignition-msgs/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ignition-msgs
DISTVERSION= 3.0.0
-PORTREVISION= 14
+PORTREVISION= 15
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 4681a99c6dc9..d46563ecb710 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 426ba30d609c..d4759c43acea 100644
--- a/devel/libphonenumber/Makefile
+++ b/devel/libphonenumber/Makefile
@@ -1,6 +1,7 @@
PORTNAME= libphonenumber
DISTVERSIONPREFIX= v
DISTVERSION= 8.13.26
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/protobuf-c/Makefile b/devel/protobuf-c/Makefile
index d4185e2bceae..53afc0ad07b7 100644
--- a/devel/protobuf-c/Makefile
+++ b/devel/protobuf-c/Makefile
@@ -1,6 +1,6 @@
PORTNAME= protobuf-c
DISTVERSION= 1.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile
index aebce69dd3f0..3fa15a6f5500 100644
--- a/devel/protobuf/Makefile
+++ b/devel/protobuf/Makefile
@@ -1,9 +1,8 @@
PORTNAME= protobuf
-PORTVERSION= 3.21.12
-DISTVERSIONPREFIX= cpp-
+PORTVERSION= 24.4
PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= https://github.com/protocolbuffers/protobuf/releases/download/v${PORTVERSION:R:E}.${PORTVERSION:E}/
+MASTER_SITES= https://github.com/protocolbuffers/protobuf/releases/download/v${PORTVERSION}/
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Data interchange format library
@@ -15,26 +14,38 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN_sparc64= fails to compile: no atomic ops available
+LIB_DEPENDS= libabsl_base.so:devel/abseil \
+ libjsoncpp.so:devel/jsoncpp
TEST_DEPENDS= googletest>=0:devel/googletest
-USES= compiler:c++11-lang cpe libtool localbase pathfix pkgconfig
-
-CFLAGS+= -D_THREAD_SAFE -DGOOGLE_PROTOBUF_NO_RTTI -I${WRKSRC}/src
-CONFIGURE_ENV= CC_FOR_BUILD="${CC}" \
- CFLAGS_FOR_BUILD="${CFLAGS}" \
- CPPFLAGS_FOR_BUILD="${CPPFLAGS}" \
- CXX_FOR_BUILD="${CXX}" \
- CXXFLAGS_FOR_BUILD="${CXXFLAGS}" \
- LDFLAGS_FOR_BUILD="${LDFLAGS}"
-GNU_CONFIGURE= yes
-INSTALL_TARGET= install-strip
-TEST_ARGS= ${MAKE_ARGS} ${_MAKE_JOBS}
-TEST_TARGET= check
-USE_CXXSTD= c++11
+USES= cmake:testing compiler:c++17-lang cpe localbase pathfix pkgconfig
+
+CMAKE_ARGS= -Dprotobuf_ABSL_PROVIDER=package \
+ -Dprotobuf_JSONCPP_PROVIDER=package
+CMAKE_OFF= protobuf_BUILD_CONFORMANCE \
+ protobuf_BUILD_EXAMPLES \
+ protobuf_BUILD_EXAMPLES_MULTITEST \
+ protobuf_BUILD_TESTS \
+ protobuf_DISABLE_RTTI \
+ protobuf_INSTALL_EXAMPLES \
+ protobuf_MODULE_COMPATIBLE \
+ protobuf_REMOVE_INSTALLED_HEADERS
+CMAKE_ON= protobuf_ABSOLUTE_TEST_PLUGIN_PATH \
+ protobuf_ALLOW_CCACHE \
+ protobuf_BUILD_LIBPROTOC \
+ protobuf_BUILD_PROTOBUF_BINARIES \
+ protobuf_BUILD_PROTOC_BINARIES \
+ protobuf_BUILD_SHARED_LIBS \
+ protobuf_INSTALL \
+ protobuf_USE_EXTERNAL_GTEST \
+ protobuf_VERBOSE \
+ protobuf_WITH_ZLIB
+CMAKE_TESTING_ON= protobuf_BUILD_TESTS
+PATHFIX_CMAKELISTSTXT= CMakeLists.txt install.cmake
+USE_CXXSTD= c++17
USE_LDCONFIG= yes
-PLIST_SUB= PATCH_VERSION=${PORTVERSION:E}
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+PLIST_SUB= PORTVERSION=${PORTVERSION}
CPE_VENDOR= google
diff --git a/devel/protobuf/distinfo b/devel/protobuf/distinfo
index b0b2e5326d8a..723b5f281c89 100644
--- a/devel/protobuf/distinfo
+++ b/devel/protobuf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674589582
-SHA256 (protobuf-cpp-3.21.12.tar.gz) = 4eab9b524aa5913c6fffb20b2a8abf5ef7f95a80bc0701f3a6dbb4c607f73460
-SIZE (protobuf-cpp-3.21.12.tar.gz) = 4842303
+TIMESTAMP = 1696454861
+SHA256 (protobuf-24.4.tar.gz) = 616bb3536ac1fff3fb1a141450fa28b875e985712170ea7f1bfe5e5fc41e2cd8
+SIZE (protobuf-24.4.tar.gz) = 5180235
diff --git a/devel/protobuf/files/patch-Makefile.in b/devel/protobuf/files/patch-Makefile.in
deleted file mode 100644
index b93039e03270..000000000000
--- a/devel/protobuf/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2022-12-14 14:21:49 UTC
-+++ Makefile.in
-@@ -2188,7 +2188,7 @@ uninstall-am: uninstall-pkgconfigDATA
- # which takes a lot of time and is generally not useful to us. Also, we don't
- # want "make install" to recurse into gmock since we don't want to overwrite
- # the installed version of gmock if there is one.
--check-local:
-+disabled-check-local:
- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
- @cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
- @cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
diff --git a/devel/protobuf/files/patch-i386 b/devel/protobuf/files/patch-i386
deleted file mode 100644
index 56efb9d86368..000000000000
--- a/devel/protobuf/files/patch-i386
+++ /dev/null
@@ -1,13 +0,0 @@
-Obtained from: https://cgit.freebsd.org/ports/commit/?id=c212fb9fcceacf49ac4f236c7944aaec5d3cfa57
-
---- src/google/protobuf/arena_impl.h.orig 2022-09-29 19:05:00 UTC
-+++ src/google/protobuf/arena_impl.h
-@@ -640,7 +640,7 @@ class PROTOBUF_EXPORT ThreadSafeArena {
- #ifdef _MSC_VER
- #pragma warning(disable : 4324)
- #endif
-- struct alignas(kCacheAlignment) CacheAlignedLifecycleIdGenerator {
-+ struct alignas(alignof(std::atomic<LifecycleIdAtomic>)) CacheAlignedLifecycleIdGenerator {
- std::atomic<LifecycleIdAtomic> id;
- };
- static CacheAlignedLifecycleIdGenerator lifecycle_id_generator_;
diff --git a/devel/protobuf/files/patch-src-Makefile.in b/devel/protobuf/files/patch-src-Makefile.in
deleted file mode 100644
index 0ffe912b69bf..000000000000
--- a/devel/protobuf/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,124 +0,0 @@
---- src/Makefile.in.orig 2022-12-14 14:21:49 UTC
-+++ src/Makefile.in
-@@ -492,9 +492,9 @@ protobuf_lazy_descriptor_test_OBJECTS = \
- $(nodist_protobuf_lazy_descriptor_test_OBJECTS)
- protobuf_lazy_descriptor_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- libprotobuf.la libprotoc.la \
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
-+ -lgtest \
-+ -lgmock \
-+ -lgmock_main
- protobuf_lazy_descriptor_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
- $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) \
-@@ -513,9 +513,9 @@ protobuf_lite_arena_test_OBJECTS = \
- $(am_protobuf_lite_arena_test_OBJECTS) \
- $(nodist_protobuf_lite_arena_test_OBJECTS)
- protobuf_lite_arena_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-- libprotobuf-lite.la $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
-+ libprotobuf-lite.la -lgtest \
-+ -lgmock \
-+ -lgmock_main
- protobuf_lite_arena_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
- $(protobuf_lite_arena_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-@@ -535,9 +535,9 @@ nodist_protobuf_lite_test_OBJECTS = $(am__objects_11)
- protobuf_lite_test_OBJECTS = $(am_protobuf_lite_test_OBJECTS) \
- $(nodist_protobuf_lite_test_OBJECTS)
- protobuf_lite_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-- libprotobuf-lite.la $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
-+ libprotobuf-lite.la -lgtest \
-+ -lgmock \
-+ -lgmock_main
- protobuf_lite_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
- $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-@@ -681,9 +681,9 @@ nodist_protobuf_test_OBJECTS = $(am__objects_15)
- protobuf_test_OBJECTS = $(am_protobuf_test_OBJECTS) \
- $(nodist_protobuf_test_OBJECTS)
- protobuf_test_DEPENDENCIES = $(am__DEPENDENCIES_1) libprotobuf.la \
-- libprotoc.la $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
-+ libprotoc.la -lgtest \
-+ -lgmock \
-+ -lgmock_main
- protobuf_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
- $(protobuf_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-@@ -697,7 +697,7 @@ am_test_plugin_OBJECTS = google/protobuf/compiler/test
- google/protobuf/testing/test_plugin-file.$(OBJEXT)
- test_plugin_OBJECTS = $(am_test_plugin_OBJECTS)
- test_plugin_DEPENDENCIES = $(am__DEPENDENCIES_1) libprotobuf.la \
-- libprotoc.la $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
-+ libprotoc.la -lgtest
- am__zcgunzip_SOURCES_DIST = google/protobuf/testing/zcgunzip.cc
- @HAVE_ZLIB_TRUE@am_zcgunzip_OBJECTS = \
- @HAVE_ZLIB_TRUE@ google/protobuf/testing/zcgunzip.$(OBJEXT)
-@@ -2346,9 +2346,9 @@ GOOGLEMOCK_BUILD_DIR = ../third_party/googletest/googl
- GOOGLETEST_SRC_DIR = $(srcdir)/../third_party/googletest/googletest
- GOOGLEMOCK_SRC_DIR = $(srcdir)/../third_party/googletest/googlemock
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
-+ -lgtest \
-+ -lgmock \
-+ -lgmock_main
-
- protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
- -I$(GOOGLEMOCK_SRC_DIR)/include
-@@ -2446,9 +2446,9 @@ nodist_protobuf_test_SOURCES = $(protoc_outputs)
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
- libprotoc.la \
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
-+ -lgtest \
-+ -lgmock \
-+ -lgmock_main
-
- protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
- -I$(GOOGLETEST_SRC_DIR)/include \
-@@ -2475,9 +2475,9 @@ COMMON_LITE_TEST_SOURCES = \
- # full runtime and we want to make sure this test builds without full
- # runtime.
- protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
-+ -lgtest \
-+ -lgmock \
-+ -lgmock_main
-
- protobuf_lite_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
- -I$(GOOGLETEST_SRC_DIR)/include
-@@ -2493,9 +2493,9 @@ nodist_protobuf_lite_test_SOURCES = $(protoc_lite_outp
- # gtest when building the test internally our memory sanitizer doesn't detect
- # memory leaks (don't know why).
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
-+ -lgtest \
-+ -lgmock \
-+ -lgmock_main
-
- protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
- -I$(GOOGLETEST_SRC_DIR)/include
-@@ -2509,7 +2509,7 @@ nodist_protobuf_lite_arena_test_SOURCES = $(protoc_lit
-
- # Test plugin binary.
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
-+ -lgtest
-
- test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
- test_plugin_SOURCES = \
diff --git a/devel/protobuf/pkg-plist b/devel/protobuf/pkg-plist
index d60b9a3c684c..4c6db404665b 100644
--- a/devel/protobuf/pkg-plist
+++ b/devel/protobuf/pkg-plist
@@ -1,44 +1,131 @@
bin/protoc
+bin/protoc-%%PORTVERSION%%.0
include/google/protobuf/any.h
include/google/protobuf/any.pb.h
include/google/protobuf/any.proto
include/google/protobuf/api.pb.h
include/google/protobuf/api.proto
include/google/protobuf/arena.h
-include/google/protobuf/arena_impl.h
+include/google/protobuf/arena_align.h
+include/google/protobuf/arena_allocation_policy.h
+include/google/protobuf/arena_cleanup.h
include/google/protobuf/arenastring.h
include/google/protobuf/arenaz_sampler.h
+include/google/protobuf/compiler/allowlists/allowlist.h
+include/google/protobuf/compiler/allowlists/allowlists.h
include/google/protobuf/compiler/code_generator.h
include/google/protobuf/compiler/command_line_interface.h
-include/google/protobuf/compiler/cpp/cpp_generator.h
+include/google/protobuf/compiler/cpp/enum.h
+include/google/protobuf/compiler/cpp/extension.h
+include/google/protobuf/compiler/cpp/field.h
+include/google/protobuf/compiler/cpp/field_generators/generators.h
include/google/protobuf/compiler/cpp/file.h
include/google/protobuf/compiler/cpp/generator.h
include/google/protobuf/compiler/cpp/helpers.h
+include/google/protobuf/compiler/cpp/message.h
+include/google/protobuf/compiler/cpp/message_layout_helper.h
include/google/protobuf/compiler/cpp/names.h
+include/google/protobuf/compiler/cpp/options.h
+include/google/protobuf/compiler/cpp/padding_optimizer.h
+include/google/protobuf/compiler/cpp/parse_function_generator.h
+include/google/protobuf/compiler/cpp/service.h
+include/google/protobuf/compiler/cpp/tracker.h
include/google/protobuf/compiler/csharp/csharp_doc_comment.h
+include/google/protobuf/compiler/csharp/csharp_enum.h
+include/google/protobuf/compiler/csharp/csharp_enum_field.h
+include/google/protobuf/compiler/csharp/csharp_field_base.h
include/google/protobuf/compiler/csharp/csharp_generator.h
-include/google/protobuf/compiler/csharp/csharp_names.h
+include/google/protobuf/compiler/csharp/csharp_helpers.h
+include/google/protobuf/compiler/csharp/csharp_map_field.h
+include/google/protobuf/compiler/csharp/csharp_message.h
+include/google/protobuf/compiler/csharp/csharp_message_field.h
include/google/protobuf/compiler/csharp/csharp_options.h
+include/google/protobuf/compiler/csharp/csharp_primitive_field.h
+include/google/protobuf/compiler/csharp/csharp_reflection_class.h
+include/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h
+include/google/protobuf/compiler/csharp/csharp_repeated_message_field.h
+include/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h
+include/google/protobuf/compiler/csharp/csharp_source_generator_base.h
+include/google/protobuf/compiler/csharp/csharp_wrapper_field.h
+include/google/protobuf/compiler/csharp/names.h
include/google/protobuf/compiler/importer.h
+include/google/protobuf/compiler/java/context.h
+include/google/protobuf/compiler/java/doc_comment.h
+include/google/protobuf/compiler/java/enum.h
+include/google/protobuf/compiler/java/enum_field.h
+include/google/protobuf/compiler/java/enum_field_lite.h
+include/google/protobuf/compiler/java/enum_lite.h
+include/google/protobuf/compiler/java/extension.h
+include/google/protobuf/compiler/java/extension_lite.h
+include/google/protobuf/compiler/java/field.h
+include/google/protobuf/compiler/java/file.h
include/google/protobuf/compiler/java/generator.h
-include/google/protobuf/compiler/java/java_generator.h
+include/google/protobuf/compiler/java/generator_factory.h
+include/google/protobuf/compiler/java/helpers.h
include/google/protobuf/compiler/java/kotlin_generator.h
+include/google/protobuf/compiler/java/map_field.h
+include/google/protobuf/compiler/java/map_field_lite.h
+include/google/protobuf/compiler/java/message.h
+include/google/protobuf/compiler/java/message_builder.h
+include/google/protobuf/compiler/java/message_builder_lite.h
+include/google/protobuf/compiler/java/message_field.h
+include/google/protobuf/compiler/java/message_field_lite.h
+include/google/protobuf/compiler/java/message_lite.h
+include/google/protobuf/compiler/java/message_serialization.h
+include/google/protobuf/compiler/java/name_resolver.h
include/google/protobuf/compiler/java/names.h
-include/google/protobuf/compiler/objectivec/objectivec_generator.h
-include/google/protobuf/compiler/objectivec/objectivec_helpers.h
+include/google/protobuf/compiler/java/options.h
+include/google/protobuf/compiler/java/primitive_field.h
+include/google/protobuf/compiler/java/primitive_field_lite.h
+include/google/protobuf/compiler/java/service.h
+include/google/protobuf/compiler/java/shared_code_generator.h
+include/google/protobuf/compiler/java/string_field.h
+include/google/protobuf/compiler/java/string_field_lite.h
+include/google/protobuf/compiler/objectivec/enum.h
+include/google/protobuf/compiler/objectivec/enum_field.h
+include/google/protobuf/compiler/objectivec/extension.h
+include/google/protobuf/compiler/objectivec/field.h
+include/google/protobuf/compiler/objectivec/file.h
+include/google/protobuf/compiler/objectivec/generator.h
+include/google/protobuf/compiler/objectivec/helpers.h
+include/google/protobuf/compiler/objectivec/import_writer.h
+include/google/protobuf/compiler/objectivec/line_consumer.h
+include/google/protobuf/compiler/objectivec/map_field.h
+include/google/protobuf/compiler/objectivec/message.h
+include/google/protobuf/compiler/objectivec/message_field.h
+include/google/protobuf/compiler/objectivec/names.h
+include/google/protobuf/compiler/objectivec/nsobject_methods.h
+include/google/protobuf/compiler/objectivec/oneof.h
+include/google/protobuf/compiler/objectivec/options.h
+include/google/protobuf/compiler/objectivec/primitive_field.h
+include/google/protobuf/compiler/objectivec/text_format_decode_data.h
include/google/protobuf/compiler/parser.h
+include/google/protobuf/compiler/php/names.h
include/google/protobuf/compiler/php/php_generator.h
include/google/protobuf/compiler/plugin.h
include/google/protobuf/compiler/plugin.pb.h
include/google/protobuf/compiler/plugin.proto
include/google/protobuf/compiler/python/generator.h
+include/google/protobuf/compiler/python/helpers.h
include/google/protobuf/compiler/python/pyi_generator.h
-include/google/protobuf/compiler/python/python_generator.h
+include/google/protobuf/compiler/retention.h
include/google/protobuf/compiler/ruby/ruby_generator.h
+include/google/protobuf/compiler/rust/accessors/accessors.h
+include/google/protobuf/compiler/rust/context.h
+include/google/protobuf/compiler/rust/generator.h
+include/google/protobuf/compiler/rust/message.h
+include/google/protobuf/compiler/rust/naming.h
+include/google/protobuf/compiler/scc.h
+include/google/protobuf/compiler/subprocess.h
+include/google/protobuf/compiler/zip_writer.h
+include/google/protobuf/cpp_features.pb.h
+include/google/protobuf/cpp_features.proto
include/google/protobuf/descriptor.h
include/google/protobuf/descriptor.pb.h
include/google/protobuf/descriptor.proto
include/google/protobuf/descriptor_database.h
+include/google/protobuf/descriptor_legacy.h
+include/google/protobuf/descriptor_visitor.h
include/google/protobuf/duration.pb.h
include/google/protobuf/duration.proto
include/google/protobuf/dynamic_message.h
@@ -48,6 +135,7 @@ include/google/protobuf/endian.h
include/google/protobuf/explicitly_constructed.h
include/google/protobuf/extension_set.h
include/google/protobuf/extension_set_inl.h
+include/google/protobuf/feature_resolver.h
include/google/protobuf/field_access_listener.h
include/google/protobuf/field_mask.pb.h
include/google/protobuf/field_mask.proto
@@ -56,20 +144,35 @@ 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_tctable_decl.h
+include/google/protobuf/generated_message_tctable_gen.h
include/google/protobuf/generated_message_tctable_impl.h
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/internal_message_util.h
+include/google/protobuf/internal_visibility.h
include/google/protobuf/io/coded_stream.h
include/google/protobuf/io/gzip_stream.h
include/google/protobuf/io/io_win32.h
include/google/protobuf/io/printer.h
include/google/protobuf/io/strtod.h
include/google/protobuf/io/tokenizer.h
+include/google/protobuf/io/zero_copy_sink.h
include/google/protobuf/io/zero_copy_stream.h
include/google/protobuf/io/zero_copy_stream_impl.h
include/google/protobuf/io/zero_copy_stream_impl_lite.h
+include/google/protobuf/json/internal/descriptor_traits.h
+include/google/protobuf/json/internal/lexer.h
+include/google/protobuf/json/internal/message_path.h
+include/google/protobuf/json/internal/parser.h
+include/google/protobuf/json/internal/parser_traits.h
+include/google/protobuf/json/internal/unparser.h
+include/google/protobuf/json/internal/unparser_traits.h
+include/google/protobuf/json/internal/untyped_message.h
+include/google/protobuf/json/internal/writer.h
+include/google/protobuf/json/internal/zero_copy_buffered_stream.h
+include/google/protobuf/json/json.h
include/google/protobuf/map.h
include/google/protobuf/map_entry.h
include/google/protobuf/map_entry_lite.h
@@ -85,34 +188,27 @@ include/google/protobuf/parse_context.h
include/google/protobuf/port.h
include/google/protobuf/port_def.inc
include/google/protobuf/port_undef.inc
+include/google/protobuf/raw_ptr.h
include/google/protobuf/reflection.h
include/google/protobuf/reflection_internal.h
+include/google/protobuf/reflection_mode.h
include/google/protobuf/reflection_ops.h
include/google/protobuf/repeated_field.h
include/google/protobuf/repeated_ptr_field.h
+include/google/protobuf/serial_arena.h
include/google/protobuf/service.h
include/google/protobuf/source_context.pb.h
include/google/protobuf/source_context.proto
+include/google/protobuf/string_block.h
include/google/protobuf/struct.pb.h
include/google/protobuf/struct.proto
-include/google/protobuf/stubs/bytestream.h
include/google/protobuf/stubs/callback.h
-include/google/protobuf/stubs/casts.h
include/google/protobuf/stubs/common.h
-include/google/protobuf/stubs/hash.h
-include/google/protobuf/stubs/logging.h
-include/google/protobuf/stubs/macros.h
-include/google/protobuf/stubs/map_util.h
-include/google/protobuf/stubs/mutex.h
-include/google/protobuf/stubs/once.h
include/google/protobuf/stubs/platform_macros.h
include/google/protobuf/stubs/port.h
-include/google/protobuf/stubs/status.h
-include/google/protobuf/stubs/stl_util.h
-include/google/protobuf/stubs/stringpiece.h
-include/google/protobuf/stubs/strutil.h
-include/google/protobuf/stubs/template_util.h
+include/google/protobuf/stubs/status_macros.h
include/google/protobuf/text_format.h
+include/google/protobuf/thread_safe_arena.h
include/google/protobuf/timestamp.pb.h
include/google/protobuf/timestamp.proto
include/google/protobuf/type.pb.h
@@ -126,21 +222,31 @@ include/google/protobuf/util/message_differencer.h
include/google/protobuf/util/time_util.h
include/google/protobuf/util/type_resolver.h
include/google/protobuf/util/type_resolver_util.h
+include/google/protobuf/varint_shuffle.h
include/google/protobuf/wire_format.h
include/google/protobuf/wire_format_lite.h
include/google/protobuf/wrappers.pb.h
include/google/protobuf/wrappers.proto
-lib/libprotobuf-lite.a
+include/utf8_range.h
+include/utf8_validity.h
+lib/cmake/protobuf/protobuf-config-version.cmake
+lib/cmake/protobuf/protobuf-config.cmake
+lib/cmake/protobuf/protobuf-generate.cmake
+lib/cmake/protobuf/protobuf-module.cmake
+lib/cmake/protobuf/protobuf-options.cmake
+lib/cmake/protobuf/protobuf-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/protobuf/protobuf-targets.cmake
+lib/cmake/utf8_range/utf8_range-config.cmake
+lib/cmake/utf8_range/utf8_range-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/utf8_range/utf8_range-targets.cmake
lib/libprotobuf-lite.so
-lib/libprotobuf-lite.so.32
-lib/libprotobuf-lite.so.32.0.%%PATCH_VERSION%%
-lib/libprotobuf.a
+lib/libprotobuf-lite.so.%%PORTVERSION%%.0
lib/libprotobuf.so
-lib/libprotobuf.so.32
-lib/libprotobuf.so.32.0.%%PATCH_VERSION%%
-lib/libprotoc.a
+lib/libprotobuf.so.%%PORTVERSION%%.0
lib/libprotoc.so
-lib/libprotoc.so.32
-lib/libprotoc.so.32.0.%%PATCH_VERSION%%
+lib/libprotoc.so.%%PORTVERSION%%.0
+lib/libutf8_range.a
+lib/libutf8_validity.a
libdata/pkgconfig/protobuf-lite.pc
libdata/pkgconfig/protobuf.pc
+libdata/pkgconfig/utf8_range.pc
diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile
index 85351e2e4bdb..ada5f687b1f3 100644
--- a/dns/knot-resolver/Makefile
+++ b/dns/knot-resolver/Makefile
@@ -1,5 +1,6 @@
PORTNAME= knot-resolver
DISTVERSION= 5.7.0
+PORTREVISION= 1
CATEGORIES= dns
MASTER_SITES= https://secure.nic.cz/files/knot-resolver/ \
https://dns.company/downloads/knot-resolver/
diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile
index 7e04ac3d3e8a..2fe48c0b8da4 100644
--- a/games/pink-pony/Makefile
+++ b/games/pink-pony/Makefile
@@ -1,6 +1,6 @@
PORTNAME= pink-pony
PORTVERSION= 1.4.1
-PORTREVISION= 40
+PORTREVISION= 41
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
index 52afc46405ac..8c39cd469e6f 100644
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@@ -1,6 +1,6 @@
PORTNAME= pokerth
PORTVERSION= 1.1.2
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= games
MASTER_SITES= SF
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 972d12e318f2..843dcdc5e64b 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,6 +1,6 @@
PORTNAME= opencv
DISTVERSION= 4.6.0
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= graphics
PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}/commit/
diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile
index 9851c226593a..97a657d3d2ba 100644
--- a/graphics/osgearth/Makefile
+++ b/graphics/osgearth/Makefile
@@ -1,6 +1,7 @@
PORTNAME= osgearth
PORTVERSION= 3.5
DISTVERSIONPREFIX= ${PORTNAME}-
+PORTREVISION= 1
CATEGORIES= graphics geography
MAINTAINER= zirias@FreeBSD.org
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index 8f14360455d8..6af58a4ba6a4 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -1,6 +1,6 @@
PORTNAME= qgis
DISTVERSION= 3.28.13
-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 a8731f7c8128..3332aa9f6a6d 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,6 +1,6 @@
PORTNAME= qgis
DISTVERSION= 3.34.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics geography
MASTER_SITES= https://qgis.org/downloads/
diff --git a/graphics/qtpbfimageplugin/Makefile b/graphics/qtpbfimageplugin/Makefile
index 359e822ca521..4adf9dcab731 100644
--- a/graphics/qtpbfimageplugin/Makefile
+++ b/graphics/qtpbfimageplugin/Makefile
@@ -1,6 +1,6 @@
PORTNAME= qtpbfimageplugin
*** 426 LINES SKIPPED ***