diff --git a/graphics/libosmesa/Makefile b/graphics/libosmesa/Makefile
index a6d5cf59f21b..edb47698e52b 100644
--- a/graphics/libosmesa/Makefile
+++ b/graphics/libosmesa/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	libosmesa
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	6
 CATEGORIES=	graphics
 
 COMMENT=	Off-Screen Mesa implementation of the OpenGL API
 
+USES=		xorg
 USE_XORG=	xorgproto
 
 .include <bsd.port.options.mk>
diff --git a/graphics/libxatracker/Makefile b/graphics/libxatracker/Makefile
index a7141414fa8f..3910b6b1e08e 100644
--- a/graphics/libxatracker/Makefile
+++ b/graphics/libxatracker/Makefile
@@ -8,6 +8,7 @@ CATEGORIES=	graphics
 
 COMMENT=	Mesa XA state tracker
 
+USES=		xorg
 USE_XORG=	xorgproto
 
 .include <bsd.port.options.mk>
diff --git a/graphics/libxatracker/pkg-plist b/graphics/libxatracker/pkg-plist
index 297d46f28a8a..e9a0110d1a12 100644
--- a/graphics/libxatracker/pkg-plist
+++ b/graphics/libxatracker/pkg-plist
@@ -3,5 +3,5 @@ include/xa_context.h
 include/xa_tracker.h
 lib/libxatracker.so
 lib/libxatracker.so.2
-lib/libxatracker.so.2.4.0
+lib/libxatracker.so.2.5.0
 libdata/pkgconfig/xatracker.pc
diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index bcd6424788ed..b65f2b9fd474 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	mesa-dri
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	9
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
 
+USES=		xorg
 USE_XORG=	xorgproto x11 xdamage xext xfixes xshmfence xv xvmc
 
 OPTIONS_DEFINE=	VAAPI VDPAU WAYLAND
diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
index 36d55e811344..1addff1d0336 100644
--- a/graphics/mesa-dri/Makefile.common
+++ b/graphics/mesa-dri/Makefile.common
@@ -14,7 +14,7 @@
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
-MESABASEVERSION=	18.3.2
+MESABASEVERSION=	19.0.8
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=
 
@@ -51,6 +51,7 @@ USES+=		compiler:c++11-lib bison gettext-tools gmake libtool \
 		localbase pathfix pkgconfig python:2.7,build shebangfix tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--enable-autotools
 
 # only have one port to check with portscout.
 .if ${PORTNAME} != mesa-dri
diff --git a/graphics/mesa-dri/distinfo b/graphics/mesa-dri/distinfo
index 93789b0423ef..d5fe8a03f2f3 100644
--- a/graphics/mesa-dri/distinfo
+++ b/graphics/mesa-dri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547724382
-SHA256 (mesa-18.3.2.tar.xz) = f7ce7181c07b6d8e0132da879af1729523a6c8aa87f79a9d59dfd064024cfb35
-SIZE (mesa-18.3.2.tar.xz) = 11868440
+TIMESTAMP = 1561580048
+SHA256 (mesa-19.0.8.tar.xz) = d017eb53a810c32dabeedf6ca2238ae1e897ce9090e470e9ce1d6c9e3f1b0862
+SIZE (mesa-19.0.8.tar.xz) = 11967592
diff --git a/graphics/mesa-dri/files/patch-9cab8cc.c b/graphics/mesa-dri/files/patch-9cab8cc.c
deleted file mode 100644
index 1d0f021841b2..000000000000
--- a/graphics/mesa-dri/files/patch-9cab8cc.c
+++ /dev/null
@@ -1,17 +0,0 @@
-amd: Make vgpr-spilling depend on llvm version 
-
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230789#c14
-diff --git a/src/amd/common/ac_llvm_util.c b/src/amd/common/ac_llvm_util.c
-index 69d9f7b9f3fe9e5feb07b32c35cbcf1206a14ca8..dc9b684e9dd287d5bb558d9ad3868a9d0975228d 100644
---- src/amd/common/ac_llvm_util.c
-+++ src/amd/common/ac_llvm_util.c
-@@ -153,7 +153,8 @@ static LLVMTargetMachineRef ac_create_target_machine(enum radeon_family family,
- 	LLVMTargetRef target = ac_get_llvm_target(triple);
- 
- 	snprintf(features, sizeof(features),
--		 "+DumpCode,+vgpr-spilling,-fp32-denormals,+fp64-denormals%s%s%s%s",
-+		 "+DumpCode,-fp32-denormals,+fp64-denormals%s%s%s%s%s",
-+		 HAVE_LLVM >= 0x0800 ? "" : ",+vgpr-spilling",
- 		 tm_options & AC_TM_SISCHED ? ",+si-scheduler" : "",
- 		 tm_options & AC_TM_FORCE_ENABLE_XNACK ? ",+xnack" : "",
- 		 tm_options & AC_TM_FORCE_DISABLE_XNACK ? ",-xnack" : "",
diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile
index 65a206ceae3c..70a95838f884 100644
--- a/graphics/mesa-libs/Makefile
+++ b/graphics/mesa-libs/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	mesa-libs
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	3
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL libraries that support GLX and EGL clients
 
+USES=		xorg
 USE_XORG=	xorgproto x11 xcb xdamage xext \
 		xfixes xshmfence xxf86vm
 
diff --git a/lang/clover/Makefile b/lang/clover/Makefile
index 96ba7f42b6fa..77f39abce652 100644
--- a/lang/clover/Makefile
+++ b/lang/clover/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	clover
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	5
 CATEGORIES=	lang
 
 COMMENT=	Mesa OpenCL implementation for AMD GPUs