diff --git a/astro/phd2/Makefile b/astro/phd2/Makefile
index a5413ccac55c..4aa54e37ad6f 100644
--- a/astro/phd2/Makefile
+++ b/astro/phd2/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	phd2
 DISTVERSIONPREFIX=v
 DISTVERSION=	2.6.10
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	astro
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Guiding software inspired by Stark Labs PHD Guiding
 WWW=		https://openphdguiding.org/
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
 		libgmock.so:devel/googletest \
 		libindidriver.so:devel/indi \
 		libcurl.so:ftp/curl
 RUN_DEPENDS=	indiserver:devel/indi
 
 USES=		cmake eigen:3 gettext ninja pkgconfig xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenPHDGuiding
 
 USE_CXXSTD=	c++14 # googletest 1.13
 USE_WX=		3.2+
 USE_XORG=	x11
 
 WX_COMPS=	wx
 
 CMAKE_ARGS+=	-DUSE_SYSTEM_GTEST:BOOL=YES \
 		-DUSE_SYSTEM_CFITSIO:BOOL=YES \
 		-DUSE_SYSTEM_LIBUSB:BOOL=YES \
 		-DUSE_SYSTEM_LIBINDI:BOOL=YES \
 		-DUSE_SYSTEM_EIGEN3:BOOL=YES \
 		-DwxWidgets_CONFIG_EXECUTABLE=${LOCALBASE}/bin/wxgtk3u-3.2-config
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} != aarch64 && ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != amd64 && ${ARCH} != i386
 CMAKE_ARGS+=	-DOPENSOURCE_ONLY:BOOL=YES
 .endif
 
 .include <bsd.port.mk>
diff --git a/benchmarks/apib/Makefile b/benchmarks/apib/Makefile
index 87a61ba740b4..f992eddfaa7a 100644
--- a/benchmarks/apib/Makefile
+++ b/benchmarks/apib/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	apib
 DISTVERSIONPREFIX=	${PORTNAME:tu}_
 DISTVERSION=	1_2_1
 DISTVERSIONSUFFIX=	_RC1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	benchmarks www
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Simple and fast HTTP performance testing tool
 WWW=		https://github.com/apigee/apib
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libev.so:devel/libev \
 		libgtest.so:devel/googletest \
 		libhttp_parser.so:www/http-parser
 
 USES=		cmake:testing compiler:c++17-lang localbase:ldflags ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	apigee
 
 PLIST_FILES=	bin/apib bin/apibmon bin/testserver
 PORTEXAMPLES=	env.sh pivot run.sh rungroup.sh tojson
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/samplescripts/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile
index 29d8c3dac089..948624c85b6e 100644
--- a/databases/arrow/Makefile
+++ b/databases/arrow/Makefile
@@ -1,228 +1,228 @@
 PORTNAME=	arrow
 DISTVERSION=	15.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION} \
 		https://github.com/apache/orc/archive/rel/:orc
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}
 DISTFILES=	apache-${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} release-1.6.6${EXTRACT_SUFX}:orc
 EXTRACT_ONLY=	apache-${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Columnar in-memory analytics layer for big data
 WWW=		https://arrow.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 USES=		cmake compiler:c++17-lang localbase pkgconfig python:build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	apache
 
 WRKSRC_SUBDIR=	cpp
 
 CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17 -DARROW_SIMD_LEVEL=NONE -DARROW_RUNTIME_SIMD_LEVEL=NONE \
 		-DPython3_EXECUTABLE=${PYTHON_CMD}
 CMAKE_OFF=	ARROW_BUILD_STATIC ARROW_WITH_BACKTRACE ARROW_BUILD_TESTS ARROW_BUILD_BENCHMARKS
 
 OPTIONS_GROUP=			COMPRESSION COMPONENTS # components are listed in cpp/cmake_modules/DefineOptions.cmake
 OPTIONS_GROUP_COMPRESSION=	BROTLI BZ2 LZ4 SNAPPY ZLIB ZSTD
 OPTIONS_GROUP_COMPONENTS=	ACERO COMPUTE CSV DATASET FILESYSTEM FLIGHT GANDIVA HDFS IPC JSON MIMALLOC PARQUET ORC S3 SKYHOOK SUBSTRAIT BUILD_UTILITIES TENSORFLOW TESTING
 OPTIONS_SUB=			yes
 
 ## DESCs
 
 COMPRESSION_DESC=		Compression support:
 COMPONENTS_DESC=		Build components:
 
 ## Compression options
 
 BROTLI_CMAKE_BOOL=		ARROW_WITH_BROTLI
 BROTLI_LIB_DEPENDS=		libbrotlicommon.so:archivers/brotli
 
 BZ2_DESC=			bz2 compression support
 BZ2_CMAKE_BOOL=			ARROW_WITH_BZ2
 
 LZ4_CMAKE_BOOL=			ARROW_WITH_LZ4
 LZ4_LIB_DEPENDS=		liblz4.so:archivers/liblz4
 
 SNAPPY_CMAKE_BOOL=		ARROW_WITH_SNAPPY
 SNAPPY_LIB_DEPENDS=		libsnappy.so:archivers/snappy
 
 ZLIB_CMAKE_BOOL=		ARROW_WITH_ZLIB
 
 ZSTD_DESC=			zstd compression support
 ZSTD_CMAKE_BOOL=		ARROW_WITH_ZSTD
 ZSTD_LIB_DEPENDS=		libzstd.so:archivers/zstd
 
 ## Component options
 
 ACERO_DESC=			Arrow Acero Engine Module
 ACERO_CMAKE_BOOL=		ARROW_ACERO
 ACERO_IMPLIES=			COMPUTE IPC
 
 COMPUTE_DESC=			Arrow Compute Modules
 COMPUTE_CMAKE_BOOL=		ARROW_COMPUTE
 COMPUTE_CMAKE_ON=		-DARROW_WITH_UTF8PROC=ON
 COMPUTE_LIB_DEPENDS=		libre2.so:devel/re2 \
 				libutf8proc.so:textproc/utf8proc
 
 CSV_DESC=			Arrow CSV Parser Module
 CSV_CMAKE_BOOL=			ARROW_CSV
 
 DATASET_DESC=			Arrow Dataset Modules
 DATASET_CMAKE_BOOL=		ARROW_DATASET
 DATASET_IMPLIES=		ACERO FILESYSTEM
 
 FILESYSTEM_DESC=		Arrow Filesystem Layer
 FILESYSTEM_CMAKE_BOOL=		ARROW_FILESYSTEM
 
 FLIGHT_DESC=			Arrow Flight RPC System
 FLIGHT_USES=			ssl
 FLIGHT_CMAKE_BOOL=		ARROW_FLIGHT
 FLIGHT_LIB_DEPENDS=		libgflags.so:devel/gflags \
 				libprotobuf.so:devel/protobuf \
 				libabsl_base.so:devel/abseil \
 				libcares.so:dns/c-ares \
 				libgrpc.so:devel/grpc \
 				libre2.so:devel/re2
 FLIGHT_IMPLIES=			IPC COMPUTE # see https://github.com/apache/arrow/issues/40766
 FLIGHT_BROKEN=			configure breaks: Could not find a package configuration file provided by "re2"
 
 GANDIVA_DESC=			Gandiva libraries
 GANDIVA_USES=			llvm:17,lib ssl
 GANDIVA_CMAKE_BOOL=		ARROW_GANDIVA
 GANDIVA_CMAKE_ON=		-DARROW_WITH_UTF8PROC=ON
 GANDIVA_LIB_DEPENDS=		libgrpc.so:devel/grpc \
 				libprotobuf.so:devel/protobuf \
 				libre2.so:devel/re2 \
 				libutf8proc.so:textproc/utf8proc
 
 HDFS_DESC=			Arrow HDFS bridge
 HDFS_CMAKE_BOOL=		ARROW_HDFS
 
 IPC_DESC=			Arrow IPC extensions
 IPC_CMAKE_BOOL=			ARROW_IPC
 
 JSON_DESC=			JSON support
 JSON_CMAKE_BOOL=		ARROW_JSON
 JSON_BUILD_DEPENDS=		${LOCALBASE}/include/rapidjson/rapidjson.h:devel/rapidjson
 
 MIMALLOC_DESC=			Arrow mimalloc-based allocato
 MIMALLOC_CMAKE_BOOL=		ARROW_MIMALLOC
 MIMALLOC_LIB_DEPENDS=		libmimalloc.so:devel/mimalloc
 MIMALLOC_BROKEN=		Pending paths fix in bug#255537
 
 PARQUET_DESC=			Parquet libraries
 PARQUET_CMAKE_BOOL=		ARROW_PARQUET PARQUET_REQUIRE_ENCRYPTION
 PARQUET_USES=			ssl
 PARQUET_LIB_DEPENDS=		libthrift.so:devel/thrift-cpp
 PARQUET_IMPLIES=		IPC
 
 ORC_DESC=			Arrow ORC adapter
 ORC_CMAKE_BOOL=			ARROW_ORC
 ORC_LIB_DEPENDS=		libprotobuf.so:devel/protobuf
 ORC_CONFIGURE_ENV=		ARROW_ORC_URL=file://${DISTDIR}/${DIST_SUBDIR}/release-1.6.6${EXTRACT_SUFX}
 ORC_IMPLIES=			LZ4 SNAPPY ZLIB ZSTD # cpp/CMakeLists.txt
 ORC_BROKEN=			fatal error: 'orc/OrcFile.hh' file not found: https://issues.apache.org/jira/browse/ARROW-12624
 
 BUILD_UTILITIES_DESC=		build Arrow commandline utilities
 BUILD_UTILITIES_CMAKE_BOOL=	ARROW_BUILD_UTILITIES
 
 #PYTHON_DESC=			Build python extension support
 #PYTHON_CMAKE_BOOL=		ARROW_PYTHON
 #PYTHON_USES=			python
 #PYTHON_BUILD_DEPENDS=		${PYNUMPY} # see https://issues.apache.org/jira/browse/ARROW-16820
 #PYTHON_CMAKE_ON=		-DPython3_EXECUTABLE=${PYTHON_CMD}
 #PYTHON_RUN_DEPENDS=		${PYNUMPY}
 #PYTHON_IMPLIES=			COMPUTE CSV DATASET FILESYSTEM HDFS JSON
 #PYTHON_VARS=			PLIST_SUB+=PYTHON_SUFFIX=${PYTHON_SUFFIX}
 
 S3_DESC=			S3 support
 S3_CMAKE_BOOL=			ARROW_S3
 S3_USES=			ssl
 S3_LIB_DEPENDS=			\
 				libaws-c-auth.so:security/aws-c-auth \
 				libaws-c-cal.so:security/aws-c-cal \
 				libaws-c-common.so:devel/aws-c-common \
 				libaws-c-compression.so:devel/aws-c-compression \
 				libaws-c-event-stream.so:devel/aws-c-event-stream \
 				libaws-c-http.so:devel/aws-c-http \
 				libaws-c-io.so:devel/aws-c-io \
 				libaws-c-mqtt.so:devel/aws-c-mqtt \
 				libaws-c-s3.so:devel/aws-c-s3 \
 				libaws-c-sdkutils.so:devel/aws-c-sdkutils \
 				libaws-checksums.so:devel/aws-checksums \
 				libaws-crt-cpp.so:devel/aws-crt-cpp \
 				libaws-cpp-sdk-s3.so:devel/aws-sdk-cpp \
 				libs2n.so:security/s2n-tls
 
 SKYHOOK_DESC=			Build the Skyhook libraries
 SKYHOOK_CMAKE_BOOL=		ARROW_SKYHOOK
 SKYHOOK_IMPLIES=		DATASET PARQUET
 SKYHOOK_BROKEN=			could NOT find librados
 
 SUBSTRAIT_DESC=			Build the Arrow Substrait Consumer Module
 SUBSTRAIT_CMAKE_BOOL=		ARROW_SUBSTRAIT
 SUBSTRAIT_IMPLIES=		DATASET IPC PARQUET
 SUBSTRAIT_BROKEN=		needs investigation
 
 TENSORFLOW_DESC=		TensorFlow support
 TENSORFLOW_CMAKE_BOOL=		ARROW_TENSORFLOW
 TENSORFLOW_BROKEN=		needs testing
 
 TESTING_DESC=			Arrow testing libraries
 TESTING_CMAKE_BOOL=		ARROW_TESTING
 TESTING_LIB_DEPENDS=		libgtest.so:devel/googletest
 
 # form OPTIONS_DEFAULT
 .for opt in ${OPTIONS_GROUP_COMPONENTS}
 .  if "${${opt}_BROKEN}" == ""
 OPTIONS_DEFAULT+=	${opt}
 .  endif
 .endfor
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCOMPUTE} || ${PORT_OPTIONS:MFLIGHT} || ${PORT_OPTIONS:MGANDIVA}
 PLIST_FILES+=	lib/cmake/Arrow/Findre2Alt.cmake
 .endif
 
 .if ${PORT_OPTIONS:MIPC} && ${PORT_OPTIONS:MBUILD_UTILITIES}
 PLIST_FILES+=	bin/arrow-file-to-stream \
 		bin/arrow-stream-to-file
 .endif
 .if ${PORT_OPTIONS:MGANDIVA} || ${PORT_OPTIONS:MCOMPUTE}
 PLIST_FILES+=	lib/cmake/Arrow/Findutf8proc.cmake
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON} == "PYTHON" && ${PORT_OPTIONS:MFLIGHT} == "FLIGHT"
     PLIST_SUB+=	PYTHONFLIGHT=""
 .else
     PLIST_SUB+=	PYTHONFLIGHT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTESTING} && ${PORT_OPTIONS:MFLIGHT} == "FLIGHT"
     PLIST_SUB+=	TESTINGFLIGHT=""
 .else
     PLIST_SUB+=	TESTINGFLIGHT="@comment "
 .endif
 
 post-install:
 	# based on the user's report on 2024-04-12, the R extension expects only "ON" and "OFF" values in lib/cmake/Arrow/ArrowOptions.cmake
 	# other values confuse the R extension build, so we adjust these values to "ON" and "OFF" as a workaround
 	${REINPLACE_CMD} -i '' \
 		-e 's|"true"|"ON"|; s|"false"|"OFF"|' \
 		${STAGEDIR}${PREFIX}/lib/cmake/Arrow/ArrowOptions.cmake
 
 do-test: # tests fail to compile: https://issues.apache.org/jira/browse/ARROW-12625
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DARROW_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/devel/android-tools/Makefile b/devel/android-tools/Makefile
index 59cf21284629..b974dd892e57 100644
--- a/devel/android-tools/Makefile
+++ b/devel/android-tools/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	android-tools
 PORTVERSION=	31.0.3p2.0
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	devel
 MASTER_SITES=	GH
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Android debugging tools
 WWW=		https://github.com/neelchauhan/freebsd-android-tools
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=	ld: error: undefined symbol: OPENSSL_cpuid_setup
 
 LIB_DEPENDS=	libbrotlicommon.so:archivers/brotli \
 		libgmock.so:devel/googletest \
 		liblz4.so:archivers/liblz4 \
 		libpcre2-8.so:devel/pcre2 \
 		libprotobuf.so:devel/protobuf \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++17-lang go:no_targets localbase:ldflags perl5 python shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	neelchauhan
 GH_PROJECT=	freebsd-${PORTNAME}
 GH_TAGNAME=	271d7a26c8daf4b9fe412d360a2edfaca327efdd
 
 SHEBANG_FILES=	vendor/mkbootimg/repack_bootimg.py \
 		vendor/mkbootimg/mkbootimg.py \
 		vendor/mkbootimg/unpack_bootimg.py
 
 MAKE_ENV+=	GOFLAGS=-mod=vendor \
 		GOPATH=${WRKSRC}/vendor/boringssl/vendor \
 		GOPROXY=off
 
 LDFLAGS+=	-labsl_status
 
 .include <bsd.port.mk>
diff --git a/devel/ayatana-ido/Makefile b/devel/ayatana-ido/Makefile
index bf7242e74bbc..b7f14597a4cf 100644
--- a/devel/ayatana-ido/Makefile
+++ b/devel/ayatana-ido/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	ayatana-ido
 PORTVERSION=	0.10.2
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Ayatana Indicator Display Objects
 WWW=		https://github.com/AyatanaIndicators/ayatana-ido
 
 LICENSE=	LGPL3
 
 LIB_DEPENDS=	libgtest.so:devel/googletest \
 		libharfbuzz.so:print/harfbuzz
 BUILD_DEPENDS=	lcov>=0:devel/lcov
 
 USES=		cmake gnome localbase:ldflags pkgconfig vala:build
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 introspection pango
 
 OPTIONS_DEFINE=	DOCS
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AyatanaIndicators
 
 PORTDOCS=	AUTHORS ChangeLog INSTALL.md NEWS README.md
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libayatana-ido3-0.4.so.*
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/binaryen/Makefile b/devel/binaryen/Makefile
index 1af0b8b1e6d9..dfd20489d3cb 100644
--- a/devel/binaryen/Makefile
+++ b/devel/binaryen/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	binaryen
 DISTVERSIONPREFIX=	version_
 DISTVERSION=	118
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Compiler infrastructure and toolchain library for WebAssembly
 WWW=		https://github.com/WebAssembly/binaryen
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake cpe python:build
 CPE_VENDOR=	webassembly
 USE_GITHUB=	yes
 GH_ACCOUNT=	WebAssembly
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	TEST
 OPTIONS_SUB=	yes
 
 TEST_LIB_DEPENDS=	libgtest.so:devel/googletest
 TEST_USES=		localbase:ldflags
 TEST_CMAKE_BOOL=	BUILD_TESTS
 
 do-test-TEST-on:
 	binaryen-unittests
 
 .include <bsd.port.mk>
diff --git a/devel/googletest/Makefile b/devel/googletest/Makefile
index 64cc036fc874..976976af712f 100644
--- a/devel/googletest/Makefile
+++ b/devel/googletest/Makefile
@@ -1,33 +1,31 @@
 PORTNAME=	googletest
-PORTVERSION=	1.14.0
-DISTVERSIONPREFIX=	v
+PORTVERSION=	1.15.0
 CATEGORIES=	devel
+MASTER_SITES=	https://github.com/google/googletest/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Framework for writing C++ tests on a variety of platforms
 WWW=		https://google.github.io/googletest/ \
 		https://github.com/google/googletest
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:testing compiler:c++14-lang python:test
+USES=		cmake:testing compiler:c++14-lang pathfix python:test
 
 CMAKE_OFF=	GTEST_HAS_ABSL \
 		gmock_build_tests \
 		gtest_build_samples \
 		gtest_build_tests \
 		gtest_disable_pthreads \
 		gtest_hide_internal_symbols
 CMAKE_ON=	BUILD_GMOCK \
 		BUILD_SHARED_LIBS \
 		INSTALL_GTEST
 CMAKE_TESTING_ON=	gmock_build_tests gtest_build_tests
+PATHFIX_CMAKELISTSTXT=	internal_utils.cmake
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	google
-
 .include <bsd.port.mk>
diff --git a/devel/googletest/distinfo b/devel/googletest/distinfo
index 9a862da3c4f8..0e5a95bbbc8f 100644
--- a/devel/googletest/distinfo
+++ b/devel/googletest/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691069587
-SHA256 (google-googletest-v1.14.0_GH0.tar.gz) = 8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7
-SIZE (google-googletest-v1.14.0_GH0.tar.gz) = 867764
+TIMESTAMP = 1721148484
+SHA256 (googletest-1.15.0.tar.gz) = 7315acb6bf10e99f332c8a43f00d5fbb1ee6ca48c52f6b936991b216c586aaad
+SIZE (googletest-1.15.0.tar.gz) = 872487
diff --git a/devel/libayatana-indicator/Makefile b/devel/libayatana-indicator/Makefile
index 241bc662ffa7..dcf41902fabd 100644
--- a/devel/libayatana-indicator/Makefile
+++ b/devel/libayatana-indicator/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	libayatana-indicator
 PORTVERSION=	0.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Ayatana Indicators Shared Library
 WWW=		https://github.com/AyatanaIndicators/libayatana-indicator
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libayatana-ido3-0.4.so:devel/ayatana-ido \
 		libgtest.so:devel/googletest \
 		libharfbuzz.so:print/harfbuzz
 BUILD_DEPENDS=	lcov>=0:devel/lcov
 
 USES=		cmake gnome localbase:ldflags pkgconfig vala:build
 
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 introspection pango
 
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AyatanaIndicators
 
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README.md
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libayatana-indicator3.so*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/libayatana-indicator/ayatana-indicator-loader3
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/opentelemetry-cpp/Makefile b/devel/opentelemetry-cpp/Makefile
index 44ae46247591..b375c0627c6f 100644
--- a/devel/opentelemetry-cpp/Makefile
+++ b/devel/opentelemetry-cpp/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	opentelemetry-cpp
 PORTVERSION=	1.14.2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	OpenTelemetry C++ client
 WWW=		https://github.com/open-telemetry/opentelemetry-cpp
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	open-telemetry
 GH_PROJECT=	${PORTNAME}
 
 USES=		cmake compiler:c++14-lang cpe
 
 CPE_VENDOR=	cncf
 
 CMAKE_ARGS=	-DBUILD_SHARED_LIBS=ON \
 		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
 CMAKE_OFF=	BUILD_TESTING BUILD_EXAMPLES
 
 LIB_DEPENDS=	libgtest.so:devel/googletest \
 		libcurl.so:ftp/curl
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
 PLIST_SUB=	SHLIBVER=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/graphics/brunsli/Makefile b/graphics/brunsli/Makefile
index c7d12484ff92..cdcf83d9b2f1 100644
--- a/graphics/brunsli/Makefile
+++ b/graphics/brunsli/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	brunsli
 PORTVERSION=	0.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Lossless JPEG repacking library
 WWW=		https://github.com/google/brunsli
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
 		libgtest_main.so:devel/googletest \
 		libhighwayhash.so:security/highwayhash
 
 USES=		cmake compiler:c++11-lang localbase:ldflags
 
 USE_CXXSTD=	c++11
 
 GH_ACCOUNT=	google
 USE_GITHUB=	yes
 
 post-patch:
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/third_party/
 
 .include <bsd.port.mk>
diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile
index 89c2901944db..ac1e9418e9fa 100644
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	exiv2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.28.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Exif, IPTC, and XMP metadata manipulation library and tools
 WWW=		https://www.exiv2.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
 		libexpat.so:textproc/expat2 \
 		libinih.so:devel/inih \
 		libpng.so:graphics/png
 
 USES=		cmake compiler:c++17-lang cpe dos2unix gettext-tools iconv \
 		localbase:ldflags pathfix shebangfix
 DOS2UNIX_FILES=	cmake/compilerFlags.cmake
 SHEBANG_FILES=	fuzz/mkdictionary.py tests/runner.py
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Exiv2
 
 CMAKE_ON=	EXIV2_ENABLE_VIDEO
 CMAKE_OFF=	EXIV2_ENABLE_EXTERNAL_XMP
 
 LDFLAGS_mips=	-lintl
 LDFLAGS_mips64=	-lintl
 
 OPTIONS_DEFINE=	DOCS DOXYGEN NLS SAMPLE TEST
 OPTIONS_SUB=	yes
 
 SAMPLE_DESC=	Include sample applications
 
 DOXYGEN_BUILD_DEPENDS=	dot:graphics/graphviz \
 			doxygen:devel/doxygen
 DOXYGEN_CMAKE_BOOL=	EXIV2_BUILD_DOC
 DOXYGEN_ALL_TARGET=	all doc
 DOXYGEN_PORTDOCS=	*
 
 NLS_USES=	gettext-runtime
 NLS_CMAKE_BOOL=	EXIV2_ENABLE_NLS
 
 SAMPLE_CMAKE_BOOL=	EXIV2_BUILD_SAMPLES
 
 TEST_LIB_DEPENDS=	libgtest.so:devel/googletest
 TEST_TEST_DEPENDS=	bash:shells/bash
 TEST_USES=		python:build,test
 TEST_CMAKE_BOOL=	EXIV2_BUILD_UNIT_TESTS
 TEST_CMAKE_ON=		-DPython${PYTHON_MAJOR_VER}_EXECUTABLE:FILEPATH="${PYTHON_CMD}"
 TEST_TEST_TARGET=	test
 TEST_IMPLIES=		SAMPLE
 
 .include <bsd.port.mk>
diff --git a/graphics/partio/Makefile b/graphics/partio/Makefile
index 3faf0bfddbdf..01cecefb7912 100644
--- a/graphics/partio/Makefile
+++ b/graphics/partio/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	partio
 PORTVERSION=	1.14.6
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics math
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	C++ library for particle I/O and manipulation
 WWW=		http://partio.us/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	swig:devel/swig
 
 USES=		cmake compiler:c++11-lang gl python:run shebangfix xorg
 SHEBANG_FILES=	src/tools/partedit.py src/tools/partinspect.py \
 		src/tools/partjson.py
 USE_GL=		gl glu glut
 USE_LDCONFIG=	yes
 USE_XORG=	xi xmu
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wdas
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS DOXYGEN EXAMPLES PYQT TEST
 PYQT_DESC=	Install PyQt-based auxiliary tools
 
 # DOCS must be selected for PORTDOCS to work
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_ALL_TARGET=	all doc
 
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 PYQT_USES=		pyqt:5
 PYQT_USE=		PYQT=pyqt5
 PYQT_PLIST_FILES=	bin/partedit bin/partinspect
 
 TEST_LIB_DEPENDS=	libgtest.so:devel/googletest
 TEST_CMAKE_ON=		-DPARTIO_GTEST_ENABLED:BOOL=ON
 TEST_VARS=		SHEBANG_FILES+="src/tests/testpartio.py \
 			src/tests/testpartjson.py"
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^project/s,${PORTNAME},& VERSION ${PORTVERSION}, ; \
 		s,/usr,${LOCALBASE},' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's,^from Qt,from PyQt5,' \
 		${WRKSRC}/src/tools/partedit.py \
 		${WRKSRC}/src/tools/partinspect.py
 
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e '/add_subdirectory(src\/doc)/d' \
 		${WRKSRC}/CMakeLists.txt
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/src/doc && ${INSTALL_DATA} tutorial.txt partio.tex ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/src/data && ${INSTALL_DATA} * ${STAGEDIR}${EXAMPLESDIR}
 
 post-install-PYQT-off:
 	cd ${STAGEDIR}${PREFIX} && ${RM} ${PYQT_PLIST_FILES}
 
 do-test-TEST-on:
 	@cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS}
 
 .include <bsd.port.mk>
diff --git a/lang/cling/Makefile b/lang/cling/Makefile
index ea826e28404e..4953fbd66790 100644
--- a/lang/cling/Makefile
+++ b/lang/cling/Makefile
@@ -1,75 +1,75 @@
 PORTNAME=		cling
 DISTVERSION=		0.5-2018-08-13
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=		lang devel
 MASTER_SITES=		https://root.cern.ch/download/cling/
 DISTNAME=		${PORTNAME}_${DISTVERSION:C/^[0-9]\.[0-9]-//}_sources
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Interactive C++ Interpreter Based on LLVM and Clang Libs
 WWW=		https://root.cern.ch/cling
 
 LICENSE=		LLVM NCSA
 LICENSE_COMB=		multi
 LICENSE_NAME_LLVM=	LLVM Release License
 LICENSE_FILE_LLVM=	${WRKSRC}/LICENSE.TXT
 LICENSE_FILE_NCSA=	${WRKSRC}/tools/cling/LICENSE.TXT
 LICENSE_PERMS_LLVM=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_armv6=		fails to compile: AArch64TargetMachine.cpp: relocation truncated to fit: R_ARM_CALL against symbol '__aeabi_uldivmod'
 BROKEN_armv7=		fails to compile: AArch64TargetMachine.cpp: relocation truncated to fit: R_ARM_CALL against symbol '__aeabi_uldivmod'
 BROKEN_riscv64=		fails to build: CMake Error at cmake/config-ix.cmake:407: Unknown architecture riscv64
 
 LIB_DEPENDS=	libgtest.so:devel/googletest \
 		libz3.so:math/z3
 
 WRKSRC=		${WRKDIR}/src
 
 LLVM_RELEASE=	5.0.0
 LLVM_SUFFIX=	50_cern-root
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 
 USES=		cmake compiler:c++11-lib compiler:c11 gnome libedit ncurses \
 		python:build shebangfix tar:bzip2
 USE_GNOME=	libxml2
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
 
 CONFLICTS_INSTALL=	llvm zapcc # # bin/bugpoint bin/c-index-test bin/clang bin/clang++ bin/clang-5.0 bin/clang-check bin/clang-cl bin/clang-cpp bin/clang-format bin/clang-import-test bin/clang-offload-bundler bin/clang-rename bin/git-clang-format
 
 SHEBANG_FILES=	tools/clang/tools/clang-format/clang-format-diff.py \
 		tools/clang/tools/clang-format/git-clang-format \
 		tools/clang/tools/scan-view/bin/scan-view
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	LLVM_BUILD_EXAMPLES LLVM_INCLUDE_TESTS LLVM_INCLUDE_GO_TESTS
 
 SUB_LIST+=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
 PLIST_SUB+=		LLVM_SUFFIX=${LLVM_SUFFIX} LLVM_RELEASE=${LLVM_RELEASE}
 
 CMAKE_BUILD_TYPE=	Release
 CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}
 
 CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|g' \
 	    ${PATCH_WRKSRC}/tools/cling/tools/driver/cling.cpp
 	@${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|g' \
 	    ${PATCH_WRKSRC}/tools/cling/lib/Interpreter/CIFactory.cpp
 
 post-install:
 	for e in $$(cd ${STAGEDIR}${PREFIX}/llvm50_cern-root/bin && ls *); do \
 		${RLN} ${STAGEDIR}${PREFIX}/llvm50_cern-root/bin/$${e} ${STAGEDIR}${PREFIX}/bin/$${e}; \
 	done
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake
 	for m in cling llvm llvm-c clang; do \
 		${RLN} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}/include/$${m} ${STAGEDIR}${PREFIX}/include/$${m}; \
 	done
 	for m in cling llvm clang; do \
 		${RLN} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}/lib/cmake/$${m} ${STAGEDIR}${PREFIX}/lib/cmake/$${m}; \
 	done
 	for l in $$(cd ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}/lib && ls *.so* *.a); do \
 		${RLN} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}/lib/$${l} ${STAGEDIR}${PREFIX}/lib/$${l}; \
 	done
 
 .include <bsd.port.mk>
diff --git a/math/verdict/Makefile b/math/verdict/Makefile
index 17c8669eb415..e00a2e529d00 100644
--- a/math/verdict/Makefile
+++ b/math/verdict/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	verdict
 PORTVERSION=	1.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Compute quality functions of 2 and 3-dimensional regions
 WWW=		https://github.com/sandialabs/verdict
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgtest.so:devel/googletest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sandialabs
 
 USES=		cmake:testing
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 OPTIONS_DEFINE=	DOCS
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/SAND2007-2853p.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index 2a0193947479..95e28f809fcb 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -1,310 +1,310 @@
 PORTNAME=	kodi
 DISTVERSION=	21.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia java
 MASTER_SITES=	http://mirrors.kodi.tv/build-deps/sources/
 DISTFILES=	apache-groovy-binary-${GROOVY_VERSION}.zip \
 		commons-lang3-${COMMONS_LANG_VERSION}-bin.tar.gz \
 		commons-text-${COMMONS_TEXT_VERSION}-bin.tar.gz
 DIST_SUBDIR=	${PORTNAME}
 # do not forget to fix devel/kodi-platform when updating kodi
 
 MAINTAINER=	yzrh@noema.org
 COMMENT=	Award winning media center application
 WWW=		https://kodi.tv/
 
 LICENSE=	GPLv2+
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	flatbuffers>0:devel/flatbuffers \
 		rapidjson>0:devel/rapidjson \
 		swig>0:devel/swig
 LIB_DEPENDS=	libass.so:multimedia/libass \
 		libavcodec.so:multimedia/ffmpeg \
 		libavfilter.so:multimedia/ffmpeg \
 		libavformat.so:multimedia/ffmpeg \
 		libavutil.so:multimedia/ffmpeg \
 		libcdio.so:sysutils/libcdio \
 		libcrossguid.so:devel/libcrossguid \
 		libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
 		libfmt.so:devel/libfmt \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libfstrcmp.so:devel/fstrcmp \
 		libgif.so:graphics/giflib \
 		libharfbuzz.so:print/harfbuzz \
 		liblzo2.so:archivers/lzo2 \
 		libpcre.so:devel/pcre \
 		libpng.so:graphics/png \
 		libpostproc.so:multimedia/ffmpeg \
 		libspdlog.so:devel/spdlog \
 		libswresample.so:multimedia/ffmpeg \
 		libswscale.so:multimedia/ffmpeg \
 		libtag.so:audio/taglib \
 		libtinyxml.so:textproc/tinyxml \
 		libtinyxml2.so:textproc/tinyxml2 \
 		libudfread.so:multimedia/libudfread \
 		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 USES=		autoreconf:build cmake:noninja compiler:c++17-lang cpe \
 		desktop-file-utils gettext gmake gnome iconv jpeg libtool \
 		pkgconfig python sqlite ssl
 
 KODI_CODENAME=		Omega
 LIBDVDCSS_VERSION=	1.4.3-Next-Nexus-Alpha2-2
 LIBDVDNAV_VERSION=	6.1.1-Next-Nexus-Alpha2-2
 LIBDVDREAD_VERSION=	6.1.3-Next-Nexus-Alpha2-2
 GROOVY_VERSION=		4.0.16
 COMMONS_LANG_VERSION=	3.14.0
 COMMONS_TEXT_VERSION=	1.11.0
 
 USE_GITHUB=	yes
 GH_TUPLE=	xbmc:xbmc:${DISTVERSION}-${KODI_CODENAME} \
 		xbmc:libdvdcss:${LIBDVDCSS_VERSION}:libdvdcss/tools/depends/target/libdvdcss/native \
 		xbmc:libdvdnav:${LIBDVDNAV_VERSION}:libdvdnav/tools/depends/target/libdvdnav/native \
 		xbmc:libdvdread:${LIBDVDREAD_VERSION}:libdvdread/tools/depends/target/libdvdread/native
 
 KODI_ARCH_aarch64=	aarch64
 KODI_ARCH_amd64=	x86_64
 KODI_ARCH_i386=		x86
 KODI_ARCH_armv7=	armv7
 KODI_ARCH_armv6=	armv6
 KODI_ARCH_powerpc64=	powerpc64
 KODI_ARCH_powerpc64le=	powerpc64le
 
 PLIST_SUB=	ARCH=${KODI_ARCH_${ARCH}}
 
 USE_LDCONFIG=	yes
 USE_JAVA=	yes
 JAVA_BUILD=	jre
 USE_GNOME=	libxml2
 CMAKE_ARGS=	-DGIT_VERSION="${DISTVERSION}-${KODI_CODENAME}" \
 		-DLIBDVDCSS_URL="${DISTDIR}/${PORTNAME}/xbmc-libdvdcss-${LIBDVDCSS_VERSION}_GH0.tar.gz" \
 		-DLIBDVDNAV_URL="${DISTDIR}/${PORTNAME}/xbmc-libdvdnav-${LIBDVDNAV_VERSION}_GH0.tar.gz" \
 		-DLIBDVDREAD_URL="${DISTDIR}/${PORTNAME}/xbmc-libdvdread-${LIBDVDREAD_VERSION}_GH0.tar.gz" \
 		-Dgroovy_SOURCE_DIR="${WRKSRC}/tools/depends/share/groovy" \
 		-Dapache-commons-lang_SOURCE_DIR="${WRKSRC}/tools/depends/share/java/lang" \
 		-Dapache-commons-text_SOURCE_DIR="${WRKSRC}/tools/depends/share/java/text" \
 		-DCROSSGUID_INCLUDE_DIR="${LOCALBASE}/include" \
 		-DCORE_PLATFORM_NAME:STRING="${KODI_PLATFORM}" \
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 CMAKE_OFF=	ENABLE_INTERNAL_CROSSGUID
 CONFIGURE_ENV=	_CPU_FEATURE="${CPU_FEATURE}"
 
 OPTIONS_SUB=		yes
 OPTIONS_DEFINE=		AIRPLAY AVAHI LIBBLURAY CEC DAV1D DBUS \
 			DVDCSS LCMS2 LIRC WEBSERVER MYSQL NFS DVD SMB TEST \
 			UDEV UPNP VAAPI VDPAU XSLT DOCS
 OPTIONS_DEFAULT=	LIBBLURAY CEC LCMS2 WEBSERVER DAV1D \
 			DVD UPNP VAAPI VDPAU XSLT GBM WAYLAND X11 GL
 OPTIONS_DEFAULT_amd64=	SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2
 OPTIONS_DEFAULT_i386=	SSE SSE2 SSE3
 OPTIONS_SINGLE=		RENDER
 OPTIONS_SINGLE_RENDER=	GL GLES
 OPTIONS_GROUP=		SOUND FEATURE PLATFORM
 OPTIONS_GROUP_SOUND=	ALSA PIPEWIRE PULSEAUDIO SNDIO
 OPTIONS_GROUP_FEATURE=	SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 AVX AVX2
 OPTIONS_GROUP_PLATFORM=	GBM WAYLAND X11
 OPTIONS_EXCLUDE_aarch64=FEATURE
 OPTIONS_EXCLUDE_armv7=	FEATURE
 OPTIONS_EXCLUDE_armv6=	FEATURE
 OPTIONS_EXCLUDE_powerpc64=	FEATURE
 OPTIONS_EXCLUDE_powerpc64le=	FEATURE
 
 PLATFORM_DESC=	Kodi platform
 FEATURE_DESC=	X86 CPU feature
 
 AIRPLAY_DESC=	AirPlay support
 CEC_DESC=	CEC adapter support
 DAV1D_DESC=	Use dav1d as AV1 decoder
 DVD_DESC=	DVD support
 UDEV_DESC=	Use libudev-devd
 XSLT_DESC=	Use libxslt
 
 RENDER_DESC=	Render system
 GL_DESC=	OpenGL
 GLES_DESC=	OpenGL ES
 
 GBM_DESC=	GBM support
 
 SSE2_DESC=	Use SSE2 optimized routines
 SSE3_DESC=	Use SSE3 optimized routines
 SSSE3_DESC=	Use SSSE3 optimized routines
 SSE4_1_DESC=	Use SSE4.1 optimized routines
 SSE4_2_DESC=	Use SSE4.2 optimized routines
 AVX_DESC=	Use AVX optimized routines
 AVX2_DESC=	Use AVX2 optimized routines
 
 AIRPLAY_LIB_DEPENDS=	libplist-2.0.so:devel/libplist \
 			libshairplay.so:audio/shairplay
 AIRPLAY_CMAKE_BOOL=	ENABLE_PLIST \
 			ENABLE_AIRTUNES
 
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CMAKE_BOOL=	ENABLE_AVAHI
 
 LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CMAKE_BOOL=	ENABLE_BLURAY
 
 CEC_LIB_DEPENDS=	libcec.so:multimedia/libcec
 CEC_CMAKE_BOOL=		ENABLE_CEC
 
 DAV1D_LIB_DEPENDS=	libdav1d.so:multimedia/dav1d
 DAV1D_CMAKE_BOOL=	ENABLE_DAV1D
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CMAKE_BOOL=	ENABLE_DBUS
 
 DVDCSS_CMAKE_BOOL=	ENABLE_DVDCSS
 
 LCMS2_LIB_DEPENDS=	liblcms2.so.2:graphics/lcms2
 LCMS2_CMAKE_BOOL=	ENABLE_LCMS2
 
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CMAKE_BOOL=	ENABLE_LIRCCLIENT
 
 WEBSERVER_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
 WEBSERVER_CMAKE_BOOL=	ENABLE_MICROHTTPD
 
 NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
 NFS_CMAKE_BOOL=		ENABLE_NFS
 
 DVD_CMAKE_BOOL=		ENABLE_OPTICAL
 
 SMB_USES=		samba:lib
 SMB_CMAKE_BOOL=		ENABLE_SMBCLIENT
 
 TEST_LIB_DEPENDS=	libgtest.so:devel/googletest
 TEST_CMAKE_BOOL=	ENABLE_TESTING
 
 UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd
 UDEV_CMAKE_BOOL=	ENABLE_UDEV
 
 UPNP_CMAKE_BOOL=	ENABLE_UPNP
 
 VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CMAKE_BOOL=	ENABLE_VAAPI
 
 VDPAU_IMPLIES=		X11 GL
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CMAKE_BOOL=	ENABLE_VDPAU
 
 XSLT_LIB_DEPENDS=	libxslt.so:textproc/libxslt
 XSLT_CMAKE_BOOL=	ENABLE_XSLT
 
 GL_CMAKE_ON=		-DAPP_RENDER_SYSTEM:STRING="gl"
 GL_USES=		gl
 GL_USE=			GL=gl
 
 GLES_CMAKE_ON=		-DAPP_RENDER_SYSTEM:STRING="gles"
 GLES_USES=		gl
 GLES_USE=		GL=glesv2
 
 MYSQL_USES=		mysql
 MYSQL_CMAKE_BOOL=	ENABLE_MYSQLCLIENT
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	ENABLE_ALSA
 
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_CMAKE_BOOL=	ENABLE_PIPEWIRE
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	ENABLE_PULSEAUDIO
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CMAKE_BOOL=	ENABLE_SNDIO
 
 SSE_VARS=		CPU_FEATURE+=SSE
 SSE2_VARS=		CPU_FEATURE+=SSE2
 SSE3_VARS=		CPU_FEATURE+=SSE3
 SSSE3_VARS=		CPU_FEATURE+=SSSE3
 SSE4_1_VARS=		CPU_FEATURE+=SSE4.1
 SSE4_2_VARS=		CPU_FEATURE+=SSE4.2
 AVX_VARS=		CPU_FEATURE+=AVX
 AVX2_VARS=		CPU_FEATURE+=AVX2
 
 GBM_IMPLIES=		UDEV
 GBM_VARS=		KODI_PLATFORM+=gbm
 GBM_USES=		gl
 GBM_USE=		GL=egl,gbm,glu
 GBM_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 GBM_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 			libdrm.so:graphics/libdrm \
 			libxkbcommon.so:x11/libxkbcommon \
 			libinput.so:x11/libinput \
 			libdisplay-info.so:sysutils/libdisplay-info
 GBM_RUN_DEPENDS=	mesa-dri>0:graphics/mesa-dri
 
 WAYLAND_VARS=		KODI_PLATFORM+=wayland
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_USES=		gl
 WAYLAND_USE=		GL=egl,glu
 WAYLAND_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 			wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 			libxkbcommon.so:x11/libxkbcommon \
 			libinput.so:x11/libinput \
 			libwayland-client++.so:graphics/waylandpp
 
 X11_VARS=		KODI_PLATFORM+=x11
 X11_USES=		xorg gl
 X11_USE=		XORG=x11,xext,xrandr GL=egl,gbm,glu
 X11_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 
 .include <bsd.port.options.mk>
 
 .if (!empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) || !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MX11) || !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)) && !empty(PORT_OPTIONS:MGLES)
 BROKEN=	option GLES does not build with multiple PLATFORM
 .endif
 
 .if !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) || !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MX11) || !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 PLIST_SUB+=	KODICOMBINED="" \
 		KODIGBM="@comment " \
 		KODIWAYLAND="@comment " \
 		KODIX11="@comment "
 .else
 PLIST_SUB+=	KODICOMBINED="@comment "
 
 .if !empty(PORT_OPTIONS:MGBM)
 PLIST_SUB+=	KODIGBM=""
 .else
 PLIST_SUB+=	KODIGBM="@comment "
 .endif
 
 .if !empty(PORT_OPTIONS:MWAYLAND)
 PLIST_SUB+=	KODIWAYLAND=""
 .else
 PLIST_SUB+=	KODIWAYLAND="@comment "
 .endif
 
 .if !empty(PORT_OPTIONS:MX11)
 PLIST_SUB+=	KODIX11=""
 .else
 PLIST_SUB+=	KODIX11="@comment "
 .endif
 .endif
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/tools/depends/share
 	@${MV} ${WRKDIR}/groovy-${GROOVY_VERSION} ${WRKSRC}/tools/depends/share/groovy
 
 	@${MKDIR} ${WRKSRC}/tools/depends/share/java
 	@${MV} ${WRKDIR}/commons-lang3-${COMMONS_LANG_VERSION} ${WRKSRC}/tools/depends/share/java/lang
 	@${MV} ${WRKDIR}/commons-text-${COMMONS_TEXT_VERSION} ${WRKSRC}/tools/depends/share/java/text
 
 post-patch:
 	${REINPLACE_CMD} 's|/usr/share|${LOCALBASE}/share|' \
 		${WRKSRC}/xbmc/platform/linux/input/LibInputSettings.cpp
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/manpages/kodi.bin.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	cd ${STAGEDIR}${PREFIX}/share/man/man1 && ${LN} -s kodi.bin.1.gz kodi.1.gz
 	cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} kodi-TexturePacker TexturePacker
 	${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -type f -name '*.so' -print0 | ${XARGS} -0 ${STRIP_CMD}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/firewalld
 
 .include <bsd.port.mk>
diff --git a/net-im/tdlib-purple/Makefile b/net-im/tdlib-purple/Makefile
index 8643ac0b42d1..246dc9e814fe 100644
--- a/net-im/tdlib-purple/Makefile
+++ b/net-im/tdlib-purple/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	tdlib-purple
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 
 PATCH_SITES=	https://github.com/ars3niy/tdlib-purple/commit/
 PATCHFILES+=	8c87b899ddbec32.patch:-p1 # https://github.com/ars3niy/tdlib-purple/pull/154
 
 MAINTAINER=	ports@virtual-estates.net
 COMMENT=	Telegram plugin for libpurple, using tdlib
 WWW=		https://github.com/ars3niy/tdlib-purple
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfmt.so:devel/libfmt	\
 		libtdapi.so:net-im/tdlib	\
 		librlottie.so:graphics/rlottie	\
 		libwebp.so:graphics/webp	\
 		libpurple.so:net-im/libpurple	\
 		libpng.so:graphics/png
 TEST_LIB_DEPENDS=libgtest.so:devel/googletest
 
 USES=		cmake localbase pkgconfig
 
 USE_GITHUB=	yeah
 GH_ACCOUNT=	ars3niy
 
 OPTIONS_DEFINE=	NLS TEST
 OPTIONS_DEFAULT=NLS
 OPTIONS_SUB=	yes
 TEST_DESC=	Do not enable, tests are broken
 
 CMAKE_ON+=	NoVoip	# tgvoip is yet to be ported
 CMAKE_ON+=	NoBundledLottie	# Using graphics/rlottie
 NLS_CMAKE_OFF+=	-DNoTranslations=1
 NLS_USES=	gettext-tools gettext-runtime
 
 EXTRACT_AFTER_ARGS=--exclude rlottie --exclude fmt
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTEST}
 WARNING+=	"Tests are stale at this time and are likely to fail to compile"
 TEST_TARGET=	tests
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-p2p/ethash/Makefile b/net-p2p/ethash/Makefile
index f7e9cf4a994f..69ecfff5c604 100644
--- a/net-p2p/ethash/Makefile
+++ b/net-p2p/ethash/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	ethash
 PORTVERSION=	1.0.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	C/C++ implementation of Ethash and ProgPoW
 WWW=		https://github.com/chfast/ethash
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libbenchmark.so:devel/benchmark \
 		libgtest.so:devel/googletest
 
 USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	chfast
 
 CMAKE_OFF=	HUNTER_ENABLED
 
 CFLAGS+=	-Wno-error=deprecated-declarations
 
 .include <bsd.port.mk>
diff --git a/science/orthanc/Makefile b/science/orthanc/Makefile
index 17b96314a9f5..d881fedb7fd7 100644
--- a/science/orthanc/Makefile
+++ b/science/orthanc/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	orthanc
 DISTVERSION=	1.12.3
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://orthanc.uclouvain.be/downloads/sources/orthanc/
 DISTNAME=	Orthanc-${PORTVERSION}
 
 MAINTAINER=	maintainer.freebsd@xpoundit.com
 COMMENT=	Lightweight DICOM server for healthcare and medical research
 WWW=		https://www.orthanc-server.com/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	protoc:devel/protobuf
 
 LIB_DEPENDS=	libboost_atomic.so:devel/boost-libs \
 		libcivetweb.so:www/civetweb \
 		libcurl.so:ftp/curl \
 		libdcmtkcharls.so:graphics/dcmtk \
 		libgtest.so:devel/googletest \
 		libicuuc.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libpng16.so:graphics/png \
 		libprotobuf.so:devel/protobuf \
 		libpugixml.so:textproc/pugixml \
 		libtiff.so:graphics/tiff \
 		libuuid.so:misc/e2fsprogs-libuuid \
 
 USES=		cmake gnome iconv jpeg lua python:build sqlite ssl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	orthanc
 
 CMAKE_ON=	USE_SYSTEM_BOOST USE_SYSTEM_CIVETWEB USE_SYSTEM_DCMTK \
 		USE_SYSTEM_GOOGLE_TEST USE_SYSTEM_JSONCPP USE_SYSTEM_LIBICONV \
 		USE_SYSTEM_LIBJPEG USE_SYSTEM_LIBPNG USE_SYSTEM_LUA \
 		USE_SYSTEM_OPENSSL USE_SYSTEM_PUGIXML USE_SYSTEM_SQLITE \
 		USE_SYSTEM_UUID USE_SYSTEM_ZLIB
 CMAKE_OFF=	BUILD_CONNECTIVITY_CHECKS UNIT_TESTS_WITH_HTTP_CONNEXIONS
 CMAKE_SOURCE_PATH=	${WRKSRC}/OrthancServer
 
 CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
 WRKSRC=		${WRKDIR}/Orthanc-${PORTVERSION}
 
 USERS=		orthanc
 GROUPS=		orthanc
 
 PLIST_SUB+=	DISTVERSION=${DISTVERSION}
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/db/orthanc/db/db-v5
 	${MKDIR} ${STAGEDIR}${DATADIR}/plugins
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${CMAKE_SOURCE_PATH}/Resources/Configuration.json
 	${CP} ${CMAKE_SOURCE_PATH}/Resources/Configuration.json ${STAGEDIR}${ETCDIR}/orthanc.json.sample
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/ots/Makefile b/x11-fonts/ots/Makefile
index 872940441846..b1b3f4827dbd 100644
--- a/x11-fonts/ots/Makefile
+++ b/x11-fonts/ots/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	ots
 PORTVERSION=	9.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://github.com/khaledhosny/ots/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	OpenType Sanitizer
 WWW=		https://github.com/khaledhosny/ots
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	brotli>=1.0.9:archivers/brotli \
 		freetype2>=2.12.1:print/freetype2 \
 		googletest>=1.11.0:devel/googletest \
 		liblz4>=1.9.4:archivers/liblz4 \
 		woff2>=1.0.2:devel/woff2
 LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
 		libfreetype.so:print/freetype2 \
 		libgtest.so:devel/googletest \
 		liblz4.so:archivers/liblz4 \
 		libwoff2dec.so:devel/woff2
 
 USES=		compiler:c++14-lang meson pkgconfig tar:xz
 
 MESON_ARGS=	--default-library=both -Ddebug=false -Dgraphite=true -Dsynthesize-gvar=true
 USE_CXXSTD=	c++14
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.mk>