emulators/wine-devel: Merge the VKD3D option into X11

Vulkan and vkd3d have few additional dependencies on top of OpenGL
(via Mesa) so fold them into the general X11 switch.

This further reduces the number of options in this port.

PR:		258375

2 files changed, 8 insertions, 11 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 6dc7a019418b..9dca8e8565c8 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -65,7 +65,7 @@ SUB_FILES=	pkg-message
 
 PORTDATA=	wine.inf
 
-OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS LDAP LIBXSLT MPG123 OPENAL SDL STAGING V4L VKD3D WINEMAKER X11 GECKO MONO
+OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS LDAP LIBXSLT MPG123 OPENAL SDL STAGING V4L WINEMAKER X11 GECKO MONO
 OPTIONS_DEFAULT=GNUTLS X11
 OPTIONS_SUB=	yes
 
@@ -73,7 +73,6 @@ DOSBOX_DESC=	Use DOSBox to run MS-DOS programs
 LIBXSLT_DESC=	Use libxslt (only used by msxml3.dll)
 SDL_DESC=	Use SDL for gamepad support (XInput only)
 STAGING_DESC=	Include Wine Staging patchset (experimental&unsupported)
-VKD3D_DESC=	Vulkan and Direct3D 12 support
 WINEMAKER_DESC=	Fully support winemaker (requires Perl)
 GECKO_DESC=	Bundle Gecko MSI package for Wine
 MONO_DESC=	Bundle Mono MSI package for Wine
@@ -118,19 +117,17 @@ V4L_CONFIGURE_WITH=	v4l2
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
-VKD3D_CONFIGURE_WITH=	vkd3d
-VKD3D_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader \
-			libvkd3d.so:graphics/vkd3d
-
 WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:textproc/p5-XML-LibXML
 
-X11_CONFIGURE_WITH=	x cms fontconfig freetype jpeg opengl png xinerama xinput2 xrandr xrender
+X11_CONFIGURE_WITH=	x cms fontconfig freetype jpeg opengl png vkd3d xinerama xinput2 xrandr xrender
 X11_USES=		gl jpeg xorg
 X11_USE=		GL=glu XORG=x11,xext,xcomposite,xcursor,xi,xinerama,xrandr,xrender
 X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2 \
 			liblcms2.so:graphics/lcms2 \
-			libpng.so:graphics/png
+			libpng.so:graphics/png \
+			libvulkan.so:graphics/vulkan-loader \
+			libvkd3d.so:graphics/vkd3d
 
 # Include this only if it has not been already included by the
 # i386-wine-devel slave port.
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 6521d901e4ac..1d4974cc2bb1 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -1444,7 +1444,7 @@ lib/wine/%%WINEARCH%%-unix/d3d10.dll.so
 lib/wine/%%WINEARCH%%-unix/d3d10_1.dll.so
 lib/wine/%%WINEARCH%%-unix/d3d10core.dll.so
 lib/wine/%%WINEARCH%%-unix/d3d11.dll.so
-%%VKD3D%%lib/wine/%%WINEARCH%%-unix/d3d12.dll.so
+lib/wine/%%WINEARCH%%-unix/d3d12.dll.so
 lib/wine/%%WINEARCH%%-unix/d3d8.dll.so
 lib/wine/%%WINEARCH%%-unix/d3d8thk.dll.so
 lib/wine/%%WINEARCH%%-unix/d3d9.dll.so
@@ -1722,7 +1722,7 @@ lib/wine/%%WINEARCH%%-unix/libd3d10.def
 lib/wine/%%WINEARCH%%-unix/libd3d10_1.def
 lib/wine/%%WINEARCH%%-unix/libd3d10core.def
 lib/wine/%%WINEARCH%%-unix/libd3d11.def
-%%VKD3D%%lib/wine/%%WINEARCH%%-unix/libd3d12.def
+lib/wine/%%WINEARCH%%-unix/libd3d12.def
 lib/wine/%%WINEARCH%%-unix/libd3d8.def
 lib/wine/%%WINEARCH%%-unix/libd3d9.def
 lib/wine/%%WINEARCH%%-unix/libd3dcompiler.def
@@ -2715,7 +2715,7 @@ lib/wine/%%WINEARCH%%-windows/d3d10.dll
 lib/wine/%%WINEARCH%%-windows/d3d10_1.dll
 lib/wine/%%WINEARCH%%-windows/d3d10core.dll
 lib/wine/%%WINEARCH%%-windows/d3d11.dll
-%%VKD3D%%lib/wine/%%WINEARCH%%-windows/d3d12.dll
+lib/wine/%%WINEARCH%%-windows/d3d12.dll
 lib/wine/%%WINEARCH%%-windows/d3d8.dll
 lib/wine/%%WINEARCH%%-windows/d3d8thk.dll
 lib/wine/%%WINEARCH%%-windows/d3d9.dll