diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mesa-demos
 PORTVERSION=	8.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/demos/ #${PORTVERSION}/
 
@@ -10,13 +10,11 @@
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libdrm.so:graphics/libdrm
-
 CONFLICTS_INSTALL=	glx-utils
 
 USES=		gmake gl localbase pkgconfig tar:bzip2 xorg
 GNU_CONFIGURE=	yes
-USE_GL=		egl gbm gl glesv2 glew glu glut
+USE_GL=		egl gl glesv2 glew glu glut
 USE_XORG=	xorgproto x11 xdamage xext xfixes xi xxf86vm
 
 CONFIGURE_ARGS+=--disable-gles1 --disable-osmesa --disable-vg --disable-wayland \
diff --git a/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am b/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am
deleted file mode 100644
--- a/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-# Install the EGL demos
-#
---- src/egl/opengl/Makefile.am.orig	2018-02-23 08:50:21 UTC
-+++ src/egl/opengl/Makefile.am
-@@ -57,8 +57,7 @@ endif
- 
- if HAVE_EGL
- bin_PROGRAMS = \
--	eglinfo
--noinst_PROGRAMS = \
-+	eglinfo \
- 	peglgears \
- 	$(EGL_DRM_DEMOS) \
- 	$(EGL_X11_DEMOS) \
diff --git a/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in b/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in
deleted file mode 100644
--- a/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in
+++ /dev/null
@@ -1,85 +0,0 @@
-# Install the EGL demos
-#
---- src/egl/opengl/Makefile.in.orig	2018-02-23 08:50:29 UTC
-+++ src/egl/opengl/Makefile.in
-@@ -115,9 +115,8 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--@HAVE_EGL_TRUE@bin_PROGRAMS = eglinfo$(EXEEXT)
--@HAVE_EGL_TRUE@noinst_PROGRAMS = peglgears$(EXEEXT) $(am__EXEEXT_1) \
--@HAVE_EGL_TRUE@	$(am__EXEEXT_2) $(am__EXEEXT_3)
-+@HAVE_EGL_TRUE@bin_PROGRAMS = eglinfo$(EXEEXT) peglgears$(EXEEXT) \
-+@HAVE_EGL_TRUE@	$(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
- subdir = src/egl/opengl
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
-@@ -130,14 +129,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
- mkinstalldirs = $(install_sh) -d
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
--am__installdirs = "$(DESTDIR)$(bindir)"
- @HAVE_DRM_TRUE@@HAVE_GBM_TRUE@am__EXEEXT_1 = eglkms$(EXEEXT)
- @HAVE_X11_TRUE@am__EXEEXT_2 = eglgears_x11$(EXEEXT) \
- @HAVE_X11_TRUE@	egltri_x11$(EXEEXT) xeglgears$(EXEEXT) \
- @HAVE_X11_TRUE@	xeglthreads$(EXEEXT)
- @HAVE_WAYLAND_TRUE@am__EXEEXT_3 = eglgears_wayland$(EXEEXT) \
- @HAVE_WAYLAND_TRUE@	egltri_wayland$(EXEEXT)
--PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-+am__installdirs = "$(DESTDIR)$(bindir)"
-+PROGRAMS = $(bin_PROGRAMS)
- am_eglgears_wayland_OBJECTS = eglgears.$(OBJEXT)
- eglgears_wayland_OBJECTS = $(am_eglgears_wayland_OBJECTS)
- eglgears_wayland_DEPENDENCIES = ../eglut/libeglut_wayland.la
-@@ -532,15 +531,6 @@ clean-binPROGRAMS:
- 	echo " rm -f" $$list; \
- 	rm -f $$list
- 
--clean-noinstPROGRAMS:
--	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
--	echo " rm -f" $$list; \
--	rm -f $$list || exit $$?; \
--	test -n "$(EXEEXT)" || exit 0; \
--	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
--	echo " rm -f" $$list; \
--	rm -f $$list
--
- eglgears_wayland$(EXEEXT): $(eglgears_wayland_OBJECTS) $(eglgears_wayland_DEPENDENCIES) $(EXTRA_eglgears_wayland_DEPENDENCIES) 
- 	@rm -f eglgears_wayland$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(eglgears_wayland_OBJECTS) $(eglgears_wayland_LDADD) $(LIBS)
-@@ -753,8 +743,7 @@ maintainer-clean-generic:
- 	@echo "it deletes files that may require special tools to rebuild."
- clean: clean-am
- 
--clean-am: clean-binPROGRAMS clean-generic clean-libtool \
--	clean-noinstPROGRAMS mostlyclean-am
-+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
- 
- distclean: distclean-am
- 	-rm -rf ./$(DEPDIR)
-@@ -825,16 +814,15 @@ uninstall-am: uninstall-binPROGRAMS
- .MAKE: install-am install-strip
- 
- .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
--	clean-binPROGRAMS clean-generic clean-libtool \
--	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
--	distclean-compile distclean-generic distclean-libtool \
--	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-binPROGRAMS install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-pdf install-pdf-am \
--	install-ps install-ps-am install-strip installcheck \
--	installcheck-am installdirs maintainer-clean \
-+	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
-+	ctags ctags-am distclean distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-binPROGRAMS \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- 	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
diff --git a/graphics/mesa-demos/pkg-plist b/graphics/mesa-demos/pkg-plist
--- a/graphics/mesa-demos/pkg-plist
+++ b/graphics/mesa-demos/pkg-plist
@@ -44,10 +44,7 @@
 bin/drawoverhead
 bin/drawpix
 bin/drawrange
-bin/eglgears_x11
 bin/eglinfo
-bin/eglkms
-bin/egltri_x11
 bin/engine
 bin/es2_info
 bin/es2gears_x11
@@ -134,7 +131,6 @@
 bin/paltex
 bin/pbdemo
 bin/pbinfo
-bin/peglgears
 bin/pgon-mode
 bin/pixeltest
 bin/point
@@ -312,8 +308,6 @@
 bin/vsraytrace
 bin/wincopy
 bin/winpos
-bin/xeglgears
-bin/xeglthreads
 bin/xfont
 bin/xrotfontdemo
 %%DATADIR%%/arch.rgb