updating patches ...

2007-05-24 00:43:34 +00:00 · 2007-05-24 00:43:34 +00:00 · 2294df8e9a
commit 2294df8e9a
parent 3b7fbdc0cc
35 changed files with 2353 additions and 0 deletions
--- a/modular-xorg-server-mesa653/patches/patch-bb
+++ b/modular-xorg-server-mesa653/patches/patch-bb
@ -0,0 +1,20 @@
+$NetBSD: patch-bb,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- configure.ac.orig	2007-04-19 21:23:40.000000000 -0400
+++ configure.ac
+@@ -275,6 +275,7 @@ case $host_os in
+   *netbsd*)
+ 	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
+ 	AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])
+	AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])
+ 	AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])
+ 	DRI=yes
+ 	;;
+@@ -1697,6 +1698,7 @@ GL/mesa/shader/slang/Makefile
+ GL/mesa/swrast/Makefile
+ GL/mesa/swrast_setup/Makefile
+ GL/mesa/tnl/Makefile
+GL/mesa/vbo/Makefile
+ GL/mesa/X/Makefile
+ include/Makefile
+ afb/Makefile
--- a/modular-xorg-server-mesa653/patches/patch-bd
+++ b/modular-xorg-server-mesa653/patches/patch-bd
@ -0,0 +1,15 @@
+$NetBSD: patch-bd,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- dix/window.c.orig	2007-03-17 20:29:16.000000000 -0400
+++ dix/window.c
+@@ -140,8 +140,8 @@ Equipment Corporation.
+  *
+  ******/
+ 
+-static unsigned char _back_lsb[4] = {0x88, 0x22, 0x44, 0x11};
+-static unsigned char _back_msb[4] = {0x11, 0x44, 0x22, 0x88};
+static unsigned char _back_lsb[4] = {0x00, 0x00, 0x00, 0x00};
+static unsigned char _back_msb[4] = {0x00, 0x00, 0x00, 0x00};
+ 
+ _X_EXPORT int screenIsSaved = SCREEN_SAVER_OFF;
+ 
--- a/modular-xorg-server-mesa653/patches/patch-be
+++ b/modular-xorg-server-mesa653/patches/patch-be
--- a/modular-xorg-server-mesa653/patches/patch-bf
+++ b/modular-xorg-server-mesa653/patches/patch-bf
@ -0,0 +1,99 @@
+$NetBSD: patch-bf,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- fb/fbmmx.h.orig	2006-06-06 13:13:52.000000000 -0400
+++ fb/fbmmx.h
+@@ -82,6 +82,32 @@ void fbCompositeSrc_8888x8888mmx (CARD8	
+ 				  INT16		yDst,
+ 				  CARD16	width,
+ 				  CARD16	height);
+void
+fbCompositeSolidMaskSrc_nx8x8888mmx (CARD8      op,
+				     PicturePtr pSrc,
+				     PicturePtr pMask,
+				     PicturePtr pDst,
+				     INT16      xSrc,
+				     INT16      ySrc,
+				     INT16      xMask,
+				     INT16      yMask,
+				     INT16      xDst,
+				     INT16      yDst,
+				     CARD16     width,
+				     CARD16     height);
+void
+fbCompositeSrc_x888x8x8888mmx (CARD8	op,
+			       PicturePtr pSrc,
+			       PicturePtr pMask,
+			       PicturePtr pDst,
+			       INT16	xSrc,
+			       INT16	ySrc,
+			       INT16      xMask,
+			       INT16      yMask,
+			       INT16      xDst,
+			       INT16      yDst,
+			       CARD16     width,
+			       CARD16     height);
+ void fbCompositeSolidMask_nx8888x8888Cmmx (CARD8	op,
+ 					   PicturePtr	pSrc,
+ 					   PicturePtr	pMask,
+@@ -106,6 +132,42 @@ void fbCompositeSolidMask_nx8x8888mmx (C
+ 				       INT16      yDst,
+ 				       CARD16     width,
+ 				       CARD16     height);
+void fbCompositeIn_nx8x8mmx (CARD8	op,
+			PicturePtr pSrc,
+			PicturePtr pMask,
+			PicturePtr pDst,
+			INT16      xSrc,
+			INT16      ySrc,
+			INT16      xMask,
+			INT16      yMask,
+			INT16      xDst,
+			INT16      yDst,
+			CARD16     width,
+			CARD16     height);
+void fbCompositeIn_8x8mmx (CARD8	op,
+		      PicturePtr pSrc,
+		      PicturePtr pMask,
+		      PicturePtr pDst,
+		      INT16      xSrc,
+		      INT16      ySrc,
+		      INT16      xMask,
+		      INT16      yMask,
+		      INT16      xDst,
+		      INT16      yDst,
+		      CARD16     width,
+		      CARD16     height);
+void fbCompositeSrcAdd_8888x8x8mmx (CARD8   op,
+			       PicturePtr pSrc,
+			       PicturePtr pMask,
+			       PicturePtr pDst,
+			       INT16      xSrc,
+			       INT16      ySrc,
+			       INT16      xMask,
+			       INT16      yMask,
+			       INT16      xDst,
+			       INT16      yDst,
+			       CARD16     width,
+			       CARD16     height);
+ void fbCompositeSrcAdd_8000x8000mmx (CARD8	op,
+ 				     PicturePtr pSrc,
+ 				     PicturePtr pMask,
+@@ -130,6 +192,18 @@ void fbCompositeSrc_8888RevNPx8888mmx (C
+ 				       INT16      yDst,
+ 				       CARD16     width,
+ 				       CARD16     height);
+void fbCompositeSrc_8888x0565mmx (CARD8      op,
+				  PicturePtr pSrc,
+				  PicturePtr pMask,
+				  PicturePtr pDst,
+				  INT16      xSrc,
+				  INT16      ySrc,
+				  INT16      xMask,
+				  INT16      yMask,
+				  INT16      xDst,
+				  INT16      yDst,
+				  CARD16     width,
+				  CARD16     height);
+ void fbCompositeSrc_8888RevNPx0565mmx (CARD8      op,
+ 				       PicturePtr pSrc,
+ 				       PicturePtr pMask,
--- a/modular-xorg-server-mesa653/patches/patch-bg
+++ b/modular-xorg-server-mesa653/patches/patch-bg
@ -0,0 +1,32 @@
+$NetBSD: patch-bg,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- fb/fbpict.c.orig	2007-01-30 01:03:18.000000000 -0500
+++ fb/fbpict.c
+@@ -1136,7 +1136,12 @@ fbComposite (CARD8      op,
+ 			func = fbCompositeSrc_8888x0888;
+ 			break;
+ 		    case PICT_r5g6b5:
+-			func = fbCompositeSrc_8888x0565;
+#ifdef USE_MMX
+			if (fbHaveMMX())
+			    func = fbCompositeSrc_8888x0565mmx;
+			else
+#endif
+			    func = fbCompositeSrc_8888x0565;
+ 			break;
+ 		    default:
+ 			break;
+@@ -1182,7 +1187,12 @@ fbComposite (CARD8      op,
+ 			func = fbCompositeSrc_8888x0888;
+ 			break;
+ 		    case PICT_b5g6r5:
+-			func = fbCompositeSrc_8888x0565;
+#ifdef USE_MMX
+			if (fbHaveMMX())
+			    func = fbCompositeSrc_8888x0565mmx;
+			else
+#endif
+			    func = fbCompositeSrc_8888x0565;
+ 			break;
+ 		    default:
+ 			break;
--- a/modular-xorg-server-mesa653/patches/patch-bh
+++ b/modular-xorg-server-mesa653/patches/patch-bh
@ -0,0 +1,14 @@
+$NetBSD: patch-bh,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- fb/fbtrap.c.orig	2006-11-16 13:01:23.000000000 -0500
+++ fb/fbtrap.c
+@@ -115,6 +115,9 @@ fbRasterizeTrapezoid (PicturePtr    pPic
+     RenderEdge	l, r;
+     xFixed	t, b;
+     
+    if (!xTrapezoidValid (trap))
+	return;
+
+     fbGetDrawable (pPicture->pDrawable, buf, stride, bpp, pxoff, pyoff);
+ 
+     width = pPicture->pDrawable->width;
--- a/modular-xorg-server-mesa653/patches/patch-bi
+++ b/modular-xorg-server-mesa653/patches/patch-bi
@ -0,0 +1,13 @@
+$NetBSD: patch-bi,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/dmx/glxProxy/glxext.h.orig	2006-09-18 02:04:17.000000000 -0400
+++ hw/dmx/glxProxy/glxext.h
+@@ -67,7 +67,7 @@ extern void __glXFreeGLXPixmap( __GLXpix
+ 
+ extern void __glXNoSuchRenderOpcode(GLbyte*);
+ extern int __glXNoSuchSingleOpcode(__GLXclientState*, GLbyte*);
+-extern void __glXErrorCallBack(__GLinterface *gc, GLenum code);
+extern void __glXErrorCallBack(GLenum code);
+ extern void __glXClearErrorOccured(void);
+ extern GLboolean __glXErrorOccured(void);
+ extern void __glXResetLargeCommandStatus(__GLXclientState*);
--- a/modular-xorg-server-mesa653/patches/patch-bj
+++ b/modular-xorg-server-mesa653/patches/patch-bj
@ -0,0 +1,13 @@
+$NetBSD: patch-bj,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/Makefile.am.orig	2007-05-23 11:36:53.000000000 -0400
+++ hw/xfree86/Makefile.am
+@@ -45,7 +45,7 @@ XORG_LIBS = \
+             loader/libloader.a \
+             libosandcommon.la \
+ 	    rac/librac.a \
+-            parser/libxf86config.a \
+            parser/libxf86config.la \
+ 	    dixmods/libdixmods.la \
+ 	    modes/libxf86modes.a \
+ 	    ramdac/libramdac.a \
--- a/modular-xorg-server-mesa653/patches/patch-bk
+++ b/modular-xorg-server-mesa653/patches/patch-bk
@ -0,0 +1,175 @@
+$NetBSD: patch-bk,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/common/extramodes.orig	2006-06-06 13:13:53.000000000 -0400
+++ hw/xfree86/common/extramodes
+@@ -3,21 +3,162 @@
+ //
+ // $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $
+ //
+// NOTE:  Please keep all video modes sorted in order of X res, then Y res for
+//        ease of maintenance and readability.
+ 
+ # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz
+ ModeLine "832x624" 57.284 832  864  928 1152  624  625  628  667 -Hsync -Vsync
+ 
+# Disable the 848x480 modes for now.  They're quite rare, and they screw up
+# the autosizing logic.  They're panel modes anyway, and EDID injection
+# should cover that now. - ajax, 2006-07-28
+
+# 848x480 @ 60.00 Hz (GTF) hsync: 29.82 kHz; pclk: 31.49 MHz
+# Modeline "848x480"  31.49  848 864 952 1056  480 481 484 497  -HSync +Vsync
+
+# 848x480 @ 70.00 Hz (GTF) hsync: 35.00 kHz; pclk: 37.52 MHz
+# Modeline "848x480"  37.52  848 872 960 1072  480 481 484 500  -HSync +Vsync
+
+# 848x480 @ 75.00 Hz (GTF) hsync: 37.65 kHz; pclk: 40.96 MHz
+# Modeline "848x480"  40.96  848 880 968 1088  480 481 484 502  -HSync +Vsync
+
+# 848x480 @ 85.00 Hz (GTF) hsync: 42.92 kHz; pclk: 47.39 MHz
+# Modeline "848x480"  47.39  848 888 976 1104  480 481 484 505  -HSync +Vsync
+
+ # 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz
+ ModeLine "1152x768"   64.995 1152 1178 1314 1472  768  771  777  806 +hsync +vsync
+ 
+# 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz
+Modeline "1152x864"  81.62  1152 1216 1336 1520  864 865 868 895  -HSync +Vsync
+
+# 1152x864 @ 70.00 Hz (GTF) hsync: 63.00 kHz; pclk: 96.77 MHz
+Modeline "1152x864"  96.77  1152 1224 1344 1536  864 865 868 900  -HSync +Vsync
+
+# 1152x864 @ 75.00 Hz (GTF) hsync: 67.65 kHz; pclk: 104.99 MHz
+Modeline "1152x864"  104.99  1152 1224 1352 1552  864 865 868 902  -HSync +Vsync
+
+# 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz
+Modeline "1152x864"  119.65  1152 1224 1352 1552  864 865 868 907  -HSync +Vsync
+
+# 1152x864 @ 85Hz (Red Hat custom modeline)
+ModeLine "1152x864"  121.5 1152 1216 1344 1568    864  865  868  911 +hsync -vsync
+
+# 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz
+Modeline "1152x864"  143.47  1152 1232 1360 1568  864 865 868 915  -HSync +Vsync
+
+# 1280x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 74.48 MHz
+Modeline "1280x720"  74.48  1280 1336 1472 1664  720 721 724 746  -HSync +Vsync
+
+# 1280x720 @ 70.00 Hz (GTF) hsync: 52.50 kHz; pclk: 89.04 MHz
+Modeline "1280x720"  89.04  1280 1352 1488 1696  720 721 724 750  -HSync +Vsync
+
+# 1280x720 @ 75.00 Hz (GTF) hsync: 56.40 kHz; pclk: 95.65 MHz
+Modeline "1280x720"  95.65  1280 1352 1488 1696  720 721 724 752  -HSync +Vsync
+
+# 1280x720 @ 85.00 Hz (GTF) hsync: 64.26 kHz; pclk: 110.01 MHz
+Modeline "1280x720"  110.01  1280 1360 1496 1712  720 721 724 756  -HSync +Vsync
+
+# 1280x800 @ 60.00 Hz (GTF) hsync: 49.68 kHz; pclk: 83.46 MHz
+Modeline "1280x800"  83.46  1280 1344 1480 1680  800 801 804 828  -HSync +Vsync
+
+# 1280x800 @ 70.00 Hz (GTF) hsync: 58.31 kHz; pclk: 98.89 MHz
+Modeline "1280x800"  98.89  1280 1352 1488 1696  800 801 804 833  -HSync +Vsync
+
+# 1280x800 @ 75.00 Hz (GTF) hsync: 62.62 kHz; pclk: 107.21 MHz
+Modeline "1280x800"  107.21  1280 1360 1496 1712  800 801 804 835  -HSync +Vsync
+
+# 1280x800 @ 85.00 Hz (GTF) hsync: 71.40 kHz; pclk: 123.38 MHz
+Modeline "1280x800"  123.38  1280 1368 1504 1728  800 801 804 840  -HSync +Vsync
+
+# 1280x768 @ 60.00 Hz (GTF) hsync: 47.70 kHz; pclk: 80.14 MHz
+Modeline "1280x768"  80.14  1280 1344 1480 1680  768 769 772 795  -HSync +Vsync
+
+# 1280x768 @ 70.00 Hz (GTF) hsync: 56.00 kHz; pclk: 94.98 MHz
+Modeline "1280x768"  94.98  1280 1352 1488 1696  768 769 772 800  -HSync +Vsync
+
+# 1280x768 @ 75.00 Hz (GTF) hsync: 60.15 kHz; pclk: 102.98 MHz
+Modeline "1280x768"  102.98  1280 1360 1496 1712  768 769 772 802  -HSync +Vsync
+
+# 1280x768 @ 85.00 Hz (GTF) hsync: 68.60 kHz; pclk: 118.53 MHz
+Modeline "1280x768"  118.53  1280 1368 1504 1728  768 769 772 807  -HSync +Vsync
+
+# 1360x768 59.96 Hz (CVT) hsync: 47.37 kHz; pclk: 72.00 MHz
+Modeline "1360x768"   72.00  1360 1408 1440 1520  768 771 781 790 +hsync -vsync
+
+# 1360x768 59.80 Hz (CVT) hsync: 47.72 kHz; pclk: 84.75 MHz
+Modeline "1360x768"   84.75  1360 1432 1568 1776  768 771 781 798 -hsync +vsync
+
+ # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz
+ ModeLine "1400x1050" 122.0 1400 1488 1640 1880   1050 1052 1064 1082 +hsync +vsync
+ 
+# 1400x1050 @ 70.00 Hz (GTF) hsync: 76.51 kHz; pclk: 145.06 MHz
+Modeline "1400x1050"  145.06  1400 1496 1648 1896  1050 1051 1054 1093  -HSync +Vsync
+
+# 1400x1050 @ 70Hz (Red Hat custom modeline) hsync: 76.8kHz
+ModeLine "1400x1050" 151.0 1400 1464 1656 1960   1050 1051 1054 1100 +hsync +vsync
+
+ # 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz
+ ModeLine "1400x1050" 155.8 1400 1464 1784 1912   1050 1052 1064 1090 +hsync +vsync
+ 
+-# 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz
+-Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync
+# 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz
+Modeline "1400x1050"  179.26  1400 1504 1656 1912  1050 1051 1054 1103  -HSync +Vsync
+
+# 1400x1050 @ 85Hz (Red Hat custom modeline) hsync: 93.2 kHz
+ModeLine "1400x1050" 184.0 1400 1464 1656 1960   1050 1051 1054 1100 +hsync +vsync
+
+# 1440x900 @ 60.00 Hz (CVT) field rate 59.89 Hz; hsync: 55.93 kHz; pclk: 106.50 MHz
+Modeline "1440x900"  106.50  1440 1520 1672 1904  900 903 909 934  -HSync +Vsync
+
+# 1600x1024 for SGI 1600 SW
+ModeLine "1600x1024" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 +Hsync +Vsync
+
+# 1680x1050 59.88 Hz (CVT 1.76MA-R) hsync: 64.67 kHz; pclk: 119.00 MHz
+Modeline "1680x1050"  119.00  1680 1728 1760 1840  1050 1053 1059 1080 +hsync -vsync
+
+# 1680x1050 59.95 Hz (CVT 1.76MA) hsync: 65.29 kHz; pclk: 146.25 MHz
+Modeline "1680x1050"  146.25  1680 1784 1960 2240  1050 1053 1059 1089 -hsync +vsync
+
+# 1680x1050 69.88 Hz (CVT) hsync: 76.58 kHz; pclk: 174.00 MHz
+Modeline "1680x1050"  174.00  1680 1800 1976 2272  1050 1053 1059 1096 -hsync +vsync
+
+# 1680x1050 74.89 Hz (CVT 1.76MA) hsync: 82.31 kHz; pclk: 187.00 MHz
+Modeline "1680x1050"  187.00  1680 1800 1976 2272  1050 1053 1059 1099 -hsync +vsync
+
+# 1680x1050 84.94 Hz (CVT 1.76MA) hsync: 93.86 kHz; pclk: 214.75 MHz
+Modeline "1680x1050"  214.75  1680 1808 1984 2288  1050 1053 1059 1105 -hsync +vsync
+
+# 1920x1080 59.93 Hz (CVT 2.07M9-R) hsync: 66.59 kHz; pclk: 138.50 MHz
+Modeline "1920x1080"  138.50  1920 1968 2000 2080  1080 1083 1088 1111 +hsync -vsync
+
+# 1920x1080 59.96 Hz (CVT 2.07M9) hsync: 67.16 kHz; pclk: 173.00 MHz
+Modeline "1920x1080"  173.00  1920 2048 2248 2576  1080 1083 1088 1120 -hsync +vsync
+
+# 1920x1080 69.92 Hz (CVT) hsync: 78.80 kHz; pclk: 204.25 MHz
+Modeline "1920x1080"  204.25  1920 2056 2256 2592  1080 1083 1088 1127 -hsync +vsync
+
+# 1920x1080 74.91 Hz (CVT 2.07M9) hsync: 84.64 kHz; pclk: 220.75 MHz
+Modeline "1920x1080"  220.75  1920 2064 2264 2608  1080 1083 1088 1130 -hsync +vsync
+
+# 1920x1080 84.88 Hz (CVT 2.07M9) hsync: 96.51 kHz; pclk: 253.25 MHz
+Modeline "1920x1080"  253.25  1920 2064 2272 2624  1080 1083 1088 1137 -hsync +vsync
+
+# 1920x1200 59.95 Hz (CVT 2.30MA-R) hsync: 74.04 kHz; pclk: 154.00 MHz
+Modeline "1920x1200"  154.00  1920 1968 2000 2080  1200 1203 1209 1235 +hsync -vsync
+
+# 1920x1200 @ 60.00 Hz (GTF) hsync: 74.52 kHz; pclk: 193.16 MHz
+Modeline "1920x1200"  193.16  1920 2048 2256 2592  1200 1201 1204 1242  -HSync +Vsync
+
+# 1920x1200 @ 70.00 Hz (GTF) hsync: 87.43 kHz; pclk: 228.02 MHz
+Modeline "1920x1200"  228.02  1920 2056 2264 2608  1200 1201 1204 1249  -HSync +Vsync
+
+# 1920x1200 @ 70Hz (Red Hat custom modeline - bugzilla #53364) hsync: 87.50 KHz
+Modeline "1920x1200" 230.0   1920 1936 2096 2528  1200 1201 1204 1250 -HSync -VSync
+
+# 1920x1200 @ 75.00 Hz (GTF) hsync: 93.97 kHz; pclk: 246.59 MHz
+Modeline "1920x1200"  246.59  1920 2064 2272 2624  1200 1201 1204 1253  -HSync +Vsync
+
+# 1920x1200 @ 85.00 Hz (GTF) hsync: 107.10 kHz; pclk: 282.74 MHz
+Modeline "1920x1200"  282.74  1920 2072 2280 2640  1200 1201 1204 1260  -HSync +Vsync
+ 
+ # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
+ Modeline "1920x1440" 341.35  1920 2072 2288 2656  1440 1441 1444 1512 -hsync +vsync
+@@ -31,3 +172,5 @@ Modeline "2048x1536" 340.48  2048 2216 2
+ # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz
+ Modeline "2048x1536" 388.04  2048 2216 2440 2832  1536 1537 1540 1612 -hsync +vsync
+ 
+# 2560x1600 @ 60.00 Hz (GTF) hsync: 99.36 kHz; pclk: 348.16 MHz
+Modeline "2560x1600"  348.16  2560 2752 3032 3504  1600 1601 1604 1656  -HSync +Vsync
--- a/modular-xorg-server-mesa653/patches/patch-bl
+++ b/modular-xorg-server-mesa653/patches/patch-bl
@ -0,0 +1,12 @@
+$NetBSD: patch-bl,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/common/xf86AutoConfig.c.orig	2006-11-16 13:01:24.000000000 -0500
+++ hw/xfree86/common/xf86AutoConfig.c
+@@ -99,7 +99,6 @@
+ static const char **builtinConfig = NULL;
+ static int builtinLines = 0;
+ static const char *deviceList[] = {
+-	"fbdev",
+ 	"vesa",
+ 	"vga",
+ 	NULL
--- a/modular-xorg-server-mesa653/patches/patch-bm
+++ b/modular-xorg-server-mesa653/patches/patch-bm
@ -0,0 +1,31 @@
+$NetBSD: patch-bm,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/common/xf86Config.c.orig	2007-05-23 11:36:46.000000000 -0400
+++ hw/xfree86/common/xf86Config.c
+@@ -1596,7 +1596,7 @@ checkCoreInputDevices(serverLayoutPtr se
+ 			      (count + 1) * sizeof(IDevRec));
+ 	    indp[count - 1] = Pointer;
+ 	    indp[count - 1].extraOptions =
+-				xf86addNewOption(NULL, "CorePointer", NULL);
+				xf86addNewOption(NULL, xnfstrdup("CorePointer"), NULL);
+ 	    indp[count].identifier = NULL;
+ 	    servlayoutp->inputs = indp;
+ 	}
+@@ -1631,7 +1631,7 @@ checkCoreInputDevices(serverLayoutPtr se
+ 			      (count + 1) * sizeof(IDevRec));
+ 	    indp[count - 1] = Pointer;
+ 	    indp[count - 1].extraOptions =
+-				xf86addNewOption(NULL, "AlwaysCore", NULL);
+				xf86addNewOption(NULL, xnfstrdup("AlwaysCore"), NULL);
+ 	    indp[count].identifier = NULL;
+ 	    servlayoutp->inputs = indp;
+ 	}
+@@ -1726,7 +1726,7 @@ checkCoreInputDevices(serverLayoutPtr se
+ 			      (count + 1) * sizeof(IDevRec));
+ 	    indp[count - 1] = Keyboard;
+ 	    indp[count - 1].extraOptions =
+-				xf86addNewOption(NULL, "CoreKeyboard", NULL);
+				xf86addNewOption(NULL, xnfstrdup("CoreKeyboard"), NULL);
+ 	    indp[count].identifier = NULL;
+ 	    servlayoutp->inputs = indp;
+ 	}
--- a/modular-xorg-server-mesa653/patches/patch-bn
+++ b/modular-xorg-server-mesa653/patches/patch-bn
@ -0,0 +1,51 @@
+$NetBSD: patch-bn,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/common/xf86Configure.c.orig	2007-02-17 20:37:56.000000000 -0500
+++ hw/xfree86/common/xf86Configure.c
+@@ -313,13 +313,16 @@ configureInputSection (void)
+     mouse->inp_identifier = "Mouse0";
+     mouse->inp_driver = "mouse";
+     mouse->inp_option_lst = 
+-		xf86addNewOption(mouse->inp_option_lst, "Protocol", DFLT_MOUSE_PROTO);
+		xf86addNewOption(mouse->inp_option_lst, xstrdup("Protocol"),
+				xstrdup(DFLT_MOUSE_PROTO));
+ #ifndef __SCO__
+     mouse->inp_option_lst = 
+-		xf86addNewOption(mouse->inp_option_lst, "Device", DFLT_MOUSE_DEV);
+		xf86addNewOption(mouse->inp_option_lst, xstrdup("Device"),
+				xstrdup(DFLT_MOUSE_DEV));
+ #endif
+     mouse->inp_option_lst = 
+-		xf86addNewOption(mouse->inp_option_lst, "ZAxisMapping", "4 5 6 7");
+		xf86addNewOption(mouse->inp_option_lst, xstrdup("ZAxisMapping"),
+				xstrdup("4 5 6 7"));
+     ptr = (XF86ConfInputPtr)xf86addListItem((glp)ptr, (glp)mouse);
+     return ptr;
+ }
+@@ -523,7 +526,7 @@ configureLayoutSection (void)
+ 	iptr->iref_option_lst = NULL;
+ 	iptr->iref_inputdev_str = "Mouse0";
+ 	iptr->iref_option_lst =
+-		xf86addNewOption (iptr->iref_option_lst, "CorePointer", NULL);
+		xf86addNewOption (iptr->iref_option_lst, xstrdup("CorePointer"), NULL);
+ 	ptr->lay_input_lst = (XF86ConfInputrefPtr)
+ 		xf86addListItem ((glp) ptr->lay_input_lst, (glp) iptr);
+     }
+@@ -536,7 +539,7 @@ configureLayoutSection (void)
+ 	iptr->iref_option_lst = NULL;
+ 	iptr->iref_inputdev_str = "Keyboard0";
+ 	iptr->iref_option_lst =
+-		xf86addNewOption (iptr->iref_option_lst, "CoreKeyboard", NULL);
+		xf86addNewOption (iptr->iref_option_lst, xstrdup("CoreKeyboard"), NULL);
+ 	ptr->lay_input_lst = (XF86ConfInputrefPtr)
+ 		xf86addListItem ((glp) ptr->lay_input_lst, (glp) iptr);
+     }
+@@ -755,7 +758,7 @@ configureDDCMonitorSection (int screennu
+     }
+ 
+     if (ConfiguredMonitor->features.dpms) {
+-      ptr->mon_option_lst = xf86addNewOption(ptr->mon_option_lst, "DPMS", NULL);
+      ptr->mon_option_lst = xf86addNewOption(ptr->mon_option_lst, xstrdup("DPMS"), NULL);
+     }
+ 
+     return ptr;
--- a/modular-xorg-server-mesa653/patches/patch-bo
+++ b/modular-xorg-server-mesa653/patches/patch-bo
@ -0,0 +1,13 @@
+$NetBSD: patch-bo,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/common/xf86Globals.c.orig	2006-11-16 13:01:24.000000000 -0500
+++ hw/xfree86/common/xf86Globals.c
+@@ -166,7 +166,7 @@ xf86InfoRec xf86Info = {
+ #if defined(i386) || defined(__i386__)
+ 	FALSE,		/* pc98 */
+ #endif
+-	TRUE,		/* pmFlag */
+	FALSE,		/* pmFlag */
+ 	LogNone,	/* syncLog */
+ 	0,		/* estimateSizesAggressively */
+ 	FALSE,		/* kbdCustomKeycodes */
--- a/modular-xorg-server-mesa653/patches/patch-bp
+++ b/modular-xorg-server-mesa653/patches/patch-bp
@ -0,0 +1,18 @@
+$NetBSD: patch-bp,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/common/xf86Helper.c.orig	2006-11-16 13:01:24.000000000 -0500
+++ hw/xfree86/common/xf86Helper.c
+@@ -2394,6 +2394,13 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, con
+ 			&errmaj, &errmin);
+     if (!ret)
+ 	LoaderErrorMsg(pScrn->name, name, errmaj, errmin);
+
+    /* "drm" module has been merged into "dri" module, but some drivers
+        are still trying to load it explictely and fail if it doesn't exist :-( */
+    if (!ret && !strcmp(name,"drm")) {
+        ret = (pointer) -1;
+    }
+
+     return ret;
+ }
+ 
--- a/modular-xorg-server-mesa653/patches/patch-bq
+++ b/modular-xorg-server-mesa653/patches/patch-bq
@ -0,0 +1,22 @@
+$NetBSD: patch-bq,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/common/xf86Init.c.orig	2006-11-30 20:40:10.000000000 -0500
+++ hw/xfree86/common/xf86Init.c
+@@ -1770,7 +1770,7 @@ ddxUseMsg()
+ static void
+ xf86PrintBanner()
+ {
+-#if PRE_RELEASE
+#if 0
+   ErrorF("\n"
+     "This is a pre-release version of the X server from " XVENDORNAME ".\n"
+     "It is not supported in any way.\n"
+@@ -1780,7 +1780,7 @@ xf86PrintBanner()
+     "latest version in the X.Org Foundation git repository.\n"
+     "See http://wiki.x.org/wiki/GitPage for git access instructions.\n");
+ #endif
+-  ErrorF("\nX Window System Version %d.%d.%d",
+  ErrorF("X Window System Version %d.%d.%d",
+ 	 XORG_VERSION_MAJOR,
+ 	 XORG_VERSION_MINOR,
+ 	 XORG_VERSION_PATCH);
--- a/modular-xorg-server-mesa653/patches/patch-br
+++ b/modular-xorg-server-mesa653/patches/patch-br
@ -0,0 +1,16 @@
+$NetBSD: patch-br,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/common/xf86Mode.c.orig	2006-11-16 13:01:24.000000000 -0500
+++ hw/xfree86/common/xf86Mode.c
+@@ -713,6 +713,11 @@ xf86SetModeCrtc(DisplayModePtr p, int ad
+         p->CrtcVSyncEnd         *= p->VScan;
+         p->CrtcVTotal           *= p->VScan;
+     }
+    p->CrtcVBlankStart = min(p->CrtcVSyncStart, p->CrtcVDisplay);
+    p->CrtcVBlankEnd = max(p->CrtcVSyncEnd, p->CrtcVTotal);
+    p->CrtcHBlankStart = min(p->CrtcHSyncStart, p->CrtcHDisplay);
+    p->CrtcHBlankEnd = max(p->CrtcHSyncEnd, p->CrtcHTotal);
+
+     p->CrtcHAdjusted = FALSE;
+     p->CrtcVAdjusted = FALSE;
+ 
--- a/modular-xorg-server-mesa653/patches/patch-bs
+++ b/modular-xorg-server-mesa653/patches/patch-bs
@ -0,0 +1,22 @@
+$NetBSD: patch-bs,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/common/xf86Option.c.orig	2006-11-16 13:01:24.000000000 -0500
+++ hw/xfree86/common/xf86Option.c
+@@ -289,7 +289,7 @@ xf86CheckBoolOption(pointer optlist, con
+ _X_EXPORT pointer
+ xf86ReplaceIntOption(pointer optlist, const char *name, const int val)
+ {
+-    char *tmp = xnfalloc(16);
+    char tmp[16];
+     sprintf(tmp,"%i",val);
+     return xf86AddNewOption(optlist,name,tmp);
+ }
+@@ -297,7 +297,7 @@ xf86ReplaceIntOption(pointer optlist, co
+ _X_EXPORT pointer
+ xf86ReplaceRealOption(pointer optlist, const char *name, const double val)
+ {
+-    char *tmp = xnfalloc(32);
+    char tmp[32];
+     snprintf(tmp,32,"%f",val);
+     return xf86AddNewOption(optlist,name,tmp);
+ }
--- a/modular-xorg-server-mesa653/patches/patch-bt
+++ b/modular-xorg-server-mesa653/patches/patch-bt
@ -0,0 +1,13 @@
+$NetBSD: patch-bt,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/doc/man/xorg.conf.man.pre.orig	2007-05-23 11:36:46.000000000 -0400
+++ hw/xfree86/doc/man/xorg.conf.man.pre
+@@ -602,7 +602,7 @@ action and, if found, use XKEYBOARD for 
+ the builtin handler will be used.
+ .TP 7
+ .BI "Option \*qAIGLX\*q \*q" boolean \*q
+-enable or disable AIGLX. AIGLX is enabled by default.
+enable or disable AIGLX. AIGLX is disabled by default.
+ .TP 7
+ .BI "Option \*qIgnoreABI\*q \*q" boolean \*q
+ Allow modules built for a different, potentially incompatible version of
--- a/modular-xorg-server-mesa653/patches/patch-bu
+++ b/modular-xorg-server-mesa653/patches/patch-bu
@ -0,0 +1,13 @@
+$NetBSD: patch-bu,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/loader/loadmod.c.orig	2007-04-16 12:37:51.000000000 -0400
+++ hw/xfree86/loader/loadmod.c
+@@ -864,7 +864,7 @@ doLoadModule(const char *module, const c
+     char *m = NULL;
+     const char **cim;
+ 
+-    xf86MsgVerb(X_INFO, 3, "LoadModule: \"%s\"", module);
+    xf86MsgVerb(X_INFO, 3, "LoadModule: \"%s\"\n", module);
+ 
+     for (cim = compiled_in_modules; *cim; cim++)
+ 	if (!strcmp (module, *cim))
--- a/modular-xorg-server-mesa653/patches/patch-bv
+++ b/modular-xorg-server-mesa653/patches/patch-bv
@ -0,0 +1,22 @@
+$NetBSD: patch-bv,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/modes/xf86Modes.c.orig	2007-02-16 11:03:12.000000000 -0500
+++ hw/xfree86/modes/xf86Modes.c
+@@ -46,7 +46,7 @@ extern XF86ConfigPtr xf86configptr;
+  * there but we still want to use.  We need to come up with better API here.
+  */
+ 
+-#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,2,99,2,0)
+/* if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,2,99,2,0) */
+ /**
+  * Calculates the horizontal sync rate of a mode.
+  *
+@@ -318,7 +318,7 @@ xf86PrintModeline(int scrnIndex,DisplayM
+ 		   mode->VTotal, flags, xf86ModeHSync(mode));
+     xfree(flags);
+ }
+-#endif /* XORG_VERSION_CURRENT <= 7.2.99.2 */
+/* XORG_VERSION_CURRENT <= 7.2.99.2 */
+ 
+ /**
+  * Marks as bad any modes with unsupported flags.
--- a/modular-xorg-server-mesa653/patches/patch-bw
+++ b/modular-xorg-server-mesa653/patches/patch-bw
@ -0,0 +1,43 @@
+$NetBSD: patch-bw,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/os-support/bus/linuxPci.c.orig	2006-11-16 13:01:25.000000000 -0500
+++ hw/xfree86/os-support/bus/linuxPci.c
+@@ -683,28 +683,28 @@ xf86MapDomainMemory(int ScreenNum, int F
+ 		    ADDRESS Base, unsigned long Size)
+ {
+     int domain = xf86GetPciDomain(Tag);
+-    int fd;
+    int fd = -1;
+     pointer addr;
+ 
+     /*
+      * We use /proc/bus/pci on non-legacy addresses or if the Linux sysfs
+      * legacy_mem interface is unavailable.
+      */
+-    if (Base > 1024*1024)
+-	return linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
+    if (Base >= 1024*1024)
+	addr = linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
+ 			   PCIIOC_MMAP_IS_MEM);
+-
+-    if ((fd = linuxOpenLegacy(Tag, "legacy_mem")) < 0)
+-	return linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
+    else if ((fd = linuxOpenLegacy(Tag, "legacy_mem")) < 0)
+	addr = linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
+ 			   PCIIOC_MMAP_IS_MEM);
+    else
+	addr = mmap(NULL, Size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, Base);
+ 
+-    addr = mmap(NULL, Size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, Base);
+-    if (addr == MAP_FAILED) {
+-	close (fd);
+    if (fd >= 0)
+	close(fd);
+    if (addr == NULL || addr == MAP_FAILED) {
+ 	perror("mmap failure");
+ 	FatalError("xf86MapDomainMem():  mmap() failure\n");
+     }
+-    close(fd);
+     return addr;
+ }
+ 
--- a/modular-xorg-server-mesa653/patches/patch-bx
+++ b/modular-xorg-server-mesa653/patches/patch-bx
@ -0,0 +1,13 @@
+$NetBSD: patch-bx,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/os-support/xf86_libc.h.orig	2006-09-18 02:04:18.000000000 -0400
+++ hw/xfree86/os-support/xf86_libc.h
+@@ -428,7 +428,7 @@ typedef int xf86jmp_buf[1024];
+ #define toupper(i)		xf86toupper(i)
+ #undef ungetc
+ #define ungetc(i,FP)		xf86ungetc(i,FP)
+-#undef vfprinf
+#undef vfprintf
+ #define vfprintf(p,f,a)		xf86vfprintf(p,f,a)
+ #undef vsnprintf
+ #define vsnprintf(s,n,f,a)	xf86vsnprintf(s,n,f,a)
--- a/modular-xorg-server-mesa653/patches/patch-by
+++ b/modular-xorg-server-mesa653/patches/patch-by
@ -0,0 +1,40 @@
+$NetBSD: patch-by,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/parser/Flags.c.orig	2006-09-18 02:04:18.000000000 -0400
+++ hw/xfree86/parser/Flags.c
+@@ -198,21 +198,21 @@ addNewOption2 (XF86OptionPtr head, char 
+ {
+ 	XF86OptionPtr new, old = NULL;
+ 
+-	/* Don't allow duplicates */
+- 	if (head != NULL && (old = xf86findOption(head, name)) != NULL)
+- 		new = old;
+- 	else {
+	/* Don't allow duplicates, free old strings */
+	if (head != NULL && (old = xf86findOption(head, name)) != NULL) {
+		new = old;
+		xf86conffree(new->opt_name);
+		xf86conffree(new->opt_val);
+	}
+	else
+ 		new = xf86confcalloc (1, sizeof (XF86OptionRec));
+- 		new->list.next = NULL;
+- 	}
+- 	new->opt_name = name;
+- 	new->opt_val = val;
+- 	new->opt_used = used;
+-	
+-  	if (old == NULL)
+-		return ((XF86OptionPtr) xf86addListItem ((glp) head, (glp) new));
+- 	else 
+- 		return head;
+	new->opt_name = name;
+	new->opt_val = val;
+	new->opt_used = used;
+
+	if (old)
+		return head;
+	return ((XF86OptionPtr) xf86addListItem ((glp) head, (glp) new));
+ }
+ 
+ XF86OptionPtr
--- a/modular-xorg-server-mesa653/patches/patch-bz
+++ b/modular-xorg-server-mesa653/patches/patch-bz
@ -0,0 +1,42 @@
+$NetBSD: patch-bz,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/parser/Makefile.am.orig	2007-02-16 11:03:12.000000000 -0500
+++ hw/xfree86/parser/Makefile.am
+@@ -1,13 +1,11 @@
+-if INSTALL_LIBXF86CONFIG
+-lib_LIBRARIES = libxf86config.a
+lib_LTLIBRARIES = libxf86config.la
+ LIBHEADERS = \
+ 	xf86Optrec.h \
+ 	xf86Parser.h
+-else
+-noinst_LIBRARIES = libxf86config.a
+-endif
+ 
+-libxf86config_a_SOURCES = \
+libxf86config_la_LDFLAGS = -version-number 6:9:99
+libxf86config_la_LIBADD = $(XF86CONFIG_LIBS) -lm
+libxf86config_la_SOURCES = \
+ 	Device.c \
+ 	Files.c \
+ 	Flags.c \
+@@ -24,7 +22,8 @@ libxf86config_a_SOURCES = \
+ 	scan.c \
+ 	write.c \
+ 	DRI.c \
+-	Extensions.c
+	Extensions.c \
+	error.c
+ 
+ AM_CFLAGS = $(XORG_CFLAGS)
+ 
+@@ -36,7 +35,5 @@ EXTRA_DIST = \
+ 	xf86tokens.h \
+ 	cpconfig.c
+ 
+-sdk_HEADERS = \
+-	$(LIBHEADERS) \
+-	xf86Parser.h \
+-	xf86Optrec.h
+xf86configincludedir=$(includedir)
+xf86configinclude_HEADERS = $(LIBHEADERS)
--- a/modular-xorg-server-mesa653/patches/patch-ca
+++ b/modular-xorg-server-mesa653/patches/patch-ca
@ -0,0 +1,13 @@
+$NetBSD: patch-ca,v 1.1 2007/05/24 00:43:34 bsadewitz Exp $
+
+--- hw/xfree86/parser/Monitor.c.orig	2006-09-18 02:04:18.000000000 -0400
+++ hw/xfree86/parser/Monitor.c
+@@ -674,8 +674,6 @@ xf86printMonitorSection (FILE * cf, XF86
+ 			fprintf (cf, "\tDisplaySize  %d\t%d\n",
+ 					 ptr->mon_width,
+ 					 ptr->mon_height);
+-		if ( ptr->mon_n_hsync || ptr->mon_n_vrefresh )
+-		    fprintf(cf," ### Comment all HorizSync and VertRefresh values to use DDC:\n");
+ 		for (i = 0; i < ptr->mon_n_hsync; i++)
+ 		{
+ 			fprintf (cf, "\tHorizSync    %2.1f - %2.1f\n",
--- a/modular-xorg-server-mesa653/patches/patch-cb
+++ b/modular-xorg-server-mesa653/patches/patch-cb
@ -0,0 +1,26 @@
+$NetBSD: patch-cb,v 1.1 2007/05/24 00:43:35 bsadewitz Exp $
+
+--- hw/xfree86/parser/cpconfig.c.orig	2006-09-18 02:04:18.000000000 -0400
+++ hw/xfree86/parser/cpconfig.c
+@@ -102,21 +102,3 @@ main (int argc, char *argv[])
+ 	}
+ 	exit(0);
+ }
+-
+-/* Functions that the parser requires */
+-
+-_X_EXPORT void
+-VErrorF(const char *f, va_list args)
+-{
+-	vfprintf(stderr, f, args);
+-}
+-
+-_X_EXPORT void
+-ErrorF(const char *f, ...)
+-{
+-	va_list args;
+-
+-	va_start(args, f);
+-	vfprintf(stderr, f, args);
+-	va_end(args);
+-}
--- a/modular-xorg-server-mesa653/patches/patch-cc
+++ b/modular-xorg-server-mesa653/patches/patch-cc
@ -0,0 +1,25 @@
+$NetBSD: patch-cc,v 1.1 2007/05/24 00:43:35 bsadewitz Exp $
+
+--- hw/xfree86/parser/error.c.orig	2007-05-23 11:36:56.000000000 -0400
+++ hw/xfree86/parser/error.c
+@@ -0,0 +1,20 @@
+#include <stdio.h>
+#include <stdarg.h>
+#include "xf86Parser.h"
+
+/* Functions that the parser requires */
+
+void
+VErrorF(const char *f, va_list args)
+{
+        vfprintf(stderr, f, args);
+}
+
+void
+ErrorF(const char *f, ...)
+{
+        va_list args;
+        va_start(args, f);
+        vfprintf(stderr, f, args);
+        va_end(args);
+}
--- a/modular-xorg-server-mesa653/patches/patch-cd
+++ b/modular-xorg-server-mesa653/patches/patch-cd
@ -0,0 +1,31 @@
+$NetBSD: patch-cd,v 1.1 2007/05/24 00:43:35 bsadewitz Exp $
+
+--- hw/xfree86/parser/write.c.orig	2006-09-18 02:04:18.000000000 -0400
+++ hw/xfree86/parser/write.c
+@@ -107,13 +107,19 @@ doWriteConfigFile (const char *filename,
+ 
+ 	xf86printLayoutSection (cf, cptr->conf_layout_lst);
+ 
+-	fprintf (cf, "Section \"Files\"\n");
+-	xf86printFileSection (cf, cptr->conf_files);
+-	fprintf (cf, "EndSection\n\n");
+-
+-	fprintf (cf, "Section \"Module\"\n");
+-	xf86printModuleSection (cf, cptr->conf_modules);
+-	fprintf (cf, "EndSection\n\n");
+	if (cptr->conf_files != NULL)
+	{
+		fprintf (cf, "Section \"Files\"\n");
+		xf86printFileSection (cf, cptr->conf_files);
+		fprintf (cf, "EndSection\n\n");
+	}
+
+	if (cptr->conf_modules != NULL)
+	{
+		fprintf (cf, "Section \"Module\"\n");
+		xf86printModuleSection (cf, cptr->conf_modules);
+		fprintf (cf, "EndSection\n\n");
+	}
+ 
+ 	xf86printVendorSection (cf, cptr->conf_vendor_lst);
+ 
--- a/modular-xorg-server-mesa653/patches/patch-ce
+++ b/modular-xorg-server-mesa653/patches/patch-ce
@ -0,0 +1,13 @@
+$NetBSD: patch-ce,v 1.1 2007/05/24 00:43:35 bsadewitz Exp $
+
+--- hw/xfree86/utils/xorgcfg/Makefile.am.orig	2007-05-23 11:36:53.000000000 -0400
+++ hw/xfree86/utils/xorgcfg/Makefile.am
+@@ -36,7 +36,7 @@ OPTIONSPATH=$(sysconfdir)/X11
+ xorgcfg_CFLAGS = $(XORG_CFLAGS) $(CURSESDEFINES) \
+ 	$(XORGCFG_DEP_CFLAGS) -DXKB_RULES_DIR=\"$(XKB_BASE_DIRECTORY)/rules\" \
+ 	-DPROJECT_ROOT=\"$(PROJECTROOT)\" -DOPTIONSPATH=\"$(OPTIONSPATH)\"
+-xorgcfg_LDADD = $(XORGCFG_DEP_LIBS) ../../parser/libxf86config.a $(LOADERLIB) \
+xorgcfg_LDADD = $(XORGCFG_DEP_LIBS) ../../parser/libxf86config.la $(LOADERLIB) \
+ 	../../os-support/libxorgos.la ../../dummylib/libdummy-nonserver.a \
+ 	${SYS_LIBS}
+ 
--- a/modular-xorg-server-mesa653/patches/patch-cf
+++ b/modular-xorg-server-mesa653/patches/patch-cf
@ -0,0 +1,22 @@
+$NetBSD: patch-cf,v 1.1 2007/05/24 00:43:35 bsadewitz Exp $
+
+--- hw/xfree86/utils/xorgcfg/text-mode.c.orig	2007-02-17 20:37:56.000000000 -0500
+++ hw/xfree86/utils/xorgcfg/text-mode.c
+@@ -2123,7 +2123,7 @@ LayoutConfig(void)
+ 		    else
+ 			iref->iref_option_lst =
+ 			    xf86addNewOption(iref->iref_option_lst,
+-					  "CorePointer", NULL);
+					  XtNewString("CorePointer"), NULL);
+ 		    option = xf86findOption(mref->iref_option_lst,
+ 					    "CorePointer");
+ 		    XtFree(option->opt_name);
+@@ -2221,7 +2221,7 @@ LayoutConfig(void)
+ 		    else
+ 			iref->iref_option_lst =
+ 			    xf86addNewOption(iref->iref_option_lst,
+-					  "CoreKeyboard", NULL);
+					  XtNewString("CoreKeyboard"), NULL);
+ 		    option = xf86findOption(kref->iref_option_lst,
+ 					    "CoreKeyboard");
+ 		    XtFree(option->opt_name);
--- a/modular-xorg-server-mesa653/patches/patch-cg
+++ b/modular-xorg-server-mesa653/patches/patch-cg
@ -0,0 +1,13 @@
+$NetBSD: patch-cg,v 1.1 2007/05/24 00:43:35 bsadewitz Exp $
+
+--- hw/xfree86/utils/xorgconfig/Makefile.am.orig	2006-09-18 02:04:18.000000000 -0400
+++ hw/xfree86/utils/xorgconfig/Makefile.am
+@@ -28,7 +28,7 @@
+ 
+ bin_PROGRAMS = xorgconfig
+ 
+-X11dir = $(libdir)/X11
+X11dir = $(datadir)/X11
+ dist_X11_DATA = Cards
+ 
+ xorgconfig_CFLAGS = @XORGCONFIG_DEP_CFLAGS@ \
--- a/modular-xorg-server-mesa653/patches/patch-ch
+++ b/modular-xorg-server-mesa653/patches/patch-ch
@ -0,0 +1,35 @@
+$NetBSD: patch-ch,v 1.1 2007/05/24 00:43:35 bsadewitz Exp $
+
+--- hw/xfree86/xaa/xaaInit.c.orig	2006-09-18 02:04:18.000000000 -0400
+++ hw/xfree86/xaa/xaaInit.c
+@@ -97,6 +97,30 @@ XAADestroyInfoRec(XAAInfoRecPtr infoRec)
+     xfree(infoRec);
+ }
+ 
+void
+XAAEvictPixmaps(void)
+{
+    XAAScreenPtr pScreenPriv;
+    XAAInfoRecPtr infoRec;
+    ScreenPtr pScreen;
+    int i;
+
+    xf86MsgVerb(X_INFO, 3, "XAA: Evicting pixmaps\n");
+
+    for (i = 0; i < screenInfo.numScreens; i++) {
+	pScreen = screenInfo.screens[i];
+	infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+
+	pScreenPriv = pScreen->devPrivates[XAAScreenIndex].ptr;
+	infoRec = pScreenPriv->AccelInfoRec;
+
+	infoRec->offscreenDepths = 0;
+	infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
+       
+	XAAMoveOutOffscreenPixmaps(pScreen);
+	XAAInvalidatePixmapCache(pScreen);
+    }
+}
+ 
+ Bool 
+ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
--- a/modular-xorg-server-mesa653/patches/patch-ci
+++ b/modular-xorg-server-mesa653/patches/patch-ci
@ -0,0 +1,13 @@
+$NetBSD: patch-ci,v 1.1 2007/05/24 00:43:35 bsadewitz Exp $
+
+--- render/glyph.c.orig	2006-09-18 02:04:18.000000000 -0400
+++ render/glyph.c
+@@ -443,7 +443,7 @@ FindGlyphRef (GlyphHashPtr hash, CARD32 
+ 	}
+ 	else if (s == signature &&
+ 		 (!match || 
+-		  memcmp (&compare->info, &glyph->info, compare->size) == 0))
+		  memcmp (&compare->info, &glyph->info, glyph->size < compare->size ? glyph->size : compare->size) == 0))
+ 	{
+ 	    break;
+ 	}
--- a/modular-xorg-server-mesa653/patches/patch-cj
+++ b/modular-xorg-server-mesa653/patches/patch-cj
@ -0,0 +1,12 @@
+$NetBSD: patch-cj,v 1.1 2007/05/24 00:43:35 bsadewitz Exp $
+
+--- render/renderedge.c.orig	2006-06-06 13:13:55.000000000 -0400
+++ render/renderedge.c
+@@ -143,6 +143,7 @@ RenderEdgeInit (RenderEdge	*e,
+     dx = x_bot - x_top;
+     dy = y_bot - y_top;
+     e->dy = dy;
+    e->dx = 0;
+     if (dy)
+     {
+ 	if (dx >= 0)
--- a/modular-xorg-server-mesa653/patches/patch-ck
+++ b/modular-xorg-server-mesa653/patches/patch-ck
@ -0,0 +1,40 @@
+$NetBSD: patch-ck,v 1.1 2007/05/24 00:43:35 bsadewitz Exp $
+
+--- GL/mesa/vbo/Makefile.am.orig	2007-05-23 11:38:26.000000000 -0400
+++ GL/mesa/vbo/Makefile.am
+@@ -0,0 +1,35 @@
+noinst_LTLIBRARIES = libvbo.la
+
+AM_CFLAGS = \
+	$(DIX_CFLAGS) \
+	-DXFree86Server \
+	@GLX_DEFINES@
+
+INCLUDES = -I@MESA_SOURCE@/include \
+           -I../X \
+           -I../glapi \
+           -I../main \
+           -I../math \
+           -I../shader \
+           -I../shader/slang \
+           -I../shader/slang \
+           -I../swrast \
+           -I../swrast_setup \
+           -I../tnl \
+           -I.. \
+           -I$(top_srcdir)/hw/xfree86/os-support
+
+nodist_libvbo_la_SOURCES = vbo_context.c \
+			vbo_exec_api.c \
+			vbo_exec_array.c \
+			vbo_exec.c \
+			vbo_exec_draw.c \
+			vbo_exec_eval.c \
+			vbo_rebase.c \
+			vbo_save_api.c \
+			vbo_save.c \
+			vbo_save_draw.c \
+			vbo_save_loopback.c \
+			vbo_split.c \
+			vbo_split_copy.c \
+			vbo_split_inplace.c