--- a/open-src/xserver/xorg/dri.patch	Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/dri.patch	Tue Jul 31 15:09:29 2007 -0700
@@ -26,10 +26,10 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 
-diff -urp -x '*~' configure.ac configure.ac
---- configure.ac	2006-12-21 14:24:58.815869000 -0800
-+++ configure.ac	2006-12-21 14:25:15.153507000 -0800
-@@ -282,6 +282,12 @@ case $host_os in
+diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
+--- configure.ac	2007-07-30 18:37:03.938884000 -0700
++++ configure.ac	2007-07-30 18:37:20.626554000 -0700
+@@ -300,6 +300,12 @@ case $host_os in
  	DRI=yes
  	KDRIVE_HW=yes
  	;;
@@ -42,9 +42,9 @@
  esac
  AM_CONDITIONAL(KDRIVE_HW, test "x$KDRIVE_HW" = xyes)
  
-diff -urp -x '*~' hw/xfree86/os-support/solaris/agpgart.h hw/xfree86/os-support/solaris/agpgart.h
---- hw/xfree86/os-support/solaris/agpgart.h	2006-11-13 16:59:40.000000000 -0800
-+++ hw/xfree86/os-support/solaris/agpgart.h	2006-12-21 14:25:15.153928000 -0800
+diff -urp -x '*~' -x '*.orig' hw/xfree86/os-support/solaris/agpgart.h hw/xfree86/os-support/solaris/agpgart.h
+--- hw/xfree86/os-support/solaris/agpgart.h	2006-09-17 23:04:18.000000000 -0700
++++ hw/xfree86/os-support/solaris/agpgart.h	2007-07-30 18:37:20.681168000 -0700
 @@ -23,7 +23,7 @@
   * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   */