diff --git a/games/tome4/Makefile b/games/tome4/Makefile
index fef0c7761f29..1af83ef68259 100644
--- a/games/tome4/Makefile
+++ b/games/tome4/Makefile
@@ -1,49 +1,63 @@
 PORTNAME=	tome4
 DISTVERSION?=	1.7.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	https://te4.org/dl/t-engine/ \
 		SF/lifanov-ports-distfiles/${PORTNAME}/:icons
 DISTFILES=	t-engine4-src-${DISTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}.png:icons
 EXTRACT_ONLY=	t-engine4-src-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Epic tactical turn-based roguelike adventure
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	premake4:devel/premake4
 LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis \
 		libpng.so:graphics/png
 
-USES=		compiler:c++11-lang gl gmake openal:al sdl tar:bzip2 xorg
+USES=		gl gmake openal:al sdl tar:bzip2 xorg
 USE_SDL=	image2 sdl2 ttf2
 USE_GL=		gl glu
 SUB_FILES=	tome4
 
 MAKE_JOBS_UNSAFE=	yes
 
 DESKTOP_ENTRIES="ToME 4" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;RolePlaying;" ""
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 WRKSRC=		${WRKDIR}/t-engine4-src-${DISTVERSION}
 MAKE_ARGS+=	config=release verbose=yes ARCH="" CC=${CC} CXX=${CXX}
 LDFLAGS_i386=	-Wl,-znotext
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == powerpc
+USES+=		compiler:gcc-c++11-lib
+.else
+USES+=		compiler:c++11-lang
+.endif
+
 pre-build:
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/premake4.lua
+.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*} || ${ARCH} == riscv64
 	(cd ${WRKSRC} && premake4 --lua=default gmake)
+.else
+	(cd ${WRKSRC} && premake4 gmake)
+	@${ECHO} '.NOTPARALLEL:' >> ${WRKSRC}/build/buildvm.make
+	@${ECHO} '.NOTPARALLEL:' >> ${WRKSRC}/build/luajit2.make
+.endif
 	@${REINPLACE_CMD} 's|-lpthread|-pthread|' ${WRKSRC}/build/TEngine.make
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/t-engine ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/tome4 ${STAGEDIR}${PREFIX}/bin
 	(cd ${WRKSRC}; ${COPYTREE_SHARE} "bootstrap game" ${STAGEDIR}${DATADIR})
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/games/tome4/pkg-plist b/games/tome4/pkg-plist
index 1f2d8454edfe..be11a4b451f7 100644
--- a/games/tome4/pkg-plist
+++ b/games/tome4/pkg-plist
@@ -1,216 +1,216 @@
 @(,,0755) bin/tome4
 share/pixmaps/tome4.png
 %%DATADIR%%/bootstrap/boot.lua
 %%DATADIR%%/game/addons/tome-addon-dev.teaa
 %%DATADIR%%/game/addons/tome-items-vault.teaa
 %%DATADIR%%/game/addons/tome-possessors.teaa
 %%DATADIR%%/game/addons/tome-remote-designer.teaa
 %%DATADIR%%/game/engines/te4-%%PORTVERSION%%.teae
 %%DATADIR%%/game/loader/init.lua
 %%DATADIR%%/game/loader/pre-init.lua
 %%DATADIR%%/game/modules/boot-te4-%%PORTVERSION%%.team
 %%DATADIR%%/game/modules/example_realtime/class/Actor.lua
 %%DATADIR%%/game/modules/example_realtime/class/Game.lua
 %%DATADIR%%/game/modules/example_realtime/class/Grid.lua
 %%DATADIR%%/game/modules/example_realtime/class/interface/Combat.lua
 %%DATADIR%%/game/modules/example_realtime/class/NPC.lua
 %%DATADIR%%/game/modules/example_realtime/class/Player.lua
 %%DATADIR%%/game/modules/example_realtime/data/birth/descriptors.lua
 %%DATADIR%%/game/modules/example_realtime/data/damage_types.lua
 %%DATADIR%%/game/modules/example_realtime/data/general/grids/basic.lua
 %%DATADIR%%/game/modules/example_realtime/data/general/npcs/kobold.lua
 %%DATADIR%%/game/modules/example_realtime/data/gfx/particles/acid.lua
-%%DATADIR%%/game/modules/example_realtime/data/locales/ja_JP.lua                                     
-%%DATADIR%%/game/modules/example_realtime/data/locales/ko_KR.lua                                     
-%%DATADIR%%/game/modules/example_realtime/data/locales/zh_hans.lua                                   
+%%DATADIR%%/game/modules/example_realtime/data/locales/ja_JP.lua
+%%DATADIR%%/game/modules/example_realtime/data/locales/ko_KR.lua
+%%DATADIR%%/game/modules/example_realtime/data/locales/zh_hans.lua
 %%DATADIR%%/game/modules/example_realtime/data/locales/zh_hant.lua
 %%DATADIR%%/game/modules/example_realtime/data/rooms/pilar.lua
 %%DATADIR%%/game/modules/example_realtime/data/rooms/simple.lua
 %%DATADIR%%/game/modules/example_realtime/data/talents.lua
 %%DATADIR%%/game/modules/example_realtime/data/timed_effects.lua
 %%DATADIR%%/game/modules/example_realtime/data/zones/dungeon/grids.lua
 %%DATADIR%%/game/modules/example_realtime/data/zones/dungeon/npcs.lua
 %%DATADIR%%/game/modules/example_realtime/data/zones/dungeon/objects.lua
 %%DATADIR%%/game/modules/example_realtime/data/zones/dungeon/traps.lua
 %%DATADIR%%/game/modules/example_realtime/data/zones/dungeon/zone.lua
 %%DATADIR%%/game/modules/example_realtime/dialogs/DeathDialog.lua
 %%DATADIR%%/game/modules/example_realtime/dialogs/Quit.lua
 %%DATADIR%%/game/modules/example_realtime/init.lua
 %%DATADIR%%/game/modules/example_realtime/load.lua
 %%DATADIR%%/game/modules/example/class/Actor.lua
 %%DATADIR%%/game/modules/example/class/Game.lua
 %%DATADIR%%/game/modules/example/class/Grid.lua
 %%DATADIR%%/game/modules/example/class/interface/Combat.lua
 %%DATADIR%%/game/modules/example/class/NPC.lua
 %%DATADIR%%/game/modules/example/class/Player.lua
 %%DATADIR%%/game/modules/example/data/birth/descriptors.lua
 %%DATADIR%%/game/modules/example/data/damage_types.lua
 %%DATADIR%%/game/modules/example/data/general/grids/basic.lua
 %%DATADIR%%/game/modules/example/data/general/npcs/kobold.lua
 %%DATADIR%%/game/modules/example/data/gfx/particles/acid.lua
-%%DATADIR%%/game/modules/example/data/locales/ja_JP.lua      
-%%DATADIR%%/game/modules/example/data/locales/ko_KR.lua     
-%%DATADIR%%/game/modules/example/data/locales/zh_hans.lua      
-%%DATADIR%%/game/modules/example/data/locales/zh_hant.lua                                            
+%%DATADIR%%/game/modules/example/data/locales/ja_JP.lua
+%%DATADIR%%/game/modules/example/data/locales/ko_KR.lua
+%%DATADIR%%/game/modules/example/data/locales/zh_hans.lua
+%%DATADIR%%/game/modules/example/data/locales/zh_hant.lua
 %%DATADIR%%/game/modules/example/data/rooms/pilar.lua
 %%DATADIR%%/game/modules/example/data/rooms/simple.lua
 %%DATADIR%%/game/modules/example/data/talents.lua
 %%DATADIR%%/game/modules/example/data/timed_effects.lua
 %%DATADIR%%/game/modules/example/data/zones/dungeon/grids.lua
 %%DATADIR%%/game/modules/example/data/zones/dungeon/npcs.lua
 %%DATADIR%%/game/modules/example/data/zones/dungeon/objects.lua
 %%DATADIR%%/game/modules/example/data/zones/dungeon/traps.lua
 %%DATADIR%%/game/modules/example/data/zones/dungeon/zone.lua
 %%DATADIR%%/game/modules/example/dialogs/DeathDialog.lua
 %%DATADIR%%/game/modules/example/dialogs/Quit.lua
 %%DATADIR%%/game/modules/example/init.lua
 %%DATADIR%%/game/modules/example/load.lua
 %%DATADIR%%/game/modules/tome-%%PORTVERSION%%-gfx.team
 %%DATADIR%%/game/modules/tome-%%PORTVERSION%%-music.team
 %%DATADIR%%/game/modules/tome-%%PORTVERSION%%.team
 %%DATADIR%%/game/profile-thread/Client.lua
 %%DATADIR%%/game/profile-thread/init.lua
 %%DATADIR%%/game/profile-thread/UserChat.lua
 %%DATADIR%%/game/thirdparty/algorithms/binarysearch.lua
 %%DATADIR%%/game/thirdparty/algorithms/data/hashmap.lua
 %%DATADIR%%/game/thirdparty/algorithms/data/hashset.lua
 %%DATADIR%%/game/thirdparty/algorithms/data/list.lua
 %%DATADIR%%/game/thirdparty/algorithms/data/maxpq.lua
 %%DATADIR%%/game/thirdparty/algorithms/data/minpq.lua
 %%DATADIR%%/game/thirdparty/algorithms/data/queue.lua
 %%DATADIR%%/game/thirdparty/algorithms/data/redblacktree.lua
 %%DATADIR%%/game/thirdparty/algorithms/data/stack.lua
 %%DATADIR%%/game/thirdparty/algorithms/LICENSE
 %%DATADIR%%/game/thirdparty/algorithms/shuffling.lua
 %%DATADIR%%/game/thirdparty/algorithms/sorting/heapsort.lua
 %%DATADIR%%/game/thirdparty/algorithms/sorting/insertion.lua
 %%DATADIR%%/game/thirdparty/algorithms/sorting/mergesort.lua
 %%DATADIR%%/game/thirdparty/algorithms/sorting/quicksort.lua
 %%DATADIR%%/game/thirdparty/algorithms/sorting/quicksort3ways.lua
 %%DATADIR%%/game/thirdparty/algorithms/sorting/selection.lua
 %%DATADIR%%/game/thirdparty/algorithms/sorting/shellsort.lua
 %%DATADIR%%/game/thirdparty/algorithms/tries/rwaytries.lua
 %%DATADIR%%/game/thirdparty/algorithms/unionfind.lua
 %%DATADIR%%/game/thirdparty/binpack.lua
 %%DATADIR%%/game/thirdparty/cef3/cef.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/am.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/ar.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/bg.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/bn.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/ca.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/cs.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/da.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/de.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/el.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/en-GB.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/en-US.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/es-419.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/es.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/et.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/fa.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/fi.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/fil.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/fr.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/gu.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/he.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/hi.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/hr.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/hu.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/id.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/it.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/ja.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/kn.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/ko.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/lt.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/lv.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/ml.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/mr.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/ms.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/nb.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/nl.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/pl.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/pt-BR.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/pt-PT.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/ro.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/ru.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/sk.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/sl.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/sr.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/sv.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/sw.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/ta.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/te.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/th.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/tr.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/uk.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/vi.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/zh-CN.pak
 %%DATADIR%%/game/thirdparty/cef3/locales/zh-TW.pak
 %%DATADIR%%/game/thirdparty/config.lua
 %%DATADIR%%/game/thirdparty/jit/bc.lua
 %%DATADIR%%/game/thirdparty/jit/bcname.lua
 %%DATADIR%%/game/thirdparty/jit/bcsave.lua
 %%DATADIR%%/game/thirdparty/jit/dis_arm.lua
 %%DATADIR%%/game/thirdparty/jit/dis_mips.lua
 %%DATADIR%%/game/thirdparty/jit/dis_mipsel.lua
 %%DATADIR%%/game/thirdparty/jit/dis_ppc.lua
 %%DATADIR%%/game/thirdparty/jit/dis_x64.lua
 %%DATADIR%%/game/thirdparty/jit/dis_x86.lua
 %%DATADIR%%/game/thirdparty/jit/dump.lua
 %%DATADIR%%/game/thirdparty/jit/v.lua
 %%DATADIR%%/game/thirdparty/jit/vmdef.lua
 %%DATADIR%%/game/thirdparty/Json2.lua
 %%DATADIR%%/game/thirdparty/licenses/CEF3.txt
 %%DATADIR%%/game/thirdparty/licenses/expat.txt
 %%DATADIR%%/game/thirdparty/licenses/Font-Salsa-OFL.txt
 %%DATADIR%%/game/thirdparty/licenses/freetype.txt
 %%DATADIR%%/game/thirdparty/licenses/libogg.txt
 %%DATADIR%%/game/thirdparty/licenses/libpng.txt
 %%DATADIR%%/game/thirdparty/licenses/libvorbis.txt
 %%DATADIR%%/game/thirdparty/licenses/lpeg.txt
 %%DATADIR%%/game/thirdparty/licenses/lua-algorithms.txt
 %%DATADIR%%/game/thirdparty/licenses/luabitop.txt
 %%DATADIR%%/game/thirdparty/licenses/LuaJIT.txt
 %%DATADIR%%/game/thirdparty/licenses/luamd5.txt
 %%DATADIR%%/game/thirdparty/licenses/luaprofiler.txt
 %%DATADIR%%/game/thirdparty/licenses/luasocket.txt
 %%DATADIR%%/game/thirdparty/licenses/luazlib.txt
 %%DATADIR%%/game/thirdparty/licenses/lxp.txt
 %%DATADIR%%/game/thirdparty/licenses/physfs.txt
 %%DATADIR%%/game/thirdparty/licenses/SDL_image.txt
 %%DATADIR%%/game/thirdparty/licenses/SDL_ttf.txt
 %%DATADIR%%/game/thirdparty/licenses/SDL.txt
 %%DATADIR%%/game/thirdparty/licenses/tcod.txt
 %%DATADIR%%/game/thirdparty/licenses/tween.txt
 %%DATADIR%%/game/thirdparty/licenses/utf8proc.txt
 %%DATADIR%%/game/thirdparty/licenses/zlib.txt
 %%DATADIR%%/game/thirdparty/lpeg/re.lua
 %%DATADIR%%/game/thirdparty/ltn12.lua
 %%DATADIR%%/game/thirdparty/lxp/lom.lua
 %%DATADIR%%/game/thirdparty/md5.lua
 %%DATADIR%%/game/thirdparty/mime.lua
 %%DATADIR%%/game/thirdparty/moonscript.lua
 %%DATADIR%%/game/thirdparty/moonscript/compile.lua
 %%DATADIR%%/game/thirdparty/moonscript/compile/format.lua
 %%DATADIR%%/game/thirdparty/moonscript/compile/line.lua
 %%DATADIR%%/game/thirdparty/moonscript/compile/types.lua
 %%DATADIR%%/game/thirdparty/moonscript/compile/value.lua
 %%DATADIR%%/game/thirdparty/moonscript/data.lua
 %%DATADIR%%/game/thirdparty/moonscript/dump.lua
 %%DATADIR%%/game/thirdparty/moonscript/errors.lua
 %%DATADIR%%/game/thirdparty/moonscript/init.lua
 %%DATADIR%%/game/thirdparty/moonscript/parse.lua
 %%DATADIR%%/game/thirdparty/moonscript/util.lua
 %%DATADIR%%/game/thirdparty/moonscript/version.lua
 %%DATADIR%%/game/thirdparty/remdebug/engine.lua
 %%DATADIR%%/game/thirdparty/sha1.lua
 %%DATADIR%%/game/thirdparty/slt2.lua
 %%DATADIR%%/game/thirdparty/socket.lua
 %%DATADIR%%/game/thirdparty/socket/ftp.lua
 %%DATADIR%%/game/thirdparty/socket/http.lua
 %%DATADIR%%/game/thirdparty/socket/smtp.lua
 %%DATADIR%%/game/thirdparty/socket/tp.lua
 %%DATADIR%%/game/thirdparty/socket/url.lua
 %%DATADIR%%/game/thirdparty/tween.lua
 %%DATADIR%%/game/thirdparty/vector.lua
 %%DATADIR%%/t-engine