Index: head/graphics/libGL/Makefile.common
===================================================================
--- head/graphics/libGL/Makefile.common	(revision 411840)
+++ head/graphics/libGL/Makefile.common	(revision 411841)
@@ -1,179 +1,189 @@
 # 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/dri
 #    - graphics/gbm
 #    - graphics/libEGL
 #    - graphics/libGL
 #    - graphics/libglapi
 #    - graphics/libglesv2
 #    - graphics/libosmesa
 #    - lang/clover
 #
 # $FreeBSD$
 
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
-MESABASEVERSION=	11.0.8
+MESABASEVERSION=	11.1.2
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=
 
 MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
 
 DISTFILES=	mesa-${MESADISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	x11@FreeBSD.org
 
 BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend
 LIB_DEPENDS+=	libdevq.so:${PORTSDIR}/devel/libdevq
 
 USES+=		compiler:c++11-lib gettext-tools gmake libtool \
 		pathfix pkgconfig python:2,build shebangfix tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-isystem${LOCALBASE}/include
 LDFLAGS+=	-Wl,-Y/usr/lib:${LOCALBASE}/lib
 
 PKGINSTALL=	${.CURDIR}/pkg-install
 PKGDEINSTALL=	${.CURDIR}/pkg-deinstall
 
 # only have one port to check with portscout.
 .if ${PORTNAME} != libGL
 PORTSCOUT=	ignore:1
 .endif
 
 .if ${OSVERSION} < 1000033
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 CONFIGURE_ENV+=	ac_cv_prog_LEX=${LOCALBASE}/bin/flex
 .endif
 
 python_OLD_CMD=	"/usr/bin/env[[:space:]]python"
 python_CMD=	${LOCALBASE}/bin/python2
 SHEBANG_FILES=	src/gallium/*/*/*.py src/gallium/tools/trace/*.py \
 		src/gallium/drivers/svga/svgadump/svga_dump.py \
 		src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py
 SHEBANG_FILES+=	src/mapi/mapi_abi.py
 
 MASTERDIR=		${.CURDIR}/../../graphics/libGL
 PATCHDIR=		${MASTERDIR}/files
 WRKSRC=			${WRKDIR}/mesa-${MESADISTVERSION}
 DESCR=			${.CURDIR}/pkg-descr
 PLIST=			${.CURDIR}/pkg-plist
 INSTALL_TARGET=		install-strip
 
 COMPONENT=		${PORTNAME:tl:C/^lib//:C/mesa-//}
 
-MESA_LLVM_VER=36
+MESA_LLVM_VER=37
 
+CONFIGURE_ARGS+=	--with-sha1=libcrypto
+
 # DRI3 needs PRIME support in the kernel to work
 CONFIGURE_ARGS+=	--disable-dri3
 
 CONFIGURE_ARGS+=	--enable-gbm
 
 # libEGL, dri and clover need gallium enabled.
 # the third option in --with-egl-platforms is wayland.
 CONFIGURE_ARGS+=	--enable-egl --with-egl-platforms=x11,drm
 
 # we don't care about GLes v1
 CONFIGURE_ARGS+=	--disable-gles1
 
 CONFIGURE_ARGS+=	--enable-gles2
 
 # Clover (OpenCL).
 .if ${OPSYS} == DragonFly || \
 	(${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 && \
 	 (${ARCH} == i386 || ${ARCH} == amd64))
 BUILD_DEPENDS+=	libclc>=0.0.r222830:${PORTSDIR}/devel/libclc
 
 # We need the clang port too even if it is not used to compile because
 # Clover needs some of the clang includes to build.
 .if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Mosmesa} != ""
-BUILD_DEPENDS+=	clang${MESA_LLVM_VER}>=0:${PORTSDIR}/lang/clang${MESA_LLVM_VER}
+_USES_pre_configure+=	290:clover-pre-configure
+
+# .if !exists() evaluates too early before cairo has a chance to be installed
+clover-pre-configure:
+	@if [ -e ${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER} ] && \
+		! [ -e ${LOCALBASE}/bin/clang${MESA_LLVM_VER} ]; then \
+		${ECHO_MSG} "Your llvm${MESA_LLVM_VER} is not build with clang support, which is required."; \
+		${FALSE}; \
+	fi
 .endif
 
 CONFIGURE_ARGS+=	--enable-opencl \
 			--enable-opencl-icd
 .else
 CONFIGURE_ARGS+=	--disable-opencl
 .endif
 
 CONFIGURE_ARGS+=	--enable-osmesa
 
 # gallium
 BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${MESA_LLVM_VER}
 .if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Megl} != ""
 RUN_DEPENDS+=   llvm${MESA_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${MESA_LLVM_VER}
 .endif
 
 CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
 
 CONFIGURE_ARGS+=--enable-gallium-llvm \
                 --enable-xvmc
 
 .if ${PORT_OPTIONS:MTEXTURE}
 CONFIGURE_ARGS+=--enable-texture-float
 .endif
 
 # only support on DragonFly. FreeBSD's drm doesn't support it.
 .if ${OPSYS} == DragonFly && ${COMPONENT:Mdri} != ""
 CONFIGURE_ARGS+=--enable-vdpau
 LIB_DEPENDS+=   libvdpau.so:${PORTSDIR}/multimedia/libvdpau
 PLIST_SUB+=     VDPAU=""
 .else
 CONFIGURE_ARGS+=--disable-vdpau
 PLIST_SUB+=     VDPAU="@comment "
 .endif
 
 # VAAPI support?
 CONFIGURE_ARGS+=--disable-va
 
 ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
 ALL_GALLIUM_DRIVERS=R300 R600 RADEONSI SVGA SWRAST
 
 .if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64
 DRI_DRIVERS=	${ALL_DRI_DRIVERS}
 GALLIUM_DRIVERS=	${ALL_GALLIUM_DRIVERS}
 .endif
 
 .if ${ARCH} == powerpc || ${ARCH} == powerpc64
 DRI_DRIVERS=	RADEON SWRAST
 GALLIUM_DRIVERS=	RADEONSI SWRAST
 .endif
 
 .if ${ARCH} == sparc64 || ${ARCH} == armv6
 DRI_DRIVERS=	SWRAST
 GALLIUM_DRIVERS=	SWRAST
 .endif
 
 # empty for unsupported arches
 DRI_DRIVERS+=
 GALLIUM_DRIVERS+=
 
 .for _d in ${ALL_DRI_DRIVERS}
 . if ${DRI_DRIVERS:M${_d}}
 PLIST_SUB+=	${_d}_DRIVER=""
 . else
 PLIST_SUB+=	${_d}_DRIVER="@comment "
 . endif
 .endfor
 
 CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:tl}"
 
 .for _gd in ${ALL_GALLIUM_DRIVERS}
 . if ${GALLIUM_DRIVERS:M${_gd}}
 PLIST_SUB+=	${_gd}_GDRIVER=""
 . else
 PLIST_SUB+=	${_gd}_GDRIVER="@comment "
 . endif
 .endfor
 
 CONFIGURE_ARGS+=--with-gallium-drivers="${GALLIUM_DRIVERS:tl}"
 
 .if ${OPSYS} == DragonFly
 LIB_DEPENDS+= libelf.so:${PORTSDIR}/devel/libelf
 .endif
 
Index: head/graphics/libGL/distinfo
===================================================================
--- head/graphics/libGL/distinfo	(revision 411840)
+++ head/graphics/libGL/distinfo	(revision 411841)
@@ -1,2 +1,2 @@
-SHA256 (mesa-11.0.8.tar.xz) = 5696e4730518b6805d2ed5def393c4293f425a2c2c01bd5ed4bdd7ad62f7ad75
-SIZE (mesa-11.0.8.tar.xz) = 7282812
+SHA256 (mesa-11.1.2.tar.xz) = 8f72aead896b340ba0f7a4a474bfaf71681f5d675592aec1cb7ba698e319148b
+SIZE (mesa-11.1.2.tar.xz) = 7561920
Index: head/graphics/libGL/files/patch-src__gallium__auxiliary__util__u_cpu_detect.c
===================================================================
--- head/graphics/libGL/files/patch-src__gallium__auxiliary__util__u_cpu_detect.c	(revision 411840)
+++ head/graphics/libGL/files/patch-src__gallium__auxiliary__util__u_cpu_detect.c	(nonexistent)
@@ -1,11 +0,0 @@
---- src/gallium/auxiliary/util/u_cpu_detect.c.orig	2014-09-19 18:23:33 UTC
-+++ src/gallium/auxiliary/util/u_cpu_detect.c
-@@ -52,7 +52,7 @@
- #include <machine/cpu.h>
- #endif
- 
--#if defined(PIPE_OS_FREEBSD)
-+#if defined(PIPE_OS_FREEBSD) || defined(PIPE_OS_DRAGONFLY)
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #endif

Property changes on: head/graphics/libGL/files/patch-src__gallium__auxiliary__util__u_cpu_detect.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/graphics/libGL/files/patch-src__gallium__drivers__r300__r300_chipset.c
===================================================================
--- head/graphics/libGL/files/patch-src__gallium__drivers__r300__r300_chipset.c	(revision 411840)
+++ head/graphics/libGL/files/patch-src__gallium__drivers__r300__r300_chipset.c	(nonexistent)
@@ -1,24 +0,0 @@
---- ./src/gallium/drivers/r300/r300_chipset.c.orig	2014-01-06 22:15:40.000000000 +0100
-+++ ./src/gallium/drivers/r300/r300_chipset.c	2014-02-23 22:01:50.000000000 +0100
-@@ -53,6 +53,21 @@
-     if (!os_get_process_name(proc_name, sizeof(proc_name)))
-         return;
- 
-+#if defined(__DragonFly__) || \
-+    defined(__FreeBSD__) ||   \
-+    defined(__NetBSD__) ||    \
-+    defined(__OpenBSD__)
-+    const char *progname, *program_invocation_short_name;
-+
-+    progname = getprogname();
-+    program_invocation_short_name = strrchr(progname, '/');
-+    if (program_invocation_short_name) {
-+        program_invocation_short_name++;
-+    } else {
-+        program_invocation_short_name = progname;
-+    }
-+#endif
-+
-     for (i = 0; i < Elements(list); i++) {
-         if (strcmp(list[i], proc_name) == 0) {
-             caps->zmask_ram = 0;

Property changes on: head/graphics/libGL/files/patch-src__gallium__drivers__r300__r300_chipset.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/graphics/libGL/files/patch-src__loader__Makefile.in
===================================================================
--- head/graphics/libGL/files/patch-src__loader__Makefile.in	(revision 411840)
+++ head/graphics/libGL/files/patch-src__loader__Makefile.in	(revision 411841)
@@ -1,11 +1,11 @@
---- src/loader/Makefile.in.orig	2015-08-24 10:41:51.309456000 +0200
-+++ src/loader/Makefile.in	2015-08-24 10:42:39.452059000 +0200
-@@ -505,7 +505,7 @@
- noinst_LTLIBRARIES = libloader.la
- libloader_la_CPPFLAGS = $(DEFINES) -I$(top_srcdir)/include \
- 	-I$(top_srcdir)/src $(VISIBILITY_CFLAGS) $(LIBUDEV_CFLAGS) \
--	$(am__append_1) $(am__append_3)
-+	$(LIBDEVQ_CFLAGS) $(am__append_1) $(am__append_3)
+--- src/loader/Makefile.in.orig	2015-12-04 10:21:50.951759000 +0100
++++ src/loader/Makefile.in	2015-12-04 10:27:14.391665000 +0100
+@@ -531,7 +531,7 @@
+ 	$(LIBDRM_CFLAGS) \
+ 	$(LIBUDEV_CFLAGS)
+ 
+-libloader_la_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_1)
++libloader_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDEVQ_CFLAGS) $(am__append_1)
  libloader_la_SOURCES = $(LOADER_C_FILES)
- libloader_la_LIBADD = $(am__append_2) $(am__append_4)
- all: all-am
+ libloader_la_LIBADD = $(am__append_2) $(am__append_3)
+ @HAVE_DRI3_TRUE@libloader_dri3_helper_la_SOURCES = \