Index: multimedia/dav1d/Makefile
===================================================================
--- multimedia/dav1d/Makefile
+++ multimedia/dav1d/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	dav1d
 DISTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -21,13 +22,18 @@
 LDFLAGS_i386=	-Wl,-z,notext
 
 OPTIONS_DEFINE=	SDL TEST XXHASH
+OPTIONS_DEFAULT=SDL
 OPTIONS_SUB=	yes
 
-SDL_USES=	pkgconfig sdl
-SDL_USE=	SDL=sdl2
+#USES.sdl=	pkgconfig sdl
+#USE_SDL.sdl=	sdl2
+SDL_SUBPACKAGES=	sdl
 SDL_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
-SDL_LIB_DEPENDS=	libplacebo.so:graphics/libplacebo \
+LIB_DEPENDS.sdl=	libplacebo.so:graphics/libplacebo \
 			libvulkan.so:graphics/vulkan-loader
+SELF_DEPENDS.sdl=	main
+# XXX Drop after uncommenting USE_SDL.sdl
+LIB_DEPENDS.sdl+=	libSDL2.so:devel/sdl20
 SDL_MESON_TRUE=	enable_examples
 
 TEST_GL_TUPLE=	videolan:dav1d-test-data:${DISTVERSION}:testdata/tests/dav1d-test-data
Index: multimedia/dav1d/pkg-plist
===================================================================
--- multimedia/dav1d/pkg-plist
+++ multimedia/dav1d/pkg-plist
@@ -1,5 +1,5 @@
 bin/dav1d
-%%SDL%%bin/dav1dplay
+@@sdl@@bin/dav1dplay
 include/dav1d/common.h
 include/dav1d/data.h
 include/dav1d/dav1d.h