Index: Mk/Uses/gl.mk =================================================================== --- Mk/Uses/gl.mk +++ Mk/Uses/gl.mk @@ -13,12 +13,12 @@ .if !defined(_INCLUDE_USES_GL_MK) _INCLUDE_USES_GL_MK=yes -_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_egl_LIB_DEPENDS= libEGL.so:graphics/libglvnd +_GL_gbm_LIB_DEPENDS= libgbm.so:graphics/${GL_DEFAULT:S/,/ /g:[1]} +_GL_gl_LIB_DEPENDS= libGL.so:${GL_DEFAULT:S/,/ /g:[1]} _GL_gl_USE_XORG= xorgproto -_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_glesv1_LIB_DEPENDS= libGLESv1_CM.so:graphics/libglvnd +_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: Mk/bsd.default-versions.mk =================================================================== --- Mk/bsd.default-versions.mk +++ Mk/bsd.default-versions.mk @@ -52,8 +52,8 @@ .else GCC_DEFAULT?= 10 .endif -# Possible values (tuple): libglvnd, mesa-libs, mesa-devel -GL_DEFAULT?= libglvnd,mesa-libs +# Possible values: mesa-libs, mesa-devel +GL_DEFAULT?= mesa-libs # Possible values: 7, 8, 9, agpl GHOSTSCRIPT_DEFAULT?= agpl # Possible values: 6, 6-nox11, 7, 7-nox11 Index: graphics/mesa-devel/Makefile =================================================================== --- graphics/mesa-devel/Makefile +++ graphics/mesa-devel/Makefile @@ -65,9 +65,8 @@ 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_SLAVE+= GLVND OPTIONS_SUB= yes # Convert options to -D-drivers=