Index: head/graphics/mesa-dri/Makefile.common
===================================================================
--- head/graphics/mesa-dri/Makefile.common	(revision 548948)
+++ head/graphics/mesa-dri/Makefile.common	(revision 548949)
@@ -1,112 +1,111 @@
 # Makefile.common - shared code between MesaLib ports.
 #
 # !!! Here be dragons !!! (they seem to be everywhere these days)
 #
 # Remember to upgrade the following ports everytime you bump MESAVERSION:
 #
 #    - graphics/libosmesa
 #    - graphics/mesa-dri
 #    - graphics/mesa-libs
 #    - lang/clover
 #
 # $FreeBSD$
 
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
 MESABASEVERSION=	19.0.8
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=
 
 MASTER_SITES=	https://mesa.freedesktop.org/archive/ \
 		https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \
 		ftp://ftp.freedesktop.org/pub/mesa/ \
 		ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
 
 DISTFILES=	mesa-${MESADISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	x11@FreeBSD.org
 
+NOT_FOR_ARCHS=sparc64
+NOT_FOR_ARCHS_REASON=not supported on sparc64
+
 COMPONENT=	${PORTNAME:tl:C/^lib//:C/mesa-//}
 
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs \
 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
 LIB_DEPENDS+=	libexpat.so:textproc/expat2
 .if ${COMPONENT} != clover
 .if ${PORT_OPTIONS:MPLATFORM_X11}
 USES+=	xorg
 .endif
 .endif
 .if ${COMPONENT} != osmesa
 LIB_DEPENDS+=	libdrm.so:graphics/libdrm
 .endif
 .if ${COMPONENT} != libs
 LIB_DEPENDS+=	libglapi.so:graphics/mesa-libs
 .endif
 .if ${ARCH} == amd64 || ${ARCH} == i386
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
 .if ${OPSYS} == DragonFly
 LIB_DEPENDS+=	libelf.so:devel/libelf
 .endif
 
 USES+=		compiler:c++11-lib bison meson pathfix pkgconfig \
 		python:3.6+,build shebangfix tar:xz
 
 USE_LDCONFIG=	yes
 
 .if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
 # --build-id isn't supported by old GNU ld.bfd in base
 # Also ld.bfd have problems that seems related to --as-needed
 USE_BINUTILS=		yes
 LDFLAGS+=		-B${LOCALBASE}/bin
 .endif
 
 # only have one port to check with portscout.
 .if ${PORTNAME} != mesa-dri
 PORTSCOUT=	ignore:1
 .endif
 
 python_OLD_CMD=	/usr/bin/env[[:space:]]python2 /usr/bin/python2 /bin/env[[:space:]]python
 SHEBANG_FILES=	src/gallium/*/*/*.py src/gallium/tools/trace/*.py \
 		src/gallium/drivers/svga/svgadump/svga_dump.py \
 		src/mapi/glapi/gen/*.py src/mapi/mapi_abi.py \
 		src/util/xmlpool/gen_xmlpool.py \
 		src/mesa/main/get_*.py src/util/format_srgb.py \
 		src/amd/*/*.py src/intel/genxml/gen_pack_header.py
 
 MASTERDIR=	${.CURDIR:H:H}/graphics/mesa-dri
 PATCHDIR=	${MASTERDIR}/files
 WRKSRC=		${WRKDIR}/mesa-${MESADISTVERSION}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 PKGHELP=	${.CURDIR}/pkg-help
 PKGINSTALL=	${.CURDIR}/pkg-install
 PKGDEINSTALL=	${.CURDIR}/pkg-deinstall
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == powerpc64
 LLVM_DEFAULT=	90
 .elif ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90
 LLVM_DEFAULT=	80
 .endif
 
 BINARY_ALIAS+=	python3=${PYTHON_VERSION}
 
-.if ${ARCH} == sparc64
-MESON_ARGS+=	-Dllvm=false
-.else
 BUILD_DEPENDS+=	llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT}
 .if ${COMPONENT} != libs
 RUN_DEPENDS+=	llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT}
 .endif
 MESON_ARGS+=	--native-file="${WRKSRC}/llvm.ini"
 LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib
 MESON_ARGS+=	-Dllvm=true
-.endif
 
 # we don't care about GLes v1
 MESON_ARGS+=	-Dgles1=false
 
Index: head/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__config.h
===================================================================
--- head/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__config.h	(revision 548948)
+++ head/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__config.h	(revision 548949)
@@ -1,38 +1,15 @@
---- src/gallium/include/pipe/p_config.h.orig	2017-10-02 15:49:02 UTC
+--- src/gallium/include/pipe/p_config.h.orig	2019-06-26 20:14:08 UTC
 +++ src/gallium/include/pipe/p_config.h
-@@ -77,6 +77,13 @@
- #define PIPE_CC_ICL
- #endif
- 
-+#if defined(__sparc__) || defined(__sparc64__)
-+#define PIPE_ARCH_SPARC
-+#if defined(__sparc64__)
-+#define PIPE_ARCH_SPARC_64
-+#endif
-+#endif
-+
- 
- /*
-  * Processor architecture
-@@ -131,7 +138,7 @@
- 
- #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) || defined(PIPE_ARCH_ARM) || defined(PIPE_ARCH_AARCH64)
- #define PIPE_ARCH_LITTLE_ENDIAN
--#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PIPE_ARCH_S390)
-+#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PIPE_ARCH_S390) || defined(PIPE_ARCH_SPARC) || defined(PIPE_ARCH_SPARC_64)
- #define PIPE_ARCH_BIG_ENDIAN
- #endif
- 
-@@ -160,6 +167,12 @@
+@@ -160,6 +160,12 @@
  #define PIPE_OS_ANDROID
  #endif
  
 +#if defined(__DragonFly__)
 +#define PIPE_OS_DRAGONFLY
 +#define PIPE_OS_BSD
 +#define PIPE_OS_UNIX
 +#endif
 +
  #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
  #define PIPE_OS_FREEBSD
  #define PIPE_OS_BSD