Index: head/graphics/libepoxy/Makefile
===================================================================
--- head/graphics/libepoxy/Makefile	(revision 484474)
+++ head/graphics/libepoxy/Makefile	(revision 484475)
@@ -1,30 +1,19 @@
 # $FreeBSD$
 
 PORTNAME=	libepoxy
 PORTVERSION=	1.5.2
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/anholt/${PORTNAME}/releases/download/${PORTVERSION}/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Library to handle OpenGL function pointer management
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		localbase meson pkgconfig python:3.3+,build tar:xz
 USE_XORG=	x11
-USE_GL=		gl glesv2
+USE_GL=		gl glesv2 egl
 USE_LDCONFIG=	yes
-
-OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	EGL
-OPTIONS_DEFAULT=EGL
-
-OPTIONS_EXCLUDE_sparc64=	EGL
-OPTIONS_EXCLUDE_mips=	EGL
-
-EGL_DESC=	Build EGL support
-EGL_USE=	GL=egl
-EGL_MESON_YES=	egl
 
 .include <bsd.port.mk>
Index: head/graphics/libepoxy/pkg-plist
===================================================================
--- head/graphics/libepoxy/pkg-plist	(revision 484474)
+++ head/graphics/libepoxy/pkg-plist	(revision 484475)
@@ -1,11 +1,11 @@
 include/epoxy/common.h
-%%EGL%%include/epoxy/egl.h
-%%EGL%%include/epoxy/egl_generated.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
 lib/libepoxy.so
 lib/libepoxy.so.0
 lib/libepoxy.so.0.0.0
 libdata/pkgconfig/epoxy.pc
Index: head/graphics/mesa-libs/Makefile
===================================================================
--- head/graphics/mesa-libs/Makefile	(revision 484474)
+++ head/graphics/mesa-libs/Makefile	(revision 484475)
@@ -1,70 +1,56 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mesa-libs
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL libraries that support GLX and EGL clients
 
 USE_XORG=	xorgproto x11 xcb xdamage xext \
 		xfixes xshmfence xxf86vm
 
 OPTIONS_DEFINE=	WAYLAND
 OPTIONS_SUB=	yes
 
 WAYLAND_DESC=		Enable support for the Wayland platform in EGL
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.8:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 			libwayland-server.so:graphics/wayland
 
 .include <bsd.port.options.mk>
 .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-dri-drivers="" --with-gallium-drivers=""
 
-# libEGL needs gallium enabled which depends on llvm
-.if "${MESA_LLVM_VER}" != ""
 .if ${PORT_OPTIONS:MWAYLAND}
 CONFIGURE_ARGS+=	--with-platforms=x11,surfaceless,drm,wayland
-.else
-CONFIGURE_ARGS+=	--with-platforms=x11,surfaceless,drm
 .endif
-PLIST_SUB+=		EGL=""
-.else
-CONFIGURE_ARGS+=	--disable-egl
-PLIST_SUB+=		EGL="@comment "
-.if ${PORT_OPTIONS:MWAYLAND}
-IGNORE=	option WAYLAND is only valid on platforms with LLVM
-.endif
-.endif
 
 MESA_BUILD_WRKSRC=	src/mapi src/util
 MESA_INSTALL_WRKSRC=	src/mapi
 
 .if ${PORT_OPTIONS:MWAYLAND}
 MESA_BUILD_WRKSRC+=	src/egl/wayland/wayland-drm src/egl/wayland/wayland-egl
 MESA_INSTALL_WRKSRC+=	src/egl/wayland/wayland-egl
 .endif
 
 MESA_BUILD_WRKSRC+=	src/gbm src/glx
 MESA_INSTALL_WRKSRC+=	src/gbm src/glx
 
-.if "${MESA_LLVM_VER}" != ""
 MESA_BUILD_WRKSRC+=	src/egl
 MESA_INSTALL_WRKSRC+=	src/egl
-.endif
 
 .if ${ARCH} == "i386"
 # PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set
 LDFLAGS+=-Wl,-z,notext
 .endif
 
 .include "${MASTERDIR}/Makefile.targets"
 
 post-install:
 	@cd ${WRKSRC}/src && ${SETENV} DESTDIR=${STAGEDIR} \
 		${MAKE_CMD} install-pkgconfigDATA install-glHEADERS install-glxHEADERS
 
 .include <bsd.port.post.mk>
Index: head/graphics/mesa-libs/pkg-plist
===================================================================
--- head/graphics/mesa-libs/pkg-plist	(revision 484474)
+++ head/graphics/mesa-libs/pkg-plist	(revision 484475)
@@ -1,46 +1,46 @@
 @comment etc/drirc
-%%EGL%%include/EGL/egl.h
-%%EGL%%include/EGL/eglext.h
-%%EGL%%include/EGL/eglextchromium.h
-%%EGL%%include/EGL/eglmesaext.h
-%%EGL%%include/EGL/eglplatform.h
+include/EGL/egl.h
+include/EGL/eglext.h
+include/EGL/eglextchromium.h
+include/EGL/eglmesaext.h
+include/EGL/eglplatform.h
 include/GL/gl.h
 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
 include/GLES2/gl2.h
 include/GLES2/gl2ext.h
 include/GLES2/gl2platform.h
 include/GLES3/gl3.h
 include/GLES3/gl31.h
 include/GLES3/gl32.h
 include/GLES3/gl3ext.h
 include/GLES3/gl3platform.h
-%%EGL%%include/KHR/khrplatform.h
+include/KHR/khrplatform.h
 include/gbm.h
-%%EGL%%lib/libEGL.so
-%%EGL%%lib/libEGL.so.1
-%%EGL%%lib/libEGL.so.1.0.0
+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
 lib/libGLESv2.so
 lib/libGLESv2.so.2
 lib/libGLESv2.so.2.0.0
 lib/libgbm.so
 lib/libgbm.so.1
 lib/libgbm.so.1.0.0
 lib/libglapi.so
 lib/libglapi.so.0
 lib/libglapi.so.0.0.0
 @comment %%WAYLAND%%lib/libwayland-egl.so
 @comment %%WAYLAND%%lib/libwayland-egl.so.1
 @comment %%WAYLAND%%lib/libwayland-egl.so.1.0.0
-%%EGL%%libdata/pkgconfig/egl.pc
+libdata/pkgconfig/egl.pc
 libdata/pkgconfig/gbm.pc
 libdata/pkgconfig/gl.pc
 libdata/pkgconfig/glesv2.pc
 @comment %%WAYLAND%%libdata/pkgconfig/wayland-egl.pc