Index: Mk/Uses/gl.mk
===================================================================
--- Mk/Uses/gl.mk
+++ Mk/Uses/gl.mk
@@ -12,14 +12,16 @@
 # 
 # MAINTAINER:	x11@FreeBSD.org
 
+GBM_PORT?=			graphics/mesa-libs
+
 .if !defined(_INCLUDE_USES_GL_MK)
 _INCLUDE_USES_GL_MK=yes
 
-_GL_egl_LIB_DEPENDS=		libEGL.so:graphics/mesa-libs
-_GL_gbm_LIB_DEPENDS=		libgbm.so:graphics/mesa-libs
-_GL_gl_LIB_DEPENDS=		libGL.so:graphics/mesa-libs
+_GL_egl_LIB_DEPENDS=		libEGL.so:graphics/libglvnd
+_GL_gbm_LIB_DEPENDS=		libgbm.so:${GBM_PORT}
+_GL_gl_LIB_DEPENDS=		libGL.so:graphics/libglvnd
 _GL_gl_USE_XORG=		xorgproto
-_GL_glesv2_LIB_DEPENDS=		libGLESv2.so:graphics/mesa-libs
+_GL_glesv2_LIB_DEPENDS=		libGLESv2.so:graphics/libglvnd
 _GL_glew_LIB_DEPENDS=		libGLEW.so:graphics/glew
 _GL_glu_LIB_DEPENDS=		libGLU.so:graphics/libGLU
 _GL_glu_USE_XORG=		xorgproto
Index: graphics/libglvnd/Makefile
===================================================================
--- graphics/libglvnd/Makefile
+++ graphics/libglvnd/Makefile
@@ -10,8 +10,6 @@
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	multi
 
-CONFLICTS_INSTALL=	mesa-libs # include/GL/gl.h
-
 USES=		compiler:c++11-lib localbase meson pkgconfig
 USE_LDCONFIG=	yes
 
Index: graphics/mesa-libs/Makefile
===================================================================
--- graphics/mesa-libs/Makefile
+++ graphics/mesa-libs/Makefile
@@ -3,15 +3,17 @@
 
 PORTNAME=	mesa-libs
 PORTVERSION=	${MESAVERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL libraries that support GLX and EGL clients
 
-CONFLICTS_INSTALL=	libglvnd # include/GL/gl.h
+LIB_DEPENDS=	libGLdispatch.so:graphics/libglvnd
 
 USES=		xorg
 USE_XORG=	xorgproto x11 xcb xdamage xext \
 		xfixes xshmfence xxf86vm
+CONFIGURE_ARGS=	--enable-libglvnd
 
 OPTIONS_DEFINE=	WAYLAND
 OPTIONS_DEFAULT=WAYLAND
@@ -55,5 +57,8 @@
 post-install:
 	@cd ${WRKSRC}/src && ${SETENV} DESTDIR=${STAGEDIR} \
 		${MAKE_CMD} install-pkgconfigDATA install-glHEADERS install-glxHEADERS
+# Fallback for non-GLX_EXT_libglvnd consumers
+	@${ECHO_CMD} "libGLX_indirect.so.0 libGLX_mesa.so.0" \
+		>${STAGEDIR}${PREFIX}/etc/libmap.d/mesa.conf
 
 .include <bsd.port.post.mk>
Index: graphics/mesa-libs/pkg-plist
===================================================================
--- graphics/mesa-libs/pkg-plist
+++ graphics/mesa-libs/pkg-plist
@@ -1,42 +1,44 @@
 @comment etc/drirc
-include/EGL/egl.h
-include/EGL/eglext.h
+etc/libmap.d/mesa.conf
+@comment include/EGL/egl.h
+@comment include/EGL/eglext.h
 include/EGL/eglextchromium.h
 include/EGL/eglmesaext.h
-include/EGL/eglplatform.h
-include/GL/gl.h
+@comment include/EGL/eglplatform.h
+@comment include/GL/gl.h
 include/GL/gl_mangle.h
-include/GL/glcorearb.h
-include/GL/glext.h
-include/GL/glx.h
+@comment include/GL/glcorearb.h
+@comment include/GL/glext.h
+@comment include/GL/glx.h
 include/GL/glx_mangle.h
-include/GL/glxext.h
-include/GLES2/gl2.h
-include/GLES2/gl2ext.h
-include/GLES2/gl2platform.h
-include/GLES3/gl3.h
-include/GLES3/gl31.h
-include/GLES3/gl32.h
-include/GLES3/gl3ext.h
-include/GLES3/gl3platform.h
-include/KHR/khrplatform.h
+@comment include/GL/glxext.h
+@comment include/GLES2/gl2.h
+@comment include/GLES2/gl2ext.h
+@comment include/GLES2/gl2platform.h
+@comment include/GLES3/gl3.h
+@comment include/GLES3/gl31.h
+@comment include/GLES3/gl32.h
+@comment include/GLES3/gl3ext.h
+@comment include/GLES3/gl3platform.h
+@comment include/KHR/khrplatform.h
 include/gbm.h
-lib/libEGL.so
-lib/libEGL.so.1
-lib/libEGL.so.1.0.0
-lib/libGL.so
-lib/libGL.so.1
-lib/libGL.so.1.2.0
-lib/libGLESv2.so
-lib/libGLESv2.so.2
-lib/libGLESv2.so.2.0.0
+lib/libEGL_mesa.so
+lib/libEGL_mesa.so.0
+lib/libEGL_mesa.so.0.0.0
+@comment lib/libGLESv2.so
+@comment lib/libGLESv2.so.2
+@comment lib/libGLESv2.so.2.0.0
+lib/libGLX_mesa.so
+lib/libGLX_mesa.so.0
+lib/libGLX_mesa.so.0.0.0
 lib/libgbm.so
 lib/libgbm.so.1
 lib/libgbm.so.1.0.0
 lib/libglapi.so
 lib/libglapi.so.0
 lib/libglapi.so.0.0.0
-libdata/pkgconfig/egl.pc
+@comment libdata/pkgconfig/egl.pc
 libdata/pkgconfig/gbm.pc
-libdata/pkgconfig/gl.pc
-libdata/pkgconfig/glesv2.pc
+@comment libdata/pkgconfig/gl.pc
+@comment libdata/pkgconfig/glesv2.pc
+share/glvnd/egl_vendor.d/50_mesa.json
Index: x11/nvidia-driver/Makefile
===================================================================
--- x11/nvidia-driver/Makefile
+++ x11/nvidia-driver/Makefile
@@ -13,7 +13,7 @@
 PORTNAME=	nvidia-driver
 DISTVERSION?=	440.82
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
Index: x11/nvidia-driver/files/nvidia.conf.in
===================================================================
--- x11/nvidia-driver/files/nvidia.conf.in
+++ x11/nvidia-driver/files/nvidia.conf.in
@@ -3,6 +3,8 @@
 libGL.so	libGL-NVIDIA.so
 libGL.so.1	libGL-NVIDIA.so.1
 
+libGLX_indirect.so.0	libGLX_nvidia.so.0 # override mesa.conf
+
 %%NVGL%%libEGL.so	libEGL-NVIDIA.so
 %%NVGL%%libEGL.so.1	libEGL-NVIDIA.so.1
 
Index: x11/nvidia-driver/pkg-plist
===================================================================
--- x11/nvidia-driver/pkg-plist
+++ x11/nvidia-driver/pkg-plist
@@ -18,7 +18,7 @@
 lib/libGLESv2_nvidia.so.2
 lib/libGLX.so
 lib/libGLX.so.0
-lib/libGLX_indirect.so.0
+@comment lib/libGLX_indirect.so.0
 lib/libGLX_nvidia.so
 lib/libGLX_nvidia.so.0
 lib/libGLdispatch.so