diff --git a/games/stuntrally/Makefile b/games/stuntrally/Makefile
index 798dfe0f214e..c30ef677be33 100644
--- a/games/stuntrally/Makefile
+++ b/games/stuntrally/Makefile
@@ -1,62 +1,61 @@
 PORTNAME=	stuntrally
-PORTVERSION=	2.6.1
-PORTREVISION=	4
+PORTVERSION=	2.6.2
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	3D racing game based on VDrift and OGRE with track editor
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_TUPLE=	stuntrally:tracks:${PORTVERSION}:tracks/data/tracks
 
-USES=		compiler:c++11-lib cmake dos2unix pkgconfig sdl
-USE_CXXSTD=	gnu++11
+USES=		compiler:c++14-lang cmake dos2unix pkgconfig
 DOS2UNIX_FILES=	source/ogre/BaseApp_Create.cpp
 CMAKE_ARGS=	-DSHARE_INSTALL="${DATADIR_REL}" \
 		-DBULLET_ROOT="${LOCALBASE}"
 
 LDFLAGS_i386=	-Wl,-znotext
 
 PORTDOCS=	Readme.txt
 PORTDATA=	*
 
 OPTIONS_DEFINE=	GAME EDITOR MASTER_SERVER DOCS
 OPTIONS_DEFAULT=GAME EDITOR
 OPTIONS_SUB=	yes
 
 GAME_DESC=		Build the game binary
 GAME_CMAKE_BOOL=	BUILD_GAME
 GAME_LIB_DEPENDS=	libOgreMain.so:graphics/ogre3d19 \
 			libBulletDynamics.so:devel/bullet \
 			libMyGUIEngine.so:x11-toolkits/mygui \
 			libogg.so:audio/libogg \
 			libvorbisfile.so:audio/libvorbis \
 			libenet.so:net/enet
 GAME_BUILD_DEPENDS=	${LOCALBASE}/include/MYGUI/MyGUI_OgreTexture.h:x11-toolkits/mygui-ogre
 GAME_USE=		SDL=sdl2
-GAME_USES=		openal
+GAME_USES=		openal sdl
 
 EDITOR_DESC=		Build the track editor
 EDITOR_CMAKE_BOOL=	BUILD_EDITOR
 EDITOR_LIB_DEPENDS=	libOgreMain.so:graphics/ogre3d19 \
 			libBulletDynamics.so:devel/bullet \
 			libMyGUIEngine.so:x11-toolkits/mygui \
 			libogg.so:audio/libogg \
 			libvorbisfile.so:audio/libvorbis
 EDITOR_USE=		SDL=sdl2
+EDITOR_USES=		sdl
 EDITOR_BUILD_DEPENDS=	${LOCALBASE}/include/MYGUI/MyGUI_OgreTexture.h:x11-toolkits/mygui-ogre
 
 MASTER_SERVER_CMAKE_BOOL=	BUILD_MASTER_SERVER
 MASTER_SERVER_DESC=		Build the master server
 MASTER_SERVER_LIB_DEPENDS=	libenet.so:net/enet
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Readme.txt ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/games/stuntrally/distinfo b/games/stuntrally/distinfo
index 914b5fc98d81..3f2f7f68a533 100644
--- a/games/stuntrally/distinfo
+++ b/games/stuntrally/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1555952779
-SHA256 (stuntrally-stuntrally-2.6.1_GH0.tar.gz) = 9bf0507c4235ffaeee019a852124b6cffc311afe3275ae8472eadff4441fb8ff
-SIZE (stuntrally-stuntrally-2.6.1_GH0.tar.gz) = 651581700
-SHA256 (stuntrally-tracks-2.6.1_GH0.tar.gz) = fa83ecf6dcc6e906542f3bd07677ad4369cfe4d12c639837a0f90946d47dd474
-SIZE (stuntrally-tracks-2.6.1_GH0.tar.gz) = 355800929
+TIMESTAMP = 1648667237
+SHA256 (stuntrally-stuntrally-2.6.2_GH0.tar.gz) = a63550d5d13d20dca678c2cd8e30332cd41ca5380d14720c15549e6b0387bd55
+SIZE (stuntrally-stuntrally-2.6.2_GH0.tar.gz) = 651633552
+SHA256 (stuntrally-tracks-2.6.2_GH0.tar.gz) = 4fd587cf6cfe72e78530bb051bd423f9d0d0e38ca258e8254a4fdd6e60db5bcc
+SIZE (stuntrally-tracks-2.6.2_GH0.tar.gz) = 357438076
diff --git a/games/stuntrally/files/patch-source_editor_CApp.h b/games/stuntrally/files/patch-source_editor_CApp.h
deleted file mode 100644
index 529a0d3ea207..000000000000
--- a/games/stuntrally/files/patch-source_editor_CApp.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/editor/CApp.h.orig	2019-11-27 17:44:26 UTC
-+++ source/editor/CApp.h
-@@ -137,7 +137,7 @@ class App : public BaseApp, (public)
- 		float Size,Intens,Pow,Fq,NOf;
- 		int Oct;  EBrShape shape;
- 		float Filter,HSet;
--		char newLine;  Ogre::String name;
-+		signed char newLine;  Ogre::String name;
- 	};
- 
- 	const static int brSetsNum = 87;
diff --git a/games/stuntrally/files/patch-source_vdrift_cartire.cpp b/games/stuntrally/files/patch-source_vdrift_cartire.cpp
deleted file mode 100644
index f9e31db234d9..000000000000
--- a/games/stuntrally/files/patch-source_vdrift_cartire.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/vdrift/cartire.cpp.orig	2019-03-16 14:58:09 UTC
-+++ source/vdrift/cartire.cpp
-@@ -280,7 +280,7 @@ Dbl CARTIRE::Pacejka_Fx (Dbl sigma, Dbl Fz, Dbl fricti
- 
- 	maxforce_output = D;
- 
--	assert(!std::isnan(Fx));
-+	assert(!isnan(Fx));
- 	return Fx;
- }
- 
diff --git a/games/stuntrally/pkg-plist b/games/stuntrally/pkg-plist
index 10d5b81b7691..bc7cbb99e7db 100644
--- a/games/stuntrally/pkg-plist
+++ b/games/stuntrally/pkg-plist
@@ -1,7 +1,7 @@
 %%EDITOR%%bin/sr-editor
 %%MASTER_SERVER%%bin/sr-masterserver
 %%GAME%%bin/stuntrally
 %%EDITOR%%share/applications/sr-editor.desktop
 %%GAME%%share/applications/stuntrally.desktop
 %%EDITOR%%share/icons/hicolor/64x64/apps/sr-editor.png
-%%GAME%%share/icons/hicolor/64x64/apps/stuntrally.png
+%%GAME%%share/icons/hicolor/256x256/apps/stuntrally.png