diff --git a/devel/ode/Makefile b/devel/ode/Makefile
index 8395544bdd3e..95b843553986 100644
--- a/devel/ode/Makefile
+++ b/devel/ode/Makefile
@@ -1,52 +1,44 @@
 PORTNAME=	ode
-PORTVERSION=	0.13
-PORTREVISION=	4
+DISTVERSION=	0.16.2
 PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	SF/opende/ODE/${PORTVERSION}
+MASTER_SITES=	https://bitbucket.org/odedevs/${PORTNAME}/downloads/
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Articulated rigid body dynamics library
 WWW=		https://www.ode.org/
 
 LICENSE=	LGPL21 BSD3CLAUSE
 LICENSE_COMB=	dual
 
-USES=		tar:bzip2 libtool pathfix
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared
-TEST_TARGET=	check
-USE_CXXSTD=	c++03
+USES=		cmake:testing
 
-OPTIONS_DEFINE=		GIMPACT DOUBLE OU DEMOS
+CMAKE_OFF=	ODE_WITH_TESTS
+CMAKE_TESTING_ON=	ODE_WITH_TESTS
 
-GIMPACT_DESC=		Enable gimpact instead of opcode support
-DOUBLE_DESC=		Enable double precision (BROKEN with GIMPACT)
-OU_DESC=		Enable Thread-local storage (Experimental)
-DEMOS_DESC=		Build demos (not installed)
+CXXFLAGS+=	-Wno-c++11-narrowing
 
-GIMPACT_PREVENTS=	DOUBLE
-GIMPACT_CONFIGURE_ON=	--with-trimesh=gimpact
-GIMPACT_CONFIGURE_OFF=	--with-trimesh=opcode
-DOUBLE_CONFIGURE_ENABLE=double-precision
-OU_CONFIGURE_ENABLE=	ou
-DEMOS_CONFIGURE_ENABLE=	demos
+OPTIONS_DEFINE=		DEMOS GIMPACT LIBCCD OU TRIMESH # it looks like TRIMESH isn't defined but is needed because ODE_NO_TRIMESH is never defined otherwise
+OPTIONS_DEFAULT=	TRIMESH
+
+DEMOS_DESC=		Build demos (not installed)
+DEMOS_CMAKE_BOOL=	ODE_WITH_DEMOS
 DEMOS_USES=		gl localbase pkgconfig
 DEMOS_USE=		GL=gl,glu
 
-post-patch:
-	@${REINPLACE_CMD} -e '/if test/ s|==|=|' -e 's|^\( *CFLAGS=\)|#\1|;' \
-		-e 's|^\( *CPPFLAGS=\)|#\1|' -e 's|^\( *CXXFLAGS=\)|#\1|' \
-		-e 's|CPPFLAGS+=" |CPPFLAGS="$$CPPFLAGS |' \
-		${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -type f -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-		-e '/^DEFAULT_INCLUDES/ s|$$| -I$$(top_builddir)/include|' \
-		-e '/CFLAGS/ s|-O[12]||'
-	@${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g' \
-		${WRKSRC}/build/config-default.h ${WRKSRC}/ou/src/ou/malloc.cpp
-
-post-install:
-	${SED} -e '/PACKAGE/ s|^|//|; /VERSION/ s|^|//|' ${WRKSRC}/ode/src/config.h \
-		> ${STAGEDIR}${PREFIX}/include/ode/config.h
+GIMPACT_DESC=		Enable gimpact instead of opcode support
+GIMPACT_CMAKE_BOOL=	ODE_WITH_GIMPACT
+GIMPACT_PREVENTS=	TRIMESH
+
+LIBCCD_DESC=		Use libccd for handling some collision tests absent in ODE
+LIBCCD_CMAKE_BOOL=	ODE_WITH_LIBCCD ODE_WITH_LIBCCD_SYSTEM
+LIBCCD_CXXFLAGS=	-I${WRKSRC}/libccd/src/custom
+LIBCCD_LIB_DEPENDS=	libccd.so:math/libccd
+
+OU_DESC=		Enable Thread-local storage (Experimental)
+OU_CMAKE_BOOL=		ODE_WITH_OU
+
+TRIMESH_DESC=		Build with trimesh
+TRIMESH_CMAKE_OFF=	-DODE_NO_TRIMESH=ON
 
 .include <bsd.port.mk>
diff --git a/devel/ode/distinfo b/devel/ode/distinfo
index 4679824956d8..77c7e88d2be7 100644
--- a/devel/ode/distinfo
+++ b/devel/ode/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ode-0.13.tar.bz2) = 34ce3e236e313bf109a0cb5546d2fca462aed99f29a42e62bc1463b803c31ef9
-SIZE (ode-0.13.tar.bz2) = 2008288
+TIMESTAMP = 1667161105
+SHA256 (ode-0.16.2.tar.gz) = b26aebdcb015e2d89720ef48e0cb2e8a3ca77915f89d853893e7cc861f810f22
+SIZE (ode-0.16.2.tar.gz) = 2627992
diff --git a/devel/ode/files/patch-CMakeLists.txt b/devel/ode/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..1ea3a77cc367
--- /dev/null
+++ b/devel/ode/files/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2020-07-30 13:27:35 UTC
++++ CMakeLists.txt
+@@ -568,8 +568,8 @@ endif()
+ if(ODE_WITH_LIBCCD)
+ 	if(ODE_WITH_LIBCCD_SYSTEM)
+ 		find_package(ccd)
+-		target_compile_definitions(ode PRIVATE -DdLIBCCD_ENABLED -DdLIBCCD_SYSTEM)
+-		target_link_libraries(ODE ccd::ccd)
++		target_compile_definitions(ODE PRIVATE -DdLIBCCD_ENABLED -DdLIBCCD_SYSTEM)
++		target_link_libraries(ODE ccd)
+ 	else()
+ 		target_compile_definitions(ODE PRIVATE -DdLIBCCD_ENABLED -DdLIBCCD_INTERNAL)
+ 		target_include_directories(
diff --git a/devel/ode/files/patch-config.h.cmake.in b/devel/ode/files/patch-config.h.cmake.in
new file mode 100644
index 000000000000..86e771e11c96
--- /dev/null
+++ b/devel/ode/files/patch-config.h.cmake.in
@@ -0,0 +1,11 @@
+--- config.h.cmake.in.orig	2022-10-30 20:20:09 UTC
++++ config.h.cmake.in
+@@ -67,7 +67,7 @@
+ #define ODE_PLATFORM_PS3
+ #elif defined(_MSC_VER) || defined(__CYGWIN32__) || defined(__MINGW32__)
+ #define ODE_PLATFORM_WINDOWS
+-#elif defined(__linux__)
++#elif defined(__linux__) || defined(__FreeBSD__)
+ #define ODE_PLATFORM_LINUX
+ #elif defined(__APPLE__) && defined(__MACH__)
+ #define ODE_PLATFORM_OSX
diff --git a/devel/ode/files/patch-ode_demo_demo__jointPR.cpp b/devel/ode/files/patch-ode_demo_demo__jointPR.cpp
deleted file mode 100644
index 189a7ef9e500..000000000000
--- a/devel/ode/files/patch-ode_demo_demo__jointPR.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ode/demo/demo_jointPR.cpp.orig	2013-08-19 17:48:05 UTC
-+++ ode/demo/demo_jointPR.cpp
-@@ -329,7 +329,7 @@ int main (int argc, char **argv)
-             {
-                 int j = i+1;
-                 if ( j+1 > argc      ||  // Check if we have enough arguments
--                        argv[j] == '\0' ||  // We should have a path here
-+                        argv[j][0] == '\0' ||  // We should have a path here
-                         argv[j][0] == '-' ) // We should have a path not a command line
-                     Help(argv);
-                 else
diff --git a/devel/ode/files/patch-ode_demo_demo__jointPU.cpp b/devel/ode/files/patch-ode_demo_demo__jointPU.cpp
deleted file mode 100644
index 588366a601a4..000000000000
--- a/devel/ode/files/patch-ode_demo_demo__jointPU.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ode/demo/demo_jointPU.cpp.orig	2013-12-06 21:52:14 UTC
-+++ ode/demo/demo_jointPU.cpp
-@@ -579,7 +579,7 @@ int main (int argc, char **argv)
-       if (0 == strcmp ("-t", argv[i]) || 0 == strcmp ("--texture-path", argv[i]) ) {
-         int j = i+1;
-         if ( j+1 > argc      ||  // Check if we have enough arguments
--             argv[j] == '\0' ||  // We should have a path here
-+             argv[j][0] == '\0' ||  // We should have a path here
-              argv[j][0] == '-' ) // We should have a path not a command line
-           Help (argv);
-         else
diff --git a/devel/ode/files/patch-ode_demo_demo__piston.cpp b/devel/ode/files/patch-ode_demo_demo__piston.cpp
deleted file mode 100644
index 3fdbb3327816..000000000000
--- a/devel/ode/files/patch-ode_demo_demo__piston.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ode/demo/demo_piston.cpp.orig	2013-08-19 17:48:05 UTC
-+++ ode/demo/demo_piston.cpp
-@@ -659,7 +659,7 @@ int main (int argc, char **argv)
-                 {
-                     int j = i+1;
-                     if ( j+1 > argc      ||  // Check if we have enough arguments
--                            argv[j] == '\0' ||  // We should have a path here
-+                            argv[j][0] == '\0' ||  // We should have a path here
-                             argv[j][0] == '-' ) // We should have a path not a command line
-                         Help (argv);
-                     else
diff --git a/devel/ode/pkg-plist b/devel/ode/pkg-plist
index 6956b591ec05..ec840b633c84 100644
--- a/devel/ode/pkg-plist
+++ b/devel/ode/pkg-plist
@@ -1,32 +1,36 @@
 bin/ode-config
 include/ode/collision.h
 include/ode/collision_space.h
 include/ode/collision_trimesh.h
 include/ode/common.h
 include/ode/compatibility.h
-include/ode/config.h
 include/ode/contact.h
+include/ode/cooperative.h
 include/ode/error.h
 include/ode/export-dif.h
 include/ode/mass.h
 include/ode/matrix.h
+include/ode/matrix_coop.h
 include/ode/memory.h
 include/ode/misc.h
 include/ode/objects.h
 include/ode/ode.h
 include/ode/odeconfig.h
 include/ode/odecpp.h
 include/ode/odecpp_collision.h
 include/ode/odeinit.h
 include/ode/odemath.h
 include/ode/odemath_legacy.h
 include/ode/precision.h
 include/ode/rotation.h
 include/ode/threading.h
 include/ode/threading_impl.h
 include/ode/timer.h
-lib/libode.a
+include/ode/version.h
+lib/cmake/ode-0.16.2/ode-config-version.cmake
+lib/cmake/ode-0.16.2/ode-config.cmake
+lib/cmake/ode-0.16.2/ode-export-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/ode-0.16.2/ode-export.cmake
 lib/libode.so
-lib/libode.so.3
-lib/libode.so.3.1.0
+lib/libode.so.0.16.2
 libdata/pkgconfig/ode.pc
diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index 5330f03cdd8c..4cb224365bb0 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -1,107 +1,107 @@
 PORTNAME=	alienarena
 PORTVERSION=	2013.766
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	SF/alienarena.mirror/Alien%20Arena%207.66/ \
 		http://icculus.org/alienarena/Files/ \
 		http://red.planetarena.org/files/ \
 		GENTOO
 DISTNAME=	${PORTNAME}-7.66-linux20130827
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Alien Arena (native version)
 WWW=		http://red.planetarena.org/
 
 RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/data1/default.cfg:games/alienarena-data
 
 USES=		compiler:c++11-lib dos2unix gmake
 USE_CXXSTD=	c++11
 GNU_CONFIGURE=	yes
 CONFIGURE_WRKSRC=${WRKDIR}/${PORTNAME}-7.66/
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--with-xf86vm \
 		--with-xf86dga \
 		--with-system-libode
 
 # Fix build with clang11
 CFLAGS+=	-fcommon
 
 EXTRACT_AFTER_ARGS=	--exclude "data1"
 
 MAKE_ENV=	WITH_DATADIR=yes WITH_LIBDIR=yes \
 		DATADIR="${DATADIR}" LIBDIR="${LIBDIR}"
 WRKSRC=		${WRKDIR}/${PORTNAME}-7.66/source
 
 SUB_FILES=	pkg-message
 
 OPTIONS_MULTI=	FLAVOR
 OPTIONS_MULTI_FLAVOR=	CLIENT DEDICATED
 CLIENT_DESC=	Build client
 DEDICATED_DESC=	Build dedicated server
 
 OPTIONS_DEFAULT=	CLIENT DEDICATED
 
 PLIST_SUB=	LIBDIR=${LIBDIR:S/${PREFIX}\///}
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT}
 USES+=		gl jpeg openal:soft,alut pkgconfig xorg
 LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libvorbis.so:audio/libvorbis \
 		libode.so:devel/ode
 USE_GL=		yes
 USE_XORG=	xxf86dga xxf86vm
 .endif
 
 .if ! ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MDEDICATED}
 CONFIGURE_ARGS+=--disable-client
 .endif
 
 .if ${PORT_OPTIONS:MCLIENT}
 PLIST_SUB+=	CLIENT=""
 .else
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDEDICATED}
 PLIST_SUB+=	DEDICATED=""
 .else
 PLIST_SUB+=	DEDICATED="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|(CCLD)|(CXX)|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|malloc.h|stdlib.h|g" ${WRKSRC}/client/snd_openal.c
 	@${REINPLACE_CMD} -e "s|.codered|.config/alienarena|g" ${WRKSRC}/qcommon/qcommon.h
 # Resolve name collision with jpeg-8
 	${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \
 		${WRKSRC}/ref_gl/r_image.c
 	${REINPLACE_CMD} -e 's|inline void IQM_DrawVBO|void IQM_DrawVBO|' \
 		${WRKSRC}/ref_gl/r_iqm.c
 
 do-install:
 	${MKDIR} ${STAGEDIR}${LIBDIR}/arena ${STAGEDIR}${LIBDIR}/data1
 	${LN} -s ${DATADIR}/arena/* ${STAGEDIR}${LIBDIR}/arena
 	${LN} -s ${DATADIR}/botinfo ${STAGEDIR}${LIBDIR}
 	${LN} -s ${DATADIR}/data1/* ${STAGEDIR}${LIBDIR}/data1
 .if ${PORT_OPTIONS:MCLIENT}
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 .endif
 .if ${PORT_OPTIONS:MDEDICATED}
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-ded \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}-ded
 .endif
 
 post-install:
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <bsd.port.mk>
diff --git a/games/crashtest/Makefile b/games/crashtest/Makefile
index 43f66b87a668..e5577708b93d 100644
--- a/games/crashtest/Makefile
+++ b/games/crashtest/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	crashtest
 PORTVERSION=	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games education
 MASTER_SITES=	http://www.stolk.org/crashtest/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Educational crash simulator
 WWW=		https://www.stolk.org/crashtest/
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibul.a:x11-toolkits/plib
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
 		libode.so:devel/ode
 
 USES=		gl pkgconfig
 USE_GL=		gl glu
 
 BUILD_WRKSRC=	${WRKSRC}/src-crashtest
 
 PORTDOCS=	*
 PORTDATA=	*
 PLIST_FILES=	bin/${PORTNAME}
 
 DESKTOP_ENTRIES="${PORTNAME}" \
 		"" \
 		"" \
 		"${PORTNAME}" \
 		"Game;Simulation;Physics;" \
 		""
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/src-crashtest/crashtest.cxx
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}/models
 	${INSTALL_DATA} ${WRKSRC}/models-crashtest/*.3ds ${STAGEDIR}${DATADIR}/models
 	${INSTALL_DATA} ${WRKSRC}/models-crashtest/*.ac ${STAGEDIR}${DATADIR}/models
 	${INSTALL_DATA} ${WRKSRC}/models-crashtest/*.bmp ${STAGEDIR}${DATADIR}/models
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/games/gillo/Makefile b/games/gillo/Makefile
index afbfb0753306..892cb0875e4c 100644
--- a/games/gillo/Makefile
+++ b/games/gillo/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	gillo
 DISTVERSION=	1.0beta1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.0beta1
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Players are cars throwing a magnetic fuzzy ball into a goal
 WWW=		https://sourceforge.net/projects/gillo/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${JAM}:devel/jam \
 		${LOCALBASE}/lib/libplibsg.a:x11-toolkits/plib
 LIB_DEPENDS=	libode.so:devel/ode
 
 USES=		gl sdl tar:bzip2
 USE_CXXSTD=	c++98
 USE_GL=		gl glu
 USE_SDL=	sdl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 JAM?=		${LOCALBASE}/bin/jam
 
 post-patch:
 	@${REINPLACE_CMD} '/^LINKLIBS on gillo3/s|;$$|-L${LOCALBASE}/lib -lm ;|' \
 		${WRKSRC}/src/Jamfile
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} C++="${CXX}" C++FLAGS="${CXXFLAGS}" \
 		CCFLAGS="${CFLAGS} -DDATADIR=\\\"${PREFIX}/share\\\"" \
 		HDRS="${LOCALBASE}/include" \
 		LINK="${CXX}" LINKFLAGS="${LDFLAGS}" \
 		${JAM} -dx -sPREFIX=${PREFIX}
 
 do-install:
 	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} gillo3 ${STAGEDIR}${PREFIX}/bin)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/data && ${INSTALL_DATA} *.* ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile
index 19590abf7499..a00e1e65b463 100644
--- a/games/irrlamb/Makefile
+++ b/games/irrlamb/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	irrlamb
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 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/stormbaancoureur/Makefile b/games/stormbaancoureur/Makefile
index fd9969b95400..6a4c9d689c98 100644
--- a/games/stormbaancoureur/Makefile
+++ b/games/stormbaancoureur/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	stormbaancoureur
 PORTVERSION=	2.1.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.stolk.org/stormbaancoureur/download/ \
 		http://mirror.amdmi3.ru/distfiles/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simulated obstacle course for automobiles
 WWW=		https://www.stolk.org/stormbaancoureur/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
 LIB_DEPENDS=	libode.so:devel/ode
 
 USES=		compiler gl pkgconfig
 USE_GL=		gl glu glut
 USE_CXXSTD=	c++98
 
 MAKE_ENV=	DATADIR="${DATADIR}"
 
 BUILD_WRKSRC=	${WRKSRC}/src-stormbaancoureur
 INSTALL_WRKSRC=	${WRKSRC}/src-stormbaancoureur
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*
 PORTDATA=	*
 
 OPTIONS_DEFINE=	ALSA DOCS
 OPTIONS_DEFAULT=ALSA
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_MAKE_ENV=		ALSA_LIBS="-lasound"
 ALSA_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-src-common-soundenginealsa.cxx \
 			${FILESDIR}/extra-patch-src-common-soundenginealsa.h
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|__DATADIR|"${DATADIR}"|' \
 		${WRKSRC}/src-stormbaancoureur/main.cxx
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index 7044db0063b6..bb0c2ca913f2 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	xmoto
 PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Challenging 2D motocross platform game
 WWW=		https://xmoto.tuxfamily.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libode.so:devel/ode \
 		libpng.so:graphics/png \
 		libcurl.so:ftp/curl \
 		libxdg-basedir.so:x11/libxdg-basedir
 
 USES=		compiler:c++11-lang cmake gl gnome jpeg lua:52 pkgconfig sdl sqlite
 USE_GITHUB=	yes
 USE_GNOME=	libxml2
 USE_SDL=	sdl mixer ttf net
 USE_GL=		gl glu
 CMAKE_ARGS=	-DOpenGL_GL_PREFERENCE="GLVND"
 
 PORTDOCS=	README.md ChangeLog
 PORTDATA=	*
 
 ASIAN_FONT_PATH=${LOCALBASE}/share/fonts/TrueType/bkai00mp.ttf
 
 OPTIONS_DEFINE=	ASIAN_TTF DOCS NLS
 OPTIONS_SUB=	yes
 
 ASIAN_TTF_DESC=	Use asian TTF font
 ASIAN_TTF_RUN_DEPENDS=	${ASIAN_FONT_PATH}:chinese/arphicttf
 
 NLS_USES=	gettext
 NLS_CMAKE_BOOL=	USE_GETTEXT
 
 # ensure bundled depends are not used
 post-extract:
 .for d in bzip2 lua ode xdgbasedir
 	@${RM} -r ${WRKSRC}/src/${d}
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "s|find_package(Lua|& ${LUA_VER} REQUIRED EXACT|" \
 		-e "s|/usr/share/fonts/truetype/arphic/bkai00mp.ttf|${ASIAN_FONT_PATH}|" \
 		-e "s|DEFAULT_ASIAN_TTF_FILE|ASIAN_TTF_FILE|" \
 		${WRKSRC}/src/CMakeLists.txt
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
 .include <bsd.port.mk>
diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index b989d89872a5..8f1b25abbb9d 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -1,75 +1,75 @@
 PORTNAME=	xonotic
 PORTVERSION=	0.8.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://nl.dl.xonotic.org/ \
 		http://mirror.bitmissile.com/xonotic/releases/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Fast-paced, chaotic, and intense multiplayer first person shooter
 WWW=		https://www.xonotic.org/
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpng.so:graphics/png \
 		libd0_blind_id.so:security/d0_blind_id \
 		libd0_rijndael.so:security/d0_blind_id \
 		libode.so:devel/ode
 
 USES=		compiler:features gmake jpeg localbase shebangfix zip:infozip
 SHEBANG_FILES=	server/rcon.pl server/rcon2irc/rcon2irc.pl
 WRKSRC=		${WRKDIR}/Xonotic
 BUILD_WRKSRC=	${WRKSRC}/source/darkplaces
 MAKEFILE=	makefile
 MAKE_ARGS=	DP_FS_BASEDIR="${DATADIR}" \
 		DP_PRELOAD_DEPENDENCIES=yes \
 		STRIP="${STRIP_CMD}"
 MAKE_JOBS_UNSAFE=yes
 ALL_TARGET=	# empty
 
 PORTDATA=	*
 
 OPTIONS_MULTI=		COMPONENTS
 OPTIONS_MULTI_COMPONENTS=CLIENT DEDICATED
 OPTIONS_DEFAULT=	CLIENT DEDICATED
 OPTIONS_SUB=		yes
 
 CLIENT_DESC=		Build client
 CLIENT_LIB_DEPENDS=	libtheora.so:multimedia/libtheora \
 			libvorbis.so:audio/libvorbis \
 			libvorbisenc.so:audio/libvorbis \
 			libvorbisfile.so:audio/libvorbis \
 			libogg.so:audio/libogg
 CLIENT_USES=		sdl xorg
 CLIENT_USE=		SDL=sdl2 XORG=x11
 CLIENT_ALL_TARGET=	sdl-release
 
 DEDICATED_DESC=		Build dedicated server
 DEDICATED_ALL_TARGET=	sv-release
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \
 		${BUILD_WRKSRC}/makefile ${BUILD_WRKSRC}/makefile.inc
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/data
 	${INSTALL_DATA} ${WRKSRC}/data/*.pk3 ${STAGEDIR}${DATADIR}/data/
 	${INSTALL_DATA} ${WRKSRC}/key_0.d0pk ${STAGEDIR}${DATADIR}/
 
 do-install-CLIENT-on:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-sdl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/misc/logos/xonotic.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/
 	${INSTALL_DATA} ${WRKSRC}/misc/logos/xonotic_icon.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/xonotic.svg
 .for s in 16 22 24 32 48 64 128 256 512
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/
 	${INSTALL_DATA} ${WRKSRC}/misc/logos/icons_png/xonotic_${s}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/xonotic.png
 .endfor
 
 do-install-DEDICATED-on:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-dedicated ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-dedicated
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "server" ${STAGEDIR}${DATADIR}/
 # Fixup lost +x permissions on scripts after COPYTREE_SHARE
 	${FIND} ${STAGEDIR}${DATADIR}/server -type f -name *.sh -o -name rcon*.pl | \
 		${XARGS} ${CHMOD} +x
 
 .include <bsd.port.mk>
diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile
index 3cd4985b3067..b5110bb9d19f 100644
--- a/misc/dartsim/Makefile
+++ b/misc/dartsim/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	dartsim
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.12.2
-PORTREVISION=	2
+PORTREVISION=	3
 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
 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 \
 		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 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.mk>
diff --git a/misc/ompl/Makefile b/misc/ompl/Makefile
index 49158e2671b2..16e7b9570cb5 100644
--- a/misc/ompl/Makefile
+++ b/misc/ompl/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	ompl
 DISTVERSION=	1.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc comms
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Open Motion Planning Library
 WWW=		https://ompl.kavrakilab.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 USES=		cmake compiler:c++11-lang eigen:3 pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	OMPL_REGISTRATION OMPL_BUILD_TESTS OMPL_BUILD_DEMOS OMPL_VERSIONED_INSTALL
 
 OPTIONS_DEFINE=		FLANN MORSE OPENDE SPOT TRIANGLE PLANNERARENA
 OPTIONS_DEFAULT=	FLANN MORSE OPENDE TRIANGLE
 OPTIONS_SUB=		yes
 
 FLANN_DESC=		Use FLANN for nearest neighbor queries
 FLANN_LIB_DEPENDS=	libflann.so:math/flann
 
 MORSE_DESC=		Include a plugin for the MORSE Robot Simulation engine
 MORSE_BUILD_DEPENDS=	morse-robotics>0:misc/morse
 MORSE_RUN_DEPENDS=	morse-robotics>0:misc/morse
 
 OPENDE_DESC=		Use Open Dynamics Engine for kinodynamic planning
 OPENDE_LIB_DEPENDS=	libode.so:devel/ode
 
 SPOT_DESC=		Use 'Spot' for creating finite automata from LTL formulae
 SPOT_USES=		compiler:c++14-lang
 SPOT_LIB_DEPENDS=	libspot.so:math/spot
 
 TRIANGLE_DESC=		Create triangular decompositions of 2D polygons
 TRIANGLE_LIB_DEPENDS=	libtriangle.so:math/triangle
 
 PLANNERARENA_DESC=	Install plannerarena (depends on R)
 PLANNERARENA_BUILD_DEPENDS=	Rscript:math/R
 PLANNERARENA_RUN_DEPENDS=	Rscript:math/R
 
 .for o in ${OPTIONS_DEFINE:NPLANNERARENA}
 post-patch-${o}-off:
 	@${REINPLACE_CMD} 's|find_package(${o}|#&|i' ${WRKSRC}/CMakeLists.txt
 .endfor
 
 post-patch-PLANNERARENA-off:
 	@${REINPLACE_CMD} 's|find_program(R_EXEC|#&|' ${WRKSRC}/CMakeLists.txt
 
 post-configure:
 	@${REINPLACE_CMD} 's|/usr/bin/morse|${LOCALBASE}/bin/morse|' ${BUILD_WRKSRC}/CMakeCache.txt
 
 .include <bsd.port.mk>