diff --git a/audio/faudio/Makefile b/audio/faudio/Makefile
index cc7bbd219ca0..f7ad2f150fbe 100644
--- a/audio/faudio/Makefile
+++ b/audio/faudio/Makefile
@@ -1,34 +1,39 @@
 PORTNAME=	FAudio
-DISTVERSION=	25.02
+DISTVERSION=	25.03
 CATEGORIES=	audio
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Accuracy-focused XAudio reimplementation
 WWW=		https://fna-xna.github.io/
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-FLAVORS=	sdl2 sdl3
+FLAVORS=	sdl3 sdl2
+FLAVOR?=	${FLAVORS:[1]}
 sdl2_CONFLICTS_INSTALL=	${PORTNAME}-sdl3
 sdl3_PKGNAMESUFFIX=	-sdl3
 sdl3_CONFLICTS_INSTALL=	${PORTNAME}
 
-USES=		cmake compiler:c11 sdl
-USE_SDL=	${FLAVOR}
+USES=		cmake:testing compiler:c11 sdl
 USE_LDCONFIG=	yes
-CMAKE_${"${FLAVOR:Msdl3}":?ON:OFF}=	BUILD_SDL3
+USE_SDL=	${FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FNA-XNA
 
+CMAKE_${"${FLAVOR:Msdl3}":?ON:OFF}=	BUILD_SDL3
+# Tests will fail to build with the sdl2 flavor. Upstream dropped sdl2
+# support in the utils needed for the tests starting with version 25.03.
+CMAKE_TESTING_ON=	BUILD_TESTS \
+			BUILD_UTILS
+CMAKE_TESTING_TARGET=	# No internal target for running tests. Run via post-test.
+
+TEST_ENV=	SDL_AUDIODRIVER=dummy
+
 PLIST_SUB=	SOVERSION=${DISTVERSION:S,., ,g:[1..2]:ts.}
 
-do-test:
-	@cd ${BUILD_WRKSRC} && \
-		${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
-		-DBUILD_TESTS=ON -DBUILD_UTILS=ON ${CMAKE_SOURCE_PATH} && \
-		${DO_MAKE_BUILD} ${ALL_TARGET}
-	@${SETENVI} SDL_AUDIODRIVER=dummy ${BUILD_WRKSRC}/faudio_tests
+post-test:
+	@${SETENVI} ${WRK_ENV} ${TEST_ENV} ${BUILD_WRKSRC}/faudio_tests
 
 .include <bsd.port.mk>
diff --git a/audio/faudio/distinfo b/audio/faudio/distinfo
index 5dade91429c2..0c35a5804cdd 100644
--- a/audio/faudio/distinfo
+++ b/audio/faudio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739453142
-SHA256 (FNA-XNA-FAudio-25.02_GH0.tar.gz) = eab667d231e5036b0e5c3c6f89fb4ea792284493d46161bc056a88a6dadc2683
-SIZE (FNA-XNA-FAudio-25.02_GH0.tar.gz) = 1127116
+TIMESTAMP = 1742524268
+SHA256 (FNA-XNA-FAudio-25.03_GH0.tar.gz) = 1eeb1d2d6ed038a68e6b0a02614d4c7f859aa0a22c4a64e0bd49c26573823ae8
+SIZE (FNA-XNA-FAudio-25.03_GH0.tar.gz) = 1126597
diff --git a/games/vvvvvv/Makefile b/games/vvvvvv/Makefile
index ff64fe501c4f..5ad3dc782968 100644
--- a/games/vvvvvv/Makefile
+++ b/games/vvvvvv/Makefile
@@ -1,73 +1,73 @@
 PORTNAME=	VVVVVV
 DISTVERSION=	2.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 .if ${FLAVOR:U} == makeandplay
 # The data file may only be distributed if the MAKEANDPLAY define is set.
 # See https://github.com/TerryCavanagh/VVVVVV/blob/master/License%20exceptions.md
 MASTER_SITES=	https://thelettervsixtim.es/makeandplay/data.zip?dummy=/:datafile
 DISTFILES=	VVVVVV-data-${DISTVERSION}.zip:datafile
 EXTRACT_ONLY=	${_DISTFILES:NVVVVVV-data-${DISTVERSION}.zip}
 .endif
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	2D Platformer game
 WWW=		https://thelettervsixtim.es/
 
 LICENSE=	VVVVVV APACHE20 BSD3CLAUSE ZLIB
 LICENSE_COMB=	multi
 LICENSE_NAME_VVVVVV=	VVVVVV Source Code License v1.0
 LICENSE_FILE_VVVVVV=	${WRKSRC}/../LICENSE.md
 LICENSE_FILE_APACHE20=	${WRKSRC}/../third_party/SheenBidi/LICENSE
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/../third_party/c-hashmap/LICENSE
 # physfs is ZLIB, too
 LICENSE_FILE_ZLIB=	${WRKSRC}/../third_party/lodepng/LICENSE
 LICENSE_PERMS_VVVVVV=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 .if defined(NO_LICENSES_INSTALL)
 IGNORE=		license requires that the license be shipped
 .endif
 
 BUILD_DEPENDS=	${LOCALBASE}/include/stb/stb_vorbis.c:devel/stb
-LIB_DEPENDS=	libFAudio.so:audio/faudio \
+LIB_DEPENDS=	libFAudio.so:audio/faudio@sdl2 \
 		libtinyxml2.so:textproc/tinyxml2 \
 		libphysfs.so:devel/physfs
 
 FLAVORS=	commercial makeandplay
 FLAVOR?=	${FLAVORS:[1]}
 makeandplay_PKGNAMESUFFIX=	-makeandplay
 
 USES=		sdl cmake localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	TerryCavanagh
 # physfs is unbundled, but the code still needs extras/physfsrwops.c, which is not
 # compiled into libphysfs.so
 GH_TUPLE=	lvandeve:lodepng:18964554bc769255401942e0e6dfd09f2fab2093:lodepng/../third_party/lodepng \
 		Tehreer:SheenBidi:v2.7:SheenBidi/../third_party/SheenBidi \
 		Mashpoe:c-hashmap:dedf70e0a769bc52a17a36da840d96770fc26d12:chashmap/../third_party/c-hashmap \
 		icculus:physfs:bfa7997c671957eb0a340ff1cf3c634e6269904a:physfs/../third_party/physfs
 USE_SDL=	sdl2
 
 CFLAGS+=	-DDATADIR='\"${DATADIR}\"'
 CMAKE_OFF=	BUNDLE_DEPENDENCIES GIT_FOUND
 .if ${FLAVOR:U} == makeandplay
 CMAKE_ON=	MAKEANDPLAY
 .endif
 
 WRKSRC_SUBDIR=	desktop_version
 commercial_PLIST_FILES=	bin/VVVVVV
 makeandplay_PLIST_FILES=	${DATADIR_REL}/data.zip \
 				bin/VVVVVV-makeandplay
 PLIST_FILES=	${${FLAVOR}_PLIST_FILES}
 
 SUB_FILES=	pkg-message
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/VVVVVV ${STAGEDIR}${PREFIX}/bin/VVVVVV${PKGNAMESUFFIX}
 .if ${FLAVOR:U} == makeandplay
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/VVVVVV-data-${DISTVERSION}.zip ${STAGEDIR}${DATADIR}/data.zip
 .endif
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "fonts lang" ${STAGEDIR}${DATADIR}/)
 
 .include <bsd.port.mk>