Index: branches/2021Q1/graphics/vulkan-loader/Makefile
===================================================================
--- branches/2021Q1/graphics/vulkan-loader/Makefile	(revision 560553)
+++ branches/2021Q1/graphics/vulkan-loader/Makefile	(revision 560554)
@@ -1,45 +1,43 @@
 # $FreeBSD$
 
 PORTNAME=	vulkan-loader
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.2.165
 CATEGORIES=	graphics devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Driver loader for the Vulkan graphics API
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
+BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 
 USES=		cmake compiler:${ARCH:Mi386:C/.+/gcc-/}c++11-lib pkgconfig python:3.4+,build
-USE_LDCONFIG=	yes
-
 USE_GITHUB=	yes
+USE_LDCONFIG=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-Loader
-
 CMAKE_ON=	CMAKE_SKIP_RPATH
 CMAKE_OFF=	BUILD_TESTS
 
-OPTIONS_DEFINE=	XLIB XCB WAYLAND
-OPTIONS_DEFAULT=XLIB XCB WAYLAND
+OPTIONS_DEFINE=	WAYLAND XCB XLIB
+OPTIONS_DEFAULT=WAYLAND XCB XLIB
 
-XLIB_DESC=	Build Xlib WSI (Window System Integration) support
-XCB_DESC=	Build XCB WSI (Window System Integration) support
-WAYLAND_DESC=	Build Wayland WSI (Window System Integration) support
+WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
+WAYLAND_CMAKE_BOOL=	BUILD_WSI_WAYLAND_SUPPORT
 
-XLIB_CMAKE_BOOL=	BUILD_WSI_XLIB_SUPPORT
-XLIB_LIB_DEPENDS=	libX11.so:x11/libX11 \
-			libXrandr.so:x11/libXrandr
+XCB_DESC=		${X11_DESC} via libxcb
+XCB_USES=		xorg
+XCB_USE=		XORG=xcb
 XCB_CMAKE_BOOL=		BUILD_WSI_XCB_SUPPORT
-XCB_LIB_DEPENDS=	libX11-xcb.so:x11/libX11 \
-			libxcb.so:x11/libxcb
-WAYLAND_CMAKE_BOOL=	BUILD_WSI_WAYLAND_SUPPORT
-WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
+
+XLIB_DESC=		${X11_DESC} via libX11
+XLIB_USES=		xorg
+XLIB_USE=		XORG=x11,xrandr
+XLIB_CMAKE_BOOL=	BUILD_WSI_XLIB_SUPPORT
 
 post-patch:
 # _XOPEN_SOURCE enforces X/Open-compliance but alloca isn't there
 	@${REINPLACE_CMD} '/_XOPEN_SOURCE/d' ${WRKSRC}/loader/CMakeLists.txt
 
 .include <bsd.port.mk>
Index: branches/2021Q1/graphics/vulkan-loader/pkg-descr
===================================================================
--- branches/2021Q1/graphics/vulkan-loader/pkg-descr	(revision 560553)
+++ branches/2021Q1/graphics/vulkan-loader/pkg-descr	(revision 560554)
@@ -1,6 +1,12 @@
-Vulkan is a low-level cross-platform 3D graphics and compute API.
-
-This port provides the Khronos official ICD (Installable Client Driver) loader,
-which is necessary for loading Vulkan drivers in a running application.
+Vulkan is an explicit API, enabling direct control over how GPUs
+actually work. As such, Vulkan supports systems that have multiple
+GPUs, each running with a different driver, or ICD (Installable Client
+Driver). Vulkan also supports multiple global contexts (instances, in
+Vulkan terminology). The ICD loader is a library that is placed
+between a Vulkan application and any number of Vulkan drivers, in
+order to support multiple drivers and the instance-level functionality
+that works across these drivers. Additionally, the loader manages
+inserting Vulkan layer libraries, such as validation layers, between
+an application and the drivers.
 
 WWW: https://github.com/KhronosGroup/Vulkan-Loader
Index: branches/2021Q1
===================================================================
--- branches/2021Q1	(revision 560553)
+++ branches/2021Q1	(revision 560554)

Property changes on: branches/2021Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r560550