Index: graphics/libepoxy/Makefile
===================================================================
--- graphics/libepoxy/Makefile	(revision 568116)
+++ graphics/libepoxy/Makefile	(working copy)
@@ -1,9 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	libepoxy
-PORTVERSION=	1.5.4
+PORTVERSION=	1.5.5
 CATEGORIES=	graphics
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	dbfa4b209c07.patch:-p1 # https://github.com/anholt/libepoxy/pull/238
+PATCHFILES+=	4994c48172e9.patch:-p1 # https://github.com/anholt/libepoxy/pull/238
+
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Library to handle OpenGL function pointer management
 
@@ -10,11 +14,12 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gl localbase meson pkgconfig python:3.3+,build
+USES=		gl localbase meson pkgconfig python:3.3+,build shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	anholt
 USE_GL=		glesv2 egl
 USE_LDCONFIG=	yes
+SHEBANG_FILES=	src/gen_dispatch.py
 
 OPTIONS_DEFINE=		X11
 OPTIONS_DEFAULT=	X11
@@ -24,6 +29,5 @@
 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: graphics/libepoxy/distinfo
===================================================================
--- graphics/libepoxy/distinfo	(revision 568116)
+++ graphics/libepoxy/distinfo	(working copy)
@@ -1,3 +1,7 @@
-TIMESTAMP = 1585645825
-SHA256 (anholt-libepoxy-1.5.4_GH0.tar.gz) = c926fcc606901f3e03e371027056fd478da43e01ce2da7ffc48b5a0de0ca107c
-SIZE (anholt-libepoxy-1.5.4_GH0.tar.gz) = 337615
+TIMESTAMP = 1615917195
+SHA256 (anholt-libepoxy-1.5.5_GH0.tar.gz) = 5d80a43a6524a1ebdd0c9c5d5105295546a0794681853c636a0c70f8f9c658ce
+SIZE (anholt-libepoxy-1.5.5_GH0.tar.gz) = 332057
+SHA256 (4994c48172e9.patch) = ccb188509b2c3ce983d1826f69d392509b081f390d2fa289a523c9e2a8640b95
+SIZE (4994c48172e9.patch) = 852
+SHA256 (dbfa4b209c07.patch) = 1fc9cdd587daa0aa8000bc8620ad53bdff511d8c78978ee46aef7c359a8f9ca9
+SIZE (dbfa4b209c07.patch) = 1148