Re: git: 1c742619cf3a - main - audio/faudio: Update to 25.03

"Jason E. Hale" <jhale@FreeBSD.org> writes:

> The branch main has been updated by jhale:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=1c742619cf3a43f236e410ad487978bc4bd8905e
>
> commit 1c742619cf3a43f236e410ad487978bc4bd8905e
> Author:     Jason E. Hale <jhale@FreeBSD.org>
> AuthorDate: 2025-03-21 04:01:46 +0000
> Commit:     Jason E. Hale <jhale@FreeBSD.org>
> CommitDate: 2025-03-21 04:57:20 +0000
>
>     audio/faudio: Update to 25.03
>     
>     Set default flavor. [1] Make default flavor sdl3 since this is now
>     the preferred SDL version by upstream starting with this release.

Did you forget to adjust PKGNAMESUFFIX? The default flavor now installs
suffixed package which can confuse ports-only users when not explicitly
passing FLAVOR and port maintainers when using {BUILD,RUN}_DEPENDS
instead of LIB_DEPENDS.

Note, vvvvvv (unlike rpcs3) is light on dependencies, so more likely to
be built outside of poudriere. Without BUILD_DEPENDS to enforce flavor
the port may find wrong libFAudio.so.

diff --git a/audio/faudio/Makefile b/audio/faudio/Makefile
index f7ad2f150fbe..045a9f3d11eb 100644
--- a/audio/faudio/Makefile
+++ b/audio/faudio/Makefile
@@ -11,9 +12,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 FLAVORS=	sdl3 sdl2
 FLAVOR?=	${FLAVORS:[1]}
-sdl2_CONFLICTS_INSTALL=	${PORTNAME}-sdl3
-sdl3_PKGNAMESUFFIX=	-sdl3
-sdl3_CONFLICTS_INSTALL=	${PORTNAME}
+sdl2_PKGNAMESUFFIX=	-sdl2
+sdl2_CONFLICTS_INSTALL=	${PORTNAME}
+sdl3_CONFLICTS_INSTALL=	${PORTNAME}-sdl2
 
 USES=		cmake:testing compiler:c11 sdl
 USE_LDCONFIG=	yes
diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index 1998222ef463..aced1bd82448 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -60,7 +61,7 @@ EVDEV_LIB_DEPENDS=	libevdev.so:devel/libevdev \
 			libudev.so:devel/libudev-devd
 
 FAUDIO_DESC=		FAudio audio support
-FAUDIO_LIB_DEPENDS=	libFAudio.so:audio/faudio@sdl3
+FAUDIO_LIB_DEPENDS=	libFAudio.so:audio/faudio
 FAUDIO_CMAKE_BOOL=	USE_FAUDIO USE_SYSTEM_FAUDIO
 
 JACK_BUILD_DEPENDS=	jackit>0:audio/jack
diff --git a/games/vvvvvv/Makefile b/games/vvvvvv/Makefile
index 5ad3dc782968..4299a0002828 100644
--- a/games/vvvvvv/Makefile
+++ b/games/vvvvvv/Makefile
@@ -28,7 +28,8 @@ LICENSE_PERMS_VVVVVV=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accep
 IGNORE=		license requires that the license be shipped
 .endif
 
-BUILD_DEPENDS=	${LOCALBASE}/include/stb/stb_vorbis.c:devel/stb
+BUILD_DEPENDS=	${LOCALBASE}/include/stb/stb_vorbis.c:devel/stb \
+		FAudio-sdl2>0:audio/faudio@sdl2
 LIB_DEPENDS=	libFAudio.so:audio/faudio@sdl2 \
 		libtinyxml2.so:textproc/tinyxml2 \
 		libphysfs.so:devel/physfs