Index: graphics/dri/Makefile
===================================================================
--- graphics/dri/Makefile	(revision 438246)
+++ graphics/dri/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	dri
 PORTVERSION=	${MESAVERSION}
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	graphics
 
Index: graphics/libGL/Makefile.targets
===================================================================
--- graphics/libGL/Makefile.targets	(revision 438255)
+++ graphics/libGL/Makefile.targets	(working copy)
@@ -15,10 +15,6 @@ post-patch:
 .if ${OSVERSION} < 1100000 && ${ARCH} == "i386"
 	@${REINPLACE_CMD} -e 's|-DUSE_GCC_ATOMIC_BUILTINS||' ${WRKSRC}/configure
 .endif
-.else # ${OPSYS} == DragonFly
-#	Sed on dragonfly doesn't support \< or \>
-	@${REINPLACE_CMD} -e 's|\\>//|[[:>:]]//|' \
-		${WRKSRC}/configure
 .endif # ${OPSYS}
 	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
 		${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c
Index: graphics/libGL/files/configure.ac
===================================================================
--- graphics/libGL/files/configure.ac	(revision 438255)
+++ graphics/libGL/files/configure.ac	(working copy)
@@ -1,9 +1,10 @@
 --- configure.ac.orig	2017-04-01 15:33:36 UTC
 +++ configure.ac
-@@ -943,18 +943,19 @@ llvm_add_target() {
+@@ -942,19 +942,19 @@ llvm_add_target() {
+ # Call this inside ` ` to get the return value.
  # $1 is the llvm-config command with arguments.
  strip_unwanted_llvm_flags() {
-     # Use \> (marks the end of the word)
+-    # Use \> (marks the end of the word)
 -    echo " `$1`" | sed \
 -        -e 's/\s\+-m\S*//g' \
 -        -e 's/\s\+-DNDEBUG\>//g' \
@@ -12,21 +13,23 @@
 -        -e 's/\s\+-W\S*//g' \
 -        -e 's/\s\+-O\S*//g' \
 -        -e 's/\s\+-g\S*//g' \
-+    echo " `$1`" | sed -E \
+-        -e 's/-fno-rtti\>/-Fno-rtti/g' \
+-        -e 's/\s\+-f\S*//g' \
+-        -e 's/-Fno-rtti\>/-fno-rtti/g' \
+-        -e 's/^ //'
++    echo " `$1` " | sed -E \
 +        -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \
-+        -e 's/[[[:space:]]]+-DNDEBUG\>//g' \
-+        -e 's/[[[:space:]]]+-D_GNU_SOURCE\>//g' \
-+        -e 's/[[[:space:]]]+-pedantic\>//g' \
++        -e 's/[[[:space:]]]+-DNDEBUG[[[:space:]]]/ /g' \
++        -e 's/[[[:space:]]]+-D_GNU_SOURCE[[[:space:]]]/ /g' \
++        -e 's/[[[:space:]]]+-pedantic[[[:space:]]]/ /g' \
 +        -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \
 +        -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \
 +        -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \
-         -e 's/-fno-rtti\>/-Fno-rtti/g' \
--        -e 's/\s\+-f\S*//g' \
++        -e 's/-fno-rtti[[[:space:]]]/-Fno-rtti /g' \
 +        -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \
-         -e 's/-Fno-rtti\>/-fno-rtti/g' \
--        -e 's/^ //'
-+        -e 's/-fno-exceptions\>//g' \
-+        -e 's/^[[[:space:]]]//'
++        -e 's/-Fno-rtti[[[:space:]]]/-fno-rtti /g' \
++        -e 's/^[[[:space:]]]//' \
++        -e 's/[[[:space:]]]$//'
  }
  
  llvm_set_environment_variables() {
Index: graphics/libGL/files/patch-configure
===================================================================
--- graphics/libGL/files/patch-configure	(revision 438255)
+++ graphics/libGL/files/patch-configure	(working copy)
@@ -1,9 +1,10 @@
 --- configure.orig	2017-04-01 15:33:50 UTC
 +++ configure
-@@ -22351,18 +22351,19 @@ llvm_add_target() {
+@@ -22350,19 +22307,19 @@ llvm_add_target() {
+ # Call this inside ` ` to get the return value.
  # $1 is the llvm-config command with arguments.
  strip_unwanted_llvm_flags() {
-     # Use \> (marks the end of the word)
+-    # Use \> (marks the end of the word)
 -    echo " `$1`" | sed \
 -        -e 's/\s\+-m\S*//g' \
 -        -e 's/\s\+-DNDEBUG\>//g' \
@@ -12,21 +13,23 @@
 -        -e 's/\s\+-W\S*//g' \
 -        -e 's/\s\+-O\S*//g' \
 -        -e 's/\s\+-g\S*//g' \
-+    echo " `$1`" | sed -E \
-+        -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \
-+        -e 's/[[[:space:]]]+-DNDEBUG\>//g' \
-+        -e 's/[[[:space:]]]+-D_GNU_SOURCE\>//g' \
-+        -e 's/[[[:space:]]]+-pedantic\>//g' \
-+        -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \
-+        -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \
-+        -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \
-         -e 's/-fno-rtti\>/-Fno-rtti/g' \
+-        -e 's/-fno-rtti\>/-Fno-rtti/g' \
 -        -e 's/\s\+-f\S*//g' \
-+        -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \
-         -e 's/-Fno-rtti\>/-fno-rtti/g' \
+-        -e 's/-Fno-rtti\>/-fno-rtti/g' \
 -        -e 's/^ //'
-+        -e 's/-fno-exceptions\>//g' \
-+        -e 's/^[[[:space:]]]//'
++    echo " `$1` " | sed -E \
++        -e 's/[[:space:]]+-m[^[:space:]]*//g' \
++        -e 's/[[:space:]]+-DNDEBUG[[:space:]]/ /g' \
++        -e 's/[[:space:]]+-D_GNU_SOURCE[[:space:]]/ /g' \
++        -e 's/[[:space:]]+-pedantic[[:space:]]/ /g' \
++        -e 's/[[:space:]]+-W[^[:space:]]*//g' \
++        -e 's/[[:space:]]+-O[^[:space:]]*//g' \
++        -e 's/[[:space:]]+-g[^[:space:]]*//g' \
++        -e 's/-fno-rtti[[:space:]]/-Fno-rtti /g' \
++        -e 's/[[:space:]]+-f[^[:space:]]*//g' \
++        -e 's/-Fno-rtti[[:space:]]/-fno-rtti /g' \
++        -e 's/^[[:space:]]//' \
++        -e 's/[[:space:]]$//'
  }
  
  llvm_set_environment_variables() {