diff --git a/games/jfsw/Makefile b/games/jfsw/Makefile
index bb1546498001..8195591b5233 100644
--- a/games/jfsw/Makefile
+++ b/games/jfsw/Makefile
@@ -1,61 +1,60 @@
 PORTNAME=	jfsw
-PORTVERSION=	20211225
-PORTREVISION=	2
+PORTVERSION=	20240303
 CATEGORIES=	games
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Jonathon Fowler's Shadow Warrior Port
 WWW=		https://www.jonof.id.au/jfsw
 
 # Must be distributed only through the Internet and free of charge
 LICENSE=	GPLv2 BuildLic
 LICENSE_COMB=	multi
 LICENSE_NAME_BuildLic=	Build source code license
 LICENSE_FILE_BuildLic=	${WRKSRC}/jfbuild/buildlic.txt
 LICENSE_PERMS_BuildLic=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis \
 		libfluidsynth.so:audio/fluidsynth
 
 USES=		alias compiler:c++11-lang dos2unix gl gmake gnome \
 		perl5 pkgconfig:build sdl
 USE_GL=		gl
 USE_GNOME=	gtk20
 USE_SDL=	mixer2 sdl2
 USE_PERL5=	build
 
 DOS2UNIX_REGEX=	.*(\.(c|h)|Makefile)(\.deps)?
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jonof
 GH_PROJECT=	jfbuild:build jfaudiolib:audio jfmact:mact
 # See GH listing to get current (tested) submodule hashes:
 # https://github.com/jonof/jfsw
-GH_TAGNAME=	426fc18 \
-		ab02edc:build \
-		0e94055:audio \
-		14340ff:mact
+GH_TAGNAME=	${PORTVERSION} \
+		5b7e611:audio \
+		35e0670:build \
+		1f0746a:mact
 GH_SUBDIR=	jfbuild:build jfaudiolib:audio jfmact:mact
 
 MAKE_ENV+=	DATADIR="${DATADIR}"
 
 SUB_FILES=	pkg-message
 
 PORTDOCS=	README.md releasenotes.html
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} 's|/usr/X11R6|${LOCALBASE}|' \
 		${WRKSRC}/jfbuild/Makefile
 	@${REINPLACE_CMD} 's|/usr|${LOCALBASE}|' \
 		${WRKSRC}/jfaudiolib/src/driver_fluidsynth.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sw ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/build ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-build
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/games/jfsw/distinfo b/games/jfsw/distinfo
index 43000a798d08..6299a687995f 100644
--- a/games/jfsw/distinfo
+++ b/games/jfsw/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1641939106
-SHA256 (jonof-jfsw-20211225-426fc18_GH0.tar.gz) = 35acab2473256e40eeed7da398ed7cf790c05ea9c48013eaa6f5d3f0663ec53a
-SIZE (jonof-jfsw-20211225-426fc18_GH0.tar.gz) = 1058411
-SHA256 (jonof-jfbuild-ab02edc_GH0.tar.gz) = 6429e43443b7e2f2a3df6c47f1e915d4595d56321aafa32f59dbac4126866aac
-SIZE (jonof-jfbuild-ab02edc_GH0.tar.gz) = 1540887
-SHA256 (jonof-jfaudiolib-0e94055_GH0.tar.gz) = 2b53dd0986046fae38f50c05fb16026a050917afc8bac2debce5f0acc54f0f8a
-SIZE (jonof-jfaudiolib-0e94055_GH0.tar.gz) = 1519239
-SHA256 (jonof-jfmact-14340ff_GH0.tar.gz) = e9c8e30f2f5851b308819f651c881183a1eaf9a4067181e281dce56b660bc57f
-SIZE (jonof-jfmact-14340ff_GH0.tar.gz) = 25556
+TIMESTAMP = 1709759939
+SHA256 (jonof-jfsw-20240303_GH0.tar.gz) = ece1bdcd5b70f65443721b98b848ec191f0739e19bdfa0980824215aef4c52d8
+SIZE (jonof-jfsw-20240303_GH0.tar.gz) = 1053044
+SHA256 (jonof-jfbuild-35e0670_GH0.tar.gz) = 91ca4bb5506a9114c0c23bfc198fd1c5e977c55fa0ecd2bee1e2b5930e008df0
+SIZE (jonof-jfbuild-35e0670_GH0.tar.gz) = 1535430
+SHA256 (jonof-jfaudiolib-5b7e611_GH0.tar.gz) = b818dc6332783a2a764c89668fda261df87fb6da808b239618ff391a0d674864
+SIZE (jonof-jfaudiolib-5b7e611_GH0.tar.gz) = 1565704
+SHA256 (jonof-jfmact-1f0746a_GH0.tar.gz) = d9c3e5b96612a42cab02127c24e198dc474e4373606548214d63c809e5c16fdf
+SIZE (jonof-jfmact-1f0746a_GH0.tar.gz) = 25416
diff --git a/games/jfsw/files/patch-jfaudiolib-src-midi.c b/games/jfsw/files/patch-jfaudiolib-src-midi.c
new file mode 100644
index 000000000000..2b67ec245af0
--- /dev/null
+++ b/games/jfsw/files/patch-jfaudiolib-src-midi.c
@@ -0,0 +1,12 @@
+--- jfaudiolib/src/midi.c.orig	2024-03-06 07:31:42 UTC
++++ jfaudiolib/src/midi.c
+@@ -35,7 +35,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ #ifdef _WIN32
+ # include <malloc.h>
+ #else
++#if !defined(__FreeBSD__)
+ # include <alloca.h>
++#endif
+ #endif
+ #include "sndcards.h"
+ #include "drivers.h"
diff --git a/games/jfsw/files/patch-jfaudiolib_Makefile.shared b/games/jfsw/files/patch-jfaudiolib_Makefile.shared
index 48cb6b11cf2f..384bdbb0dabd 100644
--- a/games/jfsw/files/patch-jfaudiolib_Makefile.shared
+++ b/games/jfsw/files/patch-jfaudiolib_Makefile.shared
@@ -1,17 +1,17 @@
---- jfaudiolib/Makefile.shared.orig	2021-12-25 07:53:32 UTC
+--- jfaudiolib/Makefile.shared.orig	2024-01-26 10:45:42 UTC
 +++ jfaudiolib/Makefile.shared
 @@ -7,8 +7,12 @@ JFAUDIOLIB_LDFLAGS=
  JFAUDIOLIB=libjfaudiolib.a
  JFAUDIOLIB_LDFLAGS=
  
 -SDL2CONFIG?=$(shell which sdl2-config || which false)
 -PKGCONFIG?=$(shell which pkg-config || which false)
 +ifndef SDL2CONFIG
 +SDL2CONFIG!=which sdl2-config || which false
 +endif
 +ifndef PKGCONFIG
 +PKGCONFIG!=which pkg-config || which false
 +endif
  
- machine=$(strip $(shell $(CC) -dumpmachine))
- 
+ TARGETMACHINE?=$(strip $(shell $(CC) -dumpmachine))
+ export TARGETMACHINE
diff --git a/games/jfsw/files/patch-jfbuild_Makefile.shared b/games/jfsw/files/patch-jfbuild_Makefile.shared
index 98f7d6f53b72..3274d4e20bb4 100644
--- a/games/jfsw/files/patch-jfbuild_Makefile.shared
+++ b/games/jfsw/files/patch-jfbuild_Makefile.shared
@@ -1,17 +1,17 @@
---- jfbuild/Makefile.shared.orig	2021-12-09 08:50:13 UTC
+--- jfbuild/Makefile.shared.orig	2024-02-19 08:23:00 UTC
 +++ jfbuild/Makefile.shared
-@@ -3,8 +3,12 @@ EDITORLIB=src/libbuild.a
- ENGINELIB=src/libengine.a
- EDITORLIB=src/libbuild.a
+@@ -3,8 +3,12 @@ EDITORLIB=libbuild.a
+ ENGINELIB=libengine.a
+ EDITORLIB=libbuild.a
  
 -SDL2CONFIG?=$(shell which sdl2-config || which false)
 -PKGCONFIG?=$(shell which pkg-config || which false)
 +ifndef SDL2CONFIG
 +SDL2CONFIG!=which sdl2-config || which false
 +endif
 +ifndef PKGCONFIG
 +PKGCONFIG!=which pkg-config || which false
 +endif
  export SDL2CONFIG PKGCONFIG
  
- # Path to the included libsquish
+ BUILDCFLAGS=