downgrading xorg-* on extra, xorg-* current on testing

60 files changed, 117 insertions, 86 deletions

diff --git a/extra/xorg-appres/PKGBUILD b/extra/xorg-appres/PKGBUILD
index 9af921b3b..cc1583a0b 100644
--- a/extra/xorg-appres/PKGBUILD
+++ b/extra/xorg-appres/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-appres
 pkgver=1.0.3
 pkgrel=2
 pkgdesc="List X application resource database"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxt')
diff --git a/extra/xorg-bdftopcf/PKGBUILD b/extra/xorg-bdftopcf/PKGBUILD
index 80920d665..0a6a35221 100644
--- a/extra/xorg-bdftopcf/PKGBUILD
+++ b/extra/xorg-bdftopcf/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-bdftopcf
 pkgver=1.0.3
 pkgrel=1
 pkgdesc="Convert X font from Bitmap Distribution Format to Portable Compiled Format"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxfont')
diff --git a/extra/xorg-font-util/PKGBUILD b/extra/xorg-font-util/PKGBUILD
index 09ec5570f..d23ec52bc 100644
--- a/extra/xorg-font-util/PKGBUILD
+++ b/extra/xorg-font-util/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-font-util
 pkgver=1.2.0
 pkgrel=1
 pkgdesc="X.Org font utilities"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 makedepends=('xorg-util-macros')
diff --git a/extra/xorg-iceauth/PKGBUILD b/extra/xorg-iceauth/PKGBUILD
index 7489c6c08..47d56dc44 100644
--- a/extra/xorg-iceauth/PKGBUILD
+++ b/extra/xorg-iceauth/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-iceauth
 pkgver=1.0.4
 pkgrel=2
 pkgdesc="ICE authority file utility"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libice')
diff --git a/extra/xorg-luit/PKGBUILD b/extra/xorg-luit/PKGBUILD
index 3b7f03484..48b3446d8 100644
--- a/extra/xorg-luit/PKGBUILD
+++ b/extra/xorg-luit/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.1.0
 pkgrel=2
 pkgdesc="Filter that can be run between an arbitrary application and
 a UTF-8 terminal emulator"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libfontenc')
diff --git a/extra/xorg-mkfontscale/PKGBUILD b/extra/xorg-mkfontscale/PKGBUILD
index fd5ee0a7f..b7eee43a6 100644
--- a/extra/xorg-mkfontscale/PKGBUILD
+++ b/extra/xorg-mkfontscale/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-mkfontscale
 pkgver=1.0.8
 pkgrel=1
 pkgdesc="Create an index of scalable font files for X"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('freetype2' 'libfontenc')
diff --git a/extra/xorg-oclock/PKGBUILD b/extra/xorg-oclock/PKGBUILD
index 0453c41e4..5016247f2 100644
--- a/extra/xorg-oclock/PKGBUILD
+++ b/extra/xorg-oclock/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-oclock
 pkgver=1.0.2
 pkgrel=1
 pkgdesc="Round X clock"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxmu' 'libxext')
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index bd16d9086..20913828a 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,45 +1,36 @@
-# $Id: PKGBUILD 119887 2011-04-16 12:07:45Z andyrtr $
+# $Id: PKGBUILD 114590 2011-03-14 10:49:00Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.10.1
+pkgver=1.9.4.901
 pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
-makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util')
+makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp')
 options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
-        bg-none-revert.patch
-        glx-pixmap-crash.patch
-        xserver-1.10-pointer-barriers.patch
+        vbe-fix-malloc-size-bug.patch
         xorg-redhat-die-ugly-pattern-die-die-die.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf)
-sha1sums=('59ada4c9a59f7f1eb4b68c359e9cd58272aa4809'
-          '629c6d8d52126eab81ee1b72a9e4209535f8cb81'
-          '19e7164dcf9814ad64231b50a46f651b0e68a27a'
-          '1b95e91384a57d966428c7db98ed06f4cc562f91'
-          '0efcdf61bde3c0cd813072b94e2b30ab922775b9'
-          'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
-          '6838fc00ef4618c924a77e0fb03c05346080908a'
-          '993798f3d22ad672d769dae5f48d1fa068d5578f')
+md5sums=('0fde9023db0581e9b145b4cd0784a3c5'
+         'c22e6ec412769b1c30c44b1f45b50e02'
+         '1a336eb22e27cbf443ec5a2ecddfa93c'
+         '52fd3effd80d7bc6c1660d4ecf23d31c'
+         '376c70308715cd2643f7bff936d9934b'
+         'd4f7dfc6be4ef4e2c6dd7632a9d88abe')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  # Get rid of the ugly pattern
-  patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch"
 
-  # Add pointer barrier support, patch from Fedora
-  patch -Np1 -i "${srcdir}/xserver-1.10-pointer-barriers.patch"
+  patch -Np1 -i "${srcdir}/vbe-fix-malloc-size-bug.patch"
 
-  # Patches from ~ajax/xserver xserver-next branch
-  patch -Np1 -i "${srcdir}/bg-none-revert.patch"
-  patch -Np1 -i "${srcdir}/glx-pixmap-crash.patch"
+  # Get rid of the ugly pattern
+  patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch"
 
-  autoreconf
   ./configure --prefix=/usr \
       --enable-ipv6 \
       --enable-dri \
@@ -63,6 +54,7 @@ build() {
       --localstatedir=/var \
       --with-xkb-path=/usr/share/X11/xkb \
       --with-xkb-output=/var/lib/xkb \
+      --with-dri-driver-path=/usr/lib/xorg/modules/dri \
       --with-fontrootdir=/usr/share/fonts
   make
 
@@ -84,7 +76,7 @@ package_xorg-server-common() {
   make -C xkb DESTDIR="${pkgdir}" install-data
 
   install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m644 doc/man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
+  install -m644 doc/Xserver.1 "${pkgdir}/usr/share/man/man1/"
 
   install -m755 -d "${pkgdir}/usr/lib/xorg"
   install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"
diff --git a/extra/xorg-server/vbe-fix-malloc-size-bug.patch b/extra/xorg-server/vbe-fix-malloc-size-bug.patch
new file mode 100644
index 000000000..01ed040d4
--- /dev/null
+++ b/extra/xorg-server/vbe-fix-malloc-size-bug.patch
@@ -0,0 +1,39 @@
+From 8ffaef2ebd2611e2eed4ef97350c3a34508f5252 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 24 Feb 2011 21:06:34 +0000
+Subject: vbe: Fix malloc size bug
+
+v2: Slightly more obvious sizing math.
+
+==14882== Invalid write of size 2
+==14882==    at 0x6750267: VBEGetVBEInfo (vbe.c:400)
+==14882==    by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so)
+==14882==    by 0x471895: InitOutput (xf86Init.c:519)
+==14882==    by 0x422778: main (main.c:205)
+==14882==  Address 0x4f32fa8 is 72 bytes inside a block of size 73 alloc'd
+==14882==    at 0x4A0640D: malloc (vg_replace_malloc.c:236)
+==14882==    by 0x675024B: VBEGetVBEInfo (vbe.c:398)
+==14882==    by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so)
+==14882==    by 0x471895: InitOutput (xf86Init.c:519)
+==14882==    by 0x422778: main (main.c:205)
+
+Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+(cherry picked from commit d8caa782009abf4dc17b945e325e83fda299a534)
+---
+diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
+index 7a64a4a..1d3775b 100644
+--- a/hw/xfree86/vbe/vbe.c
++++ b/hw/xfree86/vbe/vbe.c
+@@ -395,7 +395,7 @@ VBEGetVBEInfo(vbeInfoPtr pVbe)
+     i = 0;
+     while (modes[i] != 0xffff)
+ 	i++;
+-    block->VideoModePtr = malloc(sizeof(CARD16) * i + 1);
++    block->VideoModePtr = malloc(sizeof(CARD16) * (i + 1));
+     memcpy(block->VideoModePtr, modes, sizeof(CARD16) * i);
+     block->VideoModePtr[i] = 0xffff;
+ 
+--
+cgit v0.8.3-6-g21f6
diff --git a/extra/xorg-sessreg/PKGBUILD b/extra/xorg-sessreg/PKGBUILD
index 9b1f56573..4cd6d1e86 100644
--- a/extra/xorg-sessreg/PKGBUILD
+++ b/extra/xorg-sessreg/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-sessreg
 pkgver=1.0.6
 pkgrel=2
 pkgdesc="Register X sessions in system utmp/utmpx databases"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/xorg-setxkbmap/PKGBUILD b/extra/xorg-setxkbmap/PKGBUILD
index 2aceaead9..b25f37dc1 100644
--- a/extra/xorg-setxkbmap/PKGBUILD
+++ b/extra/xorg-setxkbmap/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-setxkbmap
 pkgver=1.2.0
 pkgrel=2
 pkgdesc="Set the keyboard using the X Keyboard Extension"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxkbfile')
diff --git a/extra/xorg-smproxy/PKGBUILD b/extra/xorg-smproxy/PKGBUILD
index 7fd915c9c..50964a380 100644
--- a/extra/xorg-smproxy/PKGBUILD
+++ b/extra/xorg-smproxy/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-smproxy
 pkgver=1.0.4
 pkgrel=2
 pkgdesc="Allows X applications that do not support X11R6 session management to participate in an X11R6 session"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libsm' 'libxt' 'libxmu')
diff --git a/extra/xorg-twm/PKGBUILD b/extra/xorg-twm/PKGBUILD
index 802fb69ba..b5b62d210 100644
--- a/extra/xorg-twm/PKGBUILD
+++ b/extra/xorg-twm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xorg-twm
 pkgver=1.0.6
 pkgrel=2
 pkgdesc="Tab Window Manager for the X Window System"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 backup=(etc/X11/twm/system.twmrc)
 license=('custom')
diff --git a/extra/xorg-x11perf/PKGBUILD b/extra/xorg-x11perf/PKGBUILD
index 42fc8adc9..c350c59bb 100644
--- a/extra/xorg-x11perf/PKGBUILD
+++ b/extra/xorg-x11perf/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-x11perf
 pkgver=1.5.3
 pkgrel=2
 pkgdesc="Simple X server performance benchmarker"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxmu' 'libxrender' 'libxft' 'libxext')
diff --git a/extra/xorg-xauth/PKGBUILD b/extra/xorg-xauth/PKGBUILD
index 26935f83f..85a358954 100644
--- a/extra/xorg-xauth/PKGBUILD
+++ b/extra/xorg-xauth/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xauth
 pkgver=1.0.5
 pkgrel=2
 pkgdesc="X.Org authorization settings program"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxmu')
diff --git a/extra/xorg-xbacklight/PKGBUILD b/extra/xorg-xbacklight/PKGBUILD
index 2b1a3c230..5ed14c78c 100644
--- a/extra/xorg-xbacklight/PKGBUILD
+++ b/extra/xorg-xbacklight/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xbacklight
 pkgver=1.1.2
 pkgrel=2
 pkgdesc="RandR-based backlight control application"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxrandr' 'libx11')
diff --git a/extra/xorg-xbiff/PKGBUILD b/extra/xorg-xbiff/PKGBUILD
index 47bd31dd8..60c750ed2 100644
--- a/extra/xorg-xbiff/PKGBUILD
+++ b/extra/xorg-xbiff/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xbiff
 pkgver=1.0.3
 pkgrel=1
 pkgdesc="Watch mailboxes for new message delivery"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxext')
diff --git a/extra/xorg-xcalc/PKGBUILD b/extra/xorg-xcalc/PKGBUILD
index d4d16a8c4..8272a7965 100644
--- a/extra/xorg-xcalc/PKGBUILD
+++ b/extra/xorg-xcalc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xcalc
 pkgver=1.0.4.1
 pkgrel=1
 pkgdesc="Scientific calculator for X"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw')
diff --git a/extra/xorg-xclipboard/PKGBUILD b/extra/xorg-xclipboard/PKGBUILD
index 60c4d624b..08f506c42 100644
--- a/extra/xorg-xclipboard/PKGBUILD
+++ b/extra/xorg-xclipboard/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xclipboard
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="X clipboard manager"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxmu' 'libxt' 'libx11')
diff --git a/extra/xorg-xclock/PKGBUILD b/extra/xorg-xclock/PKGBUILD
index f3d2ee24e..db6506846 100644
--- a/extra/xorg-xclock/PKGBUILD
+++ b/extra/xorg-xclock/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xclock
 pkgver=1.0.5
 pkgrel=1
 pkgdesc="X clock"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxmu' 'libxaw' 'libxrender' 'libxft' 'libxkbfile')
diff --git a/extra/xorg-xcmsdb/PKGBUILD b/extra/xorg-xcmsdb/PKGBUILD
index 9687e02fb..58fdd734f 100644
--- a/extra/xorg-xcmsdb/PKGBUILD
+++ b/extra/xorg-xcmsdb/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xcmsdb
 pkgver=1.0.3
 pkgrel=2
 pkgdesc="Device Color Characterization utility for X Color Management System"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')
diff --git a/extra/xorg-xconsole/PKGBUILD b/extra/xorg-xconsole/PKGBUILD
index 1ecc9eeac..204892339 100644
--- a/extra/xorg-xconsole/PKGBUILD
+++ b/extra/xorg-xconsole/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xconsole
 pkgver=1.0.4
 pkgrel=1
 pkgdesc="Monitor system console messages with X"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxmu' 'libxt' 'libx11')
diff --git a/extra/xorg-xcursorgen/PKGBUILD b/extra/xorg-xcursorgen/PKGBUILD
index 31e374a1d..f798e9591 100644
--- a/extra/xorg-xcursorgen/PKGBUILD
+++ b/extra/xorg-xcursorgen/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xcursorgen
 pkgver=1.0.4
 pkgrel=2
 pkgdesc="Create an X cursor file from PNG images"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxcursor' 'libpng')
diff --git a/extra/xorg-xdm/PKGBUILD b/extra/xorg-xdm/PKGBUILD
index ddce2fa0a..66f376ed2 100644
--- a/extra/xorg-xdm/PKGBUILD
+++ b/extra/xorg-xdm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xdm
 pkgver=1.1.10
 pkgrel=2
 pkgdesc="X Display Manager"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft')
diff --git a/extra/xorg-xdpyinfo/PKGBUILD b/extra/xorg-xdpyinfo/PKGBUILD
index 084e22b54..4ec899376 100644
--- a/extra/xorg-xdpyinfo/PKGBUILD
+++ b/extra/xorg-xdpyinfo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xdpyinfo
 pkgver=1.2.0
 pkgrel=2
 pkgdesc="Display information utility for X"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxext' 'libxtst' 'libxxf86vm' 'libxxf86dga' 'libxrender' 'libxcomposite' 'libxinerama' 'libdmx')
diff --git a/extra/xorg-xdriinfo/PKGBUILD b/extra/xorg-xdriinfo/PKGBUILD
index f247c07ee..643fe2e93 100644
--- a/extra/xorg-xdriinfo/PKGBUILD
+++ b/extra/xorg-xdriinfo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xdriinfo
 pkgver=1.0.4
 pkgrel=2
 pkgdesc="Query configuration information of DRI drivers"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libgl')
diff --git a/extra/xorg-xedit/PKGBUILD b/extra/xorg-xedit/PKGBUILD
index d9f9d49d7..b6a7dbf41 100644
--- a/extra/xorg-xedit/PKGBUILD
+++ b/extra/xorg-xedit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xedit
 pkgver=1.2.0
 pkgrel=1
 pkgdesc="Simple text editor for X"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxmu' 'libxt' 'libx11')
diff --git a/extra/xorg-xev/PKGBUILD b/extra/xorg-xev/PKGBUILD
index 7e981106a..70f75e86b 100644
--- a/extra/xorg-xev/PKGBUILD
+++ b/extra/xorg-xev/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xev
 pkgver=1.1.0
 pkgrel=2
 pkgdesc="Print contents of X events"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')
diff --git a/extra/xorg-xeyes/PKGBUILD b/extra/xorg-xeyes/PKGBUILD
index 5c18175bb..aea051d3a 100644
--- a/extra/xorg-xeyes/PKGBUILD
+++ b/extra/xorg-xeyes/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xeyes
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="Follow the mouse/SHAPE extension X demo"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxt' 'libxext' 'libxmu' 'libxrender')
diff --git a/extra/xorg-xfd/PKGBUILD b/extra/xorg-xfd/PKGBUILD
index 5c4bba1c6..8d7aec33c 100644
--- a/extra/xorg-xfd/PKGBUILD
+++ b/extra/xorg-xfd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xfd
 pkgver=1.1.0
 pkgrel=1
 pkgdesc="Displays all the characters in a font using either the X11 core protocol or libXft2"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'fontconfig' 'libxft' 'libxrender' 'libxmu')
diff --git a/extra/xorg-xfontsel/PKGBUILD b/extra/xorg-xfontsel/PKGBUILD
index 827003048..cca0d453e 100644
--- a/extra/xorg-xfontsel/PKGBUILD
+++ b/extra/xorg-xfontsel/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xfontsel
 pkgver=1.0.3
 pkgrel=1
 pkgdesc="Point and click selection of X11 font names"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxmu' 'libxt' 'libx11')
diff --git a/extra/xorg-xfs/PKGBUILD b/extra/xorg-xfs/PKGBUILD
index cb7244db9..606076b8f 100644
--- a/extra/xorg-xfs/PKGBUILD
+++ b/extra/xorg-xfs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xorg-xfs
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="X.Org X11 xfs font server"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 backup=('etc/X11/fs/config')
diff --git a/extra/xorg-xgamma/PKGBUILD b/extra/xorg-xgamma/PKGBUILD
index fd9a43f7c..a1cfff2aa 100644
--- a/extra/xorg-xgamma/PKGBUILD
+++ b/extra/xorg-xgamma/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xgamma
 pkgver=1.0.4
 pkgrel=2
 pkgdesc="Alter a monitor's gamma correction"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxxf86vm')
diff --git a/extra/xorg-xhost/PKGBUILD b/extra/xorg-xhost/PKGBUILD
index 82519eab8..99f1f3399 100644
--- a/extra/xorg-xhost/PKGBUILD
+++ b/extra/xorg-xhost/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xhost
 pkgver=1.0.4
 pkgrel=2
 pkgdesc="Server access control program for X"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxmu')
diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD
index 4fb60183c..e7df3f67e 100644
--- a/extra/xorg-xinit/PKGBUILD
+++ b/extra/xorg-xinit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xorg-xinit
 pkgver=1.3.0
 pkgrel=3
 pkgdesc="X.Org initialisation program "
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libx11' 'xorg-xauth')
diff --git a/extra/xorg-xinput/PKGBUILD b/extra/xorg-xinput/PKGBUILD
index a7afa3c17..e0c49d36e 100644
--- a/extra/xorg-xinput/PKGBUILD
+++ b/extra/xorg-xinput/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xinput
 pkgver=1.5.3
 pkgrel=2
 pkgdesc="Small commandline tool to configure devices"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxi')
diff --git a/extra/xorg-xkbcomp/PKGBUILD b/extra/xorg-xkbcomp/PKGBUILD
index 10d77df9d..50c2b77f6 100644
--- a/extra/xorg-xkbcomp/PKGBUILD
+++ b/extra/xorg-xkbcomp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xkbcomp
 pkgver=1.2.1
 pkgrel=2
 pkgdesc="X Keyboard description compiler"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxkbfile')
diff --git a/extra/xorg-xkbevd/PKGBUILD b/extra/xorg-xkbevd/PKGBUILD
index e95a0944d..35ac08075 100644
--- a/extra/xorg-xkbevd/PKGBUILD
+++ b/extra/xorg-xkbevd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xkbevd
 pkgver=1.1.2
 pkgrel=2
 pkgdesc="XKB event daemon"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxkbfile')
diff --git a/extra/xorg-xkbutils/PKGBUILD b/extra/xorg-xkbutils/PKGBUILD
index 81e2c9050..5b3d3be12 100644
--- a/extra/xorg-xkbutils/PKGBUILD
+++ b/extra/xorg-xkbutils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xkbutils
 pkgver=1.0.3
 pkgrel=2
 pkgdesc="XKB utility demos"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxt' 'libx11')
diff --git a/extra/xorg-xkill/PKGBUILD b/extra/xorg-xkill/PKGBUILD
index a2b3f1580..b1dbbe639 100644
--- a/extra/xorg-xkill/PKGBUILD
+++ b/extra/xorg-xkill/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xkill
 pkgver=1.0.3
 pkgrel=2
 pkgdesc="Kill a client by its X resource"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxmu')
diff --git a/extra/xorg-xload/PKGBUILD b/extra/xorg-xload/PKGBUILD
index 1451a91a0..f61b7d877 100644
--- a/extra/xorg-xload/PKGBUILD
+++ b/extra/xorg-xload/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xload
 pkgver=1.1.0
 pkgrel=1
 pkgdesc="System load average display for X"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxmu' 'libxt' 'libx11')
diff --git a/extra/xorg-xlogo/PKGBUILD b/extra/xorg-xlogo/PKGBUILD
index 56fbc99e2..114933c16 100644
--- a/extra/xorg-xlogo/PKGBUILD
+++ b/extra/xorg-xlogo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xlogo
 pkgver=1.0.3
 pkgrel=1
 pkgdesc="Draw [old] X logo"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libsm' 'libxaw' 'libxmu' 'libxt' 'libxext' 'libx11' 'libxrender' 'libxft')
diff --git a/extra/xorg-xlsatoms/PKGBUILD b/extra/xorg-xlsatoms/PKGBUILD
index 9a7f32f6e..dd88c8c9a 100644
--- a/extra/xorg-xlsatoms/PKGBUILD
+++ b/extra/xorg-xlsatoms/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xlsatoms
 pkgver=1.1.0
 pkgrel=2
 pkgdesc="List interned atoms defined on server"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxcb')
diff --git a/extra/xorg-xlsclients/PKGBUILD b/extra/xorg-xlsclients/PKGBUILD
index 46ecd019c..8d3ce59f4 100644
--- a/extra/xorg-xlsclients/PKGBUILD
+++ b/extra/xorg-xlsclients/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xlsclients
 pkgver=1.1.1
 pkgrel=2
 pkgdesc="List client applications running on a display"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxcb' 'xcb-util')
diff --git a/extra/xorg-xmag/PKGBUILD b/extra/xorg-xmag/PKGBUILD
index 4e3728a34..66dafe737 100644
--- a/extra/xorg-xmag/PKGBUILD
+++ b/extra/xorg-xmag/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xmag
 pkgver=1.0.4
 pkgrel=1
 pkgdesc="Magnify parts of the screen"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxmu' 'libxt' 'libx11')
diff --git a/extra/xorg-xman/PKGBUILD b/extra/xorg-xman/PKGBUILD
index 49e9fd5db..b35686959 100644
--- a/extra/xorg-xman/PKGBUILD
+++ b/extra/xorg-xman/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xman
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="Unix manual page viewer"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw' 'libxt')
diff --git a/extra/xorg-xmessage/PKGBUILD b/extra/xorg-xmessage/PKGBUILD
index 82c3fe420..ca10a8d57 100644
--- a/extra/xorg-xmessage/PKGBUILD
+++ b/extra/xorg-xmessage/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xmessage
 pkgver=1.0.3
 pkgrel=1
 pkgdesc="Display a message or query in a window"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxaw')
diff --git a/extra/xorg-xmodmap/PKGBUILD b/extra/xorg-xmodmap/PKGBUILD
index 92942a1e3..6f8f31e4f 100644
--- a/extra/xorg-xmodmap/PKGBUILD
+++ b/extra/xorg-xmodmap/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xmodmap
 pkgver=1.0.5
 pkgrel=2
 pkgdesc="Utility for modifying keymaps and button mappings"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')
diff --git a/extra/xorg-xpr/PKGBUILD b/extra/xorg-xpr/PKGBUILD
index 6bd56b68f..47ed9440b 100644
--- a/extra/xorg-xpr/PKGBUILD
+++ b/extra/xorg-xpr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xpr
 pkgver=1.0.3
 pkgrel=2
 pkgdesc="Print an X window dump from xwd"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxmu')
diff --git a/extra/xorg-xprop/PKGBUILD b/extra/xorg-xprop/PKGBUILD
index 6864ab180..9fd9e0cb5 100644
--- a/extra/xorg-xprop/PKGBUILD
+++ b/extra/xorg-xprop/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xprop
 pkgver=1.2.0
 pkgrel=2
 pkgdesc="Property displayer for X"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')
diff --git a/extra/xorg-xrandr/PKGBUILD b/extra/xorg-xrandr/PKGBUILD
index d92a05d1d..483f2748c 100644
--- a/extra/xorg-xrandr/PKGBUILD
+++ b/extra/xorg-xrandr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xrandr
 pkgver=1.3.4
 pkgrel=2
 pkgdesc="Primitive command line interface to RandR extension"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxrandr' 'libx11')
diff --git a/extra/xorg-xrdb/PKGBUILD b/extra/xorg-xrdb/PKGBUILD
index 60fb89669..cb84e2d49 100644
--- a/extra/xorg-xrdb/PKGBUILD
+++ b/extra/xorg-xrdb/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 118463 2011-04-07 07:16:02Z jgc $
+# $Id: PKGBUILD 113821 2011-03-10 15:52:04Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xrdb
-pkgver=1.0.9
-pkgrel=1
+pkgver=1.0.8
+pkgrel=2
 pkgdesc="X server resource database utility"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxmu' 'mcpp')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xrdb-${pkgver}.tar.bz2)
-sha1sums=('efa5f2420411988d6a6e142934393fd272507857')
+sha1sums=('9bfdd09a2b303b962439910f7bccaddd69b6ca8a')
 
 build() {
   cd "${srcdir}/xrdb-${pkgver}"
diff --git a/extra/xorg-xrefresh/PKGBUILD b/extra/xorg-xrefresh/PKGBUILD
index de950df12..74d49b040 100644
--- a/extra/xorg-xrefresh/PKGBUILD
+++ b/extra/xorg-xrefresh/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xrefresh
 pkgver=1.0.4
 pkgrel=2
 pkgdesc="Refresh all or part of an X screen"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')
diff --git a/extra/xorg-xset/PKGBUILD b/extra/xorg-xset/PKGBUILD
index caebe0d8f..d812a5a11 100644
--- a/extra/xorg-xset/PKGBUILD
+++ b/extra/xorg-xset/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xset
 pkgver=1.2.1
 pkgrel=2
 pkgdesc="User preference utility for X"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxmu')
diff --git a/extra/xorg-xsetroot/PKGBUILD b/extra/xorg-xsetroot/PKGBUILD
index 3758d9c6a..35b800dca 100644
--- a/extra/xorg-xsetroot/PKGBUILD
+++ b/extra/xorg-xsetroot/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xsetroot
 pkgver=1.1.0
 pkgrel=2
 pkgdesc="Classic X utility to set your root window background to a given pattern or color"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxmu' 'libx11' 'libxcursor')
diff --git a/extra/xorg-xvidtune/PKGBUILD b/extra/xorg-xvidtune/PKGBUILD
index e7426b638..308b8088d 100644
--- a/extra/xorg-xvidtune/PKGBUILD
+++ b/extra/xorg-xvidtune/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xvidtune
 pkgver=1.0.2
 pkgrel=1
 pkgdesc="Video mode tuner for Xorg"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxxf86vm' 'libxt' 'libxaw' 'libxmu' 'libx11')
diff --git a/extra/xorg-xvinfo/PKGBUILD b/extra/xorg-xvinfo/PKGBUILD
index 4684113fb..f125fa32d 100644
--- a/extra/xorg-xvinfo/PKGBUILD
+++ b/extra/xorg-xvinfo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xvinfo
 pkgver=1.1.1
 pkgrel=2
 pkgdesc="Prints out the capabilities of any video adaptors associated with the display that are accessible through the X-Video extension"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxv')
diff --git a/extra/xorg-xwd/PKGBUILD b/extra/xorg-xwd/PKGBUILD
index a4de8a9f1..1634c5d93 100644
--- a/extra/xorg-xwd/PKGBUILD
+++ b/extra/xorg-xwd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xwd
 pkgver=1.0.4
 pkgrel=2
 pkgdesc="X Window System image dumping utility"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')
diff --git a/extra/xorg-xwininfo/PKGBUILD b/extra/xorg-xwininfo/PKGBUILD
index 8f17bce09..785353a88 100644
--- a/extra/xorg-xwininfo/PKGBUILD
+++ b/extra/xorg-xwininfo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xwininfo
 pkgver=1.1.1
 pkgrel=2
 pkgdesc="Command-line utility to print information about windows on an X server"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxcb')
diff --git a/extra/xorg-xwud/PKGBUILD b/extra/xorg-xwud/PKGBUILD
index 5b7a4a430..c7c593386 100644
--- a/extra/xorg-xwud/PKGBUILD
+++ b/extra/xorg-xwud/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xwud
 pkgver=1.0.3
 pkgrel=2
 pkgdesc="X Window System image undumping utility"
-arch=(i686 x86_64 'mips64el')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')