diff --git a/games/exult-devel/Makefile b/games/exult-devel/Makefile
index b778e32a2b7d..340a921bde5a 100644
--- a/games/exult-devel/Makefile
+++ b/games/exult-devel/Makefile
@@ -1,14 +1,15 @@
 DISTVERSIONPREFIX=	snapshot-v
-DISTVERSION=	1.9.0.20231225
-PORTREVISION=	0 # Do not remove PORTREVISION or it will be set to master
+DISTVERSION=	1.9.0.20240105
+PORTREVISION=	0 # Always set PORTREVISION explicitly as otherwise it is inherited from games/exult
 PKGNAMESUFFIX=	-devel
 
 CONFLICTS_INSTALL=	exult
 
-STUDIO_LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz \
+STUDIO_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+			libharfbuzz.so:print/harfbuzz \
 			libicuuc.so:devel/icu
 
 MASTERDIR=	${.CURDIR}/../exult
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
 .include "${MASTERDIR}/Makefile"
diff --git a/games/exult-devel/distinfo b/games/exult-devel/distinfo
index 3f632eac88ae..14c620d2125f 100644
--- a/games/exult-devel/distinfo
+++ b/games/exult-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1703595583
-SHA256 (exult-exult-snapshot-v1.9.0.20231225_GH0.tar.gz) = dfad790eb57a57a2ec32c610406ed908924570b9a74adc1b8c60b2fca99865e1
-SIZE (exult-exult-snapshot-v1.9.0.20231225_GH0.tar.gz) = 19317343
+TIMESTAMP = 1704466061
+SHA256 (exult-exult-snapshot-v1.9.0.20240105_GH0.tar.gz) = be24219fe68cb8aaf90b6ba96d5508daeb882cf0cbca12bcc66cb1d3d0f1464a
+SIZE (exult-exult-snapshot-v1.9.0.20240105_GH0.tar.gz) = 19339495
diff --git a/games/exult/Makefile b/games/exult/Makefile
index de14ff2865ce..52d9425d344a 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -1,90 +1,90 @@
 PORTNAME=	exult
 DISTVERSION?=	1.8
 PORTREVISION?=	5
 PORTEPOCH=	1
 CATEGORIES=	games
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Engine for Ultima VII (BG, FOV, SI, SS)
 WWW=		http://exult.info
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libogg.so:audio/libogg \
 		libpng16.so:graphics/png \
 		libvorbis.so:audio/libvorbis
 
 USES=		autoreconf compiler:c++17-lang gmake libtool localbase \
 		pkgconfig sdl xorg
 USE_GNOME=	cairo gdkpixbuf2
 USE_SDL=	sdl2
 USE_XORG=	x11 xext
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static \
 		--enable-shared \
 		--with-icondir=${PREFIX}/share/pixmaps
 
 CONFLICTS_INSTALL=	exult-devel
 SUB_FILES=		pkg-message
 PLIST?=			${.CURDIR}/pkg-plist
 
 .if !defined(MASTERDIR)
 MASTER_SITES=	http://prdownloads.sourceforge.net/exult/
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-version.cc \
 		${PATCHDIR}/extra-patch-configure.ac
 .else
 USE_GITHUB=	yes
 .endif
 
 OPTIONS_DEFINE=		ALSA DEBUG DOCS FLUIDSYNTH GIMP STUDIO
 OPTIONS_DEFAULT=	STUDIO
 OPTIONS_SUB=		yes
 
 GIMP_DESC=	GIMP plugin support
 STUDIO_DESC=	Install Exult Studio
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
 
 DEBUG_CONFIGURE_ON=	--with-debug=full \
 			--with-optimization=none
 DEBUG_CONFIGURE_OFF=	--with-debug=no
 
 FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CONFIGURE_ENABLE=	fluidsynth
 
 GIMP_LIB_DEPENDS=	libbabl-0.1.so:x11/babl \
 			libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2 \
 			libgegl-0.4.so:graphics/gegl \
 			libgegl-npd-0.4.so:graphics/gegl \
 			libgimp-2.0.so:graphics/gimp-app \
 			libharfbuzz.so:print/harfbuzz \
 			libjson-glib-1.0.so:devel/json-glib
 GIMP_USES=		gnome
 GIMP_USE=		GNOME=gtk20,pango
 
 GIMP_CONFIGURE_ENABLE=	gimp-plugin
 
 STUDIO_LIB_DEPENDS?=		libharfbuzz.so:print/harfbuzz
 STUDIO_USES=			gnome
 STUDIO_USE=			GNOME=gtk30
 STUDIO_CONFIGURE_ENABLE=	exult-studio exult-studio-support
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in FAQ NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.options.mk>
 
 # Silence cast warnings from GTK callbacks in clang >=16
 # https://github.com/exult/exult/issues/416
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+.if !defined(PKGNAMESUFFIX) && ( ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )))
 CFLAGS+=	-Wno-cast-function-type-strict
 .endif
 
 .include <bsd.port.mk>