--- a/open-src/driver/xf86-video-vesa/vesa_xorg72.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-vesa/vesa_xorg72.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,10 +1,11 @@
 Fixes Sun bug 6526933: Matrox MGA chip (embedded in ServerEngines "Pilot" BSC)
 does not work with vesa driver
 
-diff -urp -x '*~' -x '*.orig' src/vesa.c src/vesa.c
---- src/vesa.c	2008-12-21 18:34:59.000000000 -0800
-+++ src/vesa.c	2009-01-11 10:09:13.986045000 -0800
-@@ -1450,19 +1450,19 @@ SaveFonts(ScrnInfoPtr pScrn)
+diff --git a/src/vesa.c b/src/vesa.c
+index 23d9e14..709d791 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -1488,19 +1488,19 @@ SaveFonts(ScrnInfoPtr pScrn)
      WriteGr(0x06, 0x05);	/* set graphics */
      slowbcopy_frombus(pVesa->VGAbase, pVesa->fonts + 8192, 8192);
  
@@ -31,7 +32,7 @@
  }
  
  static void
-@@ -1519,11 +1519,6 @@ RestoreFonts(ScrnInfoPtr pScrn)
+@@ -1557,11 +1557,6 @@ RestoreFonts(ScrnInfoPtr pScrn)
      WriteGr(0x06, 0x05);    /* set graphics */
      slowbcopy_tobus(pVesa->fonts + 8192, pVesa->VGAbase, 8192);
  
@@ -43,7 +44,7 @@
      /* restore the registers that were changed */
      WriteMiscOut(miscOut);
      WriteAttr(pVesa, 0x10, attr10);
-@@ -1535,6 +1530,11 @@ RestoreFonts(ScrnInfoPtr pScrn)
+@@ -1573,6 +1568,11 @@ RestoreFonts(ScrnInfoPtr pScrn)
      WriteGr(0x08, gr8);
      WriteSeq(0x02, seq2);
      WriteSeq(0x04, seq4);