diff --git a/devel/godot/Makefile b/devel/godot/Makefile
index 599f12c016d7..4a3afc5a0a63 100644
--- a/devel/godot/Makefile
+++ b/devel/godot/Makefile
@@ -1,114 +1,114 @@
 PORTNAME=	godot
-DISTVERSION=	4.1.2
+DISTVERSION=	4.2.1
 DISTVERSIONSUFFIX=	-stable
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	devel games
 
 MAINTAINER=	FreeBSD@Shaneware.biz
 COMMENT?=	Game runtime engine
 WWW=		https://godotengine.org/
 
 LICENSE=		MIT CC-BY-3.0
 LICENSE_COMB=		multi
-LICENSE_FILE_CC-BY-3.0=	${WRKSRC}/LOGO_LICENSE.md
+LICENSE_FILE_CC-BY-3.0=	${WRKSRC}/LOGO_LICENSE.txt
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	yasm:devel/yasm
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgraphite2.so:graphics/graphite2 \
 		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libpcre2-8.so:devel/pcre2 \
 		libpng.so:graphics/png \
 		libvpx.so:multimedia/libvpx
 RUN_DEPENDS=	xdg-user-dir:devel/xdg-user-dirs \
 		xdg-open:devel/xdg-utils \
 		xmessage:x11/xmessage
 
 USES=		compiler:c++17-lang cpe gl pkgconfig scons xorg
 USE_XORG=	x11 xcursor xext xi xinerama xrandr xrender
 USE_GL=		gl glew glu
 
 CPE_VENDOR=	godotengine
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	godotengine
 
 MAKE_ARGS+=		platform=linuxbsd builtin_freetype=False \
 			builtin_graphite=False builtin_harfbuzz=False \
 			builtin_libpng=False builtin_libvpx=False \
 			builtin_pcre2=False builtin_zlib=False verbose=True
 MAKE_ARGS+=		${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
 MAKE_ARGS_clang=	use_llvm=True linker=lld
 CXXFLAGS_i386=		${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
 CXXFLAGS_i386_gcc=	-march=i586
 
 OPTIONS_DEFINE=		EXAMPLES TOOLS UDEV
 OPTIONS_DEFAULT=	ALSA UDEV
 # Moved to devel/godot-tools
 OPTIONS_EXCLUDE?=	EXAMPLES TOOLS
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO
 
 AUDIO_DESC=		Audio support
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_MAKE_ARGS=		alsa=True
 ALSA_MAKE_ARGS_OFF=	alsa=False
-# 4.0 head at 29/3
-EXAMPLES_GH_TUPLE=	godotengine:godot-demo-projects:05c8f822972f:DEMOS
+# 4.2 head at 21/3
+EXAMPLES_GH_TUPLE=	godotengine:godot-demo-projects:98e9176b7310:DEMOS
 EXAMPLES_PORTEXAMPLES=	*
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_MAKE_ARGS=	pulseaudio=True
 PULSEAUDIO_MAKE_ARGS_OFF=	pulseaudio=False
 TOOLS_DESC=		Include development tools (IDE)
 TOOLS_MAKE_ARGS=	target=editor
 TOOLS_MAKE_ARGS_OFF=	target=template_release
 TOOLS_DESKTOP_ENTRIES=	"Godot" "${COMMENT}" "${GODOTFILE}" \
 			"${GODOTFILE}" "Development;IDE;" ""
 TOOLS_PLIST_FILES=	share/pixmaps/${GODOTFILE}.png \
 			share/pixmaps/${GODOTFILE}.svg
 UDEV_DESC=		Libudev support (Joystick)
 UDEV_BUILD_DEPENDS=	${PREFIX}/include/linux/input.h:devel/evdev-proto
 UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd
 UDEV_MAKE_ARGS=		udev=True
 UDEV_MAKE_ARGS_OFF=	udev=False
 
 GODOTFILE=		${PORTNAME}${PKGNAMESUFFIX}
 PLIST_FILES=		bin/${GODOTFILE}
 
 .ifmake makesum
 # Always include optional distfiles
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}" OPTIONS_EXCLUDE=
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc*} || ${ARCH:Mriscv64*}
 MAKE_ARGS+=	module_embree_enabled=no \
 		module_raycast_enabled=no \
 		module_webm_enabled=no
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|custom_build|${OPSYS}_Ports_build|' \
 		${WRKSRC}/methods.py
 
 # The official godot binary name reflects options used to compile
 # We just want a simple name matching the portname
 # This gives us bin/godot for runtime and bin/godot-tools for the IDE
 do-install:
 	@${RM} ${WRKSRC}/bin/*.debugsymbols
 	cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.linuxbsd* \
 		${STAGEDIR}/${PREFIX}/bin/${GODOTFILE}
 
 do-install-EXAMPLES-on:
 	(cd ${WRKSRC_DEMOS} && ${COPYTREE_SHARE} "${PORTEXAMPLES}" \
 		${STAGEDIR}${EXAMPLESDIR})
 
 do-install-TOOLS-on:
 	${INSTALL_DATA} ${WRKSRC}/icon.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.png
 	${INSTALL_DATA} ${WRKSRC}/icon.svg \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.svg
 
 .include <bsd.port.mk>
diff --git a/devel/godot/distinfo b/devel/godot/distinfo
index d15d980851cc..fc9c797cca59 100644
--- a/devel/godot/distinfo
+++ b/devel/godot/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1699255184
-SHA256 (godotengine-godot-4.1.2-stable_GH0.tar.gz) = 790ff4f364f8421597a970f16041e86007f4c522bd427b3d7d14679026e58d40
-SIZE (godotengine-godot-4.1.2-stable_GH0.tar.gz) = 41861495
-SHA256 (godotengine-godot-demo-projects-05c8f822972f_GH0.tar.gz) = 839c3cd8a1da0e71cfd6a2e9f00ab9ae5e7cef8cc800aa10b1115859c545c83a
-SIZE (godotengine-godot-demo-projects-05c8f822972f_GH0.tar.gz) = 199999702
+TIMESTAMP = 1710997182
+SHA256 (godotengine-godot-4.2.1-stable_GH0.tar.gz) = 716cfd489dbfc91b5e04cc0df8be415ba6eec74c5fb471840275d887cb53ff95
+SIZE (godotengine-godot-4.2.1-stable_GH0.tar.gz) = 39148431
+SHA256 (godotengine-godot-demo-projects-98e9176b7310_GH0.tar.gz) = da3f9bc8c172586a79dd084f24da8b85da16fc9370b2c9b2e2eec5e0de861195
+SIZE (godotengine-godot-demo-projects-98e9176b7310_GH0.tar.gz) = 214863392