Upgrade X.Org ports to 6.8.2.

Release notes are available at
http://www.x.org/X11R6.8.2/doc/RELNOTES.html

Thanks to kris and krion for running several cluster test builds,
maintainers of GNOME for prompt responses, portmgr for postponing ports
freeze for this update, testers on FreeBSD-X11@ list and others that I
might have mised here.

Also included:
- fix for ATI Mobility on Dell Inspiron 7500 (obtained from Marc Aurele La
  France; obtained and tested by julian)
- fix for kbd driver on Sparc64 (tested by Aaron Dudek, Michael G. Jung and
  Matthias Muthmann), which still appears to have problems with some
  keyboards - so
- fix for kbd driver on PC98 (reported and tested by NAKAJI Hiroyuki; PR
  ports/77217)
- fix for i810 on HP D530 (obtained from Egbert Eich; obtained and tested
  by Anders Nor Berle; PR ports/74757)

18 files changed, 695 insertions, 615 deletions

diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile
index eeb687996382..dcf1f93b7b5a 100644
--- a/x11-servers/xorg-server-snap/Makefile
+++ b/x11-servers/xorg-server-snap/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	xorg-server
-PORTVERSION=	6.8.1
-PORTREVISION=	2
+PORTVERSION=	6.8.2
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R6.8.1/tars
+MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
 DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
 		X11R${PORTVERSION}-src3.tar.gz
 
diff --git a/x11-servers/xorg-server-snap/Makefile.inc b/x11-servers/xorg-server-snap/Makefile.inc
index 7d7e1cf76d11..8dea98c31e46 100644
--- a/x11-servers/xorg-server-snap/Makefile.inc
+++ b/x11-servers/xorg-server-snap/Makefile.inc
@@ -17,6 +17,7 @@ WRKSRC?=	${WRKDIR}/xc
 USE_X_PREFIX?=	no
 PREFIX?=	${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
+MTREE_FILE=	${PORTSDIR}/x11-servers/xorg-server/files/BSD.x11-xorg.dist
 
 USE_IMAKE=	YES
 .if defined(XMAN_DIRS)
@@ -42,8 +43,11 @@ CF_PATCHES=	${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \
 
 SERVER_PATCHES=	${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-alpha_video.c \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-atimobility \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-man-Imakefile \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-os-Imakefile \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-pc98kbd \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-radeon_driver.c \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-savage-pci-id \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c \
diff --git a/x11-servers/xorg-server-snap/distinfo b/x11-servers/xorg-server-snap/distinfo
index 62c1647dc07b..00c3b2d7e408 100644
--- a/x11-servers/xorg-server-snap/distinfo
+++ b/x11-servers/xorg-server-snap/distinfo
@@ -1,4 +1,4 @@
-MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
-SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
-MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3
-SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808
+MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab
+SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802
+MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57
+SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299
diff --git a/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist b/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist
new file mode 100644
index 000000000000..e5854f4aa0d9
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist
@@ -0,0 +1,520 @@
+# $FreeBSD$
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+    bin
+    ..
+    etc
+        rc.d
+        ..
+    ..
+    include
+        X11
+            PEX5
+            ..
+            Xft
+            ..
+            bitmaps
+            ..
+            pixmaps
+            ..
+        ..
+        bitmaps
+        ..
+        freetype2
+            freetype
+                cache
+                ..
+                config
+                ..
+                internal
+                ..
+            ..
+        ..
+    ..
+    info
+    ..
+    lib
+        X11
+            XF86Setup
+                pics
+                ..
+                scripts
+                ..
+                tcllib
+                ..
+            ..
+            app-defaults
+            ..
+            etc
+            ..
+            fonts
+                local
+                ..
+            ..
+            lbxproxy
+            ..
+            xserver
+            ..
+        ..
+        aout
+        ..
+        modules
+            codeconv
+            ..
+            dri
+            ..
+        ..
+    ..
+    libdata
+        pkgconfig
+        ..
+    ..
+    libexec
+    ..
+    man
+/set uname=man
+        cat1
+        ..
+        cat2
+        ..
+        cat3
+        ..
+        cat4
+        ..
+        cat5
+        ..
+        cat6
+        ..
+        cat7
+        ..
+        cat8
+        ..
+        cat9
+        ..
+        catl
+        ..
+        catn
+        ..
+        ja              uname=root
+            cat1
+            ..
+            cat2
+            ..
+            cat3
+            ..
+            cat4
+            ..
+            cat5
+            ..
+            cat6
+            ..
+            cat7
+            ..
+            cat8
+            ..
+            cat9
+            ..
+            catl
+            ..
+            catn
+            ..
+/set uname=root
+            man1
+            ..
+            man2
+            ..
+            man3
+            ..
+            man4
+            ..
+            man5
+            ..
+            man6
+            ..
+            man7
+            ..
+            man8
+            ..
+            man9
+            ..
+            manl
+            ..
+            mann
+            ..
+        ..
+        man1
+        ..
+        man2
+        ..
+        man3
+        ..
+        man4
+        ..
+        man5
+        ..
+        man6
+        ..
+        man7
+        ..
+        man8
+        ..
+        man9
+        ..
+        manl
+        ..
+        mann
+        ..
+    ..
+    share
+        aclocal
+        ..
+        doc
+            ja
+            ..
+        ..
+        examples
+        ..
+        locale
+            af
+                LC_MESSAGES
+                ..
+            ..
+            am
+                LC_MESSAGES
+                ..
+            ..
+            ar
+                LC_MESSAGES
+                ..
+            ..
+            az
+                LC_MESSAGES
+                ..
+            ..
+            be
+                LC_MESSAGES
+                ..
+            ..
+            bg
+                LC_MESSAGES
+                ..
+            ..
+            bn
+                LC_MESSAGES
+                ..
+            ..
+            bs
+                LC_MESSAGES
+                ..
+            ..
+            ca
+                LC_MESSAGES
+                ..
+            ..
+            cs
+                LC_MESSAGES
+                ..
+            ..
+            cy
+                LC_MESSAGES
+                ..
+            ..
+            da
+                LC_MESSAGES
+                ..
+            ..
+            de
+                LC_MESSAGES
+                ..
+            ..
+            de_AT
+                LC_MESSAGES
+                ..
+            ..
+            el
+                LC_MESSAGES
+                ..
+            ..
+            en
+                LC_MESSAGES
+                ..
+            ..
+            en_AU
+                LC_MESSAGES
+                ..
+            ..
+            en_CA
+                LC_MESSAGES
+                ..
+            ..
+            en_GB
+                LC_MESSAGES
+                ..
+            ..
+            eo
+                LC_MESSAGES
+                ..
+            ..
+            es
+                LC_MESSAGES
+                ..
+            ..
+            es_ES
+                LC_MESSAGES
+                ..
+            ..
+            es_MX
+                LC_MESSAGES
+                ..
+            ..
+            et
+                LC_MESSAGES
+                ..
+            ..
+            eu
+                LC_MESSAGES
+                ..
+            ..
+            fa
+                LC_MESSAGES
+                ..
+            ..
+            fa_IR
+                LC_MESSAGES
+                ..
+            ..
+            fi
+                LC_MESSAGES
+                ..
+            ..
+            fr
+                LC_MESSAGES
+                ..
+            ..
+            fr_FR
+                LC_MESSAGES
+                ..
+            ..
+            ga
+                LC_MESSAGES
+                ..
+            ..
+            gl
+                LC_MESSAGES
+                ..
+            ..
+            gu
+                LC_MESSAGES
+                ..
+            ..
+            he
+                LC_MESSAGES
+                ..
+            ..
+            hi
+                LC_MESSAGES
+                ..
+            ..
+            hr
+                LC_MESSAGES
+                ..
+            ..
+            hu
+                LC_MESSAGES
+                ..
+            ..
+            id
+                LC_MESSAGES
+                ..
+            ..
+            is
+                LC_MESSAGES
+                ..
+            ..
+            it
+                LC_MESSAGES
+                ..
+            ..
+            ja
+                LC_MESSAGES
+                ..
+            ..
+            ka
+                LC_MESSAGES
+                ..
+            ..
+            kn
+                LC_MESSAGES
+                ..
+            ..
+            ko
+                LC_MESSAGES
+                ..
+            ..
+            li
+                LC_MESSAGES
+                ..
+            ..
+            lt
+                LC_MESSAGES
+                ..
+            ..
+            lv
+                LC_MESSAGES
+                ..
+            ..
+            mk
+                LC_MESSAGES
+                ..
+            ..
+            ml
+                LC_MESSAGES
+                ..
+            ..
+            mn
+                LC_MESSAGES
+                ..
+            ..
+            ms
+                LC_MESSAGES
+                ..
+            ..
+            nb
+                LC_MESSAGES
+                ..
+            ..
+            ne
+                LC_MESSAGES
+                ..
+            ..
+            nl
+                LC_MESSAGES
+                ..
+            ..
+            nn
+                LC_MESSAGES
+                ..
+            ..
+            no
+                LC_MESSAGES
+                ..
+            ..
+            or
+                LC_MESSAGES
+                ..
+            ..
+            pa
+                LC_MESSAGES
+                ..
+            ..
+            pl
+                LC_MESSAGES
+                ..
+            ..
+            pt
+                LC_MESSAGES
+                ..
+            ..
+            pt_BR
+                LC_MESSAGES
+                ..
+            ..
+            pt_PT
+                LC_MESSAGES
+                ..
+            ..
+            ro
+                LC_MESSAGES
+                ..
+            ..
+            ru
+                LC_MESSAGES
+                ..
+            ..
+            sk
+                LC_MESSAGES
+                ..
+            ..
+            sl
+                LC_MESSAGES
+                ..
+            ..
+            sq
+                LC_MESSAGES
+                ..
+            ..
+            sr
+                LC_MESSAGES
+                ..
+            ..
+            sr@Latn
+                LC_MESSAGES
+                ..
+            ..
+            sv
+                LC_MESSAGES
+                ..
+            ..
+            ta
+                LC_MESSAGES
+                ..
+            ..
+            tg
+                LC_MESSAGES
+                ..
+            ..
+            th
+                LC_MESSAGES
+                ..
+            ..
+            tk
+                LC_MESSAGES
+                ..
+            ..
+            tr
+                LC_MESSAGES
+                ..
+            ..
+            uk
+                LC_MESSAGES
+                ..
+            ..
+            uz
+                LC_MESSAGES
+                ..
+            ..
+            wa
+                LC_MESSAGES
+                ..
+            ..
+            vi
+                LC_MESSAGES
+                ..
+            ..
+            zh
+                LC_MESSAGES
+                ..
+            ..
+            zh_CN
+                LC_MESSAGES
+                ..
+            ..
+            zh_CN.GB2312
+                LC_MESSAGES
+                ..
+            ..
+            zh_TW
+                LC_MESSAGES
+                ..
+            ..
+            zh_TW.Big5
+                LC_MESSAGES
+                ..
+            ..
+        ..
+    ..
+..
diff --git a/x11-servers/xorg-server-snap/files/patch-ati-591 b/x11-servers/xorg-server-snap/files/patch-ati-591
deleted file mode 100644
index dc8e099f078a..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-ati-591
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v
-retrieving revision 1.3
-retrieving revision 1.3.4.1
-diff -u -u -r1.3 -r1.3.4.1
---- programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c	26 Jul 2004 19:14:58 -0000	1.3
-+++ programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c	15 Dec 2004 07:58:15 -0000	1.3.4.1
-@@ -1918,11 +1918,11 @@
-                    VBlankEnd += 0x0100U;
- 
-                 pATI->LCDHBlankWidth = HBlankEnd - HBlankStart;
--                pATI->LCDHSyncStart = HSyncStart - HBlankStart - 1;
-+                pATI->LCDHSyncStart = HSyncStart - HBlankStart;
-                 pATI->LCDHSyncWidth = HSyncEnd - HSyncStart;
- 
-                 pATI->LCDVBlankWidth = VBlankEnd - VBlankStart;
--                pATI->LCDVSyncStart = VSyncStart - VBlankStart - 1;
-+                pATI->LCDVSyncStart = VSyncStart - VBlankStart;
-                 pATI->LCDVSyncWidth = VSyncEnd - VSyncStart;
- 
-                 HDisplay = HTotal + 5 - pATI->LCDHBlankWidth;
-Index: programs/Xserver/hw/xfree86/drivers/ati/ativga.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.c,v
-retrieving revision 1.2
-retrieving revision 1.2.4.1
-diff -u -u -r1.2 -r1.2.4.1
---- programs/Xserver/hw/xfree86/drivers/ati/ativga.c	23 Apr 2004 19:26:46 -0000	1.2
-+++ programs/Xserver/hw/xfree86/drivers/ati/ativga.c	15 Dec 2004 07:58:15 -0000	1.2.4.1
-@@ -185,7 +185,11 @@
-             (pATI->Chip >= ATI_CHIP_264CT))
-             pMode->CrtcHBlankStart--;
-         pMode->CrtcHSyncStart = pMode->HSyncStart >> 3;
-+        if (pATI->LCDPanelID >= 0)
-+            pMode->CrtcHSyncStart--;
-         pMode->CrtcHSyncEnd = pMode->HSyncEnd >> 3;
-+        if (pATI->LCDPanelID >= 0)
-+            pMode->CrtcHSyncEnd--;
-         pMode->CrtcHBlankEnd = (pMode->HTotal >> 3) - 1;
-         pMode->CrtcHTotal = (pMode->HTotal >> 3) - 5;
-         pMode->CrtcHSkew = pMode->HSkew;
-@@ -327,6 +331,11 @@
-         pMode->CrtcVBlankStart++;
-     else
-         pMode->CrtcVBlankStart--;
-+    if (pATI->LCDPanelID >= 0)
-+    {
-+        pMode->CrtcVSyncStart--;
-+        pMode->CrtcVSyncEnd--;
-+    }
-     pMode->CrtcVBlankEnd--;
-     if (pATI->Chip < ATI_CHIP_264CT)
-         pMode->CrtcVBlankEnd--;
diff --git a/x11-servers/xorg-server-snap/files/patch-atimobility b/x11-servers/xorg-server-snap/files/patch-atimobility
new file mode 100644
index 000000000000..dd024a46cc9a
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-atimobility
@@ -0,0 +1,73 @@
+--- programs/Xserver/hw/xfree86/drivers/ati/atimode.c.orig	Fri Apr 23 19:26:46 2004
++++ programs/Xserver/hw/xfree86/drivers/ati/atimode.c	Sun Feb 13 05:55:05 2005
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.18 2004/01/05 16:42:03 tsi Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.20tsi Exp $ */
+ /*
+  * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+  *
+@@ -646,7 +646,7 @@
+                             SetBits(pMode->CrtcVDisplay, CRTC_V_DISP);
+                     pATIHW->crtc_v_sync_strt_wid =
+                         SetBits(pMode->CrtcVSyncStart, CRTC_V_SYNC_STRT) |
+-                            SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_WID);
++                            SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_END_VGA);
+                     if (pMode->Flags & V_NVSYNC)
+                         pATIHW->crtc_v_sync_strt_wid |= CRTC_V_SYNC_POL;
+                 }
+--- programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c.orig	Wed Dec 15 07:58:15 2004
++++ programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c	Sun Feb 13 05:55:05 2005
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.74 2003/12/22 17:48:09 tsi Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.79tsi Exp $ */
+ /*
+  * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+  *
+@@ -1902,10 +1902,10 @@
+                 VDisplay = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_DISP);
+                 VSyncStart =
+                     GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_STRT);
+-                VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_WID)) |
+-                    GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_WID);
++                VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_END_VGA)) |
++                    GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_END_VGA);
+                 if (VSyncStart > VSyncEnd)
+-                    VSyncEnd += MaxBits(CRTC_V_SYNC_WID) + 1;
++                    VSyncEnd += MaxBits(CRTC_V_SYNC_END_VGA) + 1;
+                 VTotal = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_TOTAL);
+ 
+                 VBlankStart = (VDisplay & ~0x03FFU) |
+@@ -2177,7 +2177,7 @@
+                 if ((pATIHW->horz_stretching &
+                     (HORZ_STRETCH_EN | AUTO_HORZ_RATIO)) !=
+                     (HORZ_STRETCH_EN | AUTO_HORZ_RATIO))
+-                    xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
++                    xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4,
+                         "Inconsistent panel horizontal dimension:"
+                         "  %d and %d.\n", pATI->LCDHorizontal, HDisplay);
+                 HDisplay = pATI->LCDHorizontal;
+@@ -2193,7 +2193,7 @@
+             {
+                 if (!(pATIHW->vert_stretching & VERT_STRETCH_EN) ||
+                     !(pATIHW->ext_vert_stretch & AUTO_VERT_RATIO))
+-                    xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
++                    xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4,
+                         "Inconsistent panel vertical dimension:  %d and %d.\n",
+                         pATI->LCDVertical, VDisplay);
+                 VDisplay = pATI->LCDVertical;
+--- programs/Xserver/hw/xfree86/drivers/ati/atiregs.h.orig	Fri Jul 23 05:36:14 2004
++++ programs/Xserver/hw/xfree86/drivers/ati/atiregs.h	Sun Feb 13 05:55:05 2005
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.24 2003/04/23 21:51:30 tsi Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.26tsi Exp $ */
+ /*
+  * Copyright 1994 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+  *
+@@ -551,6 +551,7 @@
+ #define CRTC_V_SYNC_STRT		0x000007fful
+ /*	?				0x0000f800ul */
+ #define CRTC_V_SYNC_WID			0x001f0000ul
++#define CRTC_V_SYNC_END_VGA		0x000f0000ul
+ #define CRTC_V_SYNC_POL			0x00200000ul
+ /*	?				0xffc00000ul */
+ #define CRTC_VLINE_CRNT_VLINE	IOPortTag(0x04u, 0x04u)
diff --git a/x11-servers/xorg-server-snap/files/patch-atiprobe.c b/x11-servers/xorg-server-snap/files/patch-atiprobe.c
deleted file mode 100644
index cb7371b1f153..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-atiprobe.c
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c,v
-retrieving revision 1.3
-retrieving revision 1.3.2.2
-diff -u -u -r1.3 -r1.3.2.2
---- programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c	30 Jul 2004 20:30:51 -0000	1.3
-+++ programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c	15 Dec 2004 08:47:20 -0000	1.3.2.2
-@@ -1554,6 +1560,9 @@
-                     continue;
- 
-                 pPCI = pVideo->thisCard;
-+		if (pPCI == NULL)
-+		    continue;
-+		
-                 PciReg = pciReadLong(pPCI->tag, PCI_REG_USERCONFIG);
-                 j = PciReg & 0x03U;
-                 if (j == 0x03U)
diff --git a/x11-servers/xorg-server-snap/files/patch-i810-6_8 b/x11-servers/xorg-server-snap/files/patch-i810-6_8
deleted file mode 100644
index 698da0065d1a..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-i810-6_8
+++ /dev/null
@@ -1,437 +0,0 @@
-Index: programs/Xserver/hw/xfree86/drivers/i810/common.h
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/common.h,v
-retrieving revision 1.3
-retrieving revision 1.3.4.1
-diff -u -u -r1.3 -r1.3.4.1
---- programs/Xserver/hw/xfree86/drivers/i810/common.h	22 Jun 2004 14:28:46 -0000	1.3
-+++ programs/Xserver/hw/xfree86/drivers/i810/common.h	15 Dec 2004 09:35:23 -0000	1.3.4.1
-@@ -173,7 +173,7 @@
- #define BEGIN_LP_RING(n)						\
-    unsigned int outring, ringmask;					\
-    volatile unsigned char *virt;					\
--   unsigned int needed;							\
-+   int needed;							\
-    if ((n) & 1)								\
-       ErrorF("BEGIN_LP_RING called with odd argument: %d\n", n);	\
-    if ((n) > 2 && (I810_DEBUG&DEBUG_ALWAYS_SYNC))			\
-@@ -206,7 +206,7 @@
- #define BEGIN_LP_RING(n)						\
-    unsigned int outring, ringmask;					\
-    volatile unsigned char *virt;					\
--   unsigned int needed;							\
-+   int needed;								\
-    if ((n) & 1)								\
-       ErrorF("BEGIN_LP_RING called with odd argument: %d\n", n);	\
-    if ((n) > 2 && (I810_DEBUG&DEBUG_ALWAYS_SYNC))			\
-Index: programs/Xserver/hw/xfree86/drivers/i810/i810.h
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h,v
-retrieving revision 1.4
-retrieving revision 1.4.4.1
-diff -u -u -r1.4 -r1.4.4.1
---- programs/Xserver/hw/xfree86/drivers/i810/i810.h	22 Jun 2004 14:28:46 -0000	1.4
-+++ programs/Xserver/hw/xfree86/drivers/i810/i810.h	15 Dec 2004 09:35:23 -0000	1.4.4.1
-@@ -172,7 +172,7 @@
-    unsigned long OverlayPhysical;
-    unsigned long OverlayStart;
-    int colorKey;
--   int surfaceAllocation[I810_TOTAL_SURFACES];
-+   unsigned int surfaceAllocation[I810_TOTAL_SURFACES];
-    int numSurfaces;
- 
-    DGAModePtr DGAModes;
-@@ -295,9 +295,10 @@
- extern void I810Sync(ScrnInfoPtr pScrn);
- extern unsigned long I810LocalToPhysical(ScrnInfoPtr pScrn,
- 					 unsigned long local);
--extern int I810AllocLow(I810MemRange * result, I810MemRange * pool, int size);
-+extern int I810AllocLow(I810MemRange * result, I810MemRange * pool, 
-+			int size);
- extern int I810AllocHigh(I810MemRange * result, I810MemRange * pool,
--			 int size);
-+			int size);
- extern Bool I810AllocateFront(ScrnInfoPtr pScrn);
- 
- extern int I810AllocateGARTMemory(ScrnInfoPtr pScrn);
-Index: programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c,v
-retrieving revision 1.4
-retrieving revision 1.4.2.1
-diff -u -u -r1.4 -r1.4.2.1
---- programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c	30 Jul 2004 20:30:52 -0000	1.4
-+++ programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c	15 Dec 2004 09:35:23 -0000	1.4.2.1
-@@ -259,7 +259,7 @@
- #ifdef XF86DRI
-    /* VT switching tries to do this.  
-     */
--   if (!pI810->LockHeld && pI810->directRenderingEnabled) {
-+   if ((!pI810->LockHeld && pI810->directRenderingEnabled) || !pScrn->vtSema) {
-       return;
-    }
- #endif
-Index: programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c,v
-retrieving revision 1.4
-retrieving revision 1.4.4.1
-diff -u -u -r1.4 -r1.4.4.1
---- programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c	22 Jun 2004 14:28:46 -0000	1.4
-+++ programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c	15 Dec 2004 09:35:23 -0000	1.4.4.1
-@@ -290,7 +290,7 @@
-    unsigned long dcacheHandle;
-    int sysmem_size = 0;
-    int back_size = 0;
--   int pitch_idx = 0;
-+   unsigned int pitch_idx = 0;
-    int bufs;
-    int width = pScrn->displayWidth * pI810->cpp;
-    int i;
-Index: programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v
-retrieving revision 1.9
-retrieving revision 1.9.2.1
-diff -u -u -r1.9 -r1.9.2.1
---- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c	25 Aug 2004 00:30:41 -0000	1.9
-+++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c	15 Dec 2004 09:35:23 -0000	1.9.2.1
-@@ -1124,14 +1124,6 @@
-    xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr);
-    xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr);
- 
--   pI810->LpRing = xalloc(sizeof(I810RingBuffer));
--   if (!pI810->LpRing) {
--     xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
--		"Could not allocate lpring data structure.\n");
--     I810FreeRec(pScrn);
--     return FALSE;
--   }
--   
-    return TRUE;
- }
- 
-@@ -1159,7 +1151,7 @@
- I810MapMem(ScrnInfoPtr pScrn)
- {
-    I810Ptr pI810 = I810PTR(pScrn);
--   unsigned i;
-+   long i;
- 
-    for (i = 2; i < pI810->FbMapSize; i <<= 1) ;
-    pI810->FbMapSize = i;
-@@ -2074,6 +2066,13 @@
-    pI810 = I810PTR(pScrn);
-    hwp = VGAHWPTR(pScrn);
- 
-+   pI810->LpRing = xcalloc(sizeof(I810RingBuffer),1);
-+   if (!pI810->LpRing) {
-+     xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
-+		"Could not allocate lpring data structure.\n");
-+     return FALSE;
-+   }
-+   
-    miClearVisualTypes();
- 
-    /* Re-implemented Direct Color support, -jens */
-Index: programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c,v
-retrieving revision 1.4
-retrieving revision 1.4.2.1
-diff -u -u -r1.4 -r1.4.2.1
---- programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c	30 Aug 2004 03:19:08 -0000	1.4
-+++ programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c	15 Dec 2004 09:35:23 -0000	1.4.2.1
-@@ -55,7 +55,7 @@
- int
- I810AllocLow(I810MemRange * result, I810MemRange * pool, int size)
- {
--   if (size > pool->Size)
-+   if (size > (long)pool->Size)
-       return 0;
- 
-    pool->Size -= size;
-@@ -69,7 +69,7 @@
- int
- I810AllocHigh(I810MemRange * result, I810MemRange * pool, int size)
- {
--   if (size > pool->Size)
-+   if (size > (long)pool->Size)
-       return 0;
- 
-    pool->Size -= size;
-Index: programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h,v
-retrieving revision 1.3
-retrieving revision 1.3.4.1
-diff -u -u -r1.3 -r1.3.4.1
---- programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h	22 Jun 2004 14:28:46 -0000	1.3
-+++ programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h	15 Dec 2004 09:35:23 -0000	1.3.4.1
-@@ -459,11 +459,11 @@
- #define I830_HEAD_MASK      0x001FFFFC
- 
- #define RING_START     0x08
--#define START_ADDR          0x00FFFFF8
-+#define START_ADDR          0x03FFFFF8
- #define I830_RING_START_MASK	0xFFFFF000
- 
- #define RING_LEN       0x0C
--#define RING_NR_PAGES       0x000FF000 
-+#define RING_NR_PAGES       0x001FF000 
- #define I830_RING_NR_PAGES	0x001FF000
- #define RING_REPORT_MASK    0x00000006
- #define RING_REPORT_64K     0x00000002
-Index: programs/Xserver/hw/xfree86/drivers/i810/i830.h
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h,v
-retrieving revision 1.5
-retrieving revision 1.5.4.1
-diff -u -u -r1.5 -r1.5.4.1
---- programs/Xserver/hw/xfree86/drivers/i810/i830.h	6 Jul 2004 14:37:47 -0000	1.5
-+++ programs/Xserver/hw/xfree86/drivers/i810/i830.h	15 Dec 2004 09:35:23 -0000	1.5.4.1
-@@ -180,17 +180,17 @@
-    int CacheLines;
- 
-    /* These are set in PreInit and never changed. */
--   unsigned long FbMapSize;
--   unsigned long TotalVideoRam;
-+   long FbMapSize;
-+   long TotalVideoRam;
-    I830MemRange StolenMemory;		/* pre-allocated memory */
--   unsigned long BIOSMemorySize;	/* min stolen pool size */
-+   long BIOSMemorySize;			/* min stolen pool size */
-    int BIOSMemSizeLoc;
- 
-    /* These change according to what has been allocated. */
-    long FreeMemory;
-    I830MemRange MemoryAperture;
-    I830MemPool StolenPool;
--   unsigned long allocatedMemory;
-+   long allocatedMemory;
- 
-    /* Regions allocated either from the above pools, or from agpgart. */
-    /* for single and dual head configurations */
-@@ -348,7 +348,7 @@
-    int xoffset;
-    int yoffset;
- 
--   int SaveGeneration;
-+   unsigned int SaveGeneration;
-    Bool vbeRestoreWorkaround;
-    Bool displayInfo;
-    Bool devicePresence;
-@@ -415,7 +415,7 @@
- extern Bool I830BindGARTMemory(ScrnInfoPtr pScrn);
- extern Bool I830UnbindGARTMemory(ScrnInfoPtr pScrn);
- extern unsigned long I830AllocVidMem(ScrnInfoPtr pScrn, I830MemRange *result,
--				     I830MemPool *pool, unsigned long size,
-+				     I830MemPool *pool, long size,
- 				     unsigned long alignment, int flags);
- 
- extern void I830PrintAllRegisters(I830RegPtr i830Reg);
-Index: programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v
-retrieving revision 1.6
-retrieving revision 1.6.2.1
-diff -u -u -r1.6 -r1.6.2.1
---- programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c	30 Jul 2004 20:38:27 -0000	1.6
-+++ programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c	15 Dec 2004 09:35:23 -0000	1.6.2.1
-@@ -594,6 +594,7 @@
-    I830Ptr pI830 = I830PTR(pScrn);
-    vbeInfoPtr pVbe = pI830->pVbe;
-    CARD32 temp;
-+
- #ifdef I915G_WORKAROUND
-    int getmode;
-    int mode;
-@@ -1018,7 +1019,7 @@
- I830MapMem(ScrnInfoPtr pScrn)
- {
-    I830Ptr pI830 = I830PTR(pScrn);
--   unsigned i;
-+   long i;
- 
-    for (i = 2; i < pI830->FbMapSize; i <<= 1) ;
-    pI830->FbMapSize = i;
-@@ -2898,7 +2899,7 @@
-    OUTREG(LP_RING + RING_TAIL, 0);
-    OUTREG(LP_RING + RING_HEAD, 0);
- 
--   if ((pI830->LpRing->mem.Start & I830_RING_START_MASK) !=
-+   if ((long)(pI830->LpRing->mem.Start & I830_RING_START_MASK) !=
-        pI830->LpRing->mem.Start) {
-       xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 		 "I830SetRingRegs: Ring buffer start (%lx) violates its "
-@@ -3441,7 +3442,7 @@
-          I830Ptr pI8301 = I830PTR(pI830->entityPrivate->pScrn_1);
- 
-          temp = INREG(stridereg);
--         if (temp / pI8301->cpp != pI830->entityPrivate->pScrn_1->displayWidth) {
-+         if (temp / pI8301->cpp != (CARD32)(pI830->entityPrivate->pScrn_1->displayWidth)) {
-             xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 		    "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(pI830->pipe),
- 		    (int)(temp / pI8301->cpp), pI830->entityPrivate->pScrn_1->displayWidth);
-@@ -3459,7 +3460,7 @@
-             sizereg = pI830->pipe ? DSPASIZE : DSPBSIZE;
- 
-             temp = INREG(stridereg);
--            if (temp / pI8302->cpp != pI830->entityPrivate->pScrn_2->displayWidth) {
-+            if (temp / pI8302->cpp != (CARD32)(pI830->entityPrivate->pScrn_2->displayWidth)) {
- 	       xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 		    "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(!pI830->pipe),
- 		    (int)(temp / pI8302->cpp), pI830->entityPrivate->pScrn_2->displayWidth);
-@@ -3478,7 +3479,7 @@
-          I830Ptr pI8302 = I830PTR(pI830->entityPrivate->pScrn_2);
- 
-          temp = INREG(stridereg);
--         if (temp / pI8301->cpp != pI830->entityPrivate->pScrn_1->displayWidth) {
-+         if (temp / pI8301->cpp != (CARD32)(pI830->entityPrivate->pScrn_1->displayWidth)) {
- 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 		    "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(pI830->pipe),
- 		    (int)(temp / pI8301->cpp), pI830->entityPrivate->pScrn_1->displayWidth);
-@@ -3494,7 +3495,7 @@
-          sizereg = !pI830->pipe ? DSPASIZE : DSPBSIZE;
- 
-          temp = INREG(stridereg);
--         if (temp / pI8302->cpp != pI830->entityPrivate->pScrn_2->displayWidth) {
-+         if (temp / pI8302->cpp != ((CARD32)pI830->entityPrivate->pScrn_2->displayWidth)) {
- 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 		    "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(!pI830->pipe),
- 		    (int)(temp / pI8302->cpp), pI830->entityPrivate->pScrn_2->displayWidth);
-@@ -3515,7 +3516,7 @@
- 	    continue;
- 
-          temp = INREG(stridereg);
--         if (temp / pI830->cpp != pScrn->displayWidth) {
-+         if (temp / pI830->cpp != (CARD32)pScrn->displayWidth) {
- 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 		    "Correcting plane %c stride (%d -> %d)\n", PIPE_NAME(i),
- 		    (int)(temp / pI830->cpp), pScrn->displayWidth);
-@@ -4354,6 +4355,9 @@
-       SaveHWOperatingState(pScrn);
- #endif
- 
-+   ResetState(pScrn, TRUE);
-+   RestoreHWState(pScrn);
-+
-    if (IsPrimary(pScrn)) {
-       if (!SetDisplayDevices(pScrn, pI830->savedDevices)) {
-          xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-@@ -4365,8 +4369,6 @@
-       }
-    }
- 
--   ResetState(pScrn, TRUE);
--   RestoreHWState(pScrn);
-    RestoreBIOSMemSize(pScrn);
-    if (IsPrimary(pScrn))
-       I830UnbindGARTMemory(pScrn);
-@@ -4506,7 +4508,8 @@
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    Bool on = xf86IsUnblank(mode);
--   CARD32 temp, ctrl, base, i;
-+   CARD32 temp, ctrl, base;
-+   int i;
- 
-    DPRINTF(PFX, "I830BIOSSaveScreen: %d, on is %s\n", mode, BOOLTOSTRING(on));
- 
-Index: programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c,v
-retrieving revision 1.4
-retrieving revision 1.4.4.1
-diff -u -u -r1.4 -r1.4.4.1
---- programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c	6 Jul 2004 14:37:47 -0000	1.4
-+++ programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c	15 Dec 2004 09:35:23 -0000	1.4.4.1
-@@ -63,10 +63,10 @@
-  */
- static unsigned long
- AllocFromPool(ScrnInfoPtr pScrn, I830MemRange *result, I830MemPool *pool,
--	      unsigned long size, unsigned long alignment, int flags)
-+	      long size, unsigned long alignment, int flags)
- {
-    I830Ptr pI830 = I830PTR(pScrn);
--   unsigned long needed, start, end;
-+   long needed, start, end;
-    Bool dryrun = ((flags & ALLOCATE_DRY_RUN) != 0);
- 
-    if (!result || !pool || !size)
-@@ -94,7 +94,7 @@
-       }
-    }
-    if (needed > pool->Free.Size) {
--      unsigned long extra;
-+      long extra;
-       /* See if the pool can be grown. */
-       if (pI830->StolenOnly && !dryrun)
- 	 return 0;
-@@ -107,7 +107,7 @@
- 	    return 0;
-       }
- 
--      if (!dryrun && (extra > pI830->MemoryAperture.Size))
-+      if (!dryrun && ((long)extra > pI830->MemoryAperture.Size))
- 	 return 0;
- 
-       pool->Free.Size += extra;
-@@ -136,7 +136,7 @@
- }
- 
- static unsigned long
--AllocFromAGP(ScrnInfoPtr pScrn, I830MemRange *result, unsigned long size,
-+AllocFromAGP(ScrnInfoPtr pScrn, I830MemRange *result, long size,
- 	     unsigned long alignment, int flags)
- {
-    I830Ptr pI830 = I830PTR(pScrn);
-@@ -212,7 +212,7 @@
- 
- unsigned long
- I830AllocVidMem(ScrnInfoPtr pScrn, I830MemRange *result, I830MemPool *pool,
--		unsigned long size, unsigned long alignment, int flags)
-+		long size, unsigned long alignment, int flags)
- {
-    I830Ptr pI830 = I830PTR(pScrn);
-    Bool dryrun = ((flags & ALLOCATE_DRY_RUN) != 0);
-@@ -392,7 +392,7 @@
- I830Allocate2DMemory(ScrnInfoPtr pScrn, const int flags)
- {
-    I830Ptr pI830 = I830PTR(pScrn);
--   unsigned long size, alloced;
-+   long size, alloced;
-    Bool dryrun = ((flags & ALLOCATE_DRY_RUN) != 0);
-    int verbosity = dryrun ? 4 : 1;
-    const char *s = dryrun ? "[dryrun] " : "";
-@@ -610,9 +610,9 @@
- 	 return FALSE;
-       }
-    } else {
--      unsigned long lineSize;
--      unsigned long extra = 0;
--      unsigned long maxFb = 0;
-+      long lineSize;
-+      long extra = 0;
-+      long maxFb = 0;
- 
-       /*
-        * XXX Need to "free" up any 3D allocations if the DRI ended up
-@@ -857,7 +857,7 @@
- I830GetExcessMemoryAllocations(ScrnInfoPtr pScrn)
- {
-    I830Ptr pI830 = I830PTR(pScrn);
--   unsigned long allocated;
-+   long allocated;
- 
-    allocated = pI830->StolenPool.Total.Size + pI830->allocatedMemory;
-    if (allocated > pI830->TotalVideoRam)
-@@ -1367,7 +1367,7 @@
-    I830Ptr pI830 = I830PTR(pScrn);
-    int pitch, ntiles, i;
-    static int nextTile = 0;
--   static int tileGeneration = -1;
-+   static unsigned int tileGeneration = -1;
- 
- #if 0
-    /* Hack to "improve" the alignment of the front buffer.
diff --git a/x11-servers/xorg-server-snap/files/patch-i830_video.c b/x11-servers/xorg-server-snap/files/patch-i830_video.c
deleted file mode 100644
index 259ad42669c1..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-i830_video.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/hw/xfree86/drivers/i810/i830_video.c.orig	Fri Dec 31 13:43:36 2004
-+++ programs/Xserver/hw/xfree86/drivers/i810/i830_video.c	Fri Dec 31 13:44:22 2004
-@@ -632,7 +632,7 @@
-    pPriv->gamma0 = 0x080808;
- 
-    /* gotta uninit this someplace */
--   REGION_INIT(pScreen, &pPriv->clip, NullBox, 0);
-+   REGION_NULL(pScreen, &pPriv->clip);
- 
-    pI830->adaptor = adapt;
- 
diff --git a/x11-servers/xorg-server-snap/files/patch-pc98kbd b/x11-servers/xorg-server-snap/files/patch-pc98kbd
new file mode 100644
index 000000000000..5b41887944da
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-pc98kbd
@@ -0,0 +1,40 @@
+--- programs/Xserver/hw/xfree86/input/keyboard/kbd.c.orig	Tue Feb  8 17:48:07 2005
++++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c	Tue Feb  8 17:48:52 2005
+@@ -595,10 +595,13 @@
+    * they need to get the same key code as the base key on the same
+    * physical keyboard key.
+    */
+-  if (scanCode == KEY_SysReqest)
+-    scanCode = KEY_Print;
+-  else if (scanCode == KEY_Break)
+-    scanCode = KEY_Pause;
++  /* PC98 keyboards however don't need this */
++  if (!xf86IsPc98()) {
++    if (scanCode == KEY_SysReqest)
++      scanCode = KEY_Print;
++    else if (scanCode == KEY_Break)
++      scanCode = KEY_Pause;
++  }
+ #endif
+ 
+   /*
+--- programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c.orig	Tue Feb  8 18:14:07 2005
++++ programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c	Tue Feb  8 18:14:12 2005
+@@ -43,6 +43,9 @@
+              case KEY_Prefix1:
+                   pKbd->scanPrefix = *scanCode;  /* special prefixes */
+                   return TRUE;
++	  }
++          if (!xf86IsPc98()) {
++            switch (*scanCode) {
+              case 0x59: *scanCode = KEY_0x59; break;
+              case 0x5a: *scanCode = KEY_0x5A; break;
+              case 0x5b: *scanCode = KEY_0x5B; break;
+@@ -71,6 +74,7 @@
+              case 0x74: *scanCode = KEY_0x74; break;
+              case 0x75: *scanCode = KEY_0x75; break;
+              case 0x76: *scanCode = KEY_0x76; break;
++            }
+           }
+           break;
+        case KEY_Prefix0:
diff --git a/x11-servers/xorg-server-snap/files/patch-r128_accel.c b/x11-servers/xorg-server-snap/files/patch-r128_accel.c
deleted file mode 100644
index 6acfe9834a8e..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-r128_accel.c
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: programs/Xserver/hw/xfree86/drivers/ati/r128_accel.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_accel.c,v
-retrieving revision 1.3
-retrieving revision 1.3.4.1
-diff -u -u -r1.3 -r1.3.4.1
---- programs/Xserver/hw/xfree86/drivers/ati/r128_accel.c	16 Jun 2004 09:43:58 -0000	1.3
-+++ programs/Xserver/hw/xfree86/drivers/ati/r128_accel.c	15 Dec 2004 09:22:02 -0000	1.3.4.1
-@@ -237,17 +237,23 @@
-         i = 0;
-         do {
-             ret = drmCommandNone(info->drmFD, DRM_R128_CCE_IDLE);
--        } while ( ret && errno == EBUSY && i++ < R128_IDLE_RETRY );
-+        } while ( ret && errno == EBUSY && i++ < (R128_IDLE_RETRY * R128_IDLE_RETRY) );
- 
- 	if (ret && ret != -EBUSY) {
- 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 		       "%s: CCE idle %d\n", __FUNCTION__, ret);
- 	}
- 
-+	if (i > R128_IDLE_RETRY) {
-+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+		       "%s: (DEBUG) CCE idle took i = %d\n", __FUNCTION__, i);
-+	}
-+
- 	if (ret == 0) return;
- 
- 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 		   "Idle timed out, resetting engine...\n");
-+	R128CCE_STOP(pScrn, info);
- 	R128EngineReset(pScrn);
- 
- 	/* Always restart the engine when doing CCE 2D acceleration */
diff --git a/x11-servers/xorg-server-snap/files/patch-r128_dri.c b/x11-servers/xorg-server-snap/files/patch-r128_dri.c
deleted file mode 100644
index c31694837bcc..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-r128_dri.c
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c,v
-retrieving revision 1.4
-retrieving revision 1.4.4.1
-diff -u -u -r1.4 -r1.4.4.1
---- programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c	10 Jul 2004 14:22:35 -0000	1.4
-+++ programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c	15 Dec 2004 08:53:01 -0000	1.4.4.1
-@@ -1297,6 +1297,7 @@
-     if (info->irq) {
- 	drmCtlUninstHandler(info->drmFD);
- 	info->irq = 0;
-+	info->gen_int_cntl = 0;
-     }
- 
- 				/* De-allocate vertex buffers */
diff --git a/x11-servers/xorg-server-snap/files/patch-radeon_driver.c b/x11-servers/xorg-server-snap/files/patch-radeon_driver.c
index 7361e77a5eaf..eddd3071447b 100644
--- a/x11-servers/xorg-server-snap/files/patch-radeon_driver.c
+++ b/x11-servers/xorg-server-snap/files/patch-radeon_driver.c
@@ -1,19 +1,10 @@
---- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig	Tue Aug 24 17:30:41 2004
-+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c	Thu Jan 13 14:34:17 2005
-@@ -4471,10 +4471,12 @@
- 
-     RADEONSave(pScrn);
- 
--    if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, FALSE)) {
--	RADEONSetDynamicClock(pScrn, 1);
--    } else {
--	RADEONSetDynamicClock(pScrn, 0);
-+    if ((!info->IsSecondary) && info->IsMobility) {
-+        if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, FALSE)) {
-+	    RADEONSetDynamicClock(pScrn, 1);
-+        } else {
-+	    RADEONSetDynamicClock(pScrn, 0);
-+        }
+--- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig	Thu Feb 17 13:15:22 2005
++++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c	Thu Feb 17 13:21:09 2005
+@@ -7159,7 +7159,6 @@
+ 	RADEONDoAdjustFrame(pScrn, x, y, FALSE);
      }
  
-     if (info->FBDev) {
+-    RADEONSetFBLocation (pScrn);
+ #ifdef XF86DRI
+ 	if (info->CPStarted) DRIUnlock(pScrn->pScreen);
+ #endif
diff --git a/x11-servers/xorg-server-snap/files/patch-radeon_reg.h b/x11-servers/xorg-server-snap/files/patch-radeon_reg.h
deleted file mode 100644
index 4aa8575e4cb2..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-radeon_reg.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h.orig	Mon Aug  9 15:37:22 2004
-+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h	Thu Jan 13 14:34:17 2005
-@@ -803,7 +803,7 @@
- #       define RADEON_MC_MCLK_MAX_DYN_STOP_LAT (1<<12)
- #       define RADEON_IO_MCLK_MAX_DYN_STOP_LAT (1<<13)
- #       define RADEON_MC_MCLK_DYN_ENABLE    (1 << 14)
--#       define RADEON_IO_MCLK_DYN_ENABLE    (1 << 14)
-+#       define RADEON_IO_MCLK_DYN_ENABLE    (1 << 15)
- #define RADEON_MDGPIO_A_REG                 0x01ac
- #define RADEON_MDGPIO_EN_REG                0x01b0
- #define RADEON_MDGPIO_MASK                  0x0198
diff --git a/x11-servers/xorg-server-snap/files/patch-sparc64kbd b/x11-servers/xorg-server-snap/files/patch-sparc64kbd
new file mode 100644
index 000000000000..d4854adf9cac
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-sparc64kbd
@@ -0,0 +1,22 @@
+--- programs/Xserver/hw/xfree86/input/keyboard/kbd.c.orig	Wed Feb 23 23:28:28 2005
++++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c	Thu Feb 24 00:12:20 2005
+@@ -571,6 +571,19 @@
+      }
+   }
+ 
++#if defined(__sparc__) && defined(__FreeBSD__)
++  /*
++   * Taken from xf86Events.c:
++   * I really don't know what's wrong here, but passing the real
++   * scanCode offsets by one from XKB's point of view.
++   *
++   * (ecd@skynet.be, 980405)
++   */
++  if (pKbd->sunKbd) {
++    scanCode--;
++  }
++#endif
++
+ #ifndef TERMINATE_FALLBACK
+ #define TERMINATE_FALLBACK 1
+ #endif
diff --git a/x11-servers/xorg-server-snap/files/patch-xf86Pci.h b/x11-servers/xorg-server-snap/files/patch-xf86Pci.h
new file mode 100644
index 000000000000..a7ec47c1e0e1
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-xf86Pci.h
@@ -0,0 +1,16 @@
+Index: programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h
+===================================================================
+RCS file: /work/eich/freedesktop/cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v
+retrieving revision 1.1.1.2
+diff -u -r1.1.1.2 xf86Pci.h
+--- programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h	25 Nov 2003 19:28:50 -0000	1.1.1.2
++++ programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h	2 Mar 2005 16:08:29 -0000
+@@ -329,7 +329,7 @@
+ #define PCI_MAP_IS_MEM(b)	(!PCI_MAP_IS_IO(b))
+ 
+ #define PCI_MAP_IS64BITMEM(b)	\
+-	(((b) & PCI_MAP_MEMORY_TYPE_MASK) == PCI_MAP_MEMORY_TYPE_64BIT)
++	  (((b) & PCI_MAP_MEMORY_TYPE) == PCI_MAP_MEMORY_TYPE_64BIT)
+ 
+ #define PCIGETMEMORY(b)		((b) & PCI_MAP_MEMORY_ADDRESS_MASK)
+ #define PCIGETMEMORY64HIGH(b)	(*((CARD32*)&b + 1))
diff --git a/x11-servers/xorg-server-snap/files/patch-xorg.cf b/x11-servers/xorg-server-snap/files/patch-xorg.cf
deleted file mode 100644
index 794860e862fe..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-xorg.cf
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/cf/xorg.cf.orig	Sat Jan  1 16:41:46 2005
-+++ config/cf/xorg.cf	Sat Jan  1 16:42:18 2005
-@@ -446,7 +446,7 @@
- # ifndef XF86CardDrivers
- #  define XF86CardDrivers	mga glint nv tga s3 s3virge sis rendition \
- 				neomagic tdfx savage cirrus tseng trident \
--				chips apm i128 ati ark cyrix siliconmotion \
-+				chips apm i128 ati i810 ark cyrix siliconmotion \
- 				vga dummy vesa \
- 				XF86OSCardDrivers XF86ExtraCardDrivers
- # endif
diff --git a/x11-servers/xorg-server-snap/pkg-plist b/x11-servers/xorg-server-snap/pkg-plist
index da6ef8eb22a4..55a23938adc6 100644
--- a/x11-servers/xorg-server-snap/pkg-plist
+++ b/x11-servers/xorg-server-snap/pkg-plist
@@ -185,3 +185,9 @@ lib/modules/libxf8_32bpp.a
 %%SPARC64_NA%%lib/modules/v10002d.uc
 %%SPARC64_NA%%lib/modules/v20002d.uc
 @dirrm lib/X11/getconfig
+@dirrm lib/modules/fonts
+@dirrm lib/modules/extensions
+@dirrm lib/modules/freebsd
+@dirrm lib/modules/drivers
+@dirrm lib/modules/input
+@unexec rmdir %D/lib/X11/doc 2>/dev/null || true