Index: graphics/libepoxy/Makefile
===================================================================
--- graphics/libepoxy/Makefile	(revision 538340)
+++ graphics/libepoxy/Makefile	(working copy)
@@ -10,11 +10,20 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gl localbase meson pkgconfig python:3.3+,build xorg
+USES=		gl localbase meson pkgconfig python:3.3+,build
 USE_GITHUB=	yes
 GH_ACCOUNT=	anholt
-USE_XORG=	x11
-USE_GL=		gl glesv2 egl
+USE_GL=		glesv2 egl
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=		X11
+#OPTIONS_DEFAULT=	X11
+OPTIONS_SUB=		yes
+
+X11_MESON_YES=		glx
+X11_MESON_TRUE=		x11
+X11_USES=		xorg
+X11_USE=		GL=gl XORG=x11
+X11_CFLAGS_OFF=		-DEGL_NO_X11
+
 .include <bsd.port.mk>
Index: graphics/libepoxy/pkg-plist
===================================================================
--- graphics/libepoxy/pkg-plist	(revision 538340)
+++ graphics/libepoxy/pkg-plist	(working copy)
@@ -3,8 +3,8 @@
 include/epoxy/egl_generated.h
 include/epoxy/gl.h
 include/epoxy/gl_generated.h
-include/epoxy/glx.h
-include/epoxy/glx_generated.h
+%%X11%%include/epoxy/glx.h
+%%X11%%include/epoxy/glx_generated.h
 lib/libepoxy.so
 lib/libepoxy.so.0
 lib/libepoxy.so.0.0.0