23 files changed, 142 insertions, 666 deletions

diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index b9183e954c58..b865f5b322cd 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -6,31 +6,39 @@
 #
 
 PORTNAME=	Server
-PORTVERSION=	4.3.0
-PORTREVISION=	8
+PORTVERSION=	4.3.99.12
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
+MASTER_SITES=	${MASTER_SITE_XFREE:S|source/||:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
+MASTER_SITE_SUBDIR=	develsnaps/:x \
 			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X430src-1.tgz:x \
-		X430src-2.tgz:x \
-		X430src-3.tgz:x \
+DISTFILES=	XFree86-${PORTVERSION}${EXTRACT_SUFX}:x \
 		Wraphelp2.gz:local
-EXTRACT_ONLY=	X430src-1.tgz \
-		X430src-2.tgz \
-		X430src-3.tgz
+EXTRACT_ONLY=	XFree86-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 X server and related programs
 
-.for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h patch-radeondri \
-	patch-r128_driver.c patch-mga_driver.c patch-xkbInit.c patch-radeon_dri.c \
-	patch-mga_dri.c patch-nv_driver.c patch-nv_setup.c patch-int10-generic.c \
-	patch-radeon_cursor.c patch-radeon_reg.h patch-smi
-EXTRA_PATCHES+=		${FILESDIR}/${pf}
+# Override default from XFree86-4-libraries/Makefile.inc
+PATCHDIR=		${MASTERDIR}/files
+
+.for pf in patch-Imake.cf patch-Imake.rules \
+			patch-Imake.tmpl patch-X11.tmpl patch-Xcursor-Imakefile \
+			patch-c2 patch-dps patch-dri-Imakefile \
+			patch-f patch-imake.c \
+			patch-texteroids patch-xditview-Imakefile patch-xdm \
+			patch-xdm_session.c patch-xf86.tmpl patch-xfree86.cf \
+			patch-xterm-Imakefile patch-z04 patch-z05 patch-z14 \
+			patch-z15 patch-z30 patch-z32 patch-z34 patch-z35 \
+			patch-z41 patch-z44 patch-z45
+# patch-startx
+
+EXTRA_PATCHES+=		${.CURDIR}/../../x11/XFree86-4-libraries/files/${pf}
 .endfor
+
+NO_LATEST_LINK=		yes
+USE_BZIP2=		yes
 SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
 			BuildXF86DRI=${BuildXF86DRI} \
 			WITH_DEBUG="${WITH_DEBUG}"
@@ -139,6 +147,7 @@ MAN4+=		apm.4 \
 		trident.4 \
 		tseng.4 \
 		vesa.4 \
+		via.4 \
 		vmware.4
 .else
 PLIST_SUB+=	I386="@comment "
diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo
index 86966f90fbd3..3035e127dab8 100644
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/distinfo
@@ -1,4 +1,2 @@
-MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
-MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
-MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
+MD5 (xc/XFree86-4.3.99.12.tar.bz2) = 12820de14d53c61cc84a0f20109f1743
 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-FreeBSD.cf b/x11-servers/XFree86-4-Server-snap/files/patch-FreeBSD.cf
new file mode 100644
index 000000000000..e8a25812cf73
--- /dev/null
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-FreeBSD.cf
@@ -0,0 +1,89 @@
+--- config/cf/FreeBSD.cf.orig	Wed Sep 10 04:00:01 2003
++++ config/cf/FreeBSD.cf	Tue Sep 16 16:54:44 2003
+@@ -167,11 +167,11 @@
+  *    ld: warning: libXThrStub.so.6, needed by libX11.so, not found
+  */
+ #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
+-# define CcCmd			$(CLIENTENVSETUP) cc
+-# define CplusplusCmd		$(CLIENTENVSETUP) c++
++# define CcCmd			$(CLIENTENVSETUP) FreeBSDCC
++# define CplusplusCmd		$(CLIENTENVSETUP) FreeBSDCXX
+ #else
+-# define CcCmd			cc
+-# define CplusplusCmd		c++
++# define CcCmd			FreeBSDCC
++# define CplusplusCmd		FreeBSDCXX
+ #endif
+ 
+ #define CppCmd			/usr/bin/cpp
+@@ -182,7 +182,8 @@
+ #if defined(UseInstalled)
+ #define DefaultCCOptions	/**/
+ #else
+-#define DefaultCCOptions	-ansi -pedantic -Dasm=__asm GccWarningOptions
++#define DefaultCCOptions	-ansi -pedantic -Wno-system-headers -Dasm=__asm \
++	GccWarningOptions
+ #endif
+ #endif
+ #ifndef ExtraLibraries
+@@ -233,20 +234,24 @@
+ #endif
+ 
+ /*
+- * 4.1/i386 and 5.0/i386 have the AGP driver.
++ * 4.1/i386 and 5.0/i386,alpha,ia64,amd64 have the AGP driver.
+  */
+ #ifndef HasAgpGart
+ #if defined(i386Architecture) && \
+ 	(OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1))
+ #define HasAgpGart		YES
+ #endif
++#if (defined(AlphaArchitecture) || defined(ia64Architecture) || \
++	defined(x86_64Architecture)) && (OSMajorVersion >= 5)
++#define HasAgpGart		YES
++#endif
+ #endif
+ 
+ /*
+  * SSE and 3DNow will be autodetected, so binutils is the only 
+  * requirement for enabling this.  By 4.2 they were all supported.
+  */
+-#if defined(i386Architecture) && \
++#if defined(x86_64Architecture) || defined(i386Architecture) && \
+ 	(OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 2))
+ # define HasX86Support          YES
+ # define HasMMXSupport		YES
+@@ -349,10 +354,8 @@
+ #ifdef i386Architecture
+ #define ServerExtraDefines GccGasOption XFree86ServerDefines
+ #endif
+-#ifdef AlphaArchitecture
+-#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
+-#endif
+-#ifdef Sparc64Architecture
++#if defined(AlphaArchitecture) || defined(Sparc64Architecture) || \
++	defined(ia64Architecture) || defined(x86_64Architecture)
+ #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
+ #endif
+ 
+@@ -376,18 +379,8 @@
+ #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
+ #endif
+ 
+-/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
+-#ifndef DefaultGcc2i386Opt
+-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
+-#define DefaultGcc2i386Opt -O2
+-#endif
+-#endif
+-
+-#ifdef i386Architecture
+-# define OptimizedCDebugFlags DefaultGcc2i386Opt
+-#else
+-# define OptimizedCDebugFlags -O
+-#endif
++#define DefaultGcc2i386Opt
++#define OptimizedCDebugFlags FreeBSDCFLAGS
+ 
+ #ifndef PreIncDir
+ # define PreIncDir	/usr/include
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h b/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h
index f7286b494cea..e69de29bb2d1 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h
@@ -1,13 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig	Tue Mar  4 16:42:16 2003
-+++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h	Tue Mar  4 16:42:21 2003
-@@ -230,6 +230,10 @@
- #  define ARCH_PCI_INIT linuxPciInit
- #  define INCLUDE_XF86_MAP_PCI_MEM
- #  define INCLUDE_XF86_NO_DOMAIN
-+# elif defined(FreeBSD)
-+#  define ARCH_PCI_INIT freebsdPciInit
-+#  define INCLUDE_XF86_MAP_PCI_MEM
-+#  define INCLUDE_XF86_NO_DOMAIN
- # endif
- # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper
- #elif defined(__i386__)
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c b/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c
index 741664e27713..e69de29bb2d1 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c
@@ -1,35 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig	Tue Oct 29 15:19:13 2002
-+++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c	Tue Mar  4 16:28:04 2003
-@@ -33,7 +33,10 @@
- #include <sys/param.h>
- #ifndef __NetBSD__
- #  include <sys/sysctl.h>
--# else
-+#  ifdef __FreeBSD__
-+#     include <machine/sysarch.h>
-+#  endif
-+#else
- #  include <machine/sysarch.h>
- #endif
- #include "xf86Axp.h"
-@@ -51,6 +54,8 @@
- #define MAP_FAILED ((caddr_t)-1)
- #endif
- 
-+axpDevice bsdGetAXP(void);
-+
- #ifndef __NetBSD__
- extern unsigned long dense_base(void);
- 
-@@ -260,10 +265,10 @@
- #endif /* __OpenBSD__ */
- 	   
-            xf86ErrorF("\tlinear framebuffer access unavailable\n");
-+#endif
- 	}
- 	useDevMem = FALSE;
- 	return;
--#endif
- }
- 
- void
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-dri_util.c b/x11-servers/XFree86-4-Server-snap/files/patch-dri_util.c
index 0084acff7a3e..e69de29bb2d1 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-dri_util.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-dri_util.c
@@ -1,26 +0,0 @@
-Index: lib/GL/dri/dri_util.c
-===================================================================
-RCS file: /home/ncvs/xfree/xc/lib/GL/dri/dri_util.c,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -u -r1.6 -r1.7
---- lib/GL/dri/dri_util.c	15 Feb 2003 22:12:29 -0000	1.6
-+++ lib/GL/dri/dri_util.c	28 Apr 2003 17:01:25 -0000	1.7
-@@ -921,7 +921,7 @@
-     int directCapable;
-     __DRIscreenPrivate *psp;
-     drmHandle hFB, hSAREA;
--    char *BusID, *driverName;
-+    char *BusID, *driverName = NULL;
-     drmMagic magic;
- 
-     if (!XF86DRIQueryDirectRenderingCapable(dpy, scrn, &directCapable)) {
-@@ -1010,6 +1010,8 @@
- 	(void)XF86DRICloseConnection(dpy, scrn);
- 	return NULL;
-     }
-+    if (driverName)
-+	Xfree(driverName);
- 
-     /* install driver's callback functions */
-     memcpy(&psp->DriverAPI, driverAPI, sizeof(struct __DriverAPIRec));
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-int10-generic.c b/x11-servers/XFree86-4-Server-snap/files/patch-int10-generic.c
index 3840a5bcd28b..e69de29bb2d1 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-int10-generic.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-int10-generic.c
@@ -1,39 +0,0 @@
-Index: programs/Xserver/hw/xfree86/int10/generic.c
-===================================================================
-RCS file: /home/ncvs/xfree/xc/programs/Xserver/hw/xfree86/int10/generic.c,v
-retrieving revision 1.25
-retrieving revision 1.26
-diff -u -u -r1.25 -r1.26
---- programs/Xserver/hw/xfree86/int10/generic.c	4 Apr 2002 14:05:51 -0000	1.25
-+++ programs/Xserver/hw/xfree86/int10/generic.c	20 Mar 2003 15:11:26 -0000	1.26
-@@ -1,4 +1,4 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.23 2001/05/28 14:21:56 eich Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.25tsi Exp $ */
- /*
-  *                   XFree86 int10 module
-  *   execute BIOS int 10h calls in x86 real mode environment
-@@ -108,7 +108,7 @@
-     MapVRam(pInt);
- #ifdef _PC
-     if (!sysMem)
--	sysMem = xf86MapVidMem(screen, VIDMEM_FRAMEBUFFER, V_BIOS,
-+	sysMem = xf86MapVidMem(screen, VIDMEM_MMIO, V_BIOS,
- 			       BIOS_SIZE + SYS_BIOS - V_BIOS);
-     INTPriv(pInt)->sysMem = sysMem;
- 
-@@ -446,12 +446,14 @@
- #define OFF(addr) ((addr) & 0xffff)
- #if defined _PC
- # define HIGH_OFFSET (INTPriv(pInt)->highMemory)
-+# define HIGH_BASE   V_BIOS
- #else
- # define HIGH_OFFSET SYS_BIOS
-+# define HIGH_BASE   SYS_BIOS
- #endif
- # define SYS(addr) ((addr) >= HIGH_OFFSET)
- #define V_ADDR(addr) \
--	  (SYS(addr) ? ((char*)INTPriv(pInt)->sysMem) + (addr - HIGH_OFFSET) \
-+	  (SYS(addr) ? ((char*)INTPriv(pInt)->sysMem) + (addr - HIGH_BASE) \
- 	   : (((char*)(INTPriv(pInt)->base) + addr)))
- #define VRAM_ADDR(addr) (addr - V_RAM)
- #define VRAM_BASE (INTPriv(pInt)->vRam)
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-mga_dri.c b/x11-servers/XFree86-4-Server-snap/files/patch-mga_dri.c
index ea1a8da4d83c..e69de29bb2d1 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-mga_dri.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-mga_dri.c
@@ -1,16 +0,0 @@
-Index: programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c
-===================================================================
-RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c,v
-retrieving revision 1.50
-retrieving revision 1.51
-diff -u -u -r1.50 -r1.51
---- programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c	25 Mar 2003 11:20:38 -0000	1.50
-+++ programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c	5 Apr 2003 04:00:25 -0000	1.51
-@@ -1359,6 +1359,7 @@
-    if (pMga->irq) {
-       drmCtlUninstHandler(pMga->drmFD);
-       pMga->irq = 0;
-+      pMga->reg_ien = 0;
-    }
- 
-    /* Cleanup DMA */
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c b/x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c
index 13228b270c5b..e69de29bb2d1 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c
@@ -1,13 +0,0 @@
---- programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c.orig	Wed Jan 29 11:29:49 2003
-+++ programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c	Thu Mar 13 00:12:12 2003
-@@ -304,7 +304,10 @@
-     "drmAgpVendorId",
-     "drmCommandNone",
-     "drmCommandWrite",
-+    "drmCtlInstHandler",
-+    "drmCtlUninstHandler",
-     "drmFreeVersion",
-+    "drmGetInterruptFromBusID",
-     "drmGetLibVersion",
-     "drmGetVersion",
-     "drmMap",
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-nv_driver.c b/x11-servers/XFree86-4-Server-snap/files/patch-nv_driver.c
index 6b0ad1d3e495..e69de29bb2d1 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-nv_driver.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-nv_driver.c
@@ -1,16 +0,0 @@
-Index: programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c
-===================================================================
-RCS file: /home/ncvs/xfree/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v
-retrieving revision 1.103
-retrieving revision 1.104
-diff -u -u -r1.103 -r1.104
---- programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c	18 Mar 2003 22:23:30 -0000	1.103
-+++ programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c	19 Mar 2003 18:02:49 -0000	1.104
-@@ -181,6 +181,7 @@
-  */
- 
- static const char *vgahwSymbols[] = {
-+    "vgaHWUnmapMem",
-     "vgaHWDPMSSet",
-     "vgaHWFreeHWRec",
-     "vgaHWGetHWRec",
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-nv_setup.c b/x11-servers/XFree86-4-Server-snap/files/patch-nv_setup.c
index ff3ee569a4fd..e69de29bb2d1 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-nv_setup.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-nv_setup.c
@@ -1,35 +0,0 @@
-Index: programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c
-===================================================================
-RCS file: /home/ncvs/xfree/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v
-retrieving revision 1.28
-retrieving revision 1.29
-diff -u -u -r1.28 -r1.29
---- programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c	12 Mar 2003 21:27:18 -0000	1.28
-+++ programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c	4 Apr 2003 00:18:50 -0000	1.29
-@@ -24,7 +24,7 @@
- /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen
-    <jpaana@s2.org> */
- 
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.27 2003/02/10 23:42:51 mvojkovi Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.28 2003/03/12 21:27:18 mvojkovi Exp $ */
- 
- #include "nv_include.h"
- 
-@@ -424,6 +424,9 @@
-         break;
-     }
- 
-+    if(pNv->riva.Architecture == 3)
-+       pNv->riva.PCRTC0 = pNv->riva.PGRAPH;
-+
-     if(pNv->SecondCRTC) {
-        pNv->riva.PCIO = pNv->riva.PCIO0 + 0x2000;
-        pNv->riva.PCRTC = pNv->riva.PCRTC0 + 0x800;
-@@ -492,7 +495,6 @@
-                                      frameBase+0x00C00000, 0x00008000);
-             
-     NVCommonSetup(pScrn);
--    pNv->riva.PCRTC = pNv->riva.PCRTC0 = pNv->riva.PGRAPH;
- }
- 
- void
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c b/x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c
index 6274de047f4e..e69de29bb2d1 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c
@@ -1,30 +0,0 @@
---- programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c.orig	Tue Feb 18 17:19:41 2003
-+++ programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c	Thu Mar 13 00:12:12 2003
-@@ -275,6 +275,7 @@
-     "drmAddMap",
-     "drmAgpAcquire",
-     "drmAgpAlloc",
-+    "drmAgpBase",
-     "drmAgpBind",
-     "drmAgpDeviceId",
-     "drmAgpEnable",
-@@ -288,8 +289,11 @@
-     "drmCommandRead",
-     "drmCommandWrite",
-     "drmCommandWriteRead",
-+    "drmCtlInstHandler",
-+    "drmCtlUninstHandler",
-     "drmFreeBufs",
-     "drmFreeVersion",
-+    "drmGetInterruptFromBusID",
-     "drmGetLibVersion",
-     "drmGetVersion",
-     "drmMap",
-@@ -307,6 +311,7 @@
-     "DRICreateInfoRec",
-     "DRIDestroyInfoRec",
-     "DRIFinishScreenInit",
-+    "DRIGetDeviceInfo",
-     "DRIGetSAREAPrivate",
-     "DRILock",
-     "DRIQueryVersion",
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-r200_vtxtmp_x86.S b/x11-servers/XFree86-4-Server-snap/files/patch-r200_vtxtmp_x86.S
new file mode 100644
index 000000000000..c77182d8b85f
--- /dev/null
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-r200_vtxtmp_x86.S
@@ -0,0 +1,11 @@
+--- lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S.orig	Wed Jul 16 13:48:41 2003
++++ lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S	Wed Jul 16 13:48:56 2003
+@@ -28,7 +28,7 @@
+ 
+ #define GLOBL( x )	\
+ .globl x;		\
+-x##:
++x:
+ 
+ .data
+ .align 4
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-radeon_cursor.c b/x11-servers/XFree86-4-Server-snap/files/patch-radeon_cursor.c
index 3d131171006e..e69de29bb2d1 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-radeon_cursor.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-radeon_cursor.c
@@ -1,16 +0,0 @@
-Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c
-===================================================================
-RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c,v
-retrieving revision 1.23
-diff -p -u -r1.23 radeon_cursor.c
---- programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c	2003/02/24 20:34:55	1.23
-+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c	2003/04/03 01:19:29
-@@ -370,7 +370,7 @@ static void RADEONLoadCursorARGB (ScrnIn
-     }
- 
-     if (info->IsSecondary || info->Clone) {
--	save2 = INREG(RADEON_CRTC_GEN_CNTL) & ~(CARD32) (3 << 20);
-+	save2 = INREG(RADEON_CRTC2_GEN_CNTL) & ~(CARD32) (3 << 20);
- 	save2 |= (CARD32) (2 << 20);
- 	OUTREG(RADEON_CRTC2_GEN_CNTL, save2 & (CARD32)~RADEON_CRTC2_CUR_EN);
-     }
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-radeon_dri.c b/x11-servers/XFree86-4-Server-snap/files/patch-radeon_dri.c
index 5bc369808bf6..e69de29bb2d1 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-radeon_dri.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-radeon_dri.c
@@ -1,15 +0,0 @@
-Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
-===================================================================
-RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c,v
-retrieving revision 1.32
-diff -p -u -r1.32 radeon_dri.c
---- programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c	2003/02/19 09:17:30	1.32
-+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c	2003/03/17 01:43:24
-@@ -1585,6 +1585,7 @@ void RADEONDRICloseScreen(ScreenPtr pScr
-     if (info->irq) {
- 	drmCtlUninstHandler(info->drmFD);
- 	info->irq = 0;
-+	info->ModeReg.gen_int_cntl = 0;
-     }
- 
- 				/* De-allocate vertex buffers */
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-radeon_reg.h b/x11-servers/XFree86-4-Server-snap/files/patch-radeon_reg.h
index 7131c938ac1c..e69de29bb2d1 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-radeon_reg.h
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-radeon_reg.h
@@ -1,11 +0,0 @@
---- programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h.orig	Fri Feb  7 10:08:59 2003
-+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h	Sat Apr 26 01:10:10 2003
-@@ -879,7 +879,7 @@
- #       define RADEON_P2PLL_REF_DIV_MASK    0x03ff
- #       define RADEON_P2PLL_ATOMIC_UPDATE_R (1 << 15) /* same as _W */
- #       define RADEON_P2PLL_ATOMIC_UPDATE_W (1 << 15) /* same as _R */
--#       define R300_PPLL_REF_DIV_ACC_MASK   (0x3ff < 18)
-+#       define R300_PPLL_REF_DIV_ACC_MASK   (0x3ff << 18)
- #       define R300_PPLL_REF_DIV_ACC_SHIFT  18
- #define RADEON_PALETTE_DATA                 0x00b4
- #define RADEON_PALETTE_30_DATA              0x00b8
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-radeon_vtxtmp_x86.S b/x11-servers/XFree86-4-Server-snap/files/patch-radeon_vtxtmp_x86.S
new file mode 100644
index 000000000000..6703e2c952fe
--- /dev/null
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-radeon_vtxtmp_x86.S
@@ -0,0 +1,11 @@
+--- lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S.orig	Wed Jul 16 13:47:09 2003
++++ lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S	Wed Jul 16 13:47:10 2003
+@@ -28,7 +28,7 @@
+ 
+ #define GLOBL( x )	\
+ .globl x;		\
+-x##:
++x:
+ 
+ .data
+ .align 4
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-radeondri b/x11-servers/XFree86-4-Server-snap/files/patch-radeondri
index 33d2bc6562b4..e69de29bb2d1 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-radeondri
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-radeondri
@@ -1,234 +0,0 @@
-diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_context.c lib/GL/mesa/src/drv/r200/r200_context.c
---- lib/GL/mesa/src/drv.orig/r200/r200_context.c	Tue Mar 11 17:51:23 2003
-+++ lib/GL/mesa/src/drv/r200/r200_context.c	Tue Mar 11 17:46:57 2003
-@@ -391,6 +391,7 @@
-     */
-    _tnl_destroy_pipeline( ctx );
-    _tnl_install_pipeline( ctx, r200_pipeline );
-+   ctx->Driver.FlushVertices = r200FlushVertices;
- 
-    /* Try and keep materials and vertices separate:
-     */
-diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_swtcl.c lib/GL/mesa/src/drv/r200/r200_swtcl.c
---- lib/GL/mesa/src/drv.orig/r200/r200_swtcl.c	Tue Mar 11 17:51:29 2003
-+++ lib/GL/mesa/src/drv/r200/r200_swtcl.c	Tue Mar 11 17:46:57 2003
-@@ -44,6 +44,7 @@
- #include "math/m_translate.h"
- #include "tnl/tnl.h"
- #include "tnl/t_context.h"
-+#include "tnl/t_imm_exec.h"
- #include "tnl/t_pipeline.h"
- 
- #include "r200_context.h"
-@@ -1220,6 +1221,14 @@
-       r200ChooseVertexState( ctx );
- }
- 
-+
-+void r200FlushVertices( GLcontext *ctx, GLuint flags )
-+{
-+   _tnl_flush_vertices( ctx, flags );
-+
-+   if (flags & FLUSH_STORED_VERTICES) 
-+      R200_FIREVERTICES( R200_CONTEXT( ctx ) );
-+}
- 
- /**********************************************************************/
- /*                            Initialization.                         */
-diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_swtcl.h lib/GL/mesa/src/drv/r200/r200_swtcl.h
---- lib/GL/mesa/src/drv.orig/r200/r200_swtcl.h	Tue Mar 11 17:51:29 2003
-+++ lib/GL/mesa/src/drv/r200/r200_swtcl.h	Tue Mar 11 17:46:57 2003
-@@ -42,6 +42,7 @@
- extern void r200InitSwtcl( GLcontext *ctx );
- extern void r200DestroySwtcl( GLcontext *ctx );
- 
-+extern void r200FlushVertices( GLcontext *ctx, GLuint flags );
- extern void r200ChooseRenderState( GLcontext *ctx );
- extern void r200ChooseVertexState( GLcontext *ctx );
- 
-diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_vtxfmt.c lib/GL/mesa/src/drv/r200/r200_vtxfmt.c
---- lib/GL/mesa/src/drv.orig/r200/r200_vtxfmt.c	Tue Mar 11 17:51:29 2003
-+++ lib/GL/mesa/src/drv/r200/r200_vtxfmt.c	Tue Mar 11 17:47:00 2003
-@@ -38,6 +38,7 @@
- #include "r200_ioctl.h"
- #include "r200_tex.h"
- #include "r200_tcl.h"
-+#include "r200_swtcl.h"
- #include "r200_vtxfmt.h"
- 
- #include "api_noop.h"
-@@ -59,7 +60,7 @@
- 
- struct r200_vb vb;
- 
--static void r200FlushVertices( GLcontext *, GLuint );
-+static void r200VtxFmtFlushVertices( GLcontext *, GLuint );
- 
- static void count_func( const char *name,  struct dynfn *l )
- {
-@@ -357,12 +358,13 @@
-       fprintf(stderr, "%s from %s\n", __FUNCTION__, caller);
- 
-    if (ctx->Driver.NeedFlush) 
--      r200FlushVertices( ctx, ctx->Driver.NeedFlush );
-+      r200VtxFmtFlushVertices( ctx, ctx->Driver.NeedFlush );
- 
-    if (ctx->NewState)
-       _mesa_update_state( ctx ); /* clear state so fell_back sticks */
- 
-    _tnl_wakeup_exec( ctx );
-+   ctx->Driver.FlushVertices = r200FlushVertices;
- 
-    assert( rmesa->dma.flush == 0 );
-    rmesa->vb.fell_back = GL_TRUE;
-@@ -404,6 +406,7 @@
-    prim = rmesa->vb.prim[0];
-    ctx->Driver.CurrentExecPrimitive = GL_POLYGON+1;
-    _tnl_wakeup_exec( ctx );
-+   ctx->Driver.FlushVertices = r200FlushVertices;
- 
-    assert(rmesa->dma.flush == 0);
-    rmesa->vb.fell_back = GL_TRUE;
-@@ -756,7 +759,7 @@
- 	    fprintf(stderr, "reinstall (new install)\n");
- 
- 	 _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt );
--	 ctx->Driver.FlushVertices = r200FlushVertices;
-+	 ctx->Driver.FlushVertices = r200VtxFmtFlushVertices;
- 	 ctx->Driver.NewList = r200NewList;
- 	 rmesa->vb.installed = GL_TRUE;
- 	 vb.context = ctx;
-@@ -772,6 +775,7 @@
- 	 if (rmesa->dma.flush)
- 	    rmesa->dma.flush( rmesa );
- 	 _tnl_wakeup_exec( ctx );
-+	 ctx->Driver.FlushVertices = r200FlushVertices;
- 	 rmesa->vb.installed = GL_FALSE;
- 	 vb.context = 0;
-       }
-@@ -931,7 +935,7 @@
-    return GL_TRUE;
- }
- 
--static void r200FlushVertices( GLcontext *ctx, GLuint flags )
-+static void r200VtxFmtFlushVertices( GLcontext *ctx, GLuint flags )
- {
-    r200ContextPtr rmesa = R200_CONTEXT( ctx );
- 
-diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_context.c lib/GL/mesa/src/drv/radeon/radeon_context.c
---- lib/GL/mesa/src/drv.orig/radeon/radeon_context.c	Tue Mar 11 17:51:29 2003
-+++ lib/GL/mesa/src/drv/radeon/radeon_context.c	Tue Mar 11 17:47:00 2003
-@@ -382,6 +382,7 @@
-     */
-    _tnl_destroy_pipeline( ctx );
-    _tnl_install_pipeline( ctx, radeon_pipeline );
-+   ctx->Driver.FlushVertices = radeonFlushVertices;
- 
-    /* Try and keep materials and vertices separate:
-     */
-diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.c lib/GL/mesa/src/drv/radeon/radeon_swtcl.c
---- lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.c	Tue Mar 11 17:51:29 2003
-+++ lib/GL/mesa/src/drv/radeon/radeon_swtcl.c	Tue Mar 11 17:47:00 2003
-@@ -45,6 +45,7 @@
- #include "math/m_translate.h"
- #include "tnl/tnl.h"
- #include "tnl/t_context.h"
-+#include "tnl/t_imm_exec.h"
- #include "tnl/t_pipeline.h"
- 
- #include "radeon_context.h"
-@@ -1133,6 +1134,14 @@
-    }
- }
- 
-+
-+void radeonFlushVertices( GLcontext *ctx, GLuint flags )
-+{
-+   _tnl_flush_vertices( ctx, flags );
-+
-+   if (flags & FLUSH_STORED_VERTICES) 
-+      RADEON_FIREVERTICES( RADEON_CONTEXT( ctx ) );
-+}
- 
- /**********************************************************************/
- /*                            Initialization.                         */
-diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.h lib/GL/mesa/src/drv/radeon/radeon_swtcl.h
---- lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.h	Tue Mar 11 17:51:29 2003
-+++ lib/GL/mesa/src/drv/radeon/radeon_swtcl.h	Tue Mar 11 17:47:00 2003
-@@ -43,6 +43,7 @@
- extern void radeonInitSwtcl( GLcontext *ctx );
- extern void radeonDestroySwtcl( GLcontext *ctx );
- 
-+extern void radeonFlushVertices( GLcontext *ctx, GLuint flags );
- extern void radeonChooseRenderState( GLcontext *ctx );
- extern void radeonChooseVertexState( GLcontext *ctx );
- 
-diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_vtxfmt.c lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c
---- lib/GL/mesa/src/drv.orig/radeon/radeon_vtxfmt.c	Tue Mar 11 17:51:29 2003
-+++ lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c	Tue Mar 11 17:47:01 2003
-@@ -38,6 +38,7 @@
- #include "radeon_ioctl.h"
- #include "radeon_tex.h"
- #include "radeon_tcl.h"
-+#include "radeon_swtcl.h"
- #include "radeon_vtxfmt.h"
- 
- #include "api_noop.h"
-@@ -59,7 +60,7 @@
- 
- struct radeon_vb vb;
- 
--static void radeonFlushVertices( GLcontext *, GLuint );
-+static void radeonVtxfmtFlushVertices( GLcontext *, GLuint );
- 
- static void count_func( const char *name,  struct dynfn *l )
- {
-@@ -336,12 +337,13 @@
-       fprintf(stderr, "%s from %s\n", __FUNCTION__, caller);
- 
-    if (ctx->Driver.NeedFlush) 
--      radeonFlushVertices( ctx, ctx->Driver.NeedFlush );
-+      radeonVtxfmtFlushVertices( ctx, ctx->Driver.NeedFlush );
- 
-    if (ctx->NewState)
-       _mesa_update_state( ctx ); /* clear state so fell_back sticks */
- 
-    _tnl_wakeup_exec( ctx );
-+   ctx->Driver.FlushVertices = radeonFlushVertices;
- 
-    assert( rmesa->dma.flush == 0 );
-    rmesa->vb.fell_back = GL_TRUE;
-@@ -382,6 +384,7 @@
-    prim = rmesa->vb.prim[0];
-    ctx->Driver.CurrentExecPrimitive = GL_POLYGON+1;
-    _tnl_wakeup_exec( ctx );
-+   ctx->Driver.FlushVertices = radeonFlushVertices;
- 
-    assert(rmesa->dma.flush == 0);
-    rmesa->vb.fell_back = GL_TRUE;
-@@ -731,7 +734,7 @@
- 	    fprintf(stderr, "reinstall (new install)\n");
- 
- 	 _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt );
--	 ctx->Driver.FlushVertices = radeonFlushVertices;
-+	 ctx->Driver.FlushVertices = radeonVtxfmtFlushVertices;
- 	 ctx->Driver.NewList = radeonNewList;
- 	 rmesa->vb.installed = GL_TRUE;
- 	 vb.context = ctx;
-@@ -747,6 +750,7 @@
- 	 if (rmesa->dma.flush)
- 	    rmesa->dma.flush( rmesa );
- 	 _tnl_wakeup_exec( ctx );
-+	 ctx->Driver.FlushVertices = radeonFlushVertices;
- 	 rmesa->vb.installed = GL_FALSE;
- 	 vb.context = 0;
-       }
-@@ -905,7 +909,7 @@
-    return GL_TRUE;
- }
- 
--static void radeonFlushVertices( GLcontext *ctx, GLuint flags )
-+static void radeonVtxfmtFlushVertices( GLcontext *ctx, GLuint flags )
- {
-    radeonContextPtr rmesa = RADEON_CONTEXT( ctx );
- 
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-savage-pci-id b/x11-servers/XFree86-4-Server-snap/files/patch-savage-pci-id
index f7396543d878..e69de29bb2d1 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-savage-pci-id
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-savage-pci-id
@@ -1,87 +0,0 @@
---- programs/Xserver/hw/xfree86/common/xf86PciInfo.h.savage-pci-id-fixes	2003-01-08 04:28:57.000000000 -0500
-+++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h	2003-01-08 05:28:02.000000000 -0500
-@@ -457,21 +457,34 @@
- #define PCI_CHIP_TRIO64V2_DXGX		0x8901
- #define PCI_CHIP_PLATO_PX		0x8902
- #define PCI_CHIP_Trio3D			0x8904
--#define PCI_CHIP_Trio3D_2X		0x8A13
- #define PCI_CHIP_VIRGE_DXGX		0x8A01
- #define PCI_CHIP_VIRGE_GX2		0x8A10
-+#define PCI_CHIP_Trio3D_2X		0x8A13
- #define PCI_CHIP_SAVAGE3D		0x8A20
- #define PCI_CHIP_SAVAGE3D_MV		0x8A21
- #define PCI_CHIP_SAVAGE4		0x8A22
--#define PCI_CHIP_VIRGE_MX		0x8C01
--#define PCI_CHIP_VIRGE_MXPLUS		0x8C01
--#define PCI_CHIP_VIRGE_MXP		0x8C03
- #define PCI_CHIP_PROSAVAGE_PM		0x8A25
- #define PCI_CHIP_PROSAVAGE_KM		0x8A26
-+#define PCI_CHIP_VIRGE_MX		0x8C01
-+#define PCI_CHIP_VIRGE_MXPLUS		0x8C02
-+#define PCI_CHIP_VIRGE_MXP		0x8C03
- #define PCI_CHIP_SAVAGE_MX_MV		0x8C10
- #define PCI_CHIP_SAVAGE_MX		0x8C11
- #define PCI_CHIP_SAVAGE_IX_MV		0x8C12
- #define PCI_CHIP_SAVAGE_IX		0x8C13
-+#define PCI_CHIP_SUPSAV_MX128		0x8C22
-+#define PCI_CHIP_SUPSAV_MX64		0x8C24
-+#define PCI_CHIP_SUPSAV_MX64C		0x8C26
-+#define PCI_CHIP_SUPSAV_IX128SDR	0x8C2A
-+#define PCI_CHIP_SUPSAV_IX128DDR	0x8C2B
-+#define PCI_CHIP_SUPSAV_IX64SDR		0x8C2C
-+#define PCI_CHIP_SUPSAV_IX64DDR		0x8C2D
-+#define PCI_CHIP_SUPSAV_IXCSDR		0x8C2E
-+#define PCI_CHIP_SUPSAV_IXCDDR		0x8C2F
-+#define PCI_CHIP_S3TWISTER_P		0x8D01
-+#define PCI_CHIP_S3TWISTER_K		0x8D02
-+#define PCI_CHIP_PROSAVAGE_DDR		0x8D03
-+#define PCI_CHIP_PROSAVAGE_DDRK		0x8D04
- #define PCI_CHIP_SAVAGE2000		0x9102
- 
- /* ARK Logic */
---- programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h.savage-pci-id-fixes	2003-01-08 05:31:06.000000000 -0500
-+++ programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h	2003-01-08 05:31:25.000000000 -0500
-@@ -3,30 +3,6 @@
- #ifndef _SAVAGE_REGS_H
- #define _SAVAGE_REGS_H
- 
--/* These are here until xf86PciInfo.h is updated. */
--
--#ifndef PCI_CHIP_S3TWISTER_P
--#define PCI_CHIP_S3TWISTER_P	0x8d01
--#endif
--#ifndef PCI_CHIP_S3TWISTER_K
--#define PCI_CHIP_S3TWISTER_K	0x8d02
--#endif
--#ifndef PCI_CHIP_SUPSAV_MX128
--#define PCI_CHIP_SUPSAV_MX128		0x8c22
--#define PCI_CHIP_SUPSAV_MX64		0x8c24
--#define PCI_CHIP_SUPSAV_MX64C		0x8c26
--#define PCI_CHIP_SUPSAV_IX128SDR	0x8c2a
--#define PCI_CHIP_SUPSAV_IX128DDR	0x8c2b
--#define PCI_CHIP_SUPSAV_IX64SDR		0x8c2c
--#define PCI_CHIP_SUPSAV_IX64DDR		0x8c2d
--#define PCI_CHIP_SUPSAV_IXCSDR		0x8c2e
--#define PCI_CHIP_SUPSAV_IXCDDR		0x8c2f
--#endif
--#ifndef PCI_CHIP_PROSAVAGE_DDR
--#define PCI_CHIP_PROSAVAGE_DDR	0x8d03
--#define PCI_CHIP_PROSAVAGE_DDRK	0x8d04
--#endif
--
- #define S3_SAVAGE3D_SERIES(chip)  ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX))
- 
- #define S3_SAVAGE4_SERIES(chip)   ((chip==S3_SAVAGE4) || (chip==S3_PROSAVAGE))
---- programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c.savage-pci-id-fixes	2003-01-08 06:28:59.000000000 -0500
-+++ programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c	2003-01-08 06:33:02.000000000 -0500
-@@ -123,8 +123,8 @@
-     { PCI_CHIP_SAVAGE_IX,	"Savage/IX" },
-     { PCI_CHIP_PROSAVAGE_PM,	"ProSavage PM133" },
-     { PCI_CHIP_PROSAVAGE_KM,	"ProSavage KM133" },
--    { PCI_CHIP_S3TWISTER_P,	"ProSavage PN133" },
--    { PCI_CHIP_S3TWISTER_K,	"ProSavage KN133" },
-+    { PCI_CHIP_S3TWISTER_P,	"Twister PN133" },
-+    { PCI_CHIP_S3TWISTER_K,	"Twister KN133" },
-     { PCI_CHIP_SUPSAV_MX128,	"SuperSavage/MX 128" },
-     { PCI_CHIP_SUPSAV_MX64,	"SuperSavage/MX 64" },
-     { PCI_CHIP_SUPSAV_MX64C,	"SuperSavage/MX 64C" },
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-smi b/x11-servers/XFree86-4-Server-snap/files/patch-smi
index 2c17234d8377..e69de29bb2d1 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-smi
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-smi
@@ -1,40 +0,0 @@
---- programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c.orig	Wed Feb  5 09:45:29 2003
-+++ programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c	Fri May  2 03:09:24 2003
-@@ -1410,7 +1410,7 @@
- 	ENTER_PROC("SMI_Save");
- 
- 	/* Save the standard VGA registers */
--	vgaHWSave(pScrn, vgaSavePtr, VGA_SR_MODE);
-+	vgaHWSave(pScrn, vgaSavePtr, VGA_SR_ALL);
- 	save->smiDACMask = VGAIN8(pSmi, VGA_DAC_MASK);
- 	VGAOUT8(pSmi, VGA_DAC_READ_ADDR, 0);
- 	for (i = 0; i < 256; i++)
-@@ -1601,7 +1601,7 @@
- 		VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0xA0, restore->SRA0);
- 
- 		/* Restore the standard VGA registers */
--		vgaHWRestore(pScrn, vgaSavePtr, VGA_SR_MODE);
-+		vgaHWRestore(pScrn, vgaSavePtr, VGA_SR_ALL);
- 		if (restore->smiDACMask)
- 		{
- 			VGAOUT8(pSmi, VGA_DAC_MASK, restore->smiDACMask);
-@@ -1672,7 +1672,7 @@
- 		} 
- 
- 		if (restore->modeInit)
--		    vgaHWRestore(pScrn, vgaSavePtr, VGA_SR_MODE);
-+		    vgaHWRestore(pScrn, vgaSavePtr, VGA_SR_ALL);
- 
- 		if (!SMI_LYNXM_SERIES(pSmi->Chipset))
- 		{
---- programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c.orig	Sat Jan 11 19:55:49 2003
-+++ programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c	Fri May  2 03:09:24 2003
-@@ -277,7 +277,7 @@
-     {XvSettable | XvGettable,        0,             1, XV_INTERLACED_NAME},
- };
- 
--static XF86AttributeRec SMI_VideoAttributes[N_ATTRS] = {
-+static XF86AttributeRec SMI_VideoAttributes[2] = {
-     {XvSettable | XvGettable,        0,           255, XV_BRIGHTNESS_NAME},
-     {XvSettable | XvGettable, 0x000000,      0xFFFFFF, XV_COLORKEY_NAME},
- };
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-xkbInit.c b/x11-servers/XFree86-4-Server-snap/files/patch-xkbInit.c
index 9b65d4c8b948..e69de29bb2d1 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-xkbInit.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-xkbInit.c
@@ -1,17 +0,0 @@
-Index: programs/Xserver/xkb/xkbInit.c
-===================================================================
-RCS file: /home/ncvs/xfree/xc/programs/Xserver/xkb/xkbInit.c,v
-retrieving revision 3.26
-retrieving revision 3.27
-diff -u -r3.26 -r3.27
---- programs/Xserver/xkb/xkbInit.c	9 Feb 2003 06:29:20 -0000	3.26
-+++ programs/Xserver/xkb/xkbInit.c	17 Mar 2003 23:52:27 -0000	3.27
-@@ -713,7 +713,7 @@
-     if (names->types) names->types = _XkbDupString(names->types);
-     if (names->compat) names->compat = _XkbDupString(names->compat);
-     if (names->geometry) names->geometry = _XkbDupString(names->geometry);
--    if (names->symbols) names->geometry = _XkbDupString(names->symbols);
-+    if (names->symbols) names->symbols = _XkbDupString(names->symbols);
- 
-     if (defs.model && defs.layout && rules) {
- 	XkbComponentNamesRec	rNames;
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist
index ccc5618b233c..5a09e4b89784 100644
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
@@ -36,7 +36,6 @@ lib/X11/Cards
 lib/X11/Options
 lib/X11/XF86Config.98
 lib/X11/XF86Config.eg
-lib/X11/app-defaults/XF86Cfg
 lib/X11/doc/BUILD
 lib/X11/doc/BugReport
 lib/X11/doc/DESIGN
@@ -74,18 +73,19 @@ lib/X11/etc/Xinstall.sh
 lib/X11/etc/sun.termcap
 lib/X11/etc/sun.terminfo
 lib/X11/etc/xmodmap.std
-lib/X11/xserver/SecurityPolicy
 lib/modules/codeconv/libARABIC.a
 lib/modules/codeconv/libARMSCII8.a
 lib/modules/codeconv/libBIG5.a
 lib/modules/codeconv/libBIG5HKSCS.a
 lib/modules/codeconv/libDOSENCODING.a
+lib/modules/codeconv/libGB18030.a
 lib/modules/codeconv/libGB2312.a
 lib/modules/codeconv/libGBK.a
 lib/modules/codeconv/libGEORGIAN.a
 lib/modules/codeconv/libISO8859_1.a
 lib/modules/codeconv/libISO8859_10.a
 lib/modules/codeconv/libISO8859_11.a
+lib/modules/codeconv/libISO8859_13.a
 lib/modules/codeconv/libISO8859_14.a
 lib/modules/codeconv/libISO8859_15.a
 lib/modules/codeconv/libISO8859_2.a
@@ -109,9 +109,9 @@ lib/modules/codeconv/libVISCII.a
 %%I386%%%%DRI%%lib/modules/dri/i810_dri.so
 %%I386%%%%DRI%%lib/modules/dri/i830_dri.so
 %%DRI%%lib/modules/dri/mga_dri.so
-%%DRI%%lib/modules/dri/radeon_dri.so
-%%DRI%%lib/modules/dri/r200_dri.so
 %%DRI%%lib/modules/dri/r128_dri.so
+%%DRI%%lib/modules/dri/r200_dri.so
+%%DRI%%lib/modules/dri/radeon_dri.so
 %%DRI%%lib/modules/dri/tdfx_dri.so
 %%I386%%lib/modules/drivers/apm_drv.o
 %%I386%%lib/modules/drivers/ark_drv.o
@@ -144,6 +144,7 @@ lib/modules/drivers/radeon_drv.o
 %%I386%%lib/modules/drivers/tseng_drv.o
 %%I386%%lib/modules/drivers/vesa_drv.o
 %%SPARC64_NA%%lib/modules/drivers/vga_drv.o
+%%I386%%lib/modules/drivers/via_drv.o
 %%I386%%lib/modules/drivers/vmware_drv.o
 lib/modules/extensions/libGLcore.a
 lib/modules/extensions/libdbe.a
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 85ee63af6364..ce9289b58fc4 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -81,7 +81,7 @@ cat >> $LOCALDEF <<END
 #if defined(i386Architecture)
 # define XF86CardDrivers	mga glint nv tga s3 s3virge sis rendition \
 				neomagic i740 tdfx savage \
-				cirrus vmware tseng trident chips apm \
+				cirrus vmware tseng trident via chips apm \
 				i128 nsc ati i810 ark cyrix siliconmotion \
 				vesa vga
 #elif defined(ia64Architecture)