Index: graphics/mesa-devel/Makefile
===================================================================
--- graphics/mesa-devel/Makefile
+++ graphics/mesa-devel/Makefile
@@ -23,8 +23,7 @@
 ONLY_FOR_ARCHS_REASON=	Limited scope: no old drivers and no software rendering. \
 			See also https://mesamatrix.net/
 
-BUILD_DEPENDS=	libglvnd>=1.3.2:graphics/libglvnd \
-		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
+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)
@@ -35,6 +34,7 @@
 USES=		bison compiler:c++11-lib meson pkgconfig python:3.6+,build shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	mesa3d
+USE_GL=		opengl
 USE_LDCONFIG=	yes
 BINARY_ALIAS=	python=${PYTHON_CMD}
 SHEBANG_FILES=	src/vulkan/overlay-layer/${PORTNAME}-overlay-control.py
Index: graphics/mesa-libs/Makefile
===================================================================
--- graphics/mesa-libs/Makefile
+++ graphics/mesa-libs/Makefile
@@ -7,8 +7,6 @@
 
 COMMENT=	OpenGL libraries that support GLX and EGL clients
 
-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
@@ -51,11 +49,13 @@
 
 .if ${PORT_OPTIONS:MPLATFORM_X11}
 MESA_PLATFORMS+=	x11
-USE_XORG+=		xorgproto x11 xcb xdamage xext \
+USE_GL=			gl
+USE_XORG+=		x11 xcb xdamage xext \
 			xfixes xshmfence xxf86vm xrandr
 PLIST_SUB+=		GLX=""
 .else
 MESON_ARGS+=	-Dglx=disabled
+USE_GL=		opengl
 PLIST_SUB+=	GLX="@comment "
 .endif
 
Index: graphics/s2tc/Makefile
===================================================================
--- graphics/s2tc/Makefile
+++ graphics/s2tc/Makefile
@@ -11,13 +11,13 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	libglvnd>=0:graphics/libglvnd
 TEST_DEPENDS=	convert:graphics/ImageMagick6 \
 		nvcompress:graphics/nvidia-texture-tools \
 		wget:ftp/wget
 
 USES=		autoreconf libtool pathfix
 USE_GITHUB=	yes
+USE_GL=		opengl
 USE_LDCONFIG=	yes
 
 GH_ACCOUNT=	divVerent
Index: x11/nvidia-driver/Makefile
===================================================================
--- x11/nvidia-driver/Makefile
+++ x11/nvidia-driver/Makefile
@@ -32,7 +32,8 @@
 # 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
+BUILD_DEPENDS=	pkg-config:devel/pkgconf
+USE_GL=		opengl
 .endif
 
 USES=		kmod uidfix xorg