Index: head/graphics/libGL/files/patch-configure
===================================================================
--- head/graphics/libGL/files/patch-configure	(revision 433896)
+++ head/graphics/libGL/files/patch-configure	(revision 433897)
@@ -1,425 +1,60 @@
 --- configure.orig	2017-01-05 15:52:21 UTC
 +++ configure
-@@ -1962,7 +1962,7 @@ Optional Features:
-                           Disable writable .text section on x86 (decreases
-                           performance) [default=disabled]
-   --enable-gallium-llvm   build gallium LLVM support [default=enabled on
--                          x86/x86_64]
-+                          x86/amd64]
-   --enable-llvm-shared-libs
-                           link with LLVM shared libraries [default=enabled]
-   --enable-valgrind       Build mesa with valgrind support (default: auto)
-@@ -9622,7 +9622,7 @@ mips64*-*linux*)
-   rm -rf conftest*
-   ;;
- 
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-+amd64-*kfreebsd*-gnu|amd64-*linux*|powerpc*-*linux*| \
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out what ABI is being produced by ac_compile, and set linker
-   # options accordingly.  Note that the listed cases only cover the
-@@ -9639,13 +9639,13 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
-     case `/usr/bin/file conftest.o` in
-       *32-bit*)
- 	case $host in
--	  x86_64-*kfreebsd*-gnu)
-+	  amd64-*kfreebsd*-gnu)
- 	    LD="${LD-ld} -m elf_i386_fbsd"
- 	    ;;
--	  x86_64-*linux*)
-+	  amd64-*linux*)
- 	    case `/usr/bin/file conftest.o` in
- 	      *x86-64*)
--		LD="${LD-ld} -m elf32_x86_64"
-+		LD="${LD-ld} -m elf32_amd64"
- 		;;
- 	      *)
- 		LD="${LD-ld} -m elf_i386"
-@@ -9668,11 +9668,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
- 	;;
-       *64-bit*)
- 	case $host in
--	  x86_64-*kfreebsd*-gnu)
--	    LD="${LD-ld} -m elf_x86_64_fbsd"
-+	  amd64-*kfreebsd*-gnu)
-+	    LD="${LD-ld} -m elf_amd64_fbsd"
- 	    ;;
--	  x86_64-*linux*)
--	    LD="${LD-ld} -m elf_x86_64"
-+	  amd64-*linux*)
-+	    LD="${LD-ld} -m elf_amd64"
- 	    ;;
- 	  powerpcle-*linux*)
- 	    LD="${LD-ld} -m elf64lppc"
-@@ -9754,8 +9754,8 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
-       case $lt_cv_prog_gnu_ld in
-       yes*)
-         case $host in
--        i?86-*-solaris*|x86_64-*-solaris*)
--          LD="${LD-ld} -m elf_x86_64"
-+        i?86-*-solaris*|amd64-*-solaris*)
-+          LD="${LD-ld} -m elf_amd64"
-           ;;
-         sparc*-*-solaris*)
-           LD="${LD-ld} -m elf64_sparc"
-@@ -11464,7 +11464,7 @@ lt_prog_compiler_static=
- 
-     linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-       case $cc_basename in
--      # old Intel for x86_64, which still supported -KPIC.
-+      # old Intel for amd64, which still supported -KPIC.
-       ecc*)
- 	lt_prog_compiler_wl='-Wl,'
- 	lt_prog_compiler_pic='-KPIC'
-@@ -11907,7 +11907,7 @@ $as_echo_n "checking whether the $compil
-   hardcode_minus_L=no
-   hardcode_shlibpath_var=unsupported
-   inherit_rpath=no
--  link_all_deplibs=unknown
-+  link_all_deplibs=no
-   module_cmds=
-   module_expsym_cmds=
-   old_archive_from_new_cmds=
-@@ -12206,7 +12206,7 @@ _LT_EOF
- 	wlarc=
-       else
- 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
-       fi
-       ;;
- 
-@@ -12225,7 +12225,7 @@ _LT_EOF
- _LT_EOF
-       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
-       else
- 	ld_shlibs=no
-       fi
-@@ -12254,7 +12254,7 @@ _LT_EOF
- 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- 	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
- 	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
--	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+	    archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
- 	  else
- 	    ld_shlibs=no
- 	  fi
-@@ -12272,7 +12272,7 @@ _LT_EOF
-     *)
-       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
-       else
- 	ld_shlibs=no
-       fi
-@@ -12920,7 +12920,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
- 	hardcode_direct_absolute=yes
- 	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
- 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
-+	  archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver'
- 	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
- 	  export_dynamic_flag_spec='$wl-E'
- 	else
-@@ -13769,7 +13769,7 @@ freebsd* | dragonfly*)
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
--      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-+      library_names_spec='$libname$release$shared_ext$versuffix  $libname$release$shared_ext$major	 $libname$shared_ext'			 soname_spec='$libname$release$shared_ext$major'
-       soname_spec='$libname$release$shared_ext$major'
-       need_version=no
-       need_lib_prefix=no
-@@ -14901,7 +14901,7 @@ striplib=
- old_striplib=
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
- $as_echo_n "checking whether stripping libraries is possible... " >&6; }
--if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
-   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -15153,7 +15153,7 @@ hardcode_automatic_CXX=no
- inherit_rpath_CXX=no
- module_cmds_CXX=
- module_expsym_cmds_CXX=
--link_all_deplibs_CXX=unknown
-+link_all_deplibs_CXX=no
- old_archive_cmds_CXX=$old_archive_cmds
- reload_flag_CXX=$reload_flag
- reload_cmds_CXX=$reload_cmds
-@@ -15364,7 +15364,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
-       # archiving commands below assume that GNU ld is being used.
-       if test yes = "$with_gnu_ld"; then
-         archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
--        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+        archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
- 
-         hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
-         export_dynamic_flag_spec_CXX='$wl--export-dynamic'
-@@ -16056,7 +16056,7 @@ fi
- 	    case `$CC -V 2>&1` in
- 	      *"Version 7."*)
- 	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
--		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+		archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
- 		;;
- 	      *)  # Version 8.0 or newer
- 	        tmp_idyn=
-@@ -16064,7 +16064,7 @@ fi
- 		  ia64*) tmp_idyn=' -i_dynamic';;
- 		esac
- 	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
--		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+		archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
- 		;;
- 	    esac
- 	    archive_cmds_need_lc_CXX=no
-@@ -16096,7 +16096,7 @@ fi
- 	      ;;
- 	    *) # Version 6 and above use weak symbols
- 	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
--	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+	      archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
- 	      ;;
- 	    esac
- 
-@@ -16107,7 +16107,7 @@ fi
- 	  cxx*)
- 	    # Compaq C++
- 	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
--	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
-+	    archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-version-script $wl$lib-ver'
- 
- 	    runpath_var=LD_RUN_PATH
- 	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -16141,7 +16141,7 @@ fi
- 	      # Sun C++ 5.9
- 	      no_undefined_flag_CXX=' -zdefs'
- 	      archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	      archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
-+	      archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-version-script $wl$lib-ver'
- 	      hardcode_libdir_flag_spec_CXX='-R$libdir'
- 	      whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
- 	      compiler_needs_object_CXX=yes
-@@ -16209,7 +16209,7 @@ fi
- 	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- 	  hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
- 	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
--	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
-+	    archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-version-script,$lib-ver -o $lib'
- 	    export_dynamic_flag_spec_CXX='$wl-E'
- 	    whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
- 	  fi
-@@ -16844,7 +16844,7 @@ lt_prog_compiler_static_CXX=
- 	    lt_prog_compiler_pic_CXX='-fPIC'
- 	    ;;
- 	  ecpc* )
--	    # old Intel C++ for x86_64, which still supported -KPIC.
-+	    # old Intel C++ for amd64, which still supported -KPIC.
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    lt_prog_compiler_static_CXX='-static'
-@@ -17731,7 +17731,7 @@ freebsd* | dragonfly*)
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
--      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-+      library_names_spec='$libname$release$shared_ext$versuffix  $libname$release$shared_ext$major	 $libname$shared_ext'			 soname_spec='$libname$release$shared_ext$major'
-       soname_spec='$libname$release$shared_ext$major'
-       need_version=no
-       need_lib_prefix=no
-@@ -20328,7 +20328,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
- 	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
- 	 if test -n "$ac_prev"; then
- 	   case $ac_word in
--	     i?86 | x86_64 | ppc | ppc64)
-+	     i?86 | amd64 | ppc | ppc64)
- 	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
- 		 ac_arch=$ac_word
- 	       else
-@@ -20915,10 +20915,10 @@ asm_arch=""
- $as_echo_n "checking whether to enable assembly... " >&6; }
- test "x$enable_asm" = xno && { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--# disable if cross compiling on x86/x86_64 since we must run gen_matypes
-+# disable if cross compiling on x86/amd64 since we must run gen_matypes
- if test "x$enable_asm" = xyes -a "x$cross_compiling" = xyes; then
-     case "$host_cpu" in
--    i?86 | x86_64 | amd64)
-+    i?86 | amd64 | amd64)
-         if test "x$host_cpu" != "x$target_cpu"; then
-             enable_asm=no
-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, cross compiling" >&5
-@@ -20937,10 +20937,10 @@ if test "x$enable_asm" = xyes; then
-             ;;
-         esac
-         ;;
--    x86_64|amd64)
-+    amd64|amd64)
-         case "$host_os" in
-         linux* | *freebsd* | dragonfly* | *netbsd* | openbsd*)
--            asm_arch=x86_64
-+            asm_arch=amd64
-             ;;
-         esac
-         ;;
-@@ -20959,10 +20959,10 @@ if test "x$enable_asm" = xyes; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, x86" >&5
- $as_echo "yes, x86" >&6; }
-         ;;
--    x86_64|amd64)
-+    amd64|amd64)
-         DEFINES="$DEFINES -DUSE_X86_64_ASM"
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, x86_64" >&5
--$as_echo "yes, x86_64" >&6; }
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, amd64" >&5
-+$as_echo "yes, amd64" >&6; }
-         ;;
-     sparc)
-         DEFINES="$DEFINES -DUSE_SPARC_ASM"
 @@ -21955,7 +21955,7 @@ fi
  
  
  case "$host_os" in
 -linux*)
 +linux*|freebsd*)
      dri3_default=yes
      ;;
  *)
 @@ -23968,6 +23968,18 @@ if test "x$enable_dri" = xyes; then
          ;;
      *freebsd* | dragonfly* | *netbsd* | openbsd*)
          DEFINES="$DEFINES -DHAVE_ALIAS"
 +        if test "x$enable_dri3" = xyes; then
 +            DEFINES="$DEFINES -DHAVE_DRI3"
 +        fi
 +
 +        case "$host_cpu" in
 +        powerpc* | sparc*)
 +            # Build only the drivers for cards that exist on PowerPC/sparc
 +            if test "x$with_dri_drivers" = "xyes"; then
 +                with_dri_drivers="r200 radeon swrast"
 +            fi
 +            ;;
 +        esac
          ;;
      gnu*)
          DEFINES="$DEFINES -DHAVE_ALIAS"
 @@ -25849,9 +25861,19 @@ if test "x$enable_opencl" = xyes; then
          as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5
      fi
  
 +    if test "x$acv_mesa_CLANG" = xno; then
 +
 +    GCC_VERSION=`$CC -dumpversion`
 +    if test $? -eq 0; then
 +        GCC_VERSION_MAJOR=`echo $GCC_VERSION | cut -d. -f1`
 +        GCC_VERSION_MINOR=`echo $GCC_VERSION | cut -d. -f2`
 +    fi
 +
      if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 7; then
          as_fn_error $? "gcc >= 4.7 is required to build clover" "$LINENO" 5
      fi
 +# end of clang test.
 +    fi
  
      if test "x$have_libclc" = xno; then
          as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover.
-@@ -26375,26 +26397,26 @@ fi
- strip_unwanted_llvm_flags() {
-     # Use \> (marks the end of the word)
-     echo `$1` | sed \
--	-e 's/-march=\S*//g' \
--	-e 's/-mtune=\S*//g' \
--	-e 's/-mcpu=\S*//g' \
--	-e 's/-DNDEBUG\>//g' \
--	-e 's/-D_GNU_SOURCE\>//g' \
--	-e 's/-pedantic\>//g' \
--	-e 's/-Wcovered-switch-default\>//g' \
--	-e 's/-O.\>//g' \
--	-e 's/-g\>//g' \
--	-e 's/-Wall\>//g' \
--	-e 's/-Wcast-qual\>//g' \
--	-e 's/-Woverloaded-virtual\>//g' \
--	-e 's/-fcolor-diagnostics\>//g' \
--	-e 's/-fdata-sections\>//g' \
--	-e 's/-ffunction-sections\>//g' \
--	-e 's/-fno-exceptions\>//g' \
--	-e 's/-fomit-frame-pointer\>//g' \
--	-e 's/-fvisibility-inlines-hidden\>//g' \
--	-e 's/-fPIC\>//g' \
--	-e 's/-fstack-protector-strong\>//g'
-+	-e 's/-march=[:graph:]* //g' \
-+	-e 's/-mtune=[:graph:]* //g' \
-+	-e 's/-mcpu=[:graph:]* //g' \
-+	-e 's/-DNDEBUG[[:>:]]//g' \
-+	-e 's/-D_GNU_SOURCE[[:>:]]//g' \
-+	-e 's/-pedantic[[:>:]]//g' \
-+	-e 's/-Wcovered-switch-default[[:>:]]//g' \
-+	-e 's/-O.[[:>:]]//g' \
-+	-e 's/-g[[:>:]]//g' \
-+	-e 's/-Wall[[:>:]]//g' \
-+	-e 's/-Wcast-qual[[:>:]]//g' \
-+	-e 's/-Woverloaded-virtual[[:>:]]//g' \
-+	-e 's/-fcolor-diagnostics[[:>:]]//g' \
-+	-e 's/-fdata-sections[[:>:]]//g' \
-+	-e 's/-ffunction-sections[[:>:]]//g' \
-+	-e 's/-fno-exceptions[[:>:]]//g' \
-+	-e 's/-fomit-frame-pointer[[:>:]]//g' \
-+	-e 's/-fvisibility-inlines-hidden[[:>:]]//g' \
-+	-e 's/-fPIC[[:>:]]//g' \
-+	-e 's/-fstack-protector-strong[[:>:]]//g'
- }
- 
- llvm_check_version_for() {
-@@ -26410,7 +26432,7 @@ if test -z "$with_gallium_drivers"; then
- fi
- if test "x$enable_gallium_llvm" = xauto; then
-     case "$host_cpu" in
--    i*86|x86_64|amd64) enable_gallium_llvm=yes;;
-+    i*86|amd64|amd64) enable_gallium_llvm=yes;;
-     esac
- fi
- if test "x$enable_gallium_llvm" = xyes || test "x$HAVE_RADEON_VULKAN" = xyes; then
 @@ -26670,9 +26692,6 @@ fi
                  CLANG_LIBDIR=${LLVM_LIBDIR}
              fi
              CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
 -            if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then :
 -  as_fn_error $? "Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries." "$LINENO" 5
 -fi
          fi
      else
          MESA_LLVM=0
-@@ -26752,7 +26771,7 @@ gallium_require_llvm() {
-     if test "x$MESA_LLVM" = x0; then
-         case "$host" in *gnux32) return;; esac
-         case "$host_cpu" in
--        i*86|x86_64|amd64) as_fn_error $? "LLVM is required to build $1 on x86 and x86_64" "$LINENO" 5;;
-+        i*86|amd64|amd64) as_fn_error $? "LLVM is required to build $1 on x86 and amd64" "$LINENO" 5;;
-         esac
-     fi
- }
-@@ -28207,7 +28226,7 @@ else
- fi
- 
- 
-- if test "x$asm_arch" = xx86 -o "x$asm_arch" = xx86_64; then
-+ if test "x$asm_arch" = xx86 -o "x$asm_arch" = xamd64; then
-   HAVE_X86_ASM_TRUE=
-   HAVE_X86_ASM_FALSE='#'
- else
-@@ -28215,7 +28234,7 @@ else
-   HAVE_X86_ASM_FALSE=
- fi
- 
-- if test "x$asm_arch" = xx86_64; then
-+ if test "x$asm_arch" = xamd64; then
-   HAVE_X86_64_ASM_TRUE=
-   HAVE_X86_64_ASM_FALSE='#'
- else
Index: head/graphics/libdrm/files/patch-configure
===================================================================
--- head/graphics/libdrm/files/patch-configure	(revision 433896)
+++ head/graphics/libdrm/files/patch-configure	(revision 433897)
@@ -1,254 +1,182 @@
 --- configure.orig	2017-01-30 19:04:05 UTC
 +++ configure
 @@ -646,6 +646,10 @@ HAVE_MANPAGES_STYLESHEET_TRUE
  MANPAGES_STYLESHEET
  BUILD_MANPAGES_FALSE
  BUILD_MANPAGES_TRUE
 +HAVE_LIBDEVQ_FALSE
 +HAVE_LIBDEVQ_TRUE
 +LIBDEVQ_LIBS
 +LIBDEVQ_CFLAGS
  HAVE_CAIRO_FALSE
  HAVE_CAIRO_TRUE
  CAIRO_LIBS
 @@ -838,6 +842,7 @@ with_gnu_ld
  with_sysroot
  enable_libtool_lock
  enable_udev
 +enable_devq
  enable_libkms
  enable_intel
  enable_radeon
 @@ -877,6 +882,8 @@ CUNIT_CFLAGS
  CUNIT_LIBS
  CAIRO_CFLAGS
  CAIRO_LIBS
 +LIBDEVQ_CFLAGS
 +LIBDEVQ_LIBS
  VALGRIND_CFLAGS
  VALGRIND_LIBS'
  
 @@ -1511,6 +1518,8 @@ Optional Features:
    --disable-libtool-lock  avoid locking (might break parallel builds)
    --enable-udev           Enable support for using udev instead of mknod
                            (default: disabled)
 +  --enable-devq           Enable support for using devq for device detection
 +                          (default: disabled)
    --disable-libkms        Disable KMS mm abstraction library (default: auto,
                            enabled on supported platforms)
    --disable-intel         Enable support for intel's KMS API (default: auto,
 @@ -1586,6 +1595,10 @@ Some influential environment variables:
    CAIRO_CFLAGS
                C compiler flags for CAIRO, overriding pkg-config
    CAIRO_LIBS  linker flags for CAIRO, overriding pkg-config
 +  LIBDEVQ_CFLAGS
 +              C compiler flags for LIBDEVQ, overriding pkg-config
 +  LIBDEVQ_LIBS
 +              linker flags for LIBDEVQ, overriding pkg-config
    VALGRIND_CFLAGS
                C compiler flags for VALGRIND, overriding pkg-config
    VALGRIND_LIBS
-@@ -10092,7 +10105,7 @@ $as_echo_n "checking whether the $compil
-   hardcode_minus_L=no
-   hardcode_shlibpath_var=unsupported
-   inherit_rpath=no
--  link_all_deplibs=unknown
-+  link_all_deplibs=no
-   module_cmds=
-   module_expsym_cmds=
-   old_archive_from_new_cmds=
-@@ -10391,7 +10404,7 @@ _LT_EOF
- 	wlarc=
-       else
- 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
-       fi
-       ;;
- 
-@@ -10410,7 +10423,7 @@ _LT_EOF
- _LT_EOF
-       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
-       else
- 	ld_shlibs=no
-       fi
-@@ -10439,7 +10452,7 @@ _LT_EOF
- 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- 	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
- 	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
--	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+	    archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
- 	  else
- 	    ld_shlibs=no
- 	  fi
-@@ -10457,7 +10470,7 @@ _LT_EOF
-     *)
-       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
-       else
- 	ld_shlibs=no
-       fi
-@@ -11105,7 +11118,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
- 	hardcode_direct_absolute=yes
- 	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
- 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
-+	  archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver'
- 	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
- 	  export_dynamic_flag_spec='$wl-E'
- 	else
-@@ -11954,7 +11967,7 @@ freebsd* | dragonfly*)
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
--      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-+      library_names_spec='$libname$release$shared_ext$versuffix  $libname$release$shared_ext$major	 $libname$shared_ext'			 soname_spec='$libname$release$shared_ext$major'
-       soname_spec='$libname$release$shared_ext$major'
-       need_version=no
-       need_lib_prefix=no
-@@ -13089,7 +13102,7 @@ striplib=
- old_striplib=
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
- $as_echo_n "checking whether stripping libraries is possible... " >&6; }
--if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
-   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 @@ -13217,6 +13230,14 @@ else
  fi
  
  
 +# Check whether --enable-devq was given.
 +if test "${enable_devq+set}" = set; then :
 +  enableval=$enable_devq; DEVQ=$enableval
 +else
 +  DEVQ=no
 +fi
 +
 +
  # Check whether --enable-libkms was given.
  if test "${enable_libkms+set}" = set; then :
    enableval=$enable_libkms; LIBKMS=$enableval
 @@ -13873,6 +13894,12 @@ $as_echo "#define UDEV 1" >>confdefs.h
  
  fi
  
 +if test "x$DEVQ" = xyes; then
 +
 +$as_echo "#define DEVQ 1" >>confdefs.h
 +
 +fi
 +
  
  if test "x$LIBKMS" = xauto ; then
  	case $host_os in
 @@ -14331,6 +14358,92 @@ else
  fi
  
  
 +# For FreeBSD support
 +
 +pkg_failed=no
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDEVQ" >&5
 +$as_echo_n "checking for LIBDEVQ... " >&6; }
 +
 +if test -n "$LIBDEVQ_CFLAGS"; then
 +    pkg_cv_LIBDEVQ_CFLAGS="$LIBDEVQ_CFLAGS"
 + elif test -n "$PKG_CONFIG"; then
 +    if test -n "$PKG_CONFIG" && \
 +    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0 >= 0.0.4\""; } >&5
 +  ($PKG_CONFIG --exists --print-errors "libdevq-1.0 >= 0.0.4") 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then
 +  pkg_cv_LIBDEVQ_CFLAGS=`$PKG_CONFIG --cflags "libdevq-1.0 >= 0.0.4" 2>/dev/null`
 +		      test "x$?" != "x0" && pkg_failed=yes
 +else
 +  pkg_failed=yes
 +fi
 + else
 +    pkg_failed=untried
 +fi
 +if test -n "$LIBDEVQ_LIBS"; then
 +    pkg_cv_LIBDEVQ_LIBS="$LIBDEVQ_LIBS"
 + elif test -n "$PKG_CONFIG"; then
 +    if test -n "$PKG_CONFIG" && \
 +    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0 >= 0.0.4\""; } >&5
 +  ($PKG_CONFIG --exists --print-errors "libdevq-1.0 >= 0.0.4") 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then
 +  pkg_cv_LIBDEVQ_LIBS=`$PKG_CONFIG --libs "libdevq-1.0 >= 0.0.4" 2>/dev/null`
 +		      test "x$?" != "x0" && pkg_failed=yes
 +else
 +  pkg_failed=yes
 +fi
 + else
 +    pkg_failed=untried
 +fi
 +
 +
 +
 +if test $pkg_failed = yes; then
 +   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +
 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 +        _pkg_short_errors_supported=yes
 +else
 +        _pkg_short_errors_supported=no
 +fi
 +        if test $_pkg_short_errors_supported = yes; then
 +	        LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdevq-1.0 >= 0.0.4" 2>&1`
 +        else
 +	        LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdevq-1.0 >= 0.0.4" 2>&1`
 +        fi
 +	# Put the nasty error message in config.log where it belongs
 +	echo "$LIBDEVQ_PKG_ERRORS" >&5
 +
 +	HAVE_LIBDEVQ=no
 +elif test $pkg_failed = untried; then
 +     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +	HAVE_LIBDEVQ=no
 +else
 +	LIBDEVQ_CFLAGS=$pkg_cv_LIBDEVQ_CFLAGS
 +	LIBDEVQ_LIBS=$pkg_cv_LIBDEVQ_LIBS
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
 +	HAVE_LIBDEVQ=yes
 +fi
 +if test "x$HAVE_LIBDEVQ" = xyes; then
 +
 +$as_echo "#define HAVE_LIBDEVQ 1" >>confdefs.h
 +
 +fi
 + if test "x$HAVE_LIBDEVQ" = xyes; then
 +  HAVE_LIBDEVQ_TRUE=
 +  HAVE_LIBDEVQ_FALSE='#'
 +else
 +  HAVE_LIBDEVQ_TRUE='#'
 +  HAVE_LIBDEVQ_FALSE=
 +fi
 +
 +
  # xsltproc for docbook manpages
  # Check whether --enable-manpages was given.
  if test "${enable_manpages+set}" = set; then :
 @@ -14737,6 +14850,10 @@ if test -z "${HAVE_CAIRO_TRUE}" && test 
    as_fn_error $? "conditional \"HAVE_CAIRO\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
 +if test -z "${HAVE_LIBDEVQ_TRUE}" && test -z "${HAVE_LIBDEVQ_FALSE}"; then
 +  as_fn_error $? "conditional \"HAVE_LIBDEVQ\" was never defined.
 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
 +fi
  if test -z "${BUILD_MANPAGES_TRUE}" && test -z "${BUILD_MANPAGES_FALSE}"; then
    as_fn_error $? "conditional \"BUILD_MANPAGES\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
Index: head/x11-servers/xorg-server/files/patch-configure
===================================================================
--- head/x11-servers/xorg-server/files/patch-configure	(revision 433896)
+++ head/x11-servers/xorg-server/files/patch-configure	(revision 433897)
@@ -1,108 +1,27 @@
 --- configure.orig	2016-07-19 17:27:31 UTC
 +++ configure
-@@ -18019,7 +18019,7 @@ $as_echo_n "checking whether the $compil
-   hardcode_minus_L=no
-   hardcode_shlibpath_var=unsupported
-   inherit_rpath=no
--  link_all_deplibs=unknown
-+  link_all_deplibs=no
-   module_cmds=
-   module_expsym_cmds=
-   old_archive_from_new_cmds=
-@@ -18318,7 +18318,7 @@ _LT_EOF
- 	wlarc=
-       else
- 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
-       fi
-       ;;
- 
-@@ -18337,7 +18337,7 @@ _LT_EOF
- _LT_EOF
-       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
-       else
- 	ld_shlibs=no
-       fi
-@@ -18366,7 +18366,7 @@ _LT_EOF
- 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- 	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
- 	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
--	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+	    archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
- 	  else
- 	    ld_shlibs=no
- 	  fi
-@@ -18384,7 +18384,7 @@ _LT_EOF
-     *)
-       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
-       else
- 	ld_shlibs=no
-       fi
-@@ -19032,7 +19032,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
- 	hardcode_direct_absolute=yes
- 	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
- 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
-+	  archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver'
- 	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
- 	  export_dynamic_flag_spec='$wl-E'
- 	else
-@@ -19881,7 +19881,7 @@ freebsd* | dragonfly*)
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
--      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-+      library_names_spec='$libname$release$shared_ext$versuffix  $libname$release$shared_ext$major	 $libname$shared_ext'			 soname_spec='$libname$release$shared_ext$major'
-       soname_spec='$libname$release$shared_ext$major'
-       need_version=no
-       need_lib_prefix=no
-@@ -21016,7 +21016,7 @@ striplib=
- old_striplib=
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
- $as_echo_n "checking whether stripping libraries is possible... " >&6; }
--if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
-   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -21738,7 +21738,7 @@ if test `${RAWCPP} < conftest.$ac_ext | 
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- else
--	if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve   \"'` -eq 1 ; then
-+	if true; then
- 		TRADITIONALCPPFLAGS="-traditional"
- 		RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 @@ -23168,9 +23168,14 @@ $as_echo "#define USE_ALPHA_PIO 1" >>con
  	esac
  	GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
  	;;
 -  arm*)
 +  arm*|aarch64*)
  	ARM_VIDEO=yes
  	DEFAULT_INT10="stub"
 +	case $host_os in
 +		*freebsd*)
 +			$as_echo "#define USE_DEV_IO 1" >>confdefs.h
 +		 ;;
 +	esac
  	;;
    i*86)
  	I386_VIDEO=yes
 @@ -26057,7 +26062,7 @@ fi
  case "x$XTRANS_SEND_FDS" in
  xauto)
  	case "$host_os" in
 -	linux*|solaris*)
 +	linux*|solaris*|freebsd*|dragonfly*|openbsd*)
  		XTRANS_SEND_FDS=yes
  		;;
  	*)