diff --git a/devel/ignition-common/Makefile b/devel/ignition-common/Makefile
index 037d37d1be2f..d628dc0b62c7 100644
--- a/devel/ignition-common/Makefile
+++ b/devel/ignition-common/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	ignition-common
 DISTVERSION=	3.0.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Set of libraries designed to rapidly develop robot applications
 WWW=		https://ignitionrobotics.org/home
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	ignition-cmake==2:devel/ignition-cmake
 LIB_DEPENDS=	libavcodec.so.58:multimedia/ffmpeg4 \
 		libfreeimage.so:graphics/freeimage \
 		libgts.so:graphics/gts \
 		libtinyxml2.so:textproc/tinyxml2 \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libignition-math6.so:math/ignition-math
 
 USES=		cmake compiler:c++17-lang gnome localbase pkgconfig
 USE_CXXSTD=	c++14
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	USE_EXTERNAL_TINYXML2
 CMAKE_OFF=	BUILD_TESTING
 
 BB_ACCOUNT=	ignitionrobotics
 BB_PROJECT=	ign-common
 BB_COMMIT=	a5c4d5a35bb8
 
 WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
 
 PLIST_SUB=	COMMON_IGN_VER=common${DISTVERSION:R:R}
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=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/games/aquaria/Makefile b/games/aquaria/Makefile
index 1c88efd31d6a..6b3d54e6262a 100644
--- a/games/aquaria/Makefile
+++ b/games/aquaria/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	aquaria
 DISTVERSIONPREFIX=	OSE-v
 DISTVERSION=	1.002-22
 DISTVERSIONSUFFIX=	-g84366ad
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 
 PATCH_SITES=	https://github.com/AquariaOSE/Aquaria/commit/
 PATCHFILES=	021512337ea0bee698e950e44222fb391ae7cb91.patch:-p1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Underwater 2D fantasy action-adventure (game engine)
 WWW=		https://github.com/AquariaOSE/Aquaria
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
 LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis \
 		libftgl.so:graphics/ftgl \
 		libpng.so:graphics/png \
 		libtinyxml2.so:textproc/tinyxml2
 
 USES=		cmake:insource compiler:c++11-lang lua:51 openal pkgconfig sdl
 USE_CXXSTD=	c++11
 USE_GITHUB=	yes
 GH_ACCOUNT=	AquariaOSE
 GH_PROJECT=	Aquaria
 
 CMAKE_ARGS=	-DAQUARIA_DEFAULT_DATA_DIR:PATH="${DATADIR}"
 CMAKE_OFF=	AQUARIA_INTERNAL_FREETYPE \
 		AQUARIA_INTERNAL_FTGL \
 		AQUARIA_INTERNAL_LUA \
 		AQUARIA_INTERNAL_OGGVORBIS \
 		AQUARIA_INTERNAL_OPENAL \
 		AQUARIA_INTERNAL_PNG \
 		AQUARIA_INTERNAL_SDL \
 		AQUARIA_INTERNAL_TINYXML2 \
 		AQUARIA_INTERNAL_ZLIB
 
 LDFLAGS+=	-Wl,--as-needed # avoid overlinking (vorbis deps)
 LDFLAGS_i386=	-Wl,-z,notext -Wl,--no-check-dynamic-relocations
 
 DESKTOP_ENTRIES="${GH_PROJECT}" \
 		"" \
 		"${DATADIR}/${PORTNAME}.png" \
 		"${PORTNAME}" \
 		"Game;ArcadeGame;" \
 		""
 EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ExternalLibs/,}
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	bin/aquaria
 PORTDATA=	*
 
 OPTIONS_DEFINE=	SDL2
 OPTIONS_DEFAULT=SDL2
 
 SDL2_DESC=	Use SDL 2.x instead of SDL 1.2.x
 
 SDL2_USE=	SDL=sdl2
 SDL2_USE_OFF=	SDL=sdl
 SDL2_CMAKE_BOOL=AQUARIA_USE_SDL2
 
 EXCLUDE=	AL FTGL GL SDL* freetype2 glm glpng/png glpng/zlib \
 		libogg-* libvorbis-* lua-* tinyxml2*
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 .for d in game_scripts files
 	(cd ${WRKSRC}/${d} && ${COPYTREE_SHARE} \
 		"." ${STAGEDIR}${DATADIR}/override)
 .endfor
 
 .include <bsd.port.mk>
diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile
index b73849fa824f..bb825a855ed1 100644
--- a/games/irrlamb/Makefile
+++ b/games/irrlamb/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	irrlamb
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	3D physics-based puzzle game
 WWW=		https://github.com/jazztickets/irrlamb
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libvorbis.so:audio/libvorbis \
 		libogg.so:audio/libogg \
 		libsqlite3.so:databases/sqlite3 \
 		libpng.so:graphics/png \
 		libtinyxml2.so:textproc/tinyxml2 \
 		libIrrlicht.so:x11-toolkits/irrlicht \
 		libode.so:devel/ode \
 		libccd.so:math/libccd
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/vec3.hpp:math/glm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jazztickets
 GH_TUPLE:=	${GH_ACCOUNT}:cmake:6e3586a:cmake/cmake
 
 USES=		cmake compiler:c++11-lib gl jpeg openal xorg lua:53
 USE_XORG=	x11 xrandr xext xxf86vm
 USE_GL=		gl
 CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
 
 LDFLAGS_i386=	-Wl,-znotext
 
 PORTDOCS=	*
 PORTDATA=	*
 
 PLIST_FILES=	bin/irrlamb \
 		share/applications/irrlamb.desktop \
 		share/icons/hicolor/256x256/apps/irrlamb.png \
 		share/metainfo/irrlamb.xml
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 .for bundled in glm irrlicht libccd lua tinyxml2 ode
 	@${RM} -r ${WRKSRC}/src/${bundled}
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/cmake/*.cmake
 	@${REINPLACE_CMD} -e 's|tinyxml2/tinyxml2.h|tinyxml2.h|g' ${WRKSRC}/src/*.cpp
 	@${REINPLACE_CMD} -e 's|share/games|share|g' ${WRKSRC}/deployment/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/games/stuntrally/Makefile b/games/stuntrally/Makefile
index 16a17e50fd3a..53b0e10b8594 100644
--- a/games/stuntrally/Makefile
+++ b/games/stuntrally/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	stuntrally
 PORTVERSION=	2.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	3D racing game based on VDrift and OGRE with track editor
 WWW=		https://stuntrally.tuxfamily.org/ \
 		https://github.com/stuntrally/stuntrally/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libOgreMain.so:graphics/ogre3d \
 		libBulletDynamics.so:devel/bullet \
 		libMyGUIEngine.so:x11-toolkits/mygui \
 		libogg.so:audio/libogg \
 		libvorbisfile.so:audio/libvorbis \
 		libenet.so:net/enet \
 		libtinyxml.so:textproc/tinyxml \
 		libtinyxml2.so:textproc/tinyxml2
 BUILD_DEPENDS=	${LOCALBASE}/include/MYGUI/MyGUI_OgreTexture.h:x11-toolkits/mygui-ogre
 
 USES=		compiler:c++14-lang cmake pkgconfig sdl
 USE_SDL=	sdl2
 USE_GITHUB=	yes
 GH_TUPLE=	stuntrally:tracks:${PORTVERSION}:tracks/data/tracks
 CMAKE_ARGS=	-DSHARE_INSTALL="${DATADIR_REL}" \
 		-DBULLET_ROOT="${LOCALBASE}"
 CMAKE_ON=	SR_FORCE_SYSTEM_DEPENDENCIES
 
 LDFLAGS_i386=	-Wl,-znotext
 
 PORTDOCS=	*
 PORTDATA=	*
 
 OPTIONS_DEFINE=	GAME EDITOR TRANSLATOR MASTER_SERVER DOCS
 OPTIONS_DEFAULT=GAME EDITOR TRANSLATOR
 OPTIONS_SUB=	yes
 
 GAME_DESC=		Build the game binary
 GAME_CMAKE_BOOL=	BUILD_GAME
 GAME_USES=		openal
 
 EDITOR_DESC=		Build the track editor
 EDITOR_CMAKE_BOOL=	BUILD_EDITOR
 EDITOR_USES=		openal
 
 TRANSLATOR_DESC=	Build translation tool
 TRANSLATOR_CMAKE_BOOL=	BUILD_TRANSL_TOOL
 
 MASTER_SERVER_CMAKE_BOOL=	BUILD_MASTER_SERVER
 MASTER_SERVER_DESC=		Build the master server
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Readme.md ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/games/trigger-rally/Makefile b/games/trigger-rally/Makefile
index d398cfe85fe9..0e59cb1b850d 100644
--- a/games/trigger-rally/Makefile
+++ b/games/trigger-rally/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	trigger-rally
 PORTVERSION=	0.6.6.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	SF/trigger-rally/trigger-${PORTVERSION}
 
 MAINTAINER=	alfix86@gmail.com
 COMMENT=	Rally car racing game
 WWW=		http://trigger-rally.sourceforge.net
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WORKINGSRC}/doc/COPYING.txt
 
 LIB_DEPENDS=	libphysfs.so:devel/physfs
 LIB_DEPENDS+=	libalut.so:audio/freealut
 LIB_DEPENDS+=	libtinyxml2.so:textproc/tinyxml2
 
 USES=		compiler:c++11-lang gmake openal:al,alut sdl gl gnome
 
 USE_SDL=	image2
 USE_GL=		glu glew
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	build
 LDFLAGS_i386=	-Wl,-znotext
 
 WRKSRC_SUBDIR=	src
 WORKINGSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DATADIR=	${PREFIX}/share/games/trigger-rally
 
 DESKTOP_ENTRIES="Trigger" "" "trigger" \
 		"trigger-rally" "" false
 
 PORTDOCS=	README-stereo.txt README.txt DATA_AUTHORS.txt
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 # The following is actually meant for lld 15.0 and later, but the ports
 # framework does not support LINKER_TYPE and LINKER_VERSION yet.
 .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150
 # Turn off checking of dynamic relocations, to avoid lld diagnostics about
 # possibly incorrect addend values.
 LDFLAGS_i386+=	-Wl,--no-check-dynamic-relocations
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Trigger/main.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WORKINGSRC}/bin/trigger-rally ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WORKINGSRC}/bin && ${CP} trigger-rally.config.defs ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WORKINGSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 	cd ${WORKINGSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 .for i in 16 22 24 32 36 48 64 72 96 128 192 256
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/ && \
 	${MV} ${STAGEDIR}${DATADIR}/icon/trigger-${i}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/trigger.png
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ && \
 	${MV} ${STAGEDIR}${DATADIR}/icon/trigger-rally-icons.svg \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/trigger-rally-icons.svg
 
 .include <bsd.port.post.mk>
diff --git a/math/linbox/Makefile b/math/linbox/Makefile
index feb5573bb39e..00da9a75f1f7 100644
--- a/math/linbox/Makefile
+++ b/math/linbox/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	linbox
 PORTVERSION=	1.7.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	C++ library for exact, high-performance linear algebra
 WWW=		https://linalg.org/
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 
 # See https://github.com/linbox-team/givaro/issues/225
 # and https://github.com/linbox-team/linbox/issues/306
 BROKEN_FreeBSD_14=	fails to compile with clang 16
 
 BUILD_DEPENDS=	fflas-ffpack-config:math/fflas-ffpack
 LIB_DEPENDS=	libgmp.so:math/gmp		\
 		libgivaro.so:math/givaro
 RUN_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	linbox-team
 
 USES=		autoreconf blaslapack:openblas compiler:c++11-lang gmake	\
 		libtool localbase pkgconfig shebangfix
 
 SHEBANG_FILES=	benchmarks/perfpublisher.sh linbox-auto-install.sh	\
 		linbox-config.in tests/jenkins-maker.sh	\
 		tests/perfpublisher.sh tests/test_leak.sh
 USE_CXXSTD=	c++14
 
 OPTIONS_DEFINE=		DOXYGEN
 OPTIONS_RADIO=		SIZE
 OPTIONS_RADIO_SIZE=	FULL MIN
 OPTIONS_DEFAULT=	FULL
 OPTIONS_SUB=		yes
 
 MIN_DESC=		Lightweight package, with less dependencies
 MIN_CONFIGURE_ON=	--without-saclib --without-ocl
 
 FULL_DESC=		Complete package with all its dependencies
 FULL_BUILD_DEPENDS=	gnuplot:math/gnuplot
 FULL_LIB_DEPENDS=	libflint.so:math/flint2		\
 			libfplll.so:math/fplll		\
 			libiml.so:math/iml		\
 			libmpfr.so:math/mpfr		\
 			libntl.so:math/ntl		\
 			libOpenCL.so:devel/ocl-icd	\
 			libtinyxml2.so:textproc/tinyxml2
 FULL_RUN_DEPENDS=	gnuplot:math/gnuplot
 FULL_USES=		ghostscript
 FULL_CONFIGURE_WITH=	flint fplll ghostscript gnuplot iml mpfr ntl ocl
 
 DOXYGEN_VARS=		BINARY_ALIAS=sed=${LOCALBASE}/bin/gsed
 DOXYGEN_CONFIGURE_ENABLE=doc
 DOXYGEN_CONFIGURE_WITH=	docdir=${DOCSDIR}
 DOXYGEN_BUILD_DEPENDS=	gsed:textproc/gsed	\
 			dot:graphics/graphviz	\
 			doxygen:devel/doxygen
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 .if defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=--disable-sse --disable-sse2 --disable-sse3 --disable-ssse3	\
 		--disable-sse41 --disable-sse42 --disable-fma --disable-fma4	\
 		--disable-avx --disable-avx2
 .endif
 
 .include <bsd.port.mk>
diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile
index 99e20177cc9d..0a51e00baabc 100644
--- a/misc/dartsim/Makefile
+++ b/misc/dartsim/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	dartsim
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.13.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Dynamic Animation and Robotics Toolkit
 WWW=		https://dartsim.github.io/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	clang failure: https://bugs.llvm.org/show_bug.cgi?id=41757
 
 BUILD_DEPENDS=	pagmo2>0:science/pagmo2 \
 		pybind11>0:devel/pybind11
 LIB_DEPENDS=	libassimp.so:multimedia/assimp \
 		libBulletDynamics.so:devel/bullet \
 		libboost_system.so:devel/boost-libs \
 		libccd.so:math/libccd \
 		libconsole_bridge.so:devel/ros-console_bridge \
 		libfcl.so:math/fcl \
 		libflann_cpp.so:math/flann \
 		libfmt.so:devel/libfmt \
 		libipopt.so:math/ipopt \
 		liblz4.so:archivers/liblz4 \
 		liboctomap.so:math/octomap \
 		libode.so:devel/ode \
 		libosg.so:graphics/osg34 \
 		libnlopt.so:math/nlopt \
 		libpagmo.so:science/pagmo2 \
 		libtinyxml2.so:textproc/tinyxml2 \
 		liburdfdom_world.so:devel/ros-urdfdom
 
 USES=		cmake compiler:c++17-lang eigen:3,build,run gl localbase:ldflags \
 		pkgconfig python xorg
 USE_GL=		gl glu glut
 USE_XORG=	xi xmu
 USE_CXXSTD=	c++17 # missing in the project, it uses std::void_t (through pagmo2) which is a c++17 feature
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_PROJECT=	dart
 
 CXXFLAGS+=	-I${LOCALBASE}/include/coin # because of pagmo2 headers include <IpReturnCodes.hpp>
 
 CMAKE_ON=	BUILD_SHARED_LIBS # DART_VERBOSE
 CMAKE_ARGS=	-DODE_DIR=${LOCALBASE}
 
 DATADIR=	share/dart
 DOCSDIR=	${PREFIX}/share/doc/dart
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=unused-but-set-variable
 .endif
 
 .include <bsd.port.mk>
diff --git a/misc/sdformat/Makefile b/misc/sdformat/Makefile
index 3452825ca889..2148d87e884e 100644
--- a/misc/sdformat/Makefile
+++ b/misc/sdformat/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	sdformat
 DISTVERSION=	8.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	misc
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simulation Description Format (SDF) parser and description files
 WWW=		https://bitbucket.org/osrf/sdformat/src/default/
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	ignition-cmake==2:devel/ignition-cmake \
 		ignition-tools>0:devel/ignition-tools \
 		rubygem-rexml>0:textproc/rubygem-rexml
 LIB_DEPENDS=	libignition-math6.so:math/ignition-math \
 		libconsole_bridge.so:devel/ros-console_bridge \
 		libtinyxml2.so:textproc/tinyxml2 \
 		liburdfdom_world.so:devel/ros-urdfdom
 RUN_DEPENDS=	ignition-tools>0:devel/ignition-tools
 
 USES=		cmake compiler:c++17-lang pkgconfig ruby:build
 USE_LDCONFIG=	yes
 BROKEN_RUBY32=	yes
 
 CMAKE_OFF=	BUILD_TESTING
 
 BB_ACCOUNT=	osrf
 BB_PROJECT=	${PORTNAME}
 BB_COMMIT=	f555f9a69f8f
 
 WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
 
 PLIST_SUB+=	INCSUBDIR=${PORTNAME}-${DISTVERSION:R}
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING: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/net/ecal/Makefile b/net/ecal/Makefile
index e93839114677..9b93f43b48a0 100644
--- a/net/ecal/Makefile
+++ b/net/ecal/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	ecal
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.12.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Enhanced Communication Abstraction Layer
 WWW=		https://eclipse-ecal.github.io/ecal/index.html
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BROKEN_armv7=	link fails: undefined reference due to --no-allow-shlib-undefined: absl::lts_20230125::hash_internal::CityHash32(char const*, unsigned int)
 BROKEN_i386=	link fails: undefined reference due to --no-allow-shlib-undefined: absl::lts_20230125::hash_internal::CityHash32(char const*, unsigned int)
 
 BUILD_DEPENDS=	asio>0:net/asio \
 		termcolor>0:devel/termcolor
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libfmt.so:devel/libfmt \
 		libfineftp-server.so:ftp/fineftp-server \
 		libftxui-component.so:devel/ftxui \
 		libhdf5.so:science/hdf5 \
 		libprotobuf.so:devel/protobuf \
 		libqwt.so:x11-toolkits/qwt6@qt5 \
 		libspdlog.so:devel/spdlog \
 		libtinyxml2.so:textproc/tinyxml2 \
 		libyaml-cpp.so:devel/yaml-cpp
 		# binaries aren't linked with libfineftp-server.so, see https://github.com/continental/ecal/issues/381; same with libcurl.so
 
 USES=		cmake compiler:c++17-lang desktop-file-utils localbase:ldflags qt:5 shared-mime-info
 USE_QT=		core gui widgets buildtools:build qmake:build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	eclipse-ecal
 GH_TUPLE=	eclipse-ecal:tcp_pubsub:f59da78:tcp_pubsub/thirdparty/tcp_pubsub \
 		brofield:simpleini:9b3ed7e:simpleini/thirdparty/simpleini \
 		steinwurf:recycle:c542570:recycle/thirdparty/recycle \
 		xguerin:tclap:349170a:tclap/thirdparty/tclap
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_SAMPLES \
 		ECAL_THIRDPARTY_BUILD_SPDLOG ECAL_THIRDPARTY_BUILD_TINYXML2 ECAL_THIRDPARTY_BUILD_FINEFTP ECAL_THIRDPARTY_BUILD_TERMCOLOR \
 		ECAL_THIRDPARTY_BUILD_FTXUI ECAL_THIRDPARTY_BUILD_GTEST ECAL_THIRDPARTY_BUILD_PROTOBUF \
 		ECAL_THIRDPARTY_BUILD_CURL ECAL_THIRDPARTY_BUILD_HDF5 ECAL_THIRDPARTY_BUILD_YAML-CPP ECAL_THIRDPARTY_BUILD_UDPCAP \
 		CPACK_PACK_WITH_INNOSETUP
 CMAKE_ARGS=	-DGIT_REVISION_MAJOR=${DISTVERSION:R:R} \
 		-DGIT_REVISION_MINOR=${DISTVERSION:R:E} \
 		-DGIT_REVISION_PATCH=${DISTVERSION:E} \
 		-Dasio_INCLUDE_DIR=${LOCALBASE}/include \
 		-Dqwt_INCLUDE_DIR=${LOCALBASE}/include/qt5/qwt6 \
 		-Dqwt_LIBRARY=${LOCALBASE}/lib/qt5/libqwt.so
 
 CXXFLAGS+=	-pthread # see https://github.com/eclipse-ecal/ecal/issues/933
-LDFLAGS+=	-labsl_hash -labsl_log_internal_message -labsl_log_internal_nullguard -labsl_spinlock_wait -ltinyxml2
+LDFLAGS+=	-labsl_hash -labsl_log_internal_message -labsl_log_internal_nullguard -labsl_spinlock_wait
 USE_CXXSTD=	c++17
 
 PLIST_SUB=	VERSION=${DISTVERSION}
 
 CONFLICTS_BUILD=	tclap simpleini # epub isn't compatible with tclap-1.4rc1, epub isn't compatible with simpleini, because some header isn't installed
 
 post-install: # not sure why isn't this installed automatically
 	${INSTALL_LIB} ${BUILD_WRKSRC}/lib/libsys_core.so ${STAGEDIR}${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/net/ecal/files/patch-CMakeLists.txt b/net/ecal/files/patch-CMakeLists.txt
index 86a38629e154..2f925210f236 100644
--- a/net/ecal/files/patch-CMakeLists.txt
+++ b/net/ecal/files/patch-CMakeLists.txt
@@ -1,20 +1,11 @@
---- CMakeLists.txt.orig	2023-10-27 08:38:06 UTC
+--- CMakeLists.txt.orig	2022-12-23 09:10:20 UTC
 +++ CMakeLists.txt
-@@ -182,7 +182,7 @@ endif()
- set(possible_subprojects
-   Protobuf
-   spdlog
--  tinyxml2
-+  #tinyxml2
-   fineftp
-   termcolor
-   recycle
-@@ -234,7 +234,7 @@ endif()
+@@ -231,7 +231,7 @@ endif()
  
  find_package(CMakeFunctions REQUIRED)
  
 -git_revision_information(DEFAULT ${ECAL_BUILD_VERSION})
 +#git_revision_information(DEFAULT ${ECAL_BUILD_VERSION})
  set(eCAL_VERSION_MAJOR  ${GIT_REVISION_MAJOR})
  set(eCAL_VERSION_MINOR  ${GIT_REVISION_MINOR})
  set(eCAL_VERSION_PATCH  ${GIT_REVISION_PATCH})
diff --git a/net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.txt b/net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.txt
deleted file mode 100644
index 25e820f74e07..000000000000
--- a/net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- app/rec/rec_server_core/CMakeLists.txt.orig	2023-10-27 08:38:06 UTC
-+++ app/rec/rec_server_core/CMakeLists.txt
-@@ -20,7 +20,6 @@ find_package(Threads REQUIRED)
- find_package(Protobuf REQUIRED)
- find_package(spdlog REQUIRED)
- find_package(fineftp REQUIRED)
--find_package(tinyxml2 REQUIRED)
- 
- set(PROJECT_NAME rec_server_core)
- 
-@@ -66,7 +65,6 @@ create_targets_protobuf()
- 
- target_link_libraries(${PROJECT_NAME}
-     PRIVATE
--    tinyxml2::tinyxml2
-     protobuf::libprotobuf
-     eCAL::core
-     eCAL::app_pb
diff --git a/net/ecal/files/patch-app_sys_sys__core_CMakeLists.txt b/net/ecal/files/patch-app_sys_sys__core_CMakeLists.txt
deleted file mode 100644
index 67c058691f49..000000000000
--- a/net/ecal/files/patch-app_sys_sys__core_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- app/sys/sys_core/CMakeLists.txt.orig	2023-10-27 08:38:06 UTC
-+++ app/sys/sys_core/CMakeLists.txt
-@@ -21,7 +21,6 @@ project(sys_core)
- find_package(Threads REQUIRED)
- find_package(Protobuf REQUIRED)
- find_package(spdlog REQUIRED)
--find_package(tinyxml2 REQUIRED)
- 
- set(ecalsyscore_src
-   include/ecalsys/ecal_sys.h
-@@ -88,7 +87,6 @@ create_targets_protobuf()
- 
- target_link_libraries(${PROJECT_NAME}
-   Threads::Threads
--  tinyxml2::tinyxml2
-   spdlog::spdlog
-   protobuf::libprotobuf
-   eCAL::core
diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile
index 4734f5ee05ea..07147e6d2357 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	encfs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.9.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Encrypted pass-through FUSE filesystem
 WWW=		http://www.arg0.net/encfs
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake compiler:c++11-lib cpe fuse ssl
 CPE_VENDOR=	${PORTNAME}_project
 USE_GITHUB=	yes
 GH_ACCOUNT=	vgough
 
 OPTIONS_DEFINE=	BUNDLED_TINYXML MANPAGES NLS
 OPTIONS_DEFAULT=	BUNDLED_TINYXML MANPAGES
 OPTIONS_SUB=	yes
 
 BUNDLED_TINYXML_DESC=	Use bundled TinyXML2 instead of textproc/tinyxml2
 BUNDLED_TINYXML_CMAKE_BOOL=	USE_INTERNAL_TINYXML
 BUNDLED_TINYXML_LIB_DEPENDS_OFF=	libtinyxml2.so:textproc/tinyxml2
 
 MANPAGES_DESC=	Install manpages (requires Perl 5)
 MANPAGES_USES=	perl5
 MANPAGES_USE=	perl5=build
 
 NLS_USES=	gettext
 NLS_CMAKE_BOOL=	ENABLE_NLS
 
 .include <bsd.port.mk>
diff --git a/textproc/tinyxml2/Makefile b/textproc/tinyxml2/Makefile
index 1dc724e82cf4..5012b48a08a9 100644
--- a/textproc/tinyxml2/Makefile
+++ b/textproc/tinyxml2/Makefile
@@ -1,38 +1,33 @@
 PORTNAME=	tinyxml2
-PORTVERSION=	10.0.0
-PORTREVISION=	1
+DISTVERSION=	10.0.0
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Small C++ XML Parser
-WWW=		https://leethomason.github.io/tinyxml2/ \
-		https://github.com/leethomason/tinyxml2
+WWW=		https://github.com/leethomason/tinyxml2
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		compiler:c++11-lang cpe dos2unix meson pathfix
-
-MESON_ARGS=	--default-library=both \
-		-Ddebug=false \
-		-Dtests=true
+USES=		cmake:testing compiler:c++11-lang cpe dos2unix pathfix
+CPE_VENDOR=	tinyxml2_project
 USE_LDCONFIG=	yes
 
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+USE_GITHUB=     yes
+GH_ACCOUNT=     leethomason
 
-GH_ACCOUNT=	leethomason
-USE_GITHUB=	yes
+CMAKE_TESTING_ON=	tinyxml2_BUILD_TESTING
+PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
-CPE_VENDOR=	tinyxml2_project
+CMAKE_OFF=	tinyxml2_BUILD_TESTING
+CMAKE_ON=	BUILD_SHARED_LIBS
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	cd ${WRKSRC}/ && ${COPYTREE_SHARE} resources ${STAGEDIR}${EXAMPLESDIR}/
 
-do-test:
-	cd ${WRKSRC}/ && _build/xmltest
-
 .include <bsd.port.mk>
diff --git a/textproc/tinyxml2/pkg-plist b/textproc/tinyxml2/pkg-plist
index d18bc5bb434e..c12561808480 100644
--- a/textproc/tinyxml2/pkg-plist
+++ b/textproc/tinyxml2/pkg-plist
@@ -1,15 +1,18 @@
 include/tinyxml2.h
-lib/libtinyxml2.a
+lib/cmake/tinyxml2/tinyxml2-config-version.cmake
+lib/cmake/tinyxml2/tinyxml2-config.cmake
+lib/cmake/tinyxml2/tinyxml2-shared-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/tinyxml2/tinyxml2-shared-targets.cmake
 lib/libtinyxml2.so
 lib/libtinyxml2.so.10
-lib/libtinyxml2.so.%%PORTVERSION%%
+lib/libtinyxml2.so.%%DISTVERSION%%
 libdata/pkgconfig/tinyxml2.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/dream.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/empty.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/out/readme.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/utf8test.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/utf8testverify.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/xmltest-4636783552757760.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/xmltest-5330.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/xmltest-5662204197076992.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/xmltest-5720541257269248.xml