Index: graphics/mesa-dri/Makefile
===================================================================
--- graphics/mesa-dri/Makefile
+++ graphics/mesa-dri/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mesa-dri
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
@@ -30,7 +30,7 @@
 .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
 
 ALL_DRI_DRIVERS=	I915 I965 RADEON R100 R200 SWRAST
-ALL_GALLIUM_DRIVERS=	FREEDRENO R300 R600 RADEONSI SVGA SWRAST VC4
+ALL_GALLIUM_DRIVERS=	R300 R600 RADEONSI SVGA SWRAST
 ALL_VULKAN_DRIVERS=	INTEL AMD
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marm*} || ${ARCH} == i386 || ${ARCH:Mmips*} || ${ARCH:Mpowerpc*}
@@ -54,11 +54,6 @@
 EXTRA_PATCHES+=	${PATCHDIR}/extra-src_mesa_drivers_dri_i965_intel__screen.c
 . endif
 VULKAN_DRIVERS+=	INTEL
-.elif ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
-GALLIUM_DRIVERS+=	FREEDRENO VC4
-. if ${ARCH} == armv6 || ${ARCH} == armv7
-EXTRA_PATCHES+=	${PATCHDIR}/extra-src_gallium_drivers_vc4_Makefile.in
-. endif
 .endif
 
 .if ${VULKAN_DRIVERS}
Index: graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in
===================================================================
--- graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gallium/drivers/vc4/Makefile.in.orig	2017-10-02 15:49:15 UTC
-+++ src/gallium/drivers/vc4/Makefile.in
-@@ -677,7 +677,7 @@ noinst_LTLIBRARIES = libvc4.la $(am__app
- libvc4_la_SOURCES = $(C_SOURCES)
- libvc4_la_LIBADD = $(SIM_LIB) $(am__append_5)
- @HAVE_ARM_ASM_TRUE@libvc4_neon_la_SOURCES = $(NEON_C_SOURCES)
--@HAVE_ARM_ASM_TRUE@libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -mfpu=neon
-+@HAVE_ARM_ASM_TRUE@libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -march=armv7-a -mfpu=neon
- libvc4_la_LDFLAGS = $(SIM_LDFLAGS)
- EXTRA_DIST = kernel/README
- all: all-am
Index: graphics/mesa-dri/pkg-plist
===================================================================
--- graphics/mesa-dri/pkg-plist
+++ graphics/mesa-dri/pkg-plist
@@ -8,9 +8,7 @@
 %%INTEL_VDRIVER%%include/vulkan/vulkan_intel.h
 %%I915_DRIVER%%lib/dri/i915_dri.so
 %%I965_DRIVER%%lib/dri/i965_dri.so
-%%FREEDRENO_GDRIVER%%lib/dri/kgsl_dri.so
 %%SWRAST_GDRIVER%%lib/dri/kms_swrast_dri.so
-%%FREEDRENO_GDRIVER%%lib/dri/msm_dri.so
 %%R200_DRIVER%%lib/dri/r200_dri.so
 %%R300_GDRIVER%%lib/dri/r300_dri.so
 %%R600_GDRIVER%%lib/dri/r600_dri.so
@@ -19,7 +17,6 @@
 %%RADEONSI_GDRIVER%%lib/dri/radeonsi_dri.so
 %%VAAPI%%%%RADEONSI_GDRIVER%%lib/dri/radeonsi_drv_video.so
 %%SWRAST_GDRIVER%%lib/dri/swrast_dri.so
-%%VC4_GDRIVER%%lib/dri/vc4_dri.so
 %%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so
 %%R600_GDRIVER%%lib/libXvMCr600.so
 %%R600_GDRIVER%%lib/libXvMCr600.so.1