Index: graphics/mesa-devel/Makefile
===================================================================
--- graphics/mesa-devel/Makefile
+++ graphics/mesa-devel/Makefile
@@ -23,10 +23,10 @@
 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
+		libexpat.so:textproc/expat2 \
+		libOpenGL.so:graphics/libglvnd
 .if !exists(/usr/lib/libelf.so)
 # DragonFly doesn't install it yet
 LIB_DEPENDS+=	libelf.so:devel/libelf
Index: graphics/mesa-libs/Makefile
===================================================================
--- graphics/mesa-libs/Makefile
+++ graphics/mesa-libs/Makefile
@@ -7,7 +7,7 @@
 
 COMMENT=	OpenGL libraries that support GLX and EGL clients
 
-BUILD_DEPENDS=	libglvnd>0:graphics/libglvnd
+LIB_DEPENDS+=	libOpenGL.so:graphics/libglvnd
 
 OPTIONS_GROUP=			PLATFORM
 OPTIONS_GROUP_PLATFORM=		PLATFORM_X11 PLATFORM_WAYLAND
Index: graphics/s2tc/Makefile
===================================================================
--- graphics/s2tc/Makefile
+++ graphics/s2tc/Makefile
@@ -11,7 +11,7 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	libglvnd>=0:graphics/libglvnd
+LIB_DEPENDS=	libOpenGL.so:graphics/libglvnd
 TEST_DEPENDS=	convert:graphics/ImageMagick6 \
 		nvcompress:graphics/nvidia-texture-tools \
 		wget:ftp/wget
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
+LIB_DEPENDS=	libOpenGL.so:graphics/libglvnd
 .endif
 
 USES=		kmod uidfix xorg