Index: head/graphics/mesa-dri/Makefile
===================================================================
--- head/graphics/mesa-dri/Makefile
+++ head/graphics/mesa-dri/Makefile
@@ -8,9 +8,6 @@
 
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
 
-USES=		xorg
-USE_XORG=	xorgproto x11 xdamage xext xfixes xshmfence
-
 OPTIONS_GROUP=			PLATFORM
 OPTIONS_GROUP_PLATFORM=		PLATFORM_X11 PLATFORM_WAYLAND PLATFORM_DRM PLATFORM_SURFACELESS
 PLATFORM_X11_DESC=		Enable X11 support for GBM/EGL
@@ -54,8 +51,8 @@
 GALLIUM_DRIVERS+=	R300 R600 RADEONSI
 VULKAN_DRIVERS+=	AMD
 . if ${PORT_OPTIONS:MPLATFORM_X11}
-USE_XORG+=		xv xvmc
 MESON_ARGS+=		-Dgallium-xvmc=true
+USE_XORG+=		xvmc
 . endif
 .endif
 .if ${ARCH} == amd64 || ${ARCH} == i386
@@ -67,14 +64,14 @@
 VULKAN_DRIVERS+=	INTEL
 .endif
 
-.if defined(VULKAN_DRIVERS)
-USE_XORG+=		xcb xrandr
-.endif
-
 LDFLAGS_i386=		-Wl,-znotext
 
 .if ${PORT_OPTIONS:MPLATFORM_X11}
 MESA_PLATFORMS+=	x11
+USE_XORG+=		xorgproto x11 xdamage xext xfixes xshmfence xv
+.if defined(VULKAN_DRIVERS)
+USE_XORG+=		xcb xrandr
+.endif
 .endif
 
 .if ${PORT_OPTIONS:MPLATFORM_DRM}
Index: head/graphics/mesa-dri/Makefile.common
===================================================================
--- head/graphics/mesa-dri/Makefile.common
+++ head/graphics/mesa-dri/Makefile.common
@@ -33,7 +33,9 @@
 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
 LIB_DEPENDS+=	libexpat.so:textproc/expat2
 .if ${COMPONENT} != clover
-USES+=		xorg
+.if ${PORT_OPTIONS:MPLATFORM_X11}
+USES+=	xorg
+.endif
 .endif
 .if ${COMPONENT} != osmesa
 LIB_DEPENDS+=	libdrm.so:graphics/libdrm
Index: head/graphics/mesa-libs/Makefile
===================================================================
--- head/graphics/mesa-libs/Makefile
+++ head/graphics/mesa-libs/Makefile
@@ -10,10 +10,6 @@
 
 CONFLICTS_INSTALL=	libglvnd # include/GL/gl.h
 
-USES=		xorg
-USE_XORG=	xorgproto x11 xcb xdamage xext \
-		xfixes xshmfence xxf86vm xrandr
-
 OPTIONS_GROUP=			PLATFORM
 OPTIONS_GROUP_PLATFORM=		PLATFORM_X11 PLATFORM_WAYLAND PLATFORM_DRM PLATFORM_SURFACELESS
 PLATFORM_X11_DESC=		Enable X11 support for GBM/EGL
@@ -52,6 +48,12 @@
 
 .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}
Index: head/graphics/mesa-libs/pkg-plist
===================================================================
--- head/graphics/mesa-libs/pkg-plist
+++ head/graphics/mesa-libs/pkg-plist
@@ -7,9 +7,9 @@
 include/GL/gl_mangle.h
 include/GL/glcorearb.h
 include/GL/glext.h
-include/GL/glx.h
-include/GL/glx_mangle.h
-include/GL/glxext.h
+%%GLX%%include/GL/glx.h
+%%GLX%%include/GL/glx_mangle.h
+%%GLX%%include/GL/glxext.h
 @comment include/GL/internal/dri_interface.h
 include/GLES2/gl2.h
 include/GLES2/gl2ext.h
@@ -25,9 +25,9 @@
 lib/libEGL.so
 lib/libEGL.so.1
 lib/libEGL.so.1.0.0
-lib/libGL.so
-lib/libGL.so.1
-lib/libGL.so.1.2.0
+%%GLX%%lib/libGL.so
+%%GLX%%lib/libGL.so.1
+%%GLX%%lib/libGL.so.1.2.0
 lib/libGLESv2.so
 lib/libGLESv2.so.2
 lib/libGLESv2.so.2.0.0
@@ -40,6 +40,6 @@
 @comment libdata/pkgconfig/dri.pc
 libdata/pkgconfig/egl.pc
 libdata/pkgconfig/gbm.pc
-libdata/pkgconfig/gl.pc
+%%GLX%%libdata/pkgconfig/gl.pc
 libdata/pkgconfig/glesv2.pc
 @comment share/drirc.d/00-mesa-defaults.conf