Index: head/graphics/mesa-devel/files/libmap.conf.in
===================================================================
--- head/graphics/mesa-devel/files/libmap.conf.in	(revision 538567)
+++ head/graphics/mesa-devel/files/libmap.conf.in	(revision 538568)
@@ -1,25 +1,25 @@
 # EGL/GLX built with -Dglvnd=false
 libEGL.so.1 libEGL%%SUFFIX%%.so.1
-libGL.so.1 libGL%%SUFFIX%%.so.1
+%%X11%%libGL.so.1 libGL%%SUFFIX%%.so.1
 libGLESv1_CM.so.1 libGLESv1_CM%%SUFFIX%%.so.1
 libGLESv2.so.2 libGLESv2%%SUFFIX%%.so.2
 
 # EGL/GLX built with -Dglvnd=true
 # Xorg sets GLX_EXT_libglvnd to "mesa" by default
 libEGL_mesa.so.0 libEGL_mesa%%SUFFIX%%.so.0
-libGLX_mesa.so.0 libGLX_mesa%%SUFFIX%%.so.0
+%%X11%%libGLX_mesa.so.0 libGLX_mesa%%SUFFIX%%.so.0
 
-# Fallback if GLX_EXT_libglvnd is missing or vendor library doesn't exist
-libGLX_indirect.so.0 libGLX_mesa%%SUFFIX%%.so.0
+%%X11%%# Fallback if GLX_EXT_libglvnd is missing or vendor library doesn't exist
+%%X11%%libGLX_indirect.so.0 libGLX_mesa%%SUFFIX%%.so.0
 
 # GBM clients like eglkms and wlroots fail otherwise
 libgbm.so.1 libgbm%%SUFFIX%%.so.1
 
 %%VULKAN%%# Avoid different versions of the same driver showing up as multiple GPUs
 %%anv%%%%PREFIX%%/lib/libvulkan_intel.so libvulkan_intel%%SUFFIX%%.so
 %%radv%%%%PREFIX%%/lib/libvulkan_radeon.so libvulkan_radeon%%SUFFIX%%.so
 
 %%VAAPI%%%%r600%%%%PREFIX%%/lib/dri/r600_drv_video.so %%PREFIX%%/lib/dri%%SUFFIX%%/r600_drv_video.so
 %%VAAPI%%%%radeonsi%%%%PREFIX%%/lib/dri/radeonsi_drv_video.so %%PREFIX%%/lib/dri%%SUFFIX%%/radeonsi_drv_video.so
 %%VDPAU%%%%r600%%%%PREFIX%%/lib/vdpau/libvdpau_r600.so.1 %%PREFIX%%/lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1
 %%VDPAU%%%%radeonsi%%%%PREFIX%%/lib/vdpau/libvdpau_radeonsi.so.1 %%PREFIX%%/lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1