Index: head/graphics/libepoxy/Makefile
===================================================================
--- head/graphics/libepoxy/Makefile	(revision 538740)
+++ head/graphics/libepoxy/Makefile	(revision 538741)
@@ -1,20 +1,29 @@
 # $FreeBSD$
 
 PORTNAME=	libepoxy
 PORTVERSION=	1.5.4
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Library to handle OpenGL function pointer management
 
 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_USES=		xorg
+X11_USE=		GL=gl XORG=x11
+X11_MESON_YES=		glx
+X11_MESON_TRUE=		x11
+X11_CFLAGS_OFF=		-DEGL_NO_X11
 
 .include <bsd.port.mk>
Index: head/graphics/libepoxy/pkg-plist
===================================================================
--- head/graphics/libepoxy/pkg-plist	(revision 538740)
+++ head/graphics/libepoxy/pkg-plist	(revision 538741)
@@ -1,11 +1,11 @@
 include/epoxy/common.h
 include/epoxy/egl.h
 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
 libdata/pkgconfig/epoxy.pc