Index: head/devel/vulkan-tools/Makefile
===================================================================
--- head/devel/vulkan-tools/Makefile
+++ head/devel/vulkan-tools/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	vulkan-tools
 DISTVERSIONPREFIX=	sdk-
 DISTVERSION=	1.2.135.0
+PORTREVISION=	1
 CATEGORIES=	devel graphics
 
 MAINTAINER=	greg@unrelenting.technology
@@ -20,11 +21,13 @@
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-Tools
 
-CMAKE_OFF=	BUILD_ICD
+CMAKE_OFF=	BUILD_CUBE BUILD_ICD
 CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR=${LOCALBASE}
 
 OPTIONS_DEFINE=		WAYLAND XCB XLIB
 OPTIONS_DEFAULT=	WAYLAND XCB XLIB
+OPTIONS_SLAVE=		DISPLAY
+OPTIONS_SUB=		yes
 
 WAYLAND_DESC=	Build Wayland WSI (Window System Integration) support
 XCB_DESC=	Build XCB WSI (Window System Integration) support
@@ -43,17 +46,27 @@
 			libICE.so:x11/libICE \
 			libSM.so:x11/libSM
 
-.include <bsd.port.options.mk>
+# https://github.com/KhronosGroup/Vulkan-Headers/issues/122
+display-build:		.IGNORE
+display-install:	.IGNORE
 
-.if ${PORT_OPTIONS:MXCB}
-CMAKE_ARGS+=	-DCUBE_WSI_SELECTION:STRING="XCB"
-.elif ${PORT_OPTIONS:MXLIB}
-CMAKE_ARGS+=	-DCUBE_WSI_SELECTION:STRING="XLIB"
-.elif ${PORT_OPTIONS:MWAYLAND}
-CMAKE_ARGS+=	-DCUBE_WSI_SELECTION:STRING="WAYLAND"
-.else
-CMAKE_ARGS+=	-DCUBE_WSI_SELECTION:STRING="DISPLAY"
-BROKEN=		https://github.com/KhronosGroup/Vulkan-Headers/issues/122
-.endif
+# https://github.com/KhronosGroup/Vulkan-Tools/issues/307
+.for _wsi in display wayland xcb xlib
+do-configure-${_wsi:tu}-on: ${_wsi}-configure
+${_wsi}-configure:
+	@${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} \
+		-DBUILD_CUBE:BOOL=ON -DBUILD_VULKANINFO:BOOL=OFF \
+		-DCUBE_WSI_SELECTION:STRING=${_wsi:tu} \
+		-B${CONFIGURE_WRKSRC}-${_wsi}
+do-build-${_wsi:tu}-on: ${_wsi}-build
+${_wsi}-build:
+	@${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --build ${BUILD_WRKSRC}-${_wsi}
+do-install-${_wsi:tu}-on: ${_wsi}-install
+${_wsi}-install:
+. for _file in vkcube vkcubepp
+	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}-${_wsi}/cube/${_file} \
+		${STAGEDIR}${PREFIX}/bin/${_file}-${_wsi}
+. endfor
+.endfor
 
 .include <bsd.port.mk>
Index: head/devel/vulkan-tools/pkg-plist
===================================================================
--- head/devel/vulkan-tools/pkg-plist
+++ head/devel/vulkan-tools/pkg-plist
@@ -1,3 +1,8 @@
-bin/vkcube
-bin/vkcubepp
+%%DISPLAY%%bin/vkcube-display
+%%WAYLAND%%bin/vkcube-wayland
+%%XCB%%bin/vkcube-xcb
+%%XLIB%%bin/vkcube-xlib
+%%WAYLAND%%bin/vkcubepp-wayland
+%%XCB%%bin/vkcubepp-xcb
+%%XLIB%%bin/vkcubepp-xlib
 bin/vulkaninfo