diff --git a/Mk/Uses/gl.mk b/Mk/Uses/gl.mk
index eb8850774b29..7d71d9724d92 100644
--- a/Mk/Uses/gl.mk
+++ b/Mk/Uses/gl.mk
@@ -1,56 +1,56 @@
 # Use OpenGL and related libraries and ports
 # 
 # Feature:	gl
 # Usage:	USES=gl
 #		USE_GL=egl gbm gl glesv1 glesv2 glew glu glut
 #		
 #		USE_GL specifies which GL components to add as dependencies.
 #		Not specifying USE_GL with USES=gl is an error.
 #		USE_GL=yes implies USE_GL=glu.  This is deprecated
 # 
 # MAINTAINER:	x11@FreeBSD.org
 
 .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/${GL_DEFAULT:S/,/ /g:[1]}
+_GL_gbm_LIB_DEPENDS=		libgbm.so:graphics/${GL_DEFAULT:S/,/ /g:[-1]}
+_GL_gl_LIB_DEPENDS=		libGL.so:graphics/${GL_DEFAULT:S/,/ /g:[1]}
 _GL_gl_USE_XORG=		xorgproto
-_GL_glesv1_LIB_DEPENDS=		libGLESv1_CM.so:graphics/mesa-libs
-_GL_glesv2_LIB_DEPENDS=		libGLESv2.so:graphics/mesa-libs
+_GL_glesv1_LIB_DEPENDS=		libGLESv1_CM.so:graphics/${GL_DEFAULT:S/,/ /g:[1]}
+_GL_glesv2_LIB_DEPENDS=		libGLESv2.so:graphics/${GL_DEFAULT:S/,/ /g:[1]}
 _GL_glew_LIB_DEPENDS=		libGLEW.so:graphics/glew
 _GL_glu_LIB_DEPENDS=		libGLU.so:graphics/libGLU
 _GL_glu_USE_XORG=		xorgproto
 _GL_glut_LIB_DEPENDS=		libglut.so:graphics/freeglut
 
 .if !empty(gl_ARGS)
 IGNORE=	USES=gl takes no arguments
 .endif
 
 .if !defined(USE_GL)
 IGNORE=		need to specify gl component with USE_GL
 .elif ${USE_GL:tl} == yes
 DEV_WARNING+=	"USE_GL=yes is deprecated, please add USE_GL=glu (default) or specify component"
 USE_GL=		glu
 .endif
 
 .for _component in ${USE_GL}
 .if !defined(_GL_${_component}_LIB_DEPENDS)
 IGNORE=		uses unknown GL component
 .else
 USE_XORG+=	${_GL_${_component}_USE_XORG}
 LIB_DEPENDS+=	${_GL_${_component}_LIB_DEPENDS}
 .endif
 .endfor
 
 # We only need to include xorg.mk if we want USE_XORG modules
 # USES+=xorg does not provide any functionality, it just silences an error
 # message about USES=xorg not being set
 .if defined(USE_XORG) && !empty(USE_XORG)
 USES+=		xorg
 .include "${USESDIR}/xorg.mk"
 .endif
 
 # _INCLUDE_USES_GL_MK
 .endif
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index f923ca84ff36..a3b836ea2fee 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -1,159 +1,161 @@
 # MAINTAINER:	ports@FreeBSD.org
 #
 # Note: before committing to this file, contact portmgr to arrange for an
 # experimental ports run.  Untested commits may be backed out at portmgr's
 # discretion.
 #
 # Provide default versions for ports with multiple versions selectable
 # by the user.
 #
 # Users who want to override these defaults can easily do so by defining
 # DEFAULT_VERSIONS in their make.conf as follows:
 #
 #   DEFAULT_VERSIONS=	perl5=5.20 ruby=2.7
 
 .if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK)
 _INCLUDE_BSD_DEFAULT_VERSIONS_MK=	yes
 
 LOCALBASE?=	/usr/local
 
-.for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT \
+.for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT GL \
 	IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM LUA MYSQL NINJA PERL5 \
 	PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH
 .if defined(${lang}_DEFAULT)
 ERROR+=	"The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
 .endif
 #.undef ${lang}_DEFAULT
 .endfor
 
 .for lang in ${DEFAULT_VERSIONS}
 _l=		${lang:C/=.*//g}
 ${_l:tu}_DEFAULT=	${lang:C/.*=//g}
 .endfor
 
 # Possible values: 2.4
 APACHE_DEFAULT?=	2.4
 # Possible values: 5, 6, 18
 BDB_DEFAULT?=		5
 # Possible values: 2, 3
 COROSYNC_DEFAULT?=	2
 # Possible_values: full canna nox devel_full devel_nox
 #EMACS_DEFAULT?=	let the flavor be the default if not explicitly set
 # Possible values: 2.5
 FIREBIRD_DEFAULT?=	2.5
 # Possible values: flang (experimental), gfortran
 FORTRAN_DEFAULT?=	gfortran
 # Possible values: 3.2.0
 FPC_DEFAULT?=		3.2.0
 # Possible values: 8, 9 (powerpcspe was dropped with GCC 9), 10
 .if ${ARCH} == "powerpcspe"
 GCC_DEFAULT?=		8
 .else
 GCC_DEFAULT?=		10
 .endif
+# Possible values (tuple): libglvnd, mesa-libs, mesa-devel
+GL_DEFAULT?=		libglvnd,mesa-libs
 # Possible values: 7, 8, 9, agpl
 GHOSTSCRIPT_DEFAULT?=	agpl
 # Possible values: 6, 6-nox11, 7, 7-nox11
 IMAGEMAGICK_DEFAULT?=	7
 # Possible values: 7, 8, 11, 12, 13, 14, 15, 16
 JAVA_DEFAULT?=		8
 # Possible values: 2.0.10
 LAZARUS_DEFAULT?=	2.0.10
 # Possible values: rust legacy
 .if empty(ARCH:Naarch64:Narmv6:Narmv7:Namd64:Ni386:Npowerpc64:Npowerpc64le)
 LIBRSVG2_DEFAULT?=	rust
 .else
 LIBRSVG2_DEFAULT?=	legacy
 .endif
 # Possible values: c7
 LINUX_DEFAULT?=		c7
 # Possible values: 70, 80, 90, 10, 11, -devel (to be used when non-base compiler is required)
 # Please give notice to the Graphics Team (x11@FreeBSD.org) in advance before
 # bumping the LLVM version.
 .if ${ARCH} == powerpc
 LLVM_DEFAULT?=		10
 .else
 LLVM_DEFAULT?=		90
 .endif
 # Possible values: 5.1, 5.2, 5.3, 5.4
 LUA_DEFAULT?=		5.2
 # Possible values: 5.10, 5.20, 6.8
 MONO_DEFAULT=		5.10
 # Possible values: 5.5, 5.6, 5.7, 8.0, 10.3m, 10.4m, 10.5m, 5.5p, 5.6p, 5.7p, 5.6w, 5.7w
 MYSQL_DEFAULT?=		5.7
 # Possible values: ninja, samurai
 NINJA_DEFAULT?=		ninja
 # Possible values: 5.28, 5.30, 5.32, 5.34, devel
 .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
     defined(PACKAGE_BUILDING))
 PERL5_DEFAULT?=		5.32
 .elif !defined(PERL5_DEFAULT)
 # There's no need to replace development versions, like "5.23" with "devel"
 # because 1) nobody is supposed to use it outside of poudriere, and 2) it must
 # be set manually in /etc/make.conf in the first place, and we're never getting
 # in here.
 .if !defined(_PERL5_FROM_BIN)
 _PERL5_FROM_BIN!=	${LOCALBASE}/bin/perl -e 'printf "%vd\n", $$^V;'
 .endif
 _EXPORTED_VARS+=	_PERL5_FROM_BIN
 PERL5_DEFAULT:=		${_PERL5_FROM_BIN:R}
 .endif
 # Possible values: 9.5, 9.6, 10, 11, 12, 13
 PGSQL_DEFAULT?=		12
 # Possible values: 7.3, 7.4, 8.0
 PHP_DEFAULT?=		7.4
 # Possible values: 2.7, 3.6, 3.7, 3.8, 3.9
 PYTHON_DEFAULT?=	3.8
 # Possible values: 2.7
 PYTHON2_DEFAULT?=	2.7
 # Possible values: 3.6, 3.7, 3.8, 3.9
 PYTHON3_DEFAULT?=	3.8
 # Possible values: 2.6, 2.7, 3.0
 RUBY_DEFAULT?=		2.7
 # Possible values: rust, rust-nightly
 RUST_DEFAULT?=		rust
 # Possible values: 4.12, 4.13
 SAMBA_DEFAULT?=		4.12
 # Possible values: base, openssl, libressl, libressl-devel
 .if !defined(SSL_DEFAULT)
 #	If no preference was set, check for an installed base version
 #	but give an installed port preference over it.
 .  if	!defined(SSL_DEFAULT) && \
 	!exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \
 	exists(${DESTDIR}/usr/include/openssl/opensslv.h)
 SSL_DEFAULT=	base
 .  else
 .    if exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so)
 .      if defined(PKG_BIN)
 # find installed port and use it for dependency
 .        if !defined(OPENSSL_INSTALLED)
 .          if defined(DESTDIR)
 PKGARGS=	-c ${DESTDIR}
 .          else
 PKGARGS=
 .          endif
 OPENSSL_INSTALLED!=	${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so || :
 .        endif
 .        if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED)
 SSL_DEFAULT:=		${OPENSSL_INSTALLED:T}
 WARNING+=	"You have ${OPENSSL_INSTALLED} installed but do not have DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} set in your make.conf"
 .        endif
 .      else
 check-makevars::
 	@${ECHO_MSG} "You have a ${LOCALBASE}/lib/libcrypto.so file installed, but the framework is unable"
 	@${ECHO_MSG} "to determine what port it comes from."
 	@${ECHO_MSG} "Add DEFAULT_VERSIONS+=ssl=<openssl package name> to your /etc/make.conf and try again."
 	@${FALSE}
 .      endif
 .    endif
 .  endif
 # Make sure we have a default in the end
 SSL_DEFAULT?=	base
 .endif
 # Possible values: 8.5, 8.6, 8.7
 TCLTK_DEFAULT?=		8.6
 
 # Possible values: 4, 6
 VARNISH_DEFAULT?=	4
 
 .endif
diff --git a/graphics/glad/Makefile b/graphics/glad/Makefile
index df7f0cb77d73..e1508f82da6e 100644
--- a/graphics/glad/Makefile
+++ b/graphics/glad/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	glad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.34
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL loader-generator
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake python:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	Dav1dde
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	GLAD_INSTALL BUILD_SHARED_LIBS GLAD_REPRODUCIBLE
 
-CONFLICTS_INSTALL=	mesa-libs # include/KHR/khrplatform.h, see https://github.com/Dav1dde/glad/issues/260
+CONFLICTS_INSTALL=	libglvnd # include/KHR/khrplatform.h, see https://github.com/Dav1dde/glad/issues/260
 
 .include <bsd.port.mk>
diff --git a/graphics/libglvnd/Makefile b/graphics/libglvnd/Makefile
index f0f2e55f8c1d..c8babe24ac12 100644
--- a/graphics/libglvnd/Makefile
+++ b/graphics/libglvnd/Makefile
@@ -1,43 +1,41 @@
 PORTNAME=	libglvnd
 DISTVERSION=	1.3.2
 CATEGORIES=	graphics
 
-MAINTAINER=	greg@unrelenting.technology
+MAINTAINER=	x11@FreeBSD.org
 COMMENT=	GL Vendor-Neutral Dispatch library
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	multi
 
-CONFLICTS_INSTALL=	mesa-libs # include/GL/gl.h
-
 USES=		localbase meson pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.freedesktop.org
 GL_ACCOUNT=	glvnd
 GL_COMMIT=	da0edd9728d6d33aa0d058037b694ee91a7ecad5
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 OPTIONS_SUB=	yes
 
 X11_USES=		xorg
 X11_USE=		XORG=x11,xext,xorgproto
 X11_MESON_ENABLED=	x11 glx
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc64*}
 USES+=		compiler:gcc-c++11-lib
 .else
 USES+=		compiler:c++11-lib
 .endif
 
 # Lots of software expects gl.pc even when it can build with EGL only
 post-install-X11-off:
 	${LN} -s opengl.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/gl.pc
 	${REINPLACE_CMD} -e '/Cflags:/s/$$/ -DEGL_NO_X11/' \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/egl.pc
 
 .include <bsd.port.mk>
diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 55792878a42d..07eec60ddd30 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -1,169 +1,170 @@
 PORTNAME=	mesa
 DISTVERSION=	21.1-branchpoint-3077
 DISTVERSIONSUFFIX=	-geb272f65715
+PORTREVISION=	1
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	-devel
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	55822330540d.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598
 PATCHFILES+=	f6c7569ad9ea.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598
 PATCHFILES+=	cb8f7a253934.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3568
 PATCHFILES+=	700efacda59c.patch:-p1
 PATCHFILES+=	e141af3ac859.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/966#note_394512
 PATCHFILES+=	167fa293d7b7.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5464
 PATCHFILES+=	19e001833ec1.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7778
 PATCHFILES+=	50433886a3e3.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6881
 PATCHFILES+=	79a9c5e470c2.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8221
 PATCHFILES+=	891152495cf7.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9168
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Bleeding edge Mesa drivers (OpenGL, Vulkan)
 
 LICENSE=	MIT
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	Limited scope: no old drivers and no software rendering. \
 			See also https://mesamatrix.net/
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libexpat.so:textproc/expat2
 .if !exists(/usr/lib/libelf.so)
 # DragonFly doesn't install it yet
 LIB_DEPENDS+=	libelf.so:devel/libelf
 .endif
 
 USES=		bison compiler:c++11-lib meson pkgconfig python:3.6+,build shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	mesa3d
 USE_LDCONFIG=	yes
 BINARY_ALIAS=	python=${PYTHON_CMD}
 SHEBANG_FILES=	src/vulkan/overlay-layer/${PORTNAME}-overlay-control.py
 MESON_ARGS=	-Dgallium-omx=disabled \
 		-Dgallium-opencl=disabled \
 		-Dgallium-xa=disabled \
 		-Dgallium-xvmc=disabled \
 		-Dplatforms=${PLATFORMS:O:[-1..1]:ts,} \
 		${BINARY_ALIAS:D--native-file=binary_alias.ini} \
 		${NULL}
 PLIST_SUB=	ARCH=${ARCH:S/amd/x86_/}
 
 .if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
 # --build-id isn't supported by old GNU ld.bfd in base
 LDFLAGS+=	-fuse-ld=lld
 .endif
 
 OPTIONS_DEFINE=		LIBUNWIND LLVM LTO VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
 OPTIONS_DEFAULT=	LIBUNWIND LLVM LTO VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
 OPTIONS_GROUP=		DRI GALLIUM VULKAN
 OPTIONS_GROUP_DRI=	i965
 OPTIONS_GROUP_GALLIUM=	iris r600 radeonsi
 OPTIONS_GROUP_VULKAN=	anv radv
 OPTIONS_EXCLUDE_DragonFly=	LIBUNWIND anv
 OPTIONS_EXCLUDE_i386=	LTO # anv: vkcube fails on vkCreateSwapchainKHR
 OPTIONS_EXCLUDE_powerpc64=	${"${/usr/bin/ld:L:tA}"==/usr/bin/ld.lld:?LTO:} # LLVM bug 47353
 OPTIONS_EXCLUDE+=	${ARCH:Namd64:Ni386:Nx86_64:C/.+/anv i965 iris/}
 OPTIONS_EXCLUDE+=	${ARCH:Naarch64:Namd64:Ni386:Npowerpc64:Npowerpc64le:Nx86_64:C/.+/LIBUNWIND/}
 OPTIONS_EXCLUDE+=	${"${GL_DEFAULT:S/,/ /g:[-1]}"==${.CURDIR:T}:?COINST:}
 OPTIONS_EXCLUDE+=	${"${GL_DEFAULT:S/,/ /g:[1]}"!=libglvnd:?GLVND:}
 OPTIONS_SLAVE+=		${"${GL_DEFAULT:S/,/ /g:[-1]}"!=${.CURDIR:T}:?COINST:}
 OPTIONS_SLAVE+=		${"${GL_DEFAULT:S/,/ /g:[1]}"==libglvnd:?GLVND:}
 OPTIONS_SUB=		yes
 
 # Convert options to -D<type>-drivers=<driver1,driver2,etc>
 .for i in ${OPTIONS_GROUP}
 MESON_ARGS+=		-D${i:tl}-drivers=${${i}_DRIVERS:ts,}
 . for j in ${OPTIONS_GROUP_${i}}
 OPTIONS_DEFAULT+=	${j}
 ${j}_VARS+=		${i}_DRIVERS+=${j:S/anv/intel/:S/radv/amd/}
 . endfor
 .endfor
 
 DRI_DESC=		Classic OpenGL drivers
 i965_DESC=		GMA 3000 (Gen4) and newer
 
 GALLIUM_DESC=		Unified OpenGL drivers
 iris_DESC=		Broadwell and newer
 r600_DESC=		R600, R700, Evergreen, Northern Islands (implies LLVM)
 radeonsi_DESC=		Southern Islands and newer (implies LLVM)
 
 VULKAN_DESC=		Vulkan drivers
 anv_DESC=		Haswell and newer
 radv_DESC=		Southern Islands and newer (implies LLVM)
 
 COINST_DESC=		Allow co-installation with another Mesa port
 COINST_VARS=		LLVM_DEFAULT=11 # chase intel-compute-runtime
 COINST_MESON_ON=	-Degl-lib-suffix=${PKGNAMESUFFIX}
 COINST_PLIST_SUB=	SUFFIX=${PKGNAMESUFFIX}
 COINST_SUB_FILES=	libmap.conf
 COINST_SUB_LIST=	SUFFIX=${PKGNAMESUFFIX}
 COINST_PLIST_SUB_OFF=	SUFFIX=
 
 GLVND_DESC=		GL Vendor-Neutral Dispatch support
 GLVND_BUILD_DEPENDS=	libglvnd>=1.3.2:graphics/libglvnd
 GLVND_MESON_TRUE=	glvnd
 
 LIBUNWIND_DESC=		Use libunwind for stacktraces
 LIBUNWIND_LIB_DEPENDS=	libunwind.so:devel/libunwind
 LIBUNWIND_MESON_ENABLED=	libunwind
 
 LLVM_DESC=		Build with LLVM support (see implies)
 LLVM_LIB_DEPENDS=	libLLVM-${LLVM_DEFAULT:C/^([6-9])0/\1/:S/-devel/13git/}.so:devel/llvm${LLVM_DEFAULT}
 LLVM_MESON_ENABLED=	llvm
 LLVM_BINARY_ALIAS=	llvm-config=llvm-config${LLVM_DEFAULT}
 .for i in r600 radeonsi radv
 ${i}_IMPLIES+=		LLVM
 .endfor
 
 LTO_MESON_TRUE=		b_lto
 
 VAAPI_DESC=		Hardware encoding/decoding (only r600, radeonsi)
 VAAPI_BUILD_DEPENDS=	libva>0:multimedia/libva
 VAAPI_MESON_ENABLED=	gallium-va
 
 VDPAU_DESC=		Hardware decoding (only r600, radeonsi) (implies X11)
 VDPAU_BUILD_DEPENDS=	libvdpau>0:multimedia/libvdpau
 VDPAU_MESON_ENABLED=	gallium-vdpau
 VDPAU_IMPLIES=		X11
 
 VKLAYERS_DESC=		Vulkan layers: ${VKLAYERS_MESON_ON:C/.*=//} (implies ${VKLAYERS_IMPLIES})
 VKLAYERS_BUILD_DEPENDS=	glslangValidator:graphics/glslang
 VKLAYERS_MESON_ON=	-Dvulkan-layers=device-select,overlay
 VKLAYERS_IMPLIES=	${"${PORT_OPTIONS:Mradv}":?radv:anv} # any from OPTIONS_GROUP_VULKAN
 
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-server.so:graphics/wayland
 WAYLAND_VARS=		PLATFORMS+=wayland
 
 X11_USES=		xorg
 X11_USE=		XORG=x11,xcb,xdamage,xext,xfixes,xorgproto,xrandr,xshmfence,xxf86vm
 X11_VARS=		PLATFORMS+=x11
 X11_MESON_OFF=		-Dglx=disabled
 
 ZSTD_DESC=		Use ZSTD for shader cache
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_MESON_ENABLED=	zstd
 
 post-extract:
 # Work around Meson lookup order e.g., llvm-config
 .if defined(BINARY_ALIAS)
 	@${ECHO_CMD} '[binaries]' >${WRKSRC}/binary_alias.ini
 	@for f in ${BINARY_ALIAS}; do \
 		${ECHO_CMD} "$${f%%=*} = '$${f#*=}'"; \
 	done >>${WRKSRC}/binary_alias.ini
 .endif
 
 post-patch:
 # Extract (snapshot) version from the port instead of empty string
 	@${REINPLACE_CMD} '/MESA_GIT_SHA1/s/""/" (git-${DISTVERSIONSUFFIX:C/.*-g//})"/' \
 		${WRKSRC}/bin/git_sha1_gen.py
 
 post-patch-COINST-on:
 	@${MV} ${WRKSRC}/src/util/00-${PORTNAME}-defaults.conf \
 		${WRKSRC}/src/util/00-${PKGBASE}-defaults.conf
 
 post-install-COINST-on:
 	@${INSTALL_DATA} ${WRKDIR}/libmap.conf \
 		${STAGEDIR}${PREFIX}/etc/libmap.d/${PKGBASE}.conf.sample
 
 .include <bsd.port.mk>
diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile
index 02155a2ace99..5ebe41c1078e 100644
--- a/graphics/mesa-libs/Makefile
+++ b/graphics/mesa-libs/Makefile
@@ -1,75 +1,82 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
 
 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
+BUILD_DEPENDS=	libglvnd>0:graphics/libglvnd
 
 OPTIONS_GROUP=			PLATFORM
 OPTIONS_GROUP_PLATFORM=		PLATFORM_X11 PLATFORM_WAYLAND
 PLATFORM_X11_DESC=		Enable X11 support for GBM/EGL
 PLATFORM_WAYLAND_DESC=		Enable Wayland support for GBM/EGL
 PLATFORM_WAYLAND_IMPLIES=	WAYLAND
 
 OPTIONS_DEFINE=	WAYLAND ZSTD
 OPTIONS_DEFAULT=WAYLAND PLATFORM_X11 PLATFORM_WAYLAND ZSTD
 OPTIONS_SUB=	yes
 
 WAYLAND_DESC=		Enable support for the Wayland platform in EGL
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.8:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
 WAYLAND_IMPLIES=	PLATFORM_WAYLAND
 
 ZSTD_DESC=		Use ZSTD for shader cache
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_MESON_ENABLED=	zstd
 
 .include <bsd.port.options.mk>
 .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
 
 MESON_ARGS+=	-Dgallium-drivers="" \
 		-Dgallium-vdpau=disabled \
 		-Dgallium-xvmc=disabled \
 		-Dgallium-omx=disabled \
 		-Dgallium-va=disabled \
 		-Dgallium-xa=disabled \
 		-Dgallium-nine=false \
 		-Dgallium-clover=disabled \
 		-Dosmesa=none \
 		-Dtools="" \
 		-Degl=enabled \
 		-Dgbm=enabled \
 		-Dvulkan-drivers="" \
+		-Dglvnd=true \
 		-Dprefer-iris=true
 # Building EGL and GBM requires a dri driver so add swrast
 MESON_ARGS+=	-Ddri-drivers="swrast"
 
 .if ${PORT_OPTIONS:MPLATFORM_X11}
 MESA_PLATFORMS+=	x11
 USE_XORG+=		xorgproto x11 xcb xdamage xext \
 			xfixes xshmfence xxf86vm xrandr
 PLIST_SUB+=		GLX=""
 .else
 MESON_ARGS+=	-Dglx=disabled
 PLIST_SUB+=	GLX="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPLATFORM_WAYLAND} && ${PORT_OPTIONS:MWAYLAND}
 MESA_PLATFORMS+=	wayland
 .endif
 
 MESON_ARGS+=	-Dplatforms="${MESA_PLATFORMS:ts,:tl}"
 
 .if ${ARCH} == "i386"
 # PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set
 LDFLAGS+=-Wl,-z,notext
 .elif ${ARCH} == "powerpc"
 USE_GCC=	yes
 .endif
 
 .include "${MASTERDIR}/Makefile.targets"
 
+post-install:
+# Fallback if GLX_EXT_libglvnd is missing or vendor library doesn't exist
+	@${ECHO_CMD} "libGLX_indirect.so.0 libGLX_mesa.so.0" \
+		>${STAGEDIR}${PREFIX}/etc/libmap.d/mesa.conf
+
 .include <bsd.port.post.mk>
diff --git a/graphics/mesa-libs/pkg-plist b/graphics/mesa-libs/pkg-plist
index 04dcaa4f87a5..4f4924cfd8b1 100644
--- a/graphics/mesa-libs/pkg-plist
+++ b/graphics/mesa-libs/pkg-plist
@@ -1,51 +1,53 @@
-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
-include/GL/glcorearb.h
-include/GL/glext.h
-%%GLX%%include/GL/glx.h
-%%GLX%%include/GL/glxext.h
+@comment include/EGL/eglplatform.h
+@comment include/GL/gl.h
+@comment include/GL/glcorearb.h
+@comment include/GL/glext.h
+%%GLX%%@comment include/GL/glx.h
+%%GLX%%@comment include/GL/glxext.h
 @comment include/GL/internal/dri_interface.h
-include/GLES/egl.h
-include/GLES/gl.h
-include/GLES/glext.h
-include/GLES/glplatform.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/GLES/egl.h
+@comment include/GLES/gl.h
+@comment include/GLES/glext.h
+@comment include/GLES/glplatform.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
 @comment lib/dri/swrast_dri.so
-lib/libEGL.so
-lib/libEGL.so.1
-lib/libEGL.so.1.0.0
-%%GLX%%lib/libGL.so
-%%GLX%%lib/libGL.so.1
-%%GLX%%lib/libGL.so.1.2.0
-lib/libGLESv1_CM.so
-lib/libGLESv1_CM.so.1
-lib/libGLESv1_CM.so.1.1.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/libGLESv1_CM.so
+@comment lib/libGLESv1_CM.so.1
+@comment lib/libGLESv1_CM.so.1.1.0
+@comment lib/libGLESv2.so
+@comment lib/libGLESv2.so.2
+@comment lib/libGLESv2.so.2.0.0
+%%GLX%%lib/libGLX_mesa.so
+%%GLX%%lib/libGLX_mesa.so.0
+%%GLX%%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
 @comment libdata/pkgconfig/dri.pc
-libdata/pkgconfig/egl.pc
+@comment libdata/pkgconfig/egl.pc
 libdata/pkgconfig/gbm.pc
-%%GLX%%libdata/pkgconfig/gl.pc
-libdata/pkgconfig/glesv1_cm.pc
-libdata/pkgconfig/glesv2.pc
+%%GLX%%@comment libdata/pkgconfig/gl.pc
+@comment libdata/pkgconfig/glesv1_cm.pc
+@comment libdata/pkgconfig/glesv2.pc
 @comment share/drirc.d/00-mesa-defaults.conf
+share/glvnd/egl_vendor.d/50_mesa.json
diff --git a/misc/raspberrypi-userland/Makefile b/misc/raspberrypi-userland/Makefile
index 5dfa743da18c..42fad99b9736 100644
--- a/misc/raspberrypi-userland/Makefile
+++ b/misc/raspberrypi-userland/Makefile
@@ -1,64 +1,64 @@
 # Created by: Mikael Urankar <mikael.urankar@gmail.com>
 
 PORTNAME=	raspberrypi-userland
 PORTVERSION=	20161026
 CATEGORIES=	misc
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Various libraries for the Raspberry Pi
 
 LICENSE=	BSD3CLAUSE
 
 ONLY_FOR_ARCHS=	armv6 armv7
 
-CONFLICTS_INSTALL=	mesa-libs
+CONFLICTS_INSTALL=	libglvnd
 
 USES=		cmake pkgconfig shebangfix
 
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gonzoua
 GH_PROJECT=	userland
 GH_TAGNAME=	e143b48
 
 CMAKE_ARGS+=	-DVMCS_INSTALL_PREFIX=${PREFIX} \
 		-DCMAKE_TOOLCHAIN_FILE=${WRKSRC}/makefiles/cmake/toolchains/arm-freebsd.cmake
 SHEBANG_FILES=	host_applications/linux/apps/dtoverlay/dtoverlay-post \
 		host_applications/linux/apps/dtoverlay/dtoverlay-pre
 
 OPTIONS_DEFINE=	EXAMPLES DEBUG
 EXAMPLES_DESC=	Install test applications source code (hello_pi)
 EXAMPLES_LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 DEBUG_CFLAGS_OFF=	-DNDEBUG
 
 LLD_UNSAFE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/opt/vc|${PREFIX}|g" \
 		${WRKSRC}/makefiles/cmake/vmcs.cmake \
 		${WRKSRC}/host_applications/linux/apps/hello_pi/Makefile.include
 	@${REINPLACE_CMD} -e "s|CMAKE_C_COMPILER cc|CMAKE_C_COMPILER ${CC}|g" \
 		-e "s|CMAKE_CXX_COMPILER c++|CMAKE_C_COMPILER ${CXX}|g" \
 		-e "s|CMAKE_ASM_COMPILER as|CMAKE_C_COMPILER ${CC}|g" \
 		${WRKSRC}/makefiles/cmake/toolchains/arm-freebsd.cmake
 # patches for hello_pi example
 	@${REINPLACE_CMD} -e "s|make|gmake|g" \
 		${WRKSRC}/host_applications/linux/apps/hello_pi/rebuild.sh
 	@${REINPLACE_CMD} -e "s|gcc|cc|g" \
 		${WRKSRC}/host_applications/linux/apps/hello_pi/hello_fft/makefile
 	@${REINPLACE_CMD} -e "s|linux|sys|g" \
 		${WRKSRC}/host_applications/linux/apps/hello_pi/hello_fft/mailbox.h
 	@${REINPLACE_CMD} -e "s|LOCALBASE|${LOCALBASE}|g" \
 		${WRKSRC}/host_applications/linux/apps/hello_pi/Makefile.include
 .for file in hello_fft/gpu_fft.txt hello_teapot/triangle.c hello_teapot/video.c hello_videocube/video.c
 	@${REINPLACE_CMD} -e "s|/opt/vc/src|${EXAMPLESDIR}|g" \
 		${WRKSRC}/host_applications/linux/apps/hello_pi/${file}
 .endfor
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKSRC}/host_applications/linux/apps/hello_pi && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/hello_pi)
 
 .include <bsd.port.mk>
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index daa727149404..23efd76bbbda 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -1,333 +1,341 @@
 # Created by: Stijn Hoop <stijn@win.tue.nl>
 #
 # For those wondering why this port is not under `x11-drivers' category,
 # have a look at https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=121930.
 #
 # Starting with version 1.0-7667, NVidia has dropped support for numerous
 # "legacy" GPUs.  Consult NVidia README (the Appendix) to find out whether
 # you need to use legacy driver version and install one of corresponding
 # slave ports instead (`x11/nvidia-driver-390', `x11/nvidia-driver-340',
 # or `x11/nvidia-driver-304').
 #
 # To simplify testing of new feature branches and beta driver versions,
 # the port aims to support building against arbitrary DISTVERSION, i.e.
 # ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.
 
 PORTNAME?=	nvidia-driver
 DISTVERSION?=	460.80
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	danfe@FreeBSD.org
 COMMENT?=	NVidia graphics card binary drivers for hardware OpenGL rendering
 
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
 .include "${.CURDIR}/../nvidia-driver/Makefile.common"
 
 # Pull GNU sed(1) for "binary" patching of obj/libglvnd/libEGL.so.1 and
 # obj/libEGL_nvidia.so.0 (see below)
 .if ${NVVERSION} >= 410.057
 PATCH_DEPENDS=	gsed:textproc/gsed
+BUILD_DEPENDS=	pkg-config:devel/pkgconf libglvnd>0:graphics/libglvnd
 .endif
 
 USES=		kmod uidfix xorg
 USE_XORG=	x11 xorg-server xext
 USE_LDCONFIG=	yes
 
 GLVND_JSON_PATH=	${PREFIX}/share/glvnd/egl_vendor.d
 WAYLAND_JSON_PATH=	${PREFIX}/share/egl/egl_external_platform.d
 MAKE_ENV=	DEBUG_FLAGS=${DEBUG_FLAGS} \
 		EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} \
 		EGL_WAYLAND_JSON_PATH=${STAGEDIR}${WAYLAND_JSON_PATH}
 SUB_FILES=	pkg-message
 .if !defined(LIBGLDIR)
 SUB_FILES+=	nvidia.conf
 .endif
 .if ${NVVERSION} < 410.057
 SUB_FILES+=	pkg-deinstall pkg-install
 .endif
 SUB_PATCHES=	extra-patch-src-Makefile \
 		extra-patch-src-nv-freebsd.h \
 		extra-patch-src-nv-misc.h \
 		extra-patch-src-nvidia_dev.c \
 		extra-patch-src-nvidia_pci.c
 DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0
 MODULESDIR=	lib/xorg/modules
 EXTENSIONSDIR?=	${MODULESDIR}/extensions/.nvidia
 PORTDOCS=	*
 
 .if ${NVVERSION} >= 331.013
 SUB_LIST+=	NVGL=""
 .else
 SUB_LIST+=	NVGL="\# "
 .endif
 
 .if ${NVVERSION} < 355.006
 NVSRC=		.
 .else
 NVSRC=		nvidia
 .endif
 
 .if ${NVVERSION} < 460.039
 .  if ${NVVERSION} >= 358.009
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c
 .  endif
 SUB_PATCHES+=	extra-patch-src-nvidia_ctl.c \
 		extra-patch-src-nvidia_linux.c
 .else
 EXTRA_PATCHES+=	${FILESDIR}/460-patch-lib-libGLX_nvidia-Makefile \
 		${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \
 		${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c \
 		${FILESDIR}/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c
 .endif
 
 OPTIONS_DEFINE=	ACPI_PM LINUX WBINVD DOCS
 OPTIONS_DEFINE_i386=	PAE
 OPTIONS_DEFAULT=	LINUX
 
 ACPI_PM_DESC=		ACPI Power Management support
 LINUX_DESC=		Linux compatibility support
 PAE_DESC=		Physical Address Extensions support
 WBINVD_DESC=		Flush CPU caches directly with WBINVD
 
 .if ${NVVERSION} < 310.014
 OPTIONS_DEFINE+=	FREEBSD_AGP
 FREEBSD_AGP_DESC=	Use FreeBSD AGP GART driver
 .endif
 
 PLIST_SUB+=	MODULESDIR=${MODULESDIR}
 .if ${NVVERSION} < 410.057
 PLIST_SUB+=	EXTENSIONSDIR=${EXTENSIONSDIR}
 .else
 PLIST_SUB+=	EXTENSIONSDIR="@comment "
 .endif
 .if defined(LIBGLDIR)
 PLIST_SUB+=	LIBGLDIR=${LIBGLDIR} LIBGLMAP="@comment "
 .else
 PLIST_SUB+=	LIBGLDIR="@comment " LIBGLMAP=""
 .endif
 
 .if ${PORTNAME} != nvidia-secondary-driver
 CONFLICTS_INSTALL+=	nvidia-secondary-driver
 .endif
 
 .include <bsd.port.pre.mk>
 
 pre-patch:
 .for p in ${SUB_PATCHES}
 	@${SED} 's/%%NVSRC%%/${NVSRC}/g' ${PATCHDIR}/${p}.in > ${WRKDIR}/${p}
 .endfor
 .for p in ${SUB_PATCHES}
 EXTRA_PATCHES+=	${WRKDIR}/${p}
 .endfor
 
 post-patch: .SILENT
 # We should support -CURRENT: kill the check (first #if __FreeBSD_version)
 	linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \
 		${WRKSRC}/src/${NVSRC}/nv-freebsd.h) ; ${REINPLACE_CMD} \
 		-e "$$linenum,+2d" ${WRKSRC}/src/${NVSRC}/nv-freebsd.h
 # Adjust Linux headers #include's after FreeBSD src r246085
 	${REINPLACE_CMD} -E '/#include "machine\/\.\.\/linux(32)?\/linux.h"/ \
 		{ x ; s/.*/#include "machine\/..\/..\/compat\/linux\/linux_ioctl.h"/ ; H ; x ; }' \
 			${WRKSRC}/src/${NVSRC}/nvidia_linux.c
 # Fix bogus memset() call
 	${REINPLACE_CMD} -e '/memset/s/sizeof(ci/sizeof(*ci/' \
 		${WRKSRC}/src/${NVSRC}/nvidia_subr.c
 # Chase `sys/capability.h' rename to `sys/capsicum.h' in FreeBSD src r263232
 	${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \
 		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
 .if ${NVVERSION} >= 358.009
 	${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \
 		${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c
 .endif
 # KPI of kmem_alloc_contig(),kmem_free() changed in FreeBSD src r338143,r338318
 .if ${OSVERSION} >= 1200079
 	${REINPLACE_CMD} \
 	    -e 's/kmem_alloc_contig(kmem_arena, /kmem_alloc_contig(/' \
 	    -e 's/kmem_free(kmem_arena, /kmem_free(/' \
 		${WRKSRC}/src/${NVSRC}/nvidia_subr.c
 .endif
 # Pull the right header after FreeBSD src r347984
 .if ${OSVERSION} >= 1300029 && ${NVVERSION} >= 358.009
 	${REINPLACE_CMD} -e '/^#include/s:lock\.h:mutex.h:' \
 		${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c
 .endif
 # Disable installation of Linux libraries (provided by the corresponding
 # `x11/linux-nvidia-libs' port or its slaves)
 	${REINPLACE_CMD} -e 's/exists(\/.*/& \&\& 0/' \
 		${WRKSRC}/lib/Makefile
 # Do not install VDPAU libraries which are provided by `multimedia/libvdpau'
 # port for a while now
 	${REINPLACE_CMD} -e '/libvdpau[[:blank:]_][^n]/d ; \
 		s/name libvdpau/&_nvidia/' ${WRKSRC}/lib/Makefile
 # Do not build any binaries (native nvidia-settings and nvidia-xconfig are
 # provided by their corresponding ports) and manual pages
 	${REINPLACE_CMD} -E 's/(extension).*/\1/' ${WRKSRC}/x11/Makefile
 	${REINPLACE_CMD} -e '/bin/d ; /man/d' ${WRKSRC}/x11/Makefile
 # Also do not install libnvidia-gtk* libraries which are for nvidia-settings
 .if ${NVVERSION} >= 346.016
 	${REINPLACE_CMD} -e '/libnvidia-gtk/d' ${WRKSRC}/lib/Makefile
 .endif
 # Adjust installation path of a conflicting file (shared between
 # nvidia-driver and xorg-server) to ease package manager work
 .if ${NVVERSION} < 410.057
 	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia:' \
 		${WRKSRC}/x11/extension/Makefile
 .endif
 # Do not execute afterinstall target (prevent automatic module registration
 # and "smart" installation of conflicting files heuristics)
 	${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's/beforeinstall/&_dontexecute/' \
 		${WRKSRC}/lib/Makefile ${WRKSRC}/src/${NVSRC}/Makefile
 # /usr/share/nvidia path is hardcoded in libGL and nvidia-settings, but we
 # won't adhere to this stupidity and install nvidia-application-profiles-*
 # files as part of documentation
 .if ${NVVERSION} >= 410.057
 	${REINPLACE_CMD} -e 's,/usr/share/nvidia,$${DESTDIR}${DOCSDIR},' \
 		${WRKSRC}/lib/libGLX_nvidia/Makefile ${WRKSRC}/doc/Makefile
 	${REINPLACE_CMD} -e '/AUXLINK_LINK/s,\$${DESTDIR},,' \
 		${WRKSRC}/lib/libGLX_nvidia/Makefile
 	prefix="${PREFIX}" ; padding=$$(($${#prefix}+3)) ; \
 	gsed ${REINPLACE_ARGS} -E "s,/etc/glvnd/egl_vendor\.d.{$$padding},${GLVND_JSON_PATH}\x00," \
 		${WRKSRC}/obj/libglvnd/libEGL.so.1
 .elif ${NVVERSION} >= 334.016
 	${REINPLACE_CMD} -e 's,/usr/share/nvidia,$${DESTDIR}${DOCSDIR},' \
 		${WRKSRC}/lib/libGL/Makefile ${WRKSRC}/doc/Makefile
 .endif
 .if ${NVVERSION} >= 415.013
 	prefix="${PREFIX}" ; padding=$$(($${#prefix}+3)) ; \
 	gsed ${REINPLACE_ARGS} -E "s,/etc/egl/egl_external_platform\.d.{$$padding},${WAYLAND_JSON_PATH}\x00," \
 		${WRKSRC}/obj/libEGL_nvidia.so.0
 .endif
 # Finally, process OPTIONS
 .if ${PORT_OPTIONS:MFREEBSD_AGP}
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
 		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
 .endif
 .if ${PORT_OPTIONS:MACPI_PM}
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_ACPI_PM)/define \1/' \
 		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
 .endif
 .if ! ${PORT_OPTIONS:MLINUX}
 	${REINPLACE_CMD} -E 's/define (NV_SUPPORT_LINUX_COMPAT)/undef \1/' \
 		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
 .  if ${NVVERSION} >= 358.009
 	${REINPLACE_CMD} -E 's/define (NVKMS_SUPPORT_LINUX_COMPAT)/undef \1/' \
 		${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c
 .  endif
 .endif
 .if ${PORT_OPTIONS:MPAE}
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_PAE)/define \1/' \
 		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
 .endif
 .if ${PORT_OPTIONS:MWBINVD}
 	${REINPLACE_CMD} -E 's/undef (NV_USE_WBINVD)/define \1/' \
 		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
 .endif
 # Conditionally install documentation (but you generally want it)
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -E 's/(x11).*/\1/ ; /doc/d' ${WRKSRC}/Makefile
 .endif
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${MODULESDIR}/drivers \
 		${STAGEDIR}${PREFIX}/${MODULESDIR}/extensions
 
 post-install: .SILENT
 	${INSTALL_SCRIPT} ${WRKSRC}/obj/nvidia-bug-report.sh \
 		${STAGEDIR}${PREFIX}/bin
 # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's
 .if ${NVVERSION:R} < 460
 	${REINPLACE_CMD} -e '/libnvidia-glvkspirv\.so/d ; \
 		/nvidia_icd\.json/d ; /nvidia_layers\.json/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} >= 304.128 && ${NVVERSION} < 310.019 || ${NVVERSION} >= 361.016
 	${REINPLACE_CMD} -E '/libvdpau(_trace)?\.so/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} >= 310.019
 	${REINPLACE_CMD} -e '/libXvMCNVIDIA/d' ${TMPPLIST}
 .else	# some applications need this symlink (see PR ports/72877)
 	${LN} -sf libXvMCNVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
 .endif
 .if ${NVVERSION} < 331.013 || ${ARCH} == amd64 && ${NVVERSION} < 334.016
 	${REINPLACE_CMD} -E '/lib(nvidia-)?(EGL|eglcore|GLESv|glsi)/d' \
 		${TMPPLIST}
 .endif
 .if ${NVVERSION} < 352.009
 	${REINPLACE_CMD} -E '/(lib)?nvidia-(debugdump|smi|ml)/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 358.009
 	${REINPLACE_CMD} -e '/nvidia-modeset\.ko/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 410.057
 	${REINPLACE_CMD} -E '/lib(EGL|GLESv[12].*)_nvidia/d ; \
 		/lib(GLX|GLdispatch|OpenGL)/d ; \
 		/extensions\/libglxserver_nvidia\.so/d ; \
 		/10_nvidia\.json/d' ${TMPPLIST}
 .else
 	${REINPLACE_CMD} -e '/extensions\/\.nvidia\/libglx/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 415.013
 	${REINPLACE_CMD} -e '/libnvidia-egl-wayland\.so/d ; \
 		/10_nvidia_wayland\.json/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 440.036
 	${REINPLACE_CMD} -e '/lib32\//d' ${TMPPLIST}
 .elif ${NVVERSION} < 465.01901
 	${REINPLACE_CMD} -e '/lib32\/libnvidia-glvkspirv\.so/d' ${TMPPLIST}
 .endif
+.if ${NVVERSION} < 410.057
 # Rename some libraries and install a libmap file to resolve conflict with
 # Mesa libraries.
 	${LN} -sf libGL-NVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so
 	${MV} -f ${STAGEDIR}${PREFIX}/lib/libGL.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so.1
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGL.so
-.if ${NVVERSION} >= 331.013
+.  if ${NVVERSION} >= 331.013
 	${LN} -sf libEGL-NVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so
 	${MV} -f ${STAGEDIR}${PREFIX}/lib/libEGL.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1
 	${RM} ${STAGEDIR}${PREFIX}/lib/libEGL.so
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv1_CM.so
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv1_CM.so.1
 	${LN} -sf libGLESv2-NVIDIA.so.2 \
 		${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so
 	${MV} -f ${STAGEDIR}${PREFIX}/lib/libGLESv2.so.2 \
 		${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so
-.endif
-# Configuration of Nvidia as secondary GPU requires preserving Mesa libraries
-# as default implementation; a libmap must not override in this case.
-.if !defined(LIBGLDIR)
+.  endif
+# Configuration of Nvidia as secondary GPU requires preserving libglvnd or mesa
+# libraries as default implementation; a libmap must not override in this case.
+.  if !defined(LIBGLDIR)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d/
 	${INSTALL_DATA} ${WRKDIR}/nvidia.conf \
 		${STAGEDIR}${PREFIX}/etc/libmap.d/
-.else
+.  else
 # libgl proxies require a library path containing unrenamed lib*GL*.so
 	${MKDIR} ${STAGEDIR}${PREFIX}/${LIBGLDIR}
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/${LIBGLDIR}/libGL.so.1
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/${LIBGLDIR}/libEGL.so.1
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2 \
 		${STAGEDIR}${PREFIX}/${LIBGLDIR}/libGLESv2.so.2
-.endif
+.  endif
 # Configuration of Nvidia as secondary GPU requires preserving xorg-server's
 # libglx.so and moving Nvidia's glx to where it can be found by a secondary
 # Xorg instance.
 # Not needed since 410.057: Nvidia driver finds libglxserver_nvidia.so instead.
-.if ${NVVERSION} < 410.057
-.if ${EXTENSIONSDIR} != ${MODULESDIR}/extensions/.nvidia
+.  if ${EXTENSIONSDIR} != ${MODULESDIR}/extensions/.nvidia
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EXTENSIONSDIR}
 	${MV} ${STAGEDIR}${PREFIX}/${MODULESDIR}/extensions/.nvidia/* \
 		${STAGEDIR}${PREFIX}/${EXTENSIONSDIR}/
-.endif
+.  endif
+.else
+	${REINPLACE_CMD} -E '/-NVIDIA/d ; \
+		/lib(Open)?E?GLX?(ESv[12](_CM)?|dispatch)?\.so/d' \
+		${TMPPLIST}
+# Override mesa.conf if GLX_EXT_libglvnd is missing
+	@${ECHO_CMD} "libGLX_indirect.so.0 libGLX_nvidia.so.0" \
+		>${STAGEDIR}${PREFIX}/etc/libmap.d/nvidia.conf
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index 85156cdb6eff..caa1dc84ae52 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -1,97 +1,97 @@
 bin/nvidia-bug-report.sh
 bin/nvidia-debugdump
 bin/nvidia-smi
 %%LIBGLMAP%%etc/libmap.d/nvidia.conf
 %%LIBGLDIR%%/libGL.so.1
 %%LIBGLDIR%%/libEGL.so.1
 %%LIBGLDIR%%/libGLESv2.so.2
 lib/libEGL-NVIDIA.so
 lib/libEGL-NVIDIA.so.1
 lib/libEGL_nvidia.so
 lib/libEGL_nvidia.so.0
 lib/libGL-NVIDIA.so
 lib/libGL-NVIDIA.so.1
 lib/libGLESv1_CM_nvidia.so
 lib/libGLESv1_CM_nvidia.so.1
 lib/libGLESv2-NVIDIA.so
 lib/libGLESv2-NVIDIA.so.2
 lib/libGLESv2_nvidia.so
 lib/libGLESv2_nvidia.so.2
-lib/libGLX.so
-lib/libGLX.so.0
-lib/libGLX_indirect.so.0
+%%LIBGLDIR%%/libGLX.so
+%%LIBGLDIR%%/libGLX.so.0
+@comment lib/libGLX_indirect.so.0
 lib/libGLX_nvidia.so
 lib/libGLX_nvidia.so.0
 lib/libGLdispatch.so
 lib/libGLdispatch.so.0
 lib/libOpenGL.so
 lib/libOpenGL.so.0
 lib/libXvMCNVIDIA.a
 lib/libXvMCNVIDIA.so
 lib/libXvMCNVIDIA.so.1
 lib/libXvMCNVIDIA_dynamic.so.1
 lib/libnvidia-cfg.so
 lib/libnvidia-cfg.so.1
 @comment lib/libnvidia-egl-wayland.so
 @comment lib/libnvidia-egl-wayland.so.1
 lib/libnvidia-eglcore.so
 lib/libnvidia-eglcore.so.1
 lib/libnvidia-glcore.so
 lib/libnvidia-glcore.so.1
 lib/libnvidia-glsi.so
 lib/libnvidia-glsi.so.1
 lib/libnvidia-glvkspirv.so
 lib/libnvidia-glvkspirv.so.1
 lib/libnvidia-ml.so
 lib/libnvidia-ml.so.1
 lib/libnvidia-tls.so
 lib/libnvidia-tls.so.1
 lib/libvdpau_nvidia.so
 lib/vdpau/libvdpau_nvidia.so.1
 lib32/libEGL.so
 lib32/libEGL.so.1
 lib32/libEGL_nvidia.so
 lib32/libEGL_nvidia.so.0
 lib32/libGL.so
 lib32/libGL.so.1
 lib32/libGLESv1_CM.so
 lib32/libGLESv1_CM.so.1
 lib32/libGLESv1_CM_nvidia.so
 lib32/libGLESv1_CM_nvidia.so.1
 lib32/libGLESv2.so
 lib32/libGLESv2.so.2
 lib32/libGLESv2_nvidia.so
 lib32/libGLESv2_nvidia.so.2
 lib32/libGLX.so
 lib32/libGLX.so.0
 lib32/libGLX_nvidia.so
 lib32/libGLX_nvidia.so.0
 lib32/libGLdispatch.so
 lib32/libGLdispatch.so.0
 lib32/libOpenGL.so
 lib32/libOpenGL.so.0
 lib32/libnvidia-cfg.so
 lib32/libnvidia-cfg.so.1
 lib32/libnvidia-eglcore.so
 lib32/libnvidia-eglcore.so.1
 lib32/libnvidia-glcore.so
 lib32/libnvidia-glcore.so.1
 lib32/libnvidia-glsi.so
 lib32/libnvidia-glsi.so.1
 lib32/libnvidia-glvkspirv.so
 lib32/libnvidia-glvkspirv.so.1
 lib32/libnvidia-tls.so
 lib32/libnvidia-tls.so.1
 lib32/vdpau/libvdpau_nvidia.so.1
 man/man1/nvidia-smi.1.gz
 @comment share/egl/egl_external_platform.d/10_nvidia_wayland.json
 share/glvnd/egl_vendor.d/10_nvidia.json
 share/vulkan/icd.d/nvidia_icd.json
 share/vulkan/implicit_layer.d/nvidia_layers.json
 %%MODULESDIR%%/drivers/nvidia_drv.so
 %%EXTENSIONSDIR%%/libglx.so
 %%EXTENSIONSDIR%%/libglx.so.1
 %%MODULESDIR%%/extensions/libglxserver_nvidia.so
 %%MODULESDIR%%/extensions/libglxserver_nvidia.so.1
 /%%KMODDIR%%/nvidia.ko
 /%%KMODDIR%%/nvidia-modeset.ko