Tue Aug 30 23:14:43 UTC 2011

94 files changed, 6612 insertions, 153 deletions

diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD
index db519cae8..656b713b7 100644
--- a/community/couchdb/PKGBUILD
+++ b/community/couchdb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 54686 2011-08-23 09:50:02Z spupykin $
+# $Id: PKGBUILD 54987 2011-08-29 12:53:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 # Previous Contributor: Michael Fellinger <m.fellinger@gmail.com>
 
 pkgname=couchdb
 pkgver=1.1.0
-pkgrel=1.svn20110823
+pkgrel=1.svn20110829
 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
 arch=('i686' 'x86_64')
 url="http://couchdb.apache.org"
diff --git a/community/djview4/PKGBUILD b/community/djview4/PKGBUILD
index 94cf3dfec..3923d1b2d 100644
--- a/community/djview4/PKGBUILD
+++ b/community/djview4/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 54964 2011-08-29 08:34:07Z bisson $
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Leslie P. Polzer <polzerΘgnu·org>
 # Contributor: erm67 <erm67Θyahoo·it>
@@ -5,15 +6,16 @@
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=djview4
-pkgver=4.7
+pkgver=4.8
 pkgrel=1
 pkgdesc='Portable DjVu viewer and browser plugin'
-arch=('i686' 'x86_64')
 url='http://djvu.sourceforge.net/djview4.html'
 license=('GPL')
+arch=('i686' 'x86_64')
 depends=('qt' 'djvulibre')
 source=("http://downloads.sourceforge.net/djvu/djview-${pkgver}.tar.gz")
-sha1sums=('6c0c9c285caaf6211454c36898801c2eda799c8b')
+sha1sums=('266d207afb63a1ee63eed054190bf88888fda572')
+
 install=install
 
 build() {
@@ -27,8 +29,9 @@ package() {
 	cd "${srcdir}/djview-${pkgver}"
 	make DESTDIR="${pkgdir}" install-djview install-nsdejavu
 
-	install -Dm644 desktopfiles/hi32-djview4.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/djvulibre-djview4.png
-	install -Dm644 desktopfiles/hi64-djview4.png "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/djvulibre-djview4.png
-	install -Dm644 desktopfiles/hi64-djview4.png "${pkgdir}"/usr/share/pixmaps/djvulibre-djview4.png
-	install -Dm644 desktopfiles/djvulibre-djview4.desktop "${pkgdir}"/usr/share/applications/djvulibre-djview4.desktop
+	cd desktopfiles
+	install -Dm644 hi32-djview4.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/djvulibre-djview4.png
+	install -Dm644 hi64-djview4.png "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/djvulibre-djview4.png
+	install -Dm644 hi64-djview4.png "${pkgdir}"/usr/share/pixmaps/djvulibre-djview4.png
+	install -Dm644 djvulibre-djview4.desktop "${pkgdir}"/usr/share/applications/djvulibre-djview4.desktop
 }
diff --git a/community/djview4/install b/community/djview4/install
index e70c054ec..f2bd04ceb 100644
--- a/community/djview4/install
+++ b/community/djview4/install
@@ -1,5 +1,7 @@
 post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	if type xdg-icon-resource &>/dev/null; then
+		xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	fi
 }
 
 post_upgrade() {
diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD
index 3e422ffcb..b9d467799 100644
--- a/community/filezilla/PKGBUILD
+++ b/community/filezilla/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 54445 2011-08-18 15:06:21Z bluewind $
+# $Id: PKGBUILD 54980 2011-08-29 11:06:13Z bluewind $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=filezilla
-pkgver=3.5.0
-pkgrel=2
+pkgver=3.5.1
+pkgrel=1
 pkgdesc="Fast and reliable FTP, FTPS and SFTP client"
 arch=('i686' 'x86_64')
 url="http://filezilla-project.org/"
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite3')
 install=filezilla.install
 source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2")
-md5sums=('25617d75167d07c0d3cfced69a4cf7cc')
+md5sums=('8afb7aee4ba72b6363dcfe469bc7fbef')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -32,4 +32,3 @@ package() {
 
   make DESTDIR=${pkgdir} install
 }
-md5sums=('6a83c3afe99c2679d5a3aa73607d80a7')
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index 3519f0e90..fb3f6e59e 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 52058 2011-07-19 20:43:20Z spupykin $
+# $Id: PKGBUILD 54993 2011-08-29 20:53:40Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:Biginoz < biginoz AT free point fr>
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
 # Contributor: Matthias Sobczyk <matthias.sobczyk@googlemail.com>
 
 pkgname=minidlna
-pkgver=1.0.21
-pkgrel=1
+pkgver=1.0.22
+pkgrel=3
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/minidlna/"
 license=('GPL')
 depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg' 'sqlite3')
 conflicts=('minidlna-cvs')
-backup=('etc/minidlna.conf')
+backup=('etc/minidlna.conf'
+	'etc/conf.d/minidlna')
+changelog=changelog
 source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz
         minidlna.rc)
-md5sums=('a53e0008ad225843a1782e4af6e5bf0b'
-         '80c423f003894ad15d7de41f3ed342c0')
+md5sums=('3de2f6b54f43bb998dfad3c8fa75cef3'
+         '8b064a6c344a3ad8029e2619dfe07b77')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,4 +30,6 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   DESTDIR=$pkgdir make install
   install -D -m755 ${srcdir}/minidlna.rc ${pkgdir}/etc/rc.d/minidlna
+  mkdir -p $pkgdir/etc/conf.d
+  echo 'MINIDLNA_USER=nobody' >$pkgdir/etc/conf.d/minidlna
 }
diff --git a/community/minidlna/changelog b/community/minidlna/changelog
new file mode 100644
index 000000000..35bf6239c
--- /dev/null
+++ b/community/minidlna/changelog
@@ -0,0 +1,4 @@
+2011-08-29 Sergej Pupykin <sergej@p5n.pp.ru>
+
+	* 1.0.22-3 :
+	add user configuration to /etc/conf.d/minidlna
diff --git a/community/minidlna/minidlna.rc b/community/minidlna/minidlna.rc
index e4ca0969f..df44a549f 100755
--- a/community/minidlna/minidlna.rc
+++ b/community/minidlna/minidlna.rc
@@ -3,13 +3,14 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 . /etc/minidlna.conf
+. /etc/conf.d/minidlna
 
 PID=`pidof -o %PPID /usr/sbin/minidlna`
 
 case "$1" in
   start)
     stat_busy "Starting minidlna"
-    [ -z "$PID" ] && /usr/sbin/minidlna
+    [ -z "$PID" ] && su -s /bin/sh -l -c /usr/sbin/minidlna - $MINIDLNA_USER
     if [ $? -gt 0 ]; then
       stat_fail
     else
diff --git a/community/nethogs/PKGBUILD b/community/nethogs/PKGBUILD
index 3ed0be492..2c2567195 100644
--- a/community/nethogs/PKGBUILD
+++ b/community/nethogs/PKGBUILD
@@ -1,29 +1,28 @@
+# $Id: PKGBUILD 54960 2011-08-29 07:11:32Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: ViNS <gladiator@fastwebnet.it>
 # Contributor: Daenyth
 pkgname=nethogs
-pkgver=0.7.0
-pkgrel=4
+pkgver=0.8.0
+pkgrel=1
 pkgdesc="A net top tool which displays traffic used per process instead of per IP or interface"
 url="http://nethogs.sourceforge.net"
 license=(GPL)
 depends=(libpcap ncurses gcc-libs)
 arch=(i686 x86_64)
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz gcc44.patch)
-md5sums=('e5f04071571e469e14c89f637cfa34a2'
+md5sums=('d6fb12b46e80a50c9b9f91dd48e2b234'
          '62eb824fbbadd1c60d0749593c16d293')
 
 build() {
   cd "$srcdir/$pkgname"
 
-  sed -i '/sbin  :=/ s/sbin/bin/g' Makefile
+  sed -i 's/sbin/bin/g' Makefile
 
   # Patch the code to work with gcc 4.4
   patch -Np1 -i "$srcdir/gcc44.patch"
 
   make
-  install -d "$pkgdir/usr/bin"
-  install -d "$pkgdir/usr/share/man/man8"
   make DESTDIR="$pkgdir/usr" install
 }
 # vim:set ts=2 sw=2 et:
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index 3c033eb3e..c014840e9 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 52187 2011-07-21 14:19:08Z spupykin $
+# $Id: PKGBUILD 54994 2011-08-29 20:55:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
 
-_doc_root=/srv/http/nginx
+_doc_root=/usr/share/nginx/http
 _server_root=/etc/nginx
 _conf_path=${_server_root}/conf
 _tmp_path=/var/spool/nginx
@@ -11,7 +11,7 @@ _user=http
 _group=http
 
 pkgname=nginx
-pkgver=1.0.5
+pkgver=1.0.6
 pkgrel=1
 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
 arch=('i686' 'x86_64')
@@ -24,11 +24,13 @@ backup=("etc/nginx/conf/nginx.conf"
 	"etc/nginx/conf/win-utf"
 	"etc/nginx/conf/mime.types"
 	"etc/nginx/conf/fastcgi_params"
-	"etc/logrotate.d/nginx")
-source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz
+	"etc/logrotate.d/nginx"
+	"etc/conf.d/nginx")
+changelog=changelog
+source=(http://nginx.org/download/nginx-$pkgver.tar.gz
 	nginx)
-md5sums=('373c7761a7c682b92b164c8ee3d6d243'
-         '7e7cafa43a59762b81c4da64e49eca69')
+md5sums=('bc98bac3f0b85da1045bc02e6d8fc80d'
+         '0e8032d3ba26c3276e8c7c30588d375f')
 
 build() {
 	cd $srcdir/nginx-${pkgver}
diff --git a/community/nginx/changelog b/community/nginx/changelog
new file mode 100644
index 000000000..9f2ffcfc8
--- /dev/null
+++ b/community/nginx/changelog
@@ -0,0 +1,4 @@
+2011-08-29 Sergej Pupykin <sergej@p5n.pp.ru>
+
+	* 1.0.6-1 :
+	move /srv/http to /usr/share/nginx/http
diff --git a/community/nginx/nginx b/community/nginx/nginx
index 811656eed..9de10e99a 100644
--- a/community/nginx/nginx
+++ b/community/nginx/nginx
@@ -41,7 +41,7 @@ case "$1" in
     ;;
   stop)
     stat_busy "Stopping Nginx"
-    NGINX_PID=`cat /var/run/nginx.pid`
+    NGINX_PID=`cat /var/run/nginx.pid 2>/dev/null`
     kill -QUIT $NGINX_PID &>/dev/null
     if [ $? -ne 0 ]; then
       stat_fail
diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD
index 7240ccc97..f3e9fa8e8 100644
--- a/community/open-vm-tools-modules/PKGBUILD
+++ b/community/open-vm-tools-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 53790 2011-08-08 08:19:14Z spupykin $
+# $Id: PKGBUILD 54998 2011-08-29 21:00:59Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools-modules
-pkgver=2011.07.19
-_pkgsubver=450511
-pkgrel=2
+pkgver=2011.08.21
+_pkgsubver=471295
+pkgrel=1
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools"
 arch=('i686' 'x86_64')
 url="http://open-vm-tools.sourceforge.net/"
@@ -14,7 +14,7 @@ makedepends=('libdnet' 'icu' 'uriparser' 'linux-headers')
 depends=("linux")
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz")
-md5sums=('efe9b078045e9f7ea1e1311bf11857e6')
+md5sums=('fd32f03ab6068c265597a74b916ca81e')
 
 build() {
   cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}"
diff --git a/community/open-vm-tools-modules/open-vm-tools-modules.install b/community/open-vm-tools-modules/open-vm-tools-modules.install
index 8de8d6ec5..801d2c5b3 100644
--- a/community/open-vm-tools-modules/open-vm-tools-modules.install
+++ b/community/open-vm-tools-modules/open-vm-tools-modules.install
@@ -2,7 +2,7 @@ KERNEL_VERSION='2.6.38-ARCH'
 
 post_install() {
   depmod -a -v $KERNEL_VERSION > /dev/null 2>&1
-  
+
   VMXNET="install pcnet32 /sbin/modprobe -q --ignore-install vmxnet;"
   VMXNET="$VMXNET /sbin/modprobe -q --ignore-install pcnet32 $CMDLINE_OPTS;"
   VMXNET="$VMXNET /bin/true;"
diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD
index 92e48c99b..e188d1a81 100644
--- a/community/open-vm-tools/PKGBUILD
+++ b/community/open-vm-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 52415 2011-07-24 20:39:18Z spupykin $
+# $Id: PKGBUILD 54996 2011-08-29 20:59:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools
-pkgver=2011.07.19
-_pkgsubver=450511
+pkgver=2011.08.21
+_pkgsubver=471295
 pkgrel=1
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools."
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}
 	tools.conf
 	vmware-guestd
 	xautostart.conf)
-md5sums=('efe9b078045e9f7ea1e1311bf11857e6'
+md5sums=('fd32f03ab6068c265597a74b916ca81e'
          '06f7448e274db2a911f582e276088fc9'
          'b183ec265200d68431a5e4eb1b0c8cf5'
          '8c333a979578bdc0c3134c1dd6bb7353'
diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD
index bcb80f277..e0b22e2e4 100644
--- a/community/unrealircd/PKGBUILD
+++ b/community/unrealircd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 54707 2011-08-23 12:04:07Z spupykin $
+# $Id: PKGBUILD 54970 2011-08-29 09:48:35Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zerial <fernando@zerial.org>
 
 pkgname=unrealircd
 pkgver=3.2.8.1
-pkgrel=7
-pkgdesc="Open Source IRC Server."
+pkgrel=8
+pkgdesc="Open Source IRC Server"
 arch=('i686' 'x86_64')
 url="http://unrealircd.com"
 license=('GPL2')
@@ -18,7 +18,7 @@ source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz
 	arch-fixes.patch)
 md5sums=('7b741e94e867c0a7370553fd01506c66'
          '0d728240132a97a2cef61be9558750b1'
-         '670f0a5ecd60789cd5f296a1901cf1b7')
+         '77807313c4578f2c30286b9f9e3fb21c')
 
 build() {
   mkdir -p $pkgdir/etc/unrealircd
diff --git a/community/unrealircd/arch-fixes.patch b/community/unrealircd/arch-fixes.patch
index 02bbb18b3..a1741968d 100644
--- a/community/unrealircd/arch-fixes.patch
+++ b/community/unrealircd/arch-fixes.patch
@@ -1,6 +1,6 @@
-diff -wbBur Unreal3.2/doc/example.conf Unreal3.2.my/doc/example.conf
---- Unreal3.2/doc/example.conf	2009-04-13 15:03:55.000000000 +0400
-+++ Unreal3.2.my/doc/example.conf	2011-08-23 15:48:46.000000000 +0400
+diff -wbBur Unreal3.2.org/doc/example.conf Unreal3.2/doc/example.conf
+--- Unreal3.2.org/doc/example.conf	2009-04-13 15:03:55.000000000 +0400
++++ Unreal3.2/doc/example.conf	2011-08-29 13:39:25.000000000 +0400
 @@ -33,8 +33,8 @@
   */
  
@@ -12,9 +12,9 @@ diff -wbBur Unreal3.2/doc/example.conf Unreal3.2.my/doc/example.conf
  
  /* FOR Windows, uncomment the following 2 lines: */
  //loadmodule "modules/commands.dll";
-diff -wbBur Unreal3.2/src/ircd.c Unreal3.2.my/src/ircd.c
---- Unreal3.2/src/ircd.c	2009-03-01 21:37:58.000000000 +0300
-+++ Unreal3.2.my/src/ircd.c	2011-08-23 15:44:30.000000000 +0400
+diff -wbBur Unreal3.2.org/src/ircd.c Unreal3.2/src/ircd.c
+--- Unreal3.2.org/src/ircd.c	2009-03-01 21:37:58.000000000 +0300
++++ Unreal3.2/src/ircd.c	2011-08-29 13:39:25.000000000 +0400
 @@ -844,7 +844,7 @@
  const char *compiledfor, *runtime;
  int error = 0;
@@ -42,9 +42,9 @@ diff -wbBur Unreal3.2/src/ircd.c Unreal3.2.my/src/ircd.c
  	/* Perhaps someone should tell them to do this a bit more easy ;)
  	 * problem is runtime output is like: 'libcurl/7.11.1 zlib/1.2.1 c-ares/1.2.0'
  	 * while header output is like: '7.11.1'.
-diff -wbBur Unreal3.2/unreal.in Unreal3.2.my/unreal.in
---- Unreal3.2/unreal.in	2009-03-01 21:37:55.000000000 +0300
-+++ Unreal3.2.my/unreal.in	2011-08-23 15:49:20.000000000 +0400
+diff -wbBur Unreal3.2.org/unreal.in Unreal3.2/unreal.in
+--- Unreal3.2.org/unreal.in	2009-03-01 21:37:55.000000000 +0300
++++ Unreal3.2/unreal.in	2011-08-29 13:39:37.000000000 +0400
 @@ -7,7 +7,7 @@
  	if [ -r $PID_FILE ] ; then
  		mv -f $PID_FILE $PID_BACKUP
@@ -54,3 +54,36 @@ diff -wbBur Unreal3.2/unreal.in Unreal3.2.my/unreal.in
  	sleep 1
  	if [ ! -r $PID_FILE ] ; then
  		echo "Possible error encountered (IRCd seemingly not started)"	
+@@ -31,11 +31,11 @@
+ 	echo "Restarting UnrealIRCd"
+ 	kill -2 `cat $PID_FILE`
+ elif [ "$1" = "mkpasswd" ] ; then
+-	@BINDIR@ -P $2 $3
++	@BINDIR@/ircd -P $2 $3
+ elif [ "$1" = "version" ] ; then
+-	@BINDIR@ -v
++	@BINDIR@/ircd -v
+ elif [ "$1" = "gencloak" ] ; then
+-	@BINDIR@ -k
++	@BINDIR@/ircd -k
+ elif [ "$1" = "backtrace" ] ; then
+ 	cd @IRCDDIR@
+ 
+@@ -90,7 +90,7 @@
+ 	fi
+ 
+ 	# Some ugly prepare work -- ignore errors
+-	(echo quit|gdb @BINDIR@ $corefile 2>&1)|\
++	(echo quit|gdb @BINDIR@/ircd $corefile 2>&1)|\
+ 	grep -i 'no such file'|\
+ 	awk -F ':' '{ print $1 }'|sort|uniq|\
+ 	awk -F '.' "{ system(\"ln -s ../$modpath/\" \$2 \".so \" \$0) }"
+@@ -110,7 +110,7 @@
+ quit
+ __EOF__
+ 
+-	gdb -batch -x gdb.commands @BINDIR@ $corefile
++	gdb -batch -x gdb.commands @BINDIR@/ircd $corefile
+ 	rm -f gdb.commands
+ 	echo "GCC: `gcc -v 2>&1|tail -n 1`"
+ 	echo "UNAME: `uname -a`"
diff --git a/community/yagf/PKGBUILD b/community/yagf/PKGBUILD
index 048e35c59..51438b1a5 100644
--- a/community/yagf/PKGBUILD
+++ b/community/yagf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 45032 2011-04-14 09:33:23Z spupykin $
+# $Id: PKGBUILD 54990 2011-08-29 13:12:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: das-ich <das-ich@yandex.ru>
 
 pkgname=yagf
-pkgver=0.8.6
+pkgver=0.8.7
 pkgrel=1
 pkgdesc="QT4-based GUI for Cuneiform OCR"
 arch=(i686 x86_64)
@@ -12,12 +12,14 @@ license=('GPL')
 depends=('cuneiform' 'qt>=4.3' 'aspell')
 optdepends=('xsane: acquire images from a scanner into YAGF directly')
 makedepends=('cmake')
-source=(http://symmetrica.net/cuneiform-linux/${pkgname}-${pkgver}-Source.tar.gz)
-md5sums=('16582668d9ae34567c4f159c3208bfca')
+install=yagf.install
+source=(http://symmetrica.net/cuneiform-linux/${pkgname}-${pkgver}.tar.gz)
+md5sums=('a05635b4d50058b18891dbb5b3ff09ab')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-Source"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release .
   make
   make DESTDIR=${pkgdir} install
+  [ -d $pkgdir/usr/lib64 ] && mv $pkgdir/usr/lib64 $pkgdir/usr/lib || true
 }
diff --git a/community/yagf/yagf.install b/community/yagf/yagf.install
new file mode 100644
index 000000000..1eb57303c
--- /dev/null
+++ b/community/yagf/yagf.install
@@ -0,0 +1,13 @@
+post_install() {
+	[ -x `which update-mime-database` ] &&  update-mime-database usr/share/mime
+	[ -x `which gtk-update-icon-cache` ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+	bin/true
+}
+
+post_upgrade() {
+	post_install $1
+}
+
+post_remove() {
+	post_install $1
+}
diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD
index ee0c7a48e..1bea4c391 100644
--- a/community/zathura/PKGBUILD
+++ b/community/zathura/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 51680 2011-07-13 07:32:38Z spupykin $
+# $Id: PKGBUILD 54972 2011-08-29 09:50:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: ML <neldoreth>
 
 pkgname=zathura
 pkgver=0.0.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc="a PDF viewer"
 arch=('i686' 'x86_64')
 url="http://zathura.pwmt.org"
 license=('custom')
 depends=('poppler-glib' 'gtk2' 'cairo')
+makedepends=('docutils')
 install=zathura.install
 DLAGENTS=('http::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
           'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u')
@@ -23,8 +24,6 @@ build() {
 
 package() {
   cd $srcdir/zathura-$pkgver
-  install -D -m775 zathura "$pkgdir/usr/bin/zathura"
-  install -D -m664 zathura.1 "$pkgdir/usr/share/man/man1/zathura.1"
+  make install DESTDIR=$pkgdir
   install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  install -D -m664 zathura.desktop "$pkgdir/usr/share/applications/zathura.desktop"
 }
diff --git a/core/run-parts/PKGBUILD b/core/run-parts/PKGBUILD
index c0bbfb4ac..8db863192 100644
--- a/core/run-parts/PKGBUILD
+++ b/core/run-parts/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120288 2011-04-22 06:59:00Z pierre $
+# $Id: PKGBUILD 136455 2011-08-29 16:51:36Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=run-parts
-pkgver=3.4.4
+pkgver=4.0.2
 pkgrel=1
 pkgdesc='run scripts or programs in a directory'
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url='http://packages.qa.debian.org/d/debianutils.html'
 license=('GPL')
 depends=('glibc')
 source=("http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_${pkgver}.tar.gz")
-sha256sums=('f5d6f6116bb2b474399c07f519c3a30bcda5c85994b43195fdf09508031c72fe')
+sha256sums=('c2fca92e93437ea5f0904f12847779d67b13d4b9d6ca85b8213e678a03ed76dc')
 
 build() {
 	cd $srcdir/debianutils-$pkgver
@@ -22,4 +22,7 @@ package() {
 	cd $srcdir/debianutils-$pkgver
 	install -D -m755 run-parts $pkgdir/usr/bin/run-parts
 	install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8
+	for l in po4a/*/run-parts.8; do
+		install -D -m644  ${l} $pkgdir/usr/share/man/${l:5:2}/man8/run-parts.8
+	done
 }
diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD
new file mode 100644
index 000000000..d5c42fd92
--- /dev/null
+++ b/extra/audacity/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 119629 2011-04-12 20:51:50Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=audacity
+pkgver=1.3.13
+pkgrel=1
+pkgdesc="A program that lets you manipulate digital audio waveforms"
+arch=('i686' 'x86_64')
+url="http://audacity.sourceforge.net/"
+license=('GPL')
+depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' 'lame' 'hicolor-icon-theme'
+	'shared-mime-info' 'desktop-file-utils' 'redland' 'jack' 'soundtouch')
+makedepends=('zip')
+options=('!makeflags')
+install=audacity.install
+source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}-beta.tar.bz2)
+md5sums=('57be7fadb8c8dd17b8462c7ac1561d03')
+
+build() {
+  cd "${srcdir}/${pkgname}-src-${pkgver}-beta"
+  WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
+    --with-portaudio --with-libsamplerate \
+    --without-libresample --with-libmad \
+    --with-id3tag --with-libflac \
+    --with-vorbis --with-libexpat \
+    --with-libsndfile --with-soundtouch \
+    --enable-unicode --without-taglib
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-src-${pkgver}-beta"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/audacity/audacity.install b/extra/audacity/audacity.install
new file mode 100644
index 000000000..028c9f62a
--- /dev/null
+++ b/extra/audacity/audacity.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD
index 1589b32e7..c352260ed 100644
--- a/extra/bzflag/PKGBUILD
+++ b/extra/bzflag/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 84161 2010-06-26 23:01:03Z kevin $
+# $Id: PKGBUILD 136398 2011-08-29 05:25:50Z bisson $
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Maintainer: Kevin Piche <kevin@archlinux.org>
+# Contributor: Kevin Piche <kevin@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=bzflag
-pkgver=2.0.16
+pkgver=2.4.0
 pkgrel=1
-pkgdesc="A multiplayer 3D tank battle game"
-depends=('curl' 'mesa' 'sdl')
-arch=('i686' 'x86_64')
+pkgdesc='Multiplayer 3D tank battle game'
+url='http://bzflag.org/'
 license=('LGPL')
-options=(!libtool)
-url="http://www.bzflag.org"
-source=(http://downloads.sourceforge.net/sourceforge/bzflag/$pkgname-$pkgver.tar.bz2)
-md5sums=('161b973bee586d43ebff4695dfb8c359')
+options=('!libtool')
+arch=('i686' 'x86_64')
+depends=('curl' 'glew' 'mesa' 'sdl')
+source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
+sha1sums=('af469d63af7143479176ea0ac91ce2eaa6e4561f')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	./configure --prefix=/usr
+	make
+
+	cd misc
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+	make DESTDIR="${pkgdir}" install
 
-  # gnome menu entry and icon.
-  cd misc
-  make || return 1
-  mkdir -p ${pkgdir}/usr/share/{applications,pixmaps}
-  install -m644 bzflag.desktop $pkgdir/usr/share/applications/bzflag.desktop
-  install -m644 ../data/bzflag-48x48.png $pkgdir/usr/share/pixmaps/bzflag-48x48.png
+	install -Dm644 misc/bzflag.desktop "${pkgdir}"/usr/share/applications/bzflag.desktop
+	install -Dm644 data/bzflag-48x48.png "${pkgdir}"/usr/share/pixmaps/bzflag-48x48.png
 }
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 10472ff5b..96cd9e138 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 135549 2011-08-15 05:01:28Z andyrtr $
+# $Id: PKGBUILD 136453 2011-08-29 14:56:34Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 # Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
 
 pkgname=dovecot
-pkgver=2.0.13
-pkgrel=3
+pkgver=2.0.14
+pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
 url="http://dovecot.org/"
@@ -25,7 +25,7 @@ backup=(etc/dovecot/dovecot.conf
 	etc/ssl/dovecot-openssl.cnf)
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh)
-md5sums=('fd8a0702275a61332db7353dadff0f92'
+md5sums=('92a10a6ca341921db9e35c6753e8de0b'
          '587159e84e2da6f83d70b3c706ba87cc')
 
 build() {
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 3eac38a4b..72281c36a 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 136223 2011-08-25 00:22:56Z dan $
+# $Id: PKGBUILD 136451 2011-08-29 14:54:02Z jgc $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
diff --git a/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD
index 1282a6dd2..dae1cfeb1 100644
--- a/extra/gnome-vfs/PKGBUILD
+++ b/extra/gnome-vfs/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 135782 2011-08-18 15:04:11Z andyrtr $
+# $Id: PKGBUILD 136438 2011-08-29 09:40:33Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-vfs
 pkgver=2.24.4
-pkgrel=5
+pkgrel=6
 pkgdesc="The GNOME Virtual File System"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls' 'libgcrypt')
+depends=('gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls' 'libgcrypt')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index f1c56e0e3..98a4821b6 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135540 2011-08-15 02:21:48Z eric $
+# $Id: PKGBUILD 136461 2011-08-29 20:24:07Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.1.6
+pkgver=6.7.2.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
@@ -12,9 +12,9 @@ depends=('libtool' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg-
 makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-md5sums=('bbb7cfef14b8e85f5499c0ee4212f193'
+md5sums=('efa11515407ef0a22535d5f429668bcb'
          'ff9974decbfe9846f8e347239d87e4eb')
-sha1sums=('75b770f3108ecd25b19c4bba44da99c71768f897'
+sha1sums=('9e82c6926db62aa5dc547a029b49a593f5d4a991'
           '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 5a2ff5ec4..18c9a5570 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 136162 2011-08-23 15:55:48Z pierre $
+# $Id: PKGBUILD 136443 2011-08-29 12:25:25Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -7,6 +7,7 @@ pkgname=('php'
          'php-apache'
          'php-fpm'
          'php-embed'
+         'php-pear'
          'php-curl'
          'php-enchant'
          'php-gd'
@@ -24,7 +25,7 @@ pkgname=('php'
          'php-xsl')
 pkgver=5.3.8
 _suhosinver=5.3.7-0.9.10
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
@@ -191,6 +192,17 @@ build() {
 		--enable-embed=shared \
 		${phpextensions}
 	make
+
+	# pear
+	cp -a ${srcdir}/build-php ${srcdir}/build-pear
+	cd ${srcdir}/build-pear
+	./configure ${phpconfig} \
+		--disable-cgi \
+		--with-readline \
+		--enable-pcntl \
+		--with-pear \
+		${phpextensions}
+	make
 }
 
 # check() {
@@ -256,6 +268,19 @@ package_php-embed() {
 	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h
 }
 
+package_php-pear() {
+	pkgdesc='PHP Extension and Application Repository'
+	depends=('php' 'bash')
+	backup=('etc/php/pear.conf')
+
+	cd ${srcdir}/build-pear
+	make -j1 install-pear INSTALL_ROOT=${pkgdir}
+	local i
+	while read i; do
+		[ ! -e "$i" ] || rm -rf "$i"
+	done < <(find ${pkgdir} -name '.*')
+}
+
 package_php-curl() {
 	depends=('php' 'curl')
 	pkgdesc='curl module for PHP'
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index a1644664b..c5c2299b6 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 127360 2011-06-13 15:53:46Z ibiru $
+# $Id: PKGBUILD 136414 2011-08-29 08:01:27Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
-pkgver=2.90.1.git20110610
-pkgrel=2
+pkgver=2.90.1.git20110829
+pkgrel=1
 pkgdesc="An iTunes-like music player/libary"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.rhythmbox.org"
 depends=('libgpod' 'gvfs-afc' 'libgnome-media-profiles' 'totem-plparser' 'libsoup-gnome' 'gtk3' 'libmusicbrainz3' 'libmtp' 'libnotify'
-         'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'pygobject' 'gstreamer0.10-python' 'python-gnomekeyring' 'gstreamer0.10-base-plugins'
+         'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'pygobject' 'python-gnomekeyring' 'gstreamer0.10-base-plugins'
          'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python-mako' 'dconf')
 makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'brasero' 'gnome-common' 'gtk-doc' 'gobject-introspection')
 optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
@@ -21,7 +21,7 @@ options=('!libtool' '!emptydirs' '!strip')
 install=rhythmbox.install
 #source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2)
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('20e9bf31f3fbd2b4e4db86ab12aeee8175a8a49a5c3ec2081a8ca3880d01fba0')
+sha256sums=('6b33abe4cc0640bb3ad33aee61b848b3b87e5f284e302a894b5d2a2f283076d8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index cb9c48fb8..eb1e63846 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 136372 2011-08-28 07:39:12Z tpowa $
+# $Id: PKGBUILD 136436 2011-08-29 09:26:26Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
@@ -8,12 +8,11 @@ pkgver=3.6.0
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.6.0
-pkgrel=7
+pkgrel=8
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
-makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'fam' 'gnutls>=2.4.1' 'talloc' 'tdb')
-options=(!makeflags)
+makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb')
 source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
         samba samba.logrotate
         swat.xinetd
@@ -34,6 +33,9 @@ build() {
               --with-pam \
               --with-pam_smbpass \
               --with-pammodulesdir=/lib/security \
+              --with-dnsupdate \
+              --with-automount \
+              --with-quotas \
               --with-ads \
               --with-acl-support \
               --with-cifsmount \
@@ -42,7 +44,7 @@ build() {
               --enable-external-libtalloc \
               --disable-dnssd \
               --disable-avahi \
-              --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash \
+              --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
               --enable-external-libtdb
   make
 }
@@ -77,13 +79,14 @@ backup=(etc/logrotate.d/samba
         etc/samba/smb.conf
         etc/xinetd.d/swat
         etc/conf.d/samba)
-depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'fam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
+depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
   cd ${srcdir}/samba-${_realver}/source3
   mkdir -p ${pkgdir}/etc/samba/private
   chmod 700 ${pkgdir}/etc/samba/private
   make DESTDIR=${pkgdir} install
   chmod 644 ${pkgdir}/usr/include/*.h
   rm -rf ${pkgdir}/usr/var
+  rm -rf ${pkgdir}/var/run/samba
   (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh)
   install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba
   install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba
@@ -102,12 +105,17 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
   install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so
   ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2
   install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so
+  ln -s libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so.2
+  # winbind krb5 locator
+  mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5
+  install -d -m 0755 ${pkgdir}/usr/lib/krb5/plugins/libkrb5
+  install -m 755 bin/winbind_krb5_locator.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/winbind_krb5_locator.so
   # remove conflict files of smbclient
   for man in libsmbclient smbspool \
       mount.cifs net cifs.upcall; do
       rm -f ${pkgdir}/usr/share/man/man8/${man}.8
   done
-  for i in libnetapi* libwbclient* libsmbclient*;do
+  for i in libnetapi* libwbclient* libsmbclient* winbind_krb5*;do
       rm -f ${pkgdir}/usr/lib/$i
   done
   for bin in net \
diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD
index b518910dc..863215a31 100644
--- a/extra/vte/PKGBUILD
+++ b/extra/vte/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127491 2011-06-15 15:04:50Z ibiru $
+# $Id: PKGBUILD 136406 2011-08-29 07:32:55Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=vte
 pkgname=(vte vte3 vte-common)
-pkgver=0.28.1
+pkgver=0.28.2
 pkgrel=1
 pkgdesc="Virtual Terminal Emulator widget for use with"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs')
 makedepends=('pygtk' 'intltool' 'gobject-introspection' 'gtk2' 'gtk3' 'pygobject-devel' 'gtk-doc')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-${pkgver}.tar.xz)
-sha256sums=('ad1b868356e0231c42ac2493d3e2a7726014c9dc4110ec89fbb01aee8c2ed7ad')
+sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD
index 4c6e2333b..598e8684b 100644
--- a/extra/ypserv/PKGBUILD
+++ b/extra/ypserv/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 123628 2011-05-11 23:04:51Z bisson $
-# Maintainer: judd <jvinet@zeroflux.org>
+# $Id: PKGBUILD 136459 2011-08-29 19:26:01Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ypserv
-pkgver=2.25
+pkgver=2.26
 pkgrel=1
 pkgdesc='Linux NIS Server'
 arch=('i686' 'x86_64')
@@ -11,26 +12,26 @@ url='http://www.linux-nis.org/nis/ypserv/'
 license=('GPL2')
 depends=('gdbm' 'openslp')
 backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
-source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz" \
+source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz" \
         'yppasswd'
         'ypserv')
-sha1sums=('ab997022d25b6374ae21d39f7ff564be028d8736'
+sha1sums=('0d7ab3f04ff7fa5f611e71ea0f3c188659602743'
           '96192b628afe36709496e4801d016c4bff343f0e'
           'b625381bfa6cf62345377a7df30b8f45935206c5')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 
-	install -D -m644 etc/netgroup "$pkgdir"/etc/netgroup
-	install -D -m644 etc/ypserv.conf "$pkgdir"/etc/ypserv.conf
-	install -D -m644 etc/securenets "$pkgdir"/var/yp/securenets
-	install -D -m755 ../ypserv "$pkgdir"/etc/rc.d/ypserv
-	install -D -m755 ../yppasswd "$pkgdir"/etc/rc.d/yppasswd
+	install -D -m644 etc/netgroup "${pkgdir}"/etc/netgroup
+	install -D -m644 etc/ypserv.conf "${pkgdir}"/etc/ypserv.conf
+	install -D -m644 etc/securenets "${pkgdir}"/var/yp/securenets
+	install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv
+	install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd
 }
diff --git a/staging/xf86-video-apm/PKGBUILD b/staging/xf86-video-apm/PKGBUILD
new file mode 100644
index 000000000..6b2a895c1
--- /dev/null
+++ b/staging/xf86-video-apm/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 136408 2011-08-29 07:40:55Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-apm
+pkgver=1.2.3
+pkgrel=4
+pkgdesc="X.org Alliance ProMotion video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.11.0')
+conflicts=('xorg-server<1.11.0')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('1fa7180cf985a74132f8d5b39a0bf9df08713fac')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/staging/xf86-video-ark/PKGBUILD b/staging/xf86-video-ark/PKGBUILD
new file mode 100644
index 000000000..cc9de161e
--- /dev/null
+++ b/staging/xf86-video-ark/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 136410 2011-08-29 07:45:07Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-ark
+pkgver=0.7.3
+pkgrel=4
+pkgdesc="X.org ark video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.11.0')
+conflicts=('xorg-server<1.11.0')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        git-fixes.patch)
+sha1sums=('56901ec6097a83433689f208268281f9c98c238b'
+          'f62cdc7995e9b64c9105382ccfa842732fa81309')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/git-fixes.patch"
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/staging/xf86-video-ark/git-fixes.patch b/staging/xf86-video-ark/git-fixes.patch
new file mode 100644
index 000000000..2de0f64be
--- /dev/null
+++ b/staging/xf86-video-ark/git-fixes.patch
@@ -0,0 +1,118 @@
+From 9d3769bed020e9796e51411c63de337da5073bb4 Mon Sep 17 00:00:00 2001
+From: Ondrej Zary <linux@rainbow-software.org>
+Date: Sat, 04 Dec 2010 00:23:51 +0000
+Subject: Don't assume that FB address registers are initialized properly
+
+https://bugs.freedesktop.org/show_bug.cgi?id=28249
+
+ark driver does not work with Hercules Stingray 64 card (ark2000pv).
+X fails to start with:
+
+[...]
+(II) ark(0): vgaHWGetIOBase: hwp->IOBase is 0x03d0, hwp->PIOOffset is
+0x0000
+(II) ark(0): Creating default Display subsection in Screen section
+        "Default Screen Section" for depth/fbbpp 24/32
+(==) ark(0): Depth 24, (--) framebuffer bpp 32
+(==) ark(0): RGB weight 888
+(==) ark(0): Default visual is TrueColor
+(**) ark(0): Chipset: "ark2000pv"
+(--) ark(0): Framebuffer @ 0xe5e50000
+(==) ark(0): Using gamma correction (1.0, 1.0, 1.0)
+(--) ark(0): Detected 2048 bytes video ram
+[...]
+Fatal server error:
+AddScreen/ScreenInit failed for driver 0
+
+Comparing with lspci, the framebuffer address is wrong:
+00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00 [VGA controller])
+	Flags: medium devsel
+	Memory at e5000000 (32-bit, prefetchable) [size=4M]
+	[virtual] Expansion ROM at 1c000000 [disabled] [size=64K]
+
+Reviewed-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/ark.h b/src/ark.h
+index de301dc..077f93b 100644
+--- a/src/ark.h
++++ b/src/ark.h
+@@ -34,7 +34,6 @@ typedef struct _ARKRec {
+ #endif
+ 	EntityInfoPtr		pEnt;
+ 	CARD32			IOAddress;
+-	CARD32			FBAddress;
+ 	unsigned char *		FBBase;
+ 	unsigned char *		MMIOBase;
+ 	unsigned long		videoRam;
+diff --git a/src/ark_driver.c b/src/ark_driver.c
+index 5de3b9a..fec3e1a 100644
+--- a/src/ark_driver.c
++++ b/src/ark_driver.c
+@@ -363,14 +363,14 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
+ 	outb(hwp->PIOOffset + hwp->IOBase + 5, tmp & 0x7f);
+ 	modinx(hwp->PIOOffset + 0x3c4, 0x1d, 0x01, 0x01);
+ 
+-	/* use membase's later on ??? */
+-	pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) +
+-			  (rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24);
+-
+-	pScrn->memPhysBase = pARK->FBAddress;
++#ifndef XSERVER_LIBPCIACCESS
++	pScrn->memPhysBase = pARK->PciInfo->memBase[0];
++#else
++	pScrn->memPhysBase = pARK->PciInfo->regions[0].base_addr;
++#endif
+ 
+ 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%lx\n",
+-		   (unsigned long)pARK->FBAddress);
++		   (unsigned long)pScrn->memPhysBase);
+ 
+ 	if (!xf86SetGamma(pScrn, gzeros))
+ 		return FALSE;
+@@ -748,8 +748,13 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ 	new->sr10 = rdinx(isaIOBase + 0x3c4, 0x10) & ~0x1f;
+ 	new->sr10 |= 0x1f;
+ 
+-	new->sr13 = pARK->FBAddress >> 16;
+-	new->sr14 = pARK->FBAddress >> 24;
++#ifndef XSERVER_LIBPCIACCESS
++	new->sr13 = pARK->PciInfo->memBase[0] >> 16;
++	new->sr14 = pARK->PciInfo->memBase[0] >> 24;
++#else
++	new->sr13 = pARK->PciInfo->regions[0].base_addr >> 16;
++	new->sr14 = pARK->PciInfo->regions[0].base_addr >> 24;
++#endif
+ 
+ 	new->sr12 = rdinx(isaIOBase + 0x3c4, 0x12) & ~0x03;
+ 	switch (pScrn->videoRam) {
+@@ -1022,7 +1027,7 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn)
+ 					     pARK->PciTag, 0xb8000, 0x8000);
+ 
+ 	pARK->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
+-				     pARK->PciTag, pARK->FBAddress,
++				     pARK->PciTag, pARK->PciInfo->memBase[0],
+ 				     pScrn->videoRam * 1024);
+ #else
+ 
+@@ -1032,14 +1037,17 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn)
+ 	{
+ 		void** result = (void**)&pARK->FBBase;
+ 		int err = pci_device_map_range(pARK->PciInfo,
+-					       pARK->FBAddress,
++					       pARK->PciInfo->regions[0].base_addr,
+ 					       pScrn->videoRam * 1024,
+ 					       PCI_DEV_MAP_FLAG_WRITABLE |
+ 					       PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ 					       result);
+ 		
+-		if (err) 
++		if (err) {
++			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++			   "Cound not map framebuffer: %d\n", err);
+ 			return FALSE;
++		}
+ 	}
+ #endif
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/staging/xf86-video-ast/PKGBUILD b/staging/xf86-video-ast/PKGBUILD
new file mode 100644
index 000000000..f2e8c9db6
--- /dev/null
+++ b/staging/xf86-video-ast/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 136412 2011-08-29 07:50:30Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-ast
+pkgver=0.93.9
+pkgrel=1
+pkgdesc="X.org ASPEED AST Graphics video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.11.0')
+conflicts=('xorg-server<1.11.0')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('424cc93d0300e49a882199c0546425f223b3b4bd')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/staging/xf86-video-ati/PKGBUILD b/staging/xf86-video-ati/PKGBUILD
new file mode 100644
index 000000000..1f13fede6
--- /dev/null
+++ b/staging/xf86-video-ati/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 136416 2011-08-29 08:02:09Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
+
+pkgname=xf86-video-ati
+pkgver=6.14.2
+pkgrel=2
+pkgdesc="X.org ati video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=(libpciaccess libdrm udev pixman ati-dri)
+makedepends=('xorg-server-devel>=1.11.0' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
+conflicts=('xorg-server<1.11.0')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('2733b3c126ad9e082ea18b7e7663d6d87fce4d49')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --enable-dri
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make "DESTDIR=${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/staging/xf86-video-chips/PKGBUILD b/staging/xf86-video-chips/PKGBUILD
new file mode 100644
index 000000000..597c2ef4e
--- /dev/null
+++ b/staging/xf86-video-chips/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 136418 2011-08-29 08:15:40Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
+
+pkgname=xf86-video-chips
+pkgver=1.2.4
+pkgrel=3
+pkgdesc="X.org Chips and Technologies video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=(glibc)
+makedepends=('xorg-server-devel>=1.11.0')
+conflicts=('xorg-server<1.11.0')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        gut-overlay-8-16-support-from-driver.patch)
+sha1sums=('71f474335d05f93b2451a7a0750c4409669641a4'
+          'f6a635196118dacb73fad980571b390849963b3d')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/gut-overlay-8-16-support-from-driver.patch"
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/staging/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch b/staging/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch
new file mode 100644
index 000000000..b9c832238
--- /dev/null
+++ b/staging/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch
@@ -0,0 +1,580 @@
+From e4bd864898fd276a62dac05cdfff394e98434f02 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Tue, 29 Mar 2011 03:53:31 +0000
+Subject: chips: gut the overlay 8/16 support from driver.
+
+This driver is for chips that were bought by Intel in 1997,
+this feature means maintaining a lot of code in the X server
+for little gain.
+
+Drop it like its hot.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Reviewed-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/man/chips.man b/man/chips.man
+index 740af38..0c022ee 100644
+--- a/man/chips.man
++++ b/man/chips.man
+@@ -165,9 +165,6 @@ Force the use of memory mapped IO where it can be used. Default: off
+ Force driver to leave centering and stretching registers alone. This
+ can fix some laptop suspend/resume problems. Default: off
+ .TP
+-.BI "Option \*qOverlay\*q"
+-Enable 8+24 overlay mode.  Only appropriate for depth 24.  Default: off.
+-.TP
+ .BI "Option \*qColorKey\*q \*q" integer \*q
+ Set the colormap index used for the transparency key for the depth 8 plane
+ when operating in 8+16 overlay mode.  The value must be in the range
+diff --git a/src/ct_accel.c b/src/ct_accel.c
+index 3920b0a..4b5776a 100644
+--- a/src/ct_accel.c
++++ b/src/ct_accel.c
+@@ -428,19 +428,7 @@ chips_imagewrite:
+         infoPtr->ImageWriteFlags |= NO_PLANEMASK;
+ #endif
+ 
+-
+-#ifdef CHIPS_HIQV
+-    if (XAAInit(pScreen, infoPtr)) {
+-	if (cPtr->Flags & ChipsOverlay8plus16)      
+-	    return(XAAInitDualFramebufferOverlay(pScreen,
+-						 CTNAME(DepthChange)));
+-	else
+-	    return TRUE;
+-    } else
+-	return FALSE;
+-#else
+     return(XAAInit(pScreen, infoPtr));
+-#endif
+ }
+ 
+ #ifdef CHIPS_HIQV
+@@ -1243,11 +1231,6 @@ CTNAME(SubsequentScreenToScreenColorExpandFill)(ScrnInfoPtr pScrn,
+ #endif
+     w *= cAcl->BytesPerPixel;
+     ctBLTWAIT;
+-#ifdef CHIPS_HIQV
+-    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16) &&
+-	    (pScrn->depth == 8))
+-	ctSETPITCH(cAcl->PitchInBytes << 1, cAcl->PitchInBytes);
+-#endif
+     ctSETSRCADDR(srcaddr);
+     ctSETDSTADDR(destaddr);
+ #ifdef CHIPS_HIQV
+@@ -1271,10 +1254,6 @@ CTNAME(SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
+     patternaddr = (paty * pScrn->displayWidth + 
+ 		   (patx & ~0x3F)) * cAcl->BytesPerPixel;
+     cAcl->patternyrot = (patx & 0x3F) >> 3;
+-#ifdef CHIPS_HIQV
+-    if (cPtr->Flags & ChipsOverlay8plus16)
+-	patternaddr += cPtr->FbOffset16;
+-#endif
+ 
+     ctBLTWAIT;
+     ctSETPATSRCADDR(patternaddr);
+@@ -1338,10 +1317,7 @@ CTNAME(SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
+ 
+ #ifdef CHIPS_HIQV
+     patternaddr = paty * pScrn->displayWidth + patx;
+-    if (cPtr->Flags & ChipsOverlay8plus16)
+-	patternaddr = patternaddr * 2 + cPtr->FbOffset16;
+-    else
+-	patternaddr *= cAcl->BytesPerPixel;
++    patternaddr *= cAcl->BytesPerPixel;
+ #else
+     patternaddr = (paty * pScrn->displayWidth + patx) * cAcl->BytesPerPixel;
+ #endif
+@@ -1593,10 +1569,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+     dwords = (((skipleft  + bytesPerLine + 0x7) & ~0x7)) >> 2;
+     destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
+     destpitch = pScrn->displayWidth * (bpp >> 3);
+-    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
+-	destaddr += cPtr->FbOffset16;
+-    else
+-	destaddr += cAcl->FbOffset;
++    destaddr += cAcl->FbOffset;
+ 
+     ctBLTWAIT;
+ 
+@@ -1681,10 +1654,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+ 	y++;
+ 
+ 	destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
+-	if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
+-	    destaddr += cPtr->FbOffset16;
+-	else
+-	    destaddr += cAcl->FbOffset;
++	destaddr += cAcl->FbOffset;
+ 
+ 	ctBLTWAIT;
+ 	ctSETDSTADDR(destaddr);
+@@ -1717,10 +1687,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+     dwords = (((bytesPerLine + 0x7) & ~0x7)) >> 2;
+     srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
+     srcpitch = pScrn->displayWidth * (bpp >> 3);
+-    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
+-	srcaddr += cPtr->FbOffset16;
+-    else
+-	srcaddr += cAcl->FbOffset;
++    srcaddr += cAcl->FbOffset;
+ 
+     ctBLTWAIT;
+     ctSETROP( ctDSTSYSTEM | ctLEFT2RIGHT | ctTOP2BOTTOM | 
+@@ -1755,10 +1722,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+ 	dst += dstwidth;
+ 	y++;
+ 	srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
+-	if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
+-	    srcaddr += cPtr->FbOffset16;
+-	else
+-	    srcaddr += cAcl->FbOffset;
++	srcaddr += cAcl->FbOffset;
+ 	ctBLTWAIT;
+ 	ctSETSRCADDR(srcaddr);
+ 	ctSETHEIGHTWIDTHGO(h, bytesPerLine);
+diff --git a/src/ct_driver.c b/src/ct_driver.c
+index 6624b79..08df050 100644
+--- a/src/ct_driver.c
++++ b/src/ct_driver.c
+@@ -1639,55 +1639,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
+ 	}
+     }
+     
+-    if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) {
+-	if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) {
+-	  if (pScrn->bitsPerPixel == 16) {
+-	    if (cPtr->Flags & ChipsLinearSupport) {
+-		cPtr->Flags |= ChipsOverlay8plus16;
+-		if(!xf86GetOptValInteger(
+-			cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey)))
+-		    pScrn->colorKey = TRANSPARENCY_KEY;
+-		pScrn->overlayFlags = OVERLAY_8_16_DUALFB;
+-		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, 
+-			   "PseudoColor overlay enabled.\n");
+-		if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH))
+-		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
+-			   "                             - Forcing option \"Stretch\" \"ON\".\n");
+-		if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER))
+-		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
+-			   "                             - Forcing option \"LcdCenter\" \"OFF\".\n");
+-		if (cPtr->Flags & ChipsShadowFB) {
+-		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+-		           "                             - Disabling \"Shadow Framebuffer\".\n");
+-		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
+-			   "                               Not support with option \"8Plus16\".\n");
+-		    cPtr->Flags &= ~ChipsShadowFB;
+-		    cPtr->Rotate = 0;
+-		}
+-	    } else {
+-		xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n");
+-	    }
+-	  } else {
+-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
+-		"Option \"Overlay\" is not supported in this configuration\n");
+-	  }
+-	} else {
+-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
+-		"\"%s\" is not a valid value for Option \"Overlay\"\n", s); 
+-	}
+-    }
+-
+-    if (!(cPtr->Flags & ChipsOverlay8plus16)) {
+-	if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
+-		&(cPtr->videoKey))) {
+-	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
++    if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
++	&(cPtr->videoKey))) {
++         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
+ 		cPtr->videoKey);
+-	} else {
+-	    cPtr->videoKey =  (1 << pScrn->offset.red) | 
++    } else {
++       cPtr->videoKey =  (1 << pScrn->offset.red) | 
+ 			(1 << pScrn->offset.green) |
+ 			(((pScrn->mask.blue >> pScrn->offset.blue) - 1)
+ 			<< pScrn->offset.blue); 
+-	}
+     }
+ 
+     if (cPtr->Flags & ChipsShadowFB) {
+@@ -2335,28 +2295,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
+     /* and 32bits on the others. Thus multiply by a suitable factor      */  
+     if (cPtr->Flags & Chips64BitMemory) {
+ 	if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
+-	    if (cPtr->Flags & ChipsOverlay8plus16 )
+-		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4);
+-	    else
+ 		cPtr->MaxClock = min(cPtr->MaxClock,
+ 			     MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1));
+ 	else
+-	    if (cPtr->Flags & ChipsOverlay8plus16)
+-		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3);
+-	    else
+ 		cPtr->MaxClock = min(cPtr->MaxClock, 
+ 			     MemClk->Clk * 8 * 0.7 / bytesPerPixel);
+     } else {
+ 	if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
+-	    if (cPtr->Flags & ChipsOverlay8plus16 )
+-		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4);
+-	    else
+ 		cPtr->MaxClock = min(cPtr->MaxClock,
+ 			     MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1));
+ 	else
+-	    if (cPtr->Flags & ChipsOverlay8plus16)
+-		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3);
+-	    else
+ 		cPtr->MaxClock = min(cPtr->MaxClock, 
+ 			     MemClk->Clk * 4 * 0.7 / bytesPerPixel);
+     }
+@@ -3736,8 +3684,7 @@ CHIPSEnterVT(int scrnIndex, int flags)
+     /* Should we re-save the text mode on each VT enter? */
+     if(!chipsModeInit(pScrn, pScrn->currentMode))
+       return FALSE;
+-    if ((!(cPtr->Flags & ChipsOverlay8plus16)) 
+-	&& (cPtr->Flags & ChipsVideoSupport)
++    if ((cPtr->Flags & ChipsVideoSupport)
+ 	&& (cPtr->Flags & ChipsLinearSupport)) 
+         CHIPSResetVideo(pScrn); 
+ 
+@@ -3788,8 +3735,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
+     int i, index, shift ;
+     CHIPSEntPtr cPtrEnt;    
+ 
+-    shift = ((pScrn->depth == 15) && 
+-	     (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0;
++    shift = (pScrn->depth == 15) ? 3 : 0;
+ 
+     if (cPtr->UseDualChannel) {
+         cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0],
+@@ -3895,18 +3841,6 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices,
+     hwp->disablePalette(hwp);
+ }
+ 
+-static Bool
+-cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
+-                  int xsize, int ysize, int dpix, int dpiy,
+-                  int width16, int width8)
+-{
+-    return
+-        (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize,
+-                              dpix, dpiy, width16, width8, 16, 8) &&
+-         fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize,
+-                                   dpix, dpiy, width16, width8, 16, 8, 16, 8));
+-}
+-
+ /* Mandatory */
+ static Bool
+ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+@@ -3947,22 +3881,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+     if (!chipsMapMem(pScrn))
+ 	return FALSE;
+ 
+-    /* Setup a pointer to the overlay if needed */
+-    if (cPtr->Flags & ChipsOverlay8plus16) {
+-	cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY;
+-	cPtr->FbSize16 =  (pScrn->displayWidth << 1) * pScrn->virtualY;
+-	if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) {
+-	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+-		   "Too little memory for overlay. Disabling.\n");
+-	    cPtr->Flags &= ~ChipsOverlay8plus16;
+-	}
+-	if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) {
+-	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+-		   "Max overlay Width/Height 1024 pixels. Disabling.\n");
+-	    cPtr->Flags &= ~ChipsOverlay8plus16;
+-	}
+-    }
+-
+     /* Setup the MMIO register access functions if need */
+     if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) {
+ 	CHIPSSetMmioExtFuncs(cPtr);
+@@ -4035,18 +3953,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+     miClearVisualTypes();
+ 
+     /* Setup the visuals we support. */
+-    if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){
+-	if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask,
+-			      pScrn->rgbBits, PseudoColor))
+-		return FALSE;
+-	if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor))
+-		return FALSE;
+-    } else {
+-      if (!miSetVisualTypes(pScrn->depth,
++    if (!miSetVisualTypes(pScrn->depth,
+ 			    miGetDefaultVisualMask(pScrn->depth),
+ 			    pScrn->rgbBits, pScrn->defaultVisual))
+-	return FALSE;
+-    }
++        return FALSE;
+     miSetPixmapDepths ();
+ 
+     /*
+@@ -4090,13 +4000,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	break;
+ #endif
+     case 16:
+-      if (cPtr->Flags & ChipsOverlay8plus16) {
+-	  ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + 
+-				  cPtr->FbOffset16, FBStart, width, 
+-				  height, pScrn->xDpi, pScrn->yDpi,
+-				  displayWidth, displayWidth);
+-	  break;
+-      }
+     default:
+ 	ret = fbScreenInit(pScreen, FBStart,
+  		        width,height,
+@@ -4244,9 +4147,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	if (pScrn->bitsPerPixel < 8)
+ 	    freespace = allocatebase - pScrn->displayWidth * 
+ 		    pScrn->virtualY / 2;
+-	else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16))
+-	    freespace = allocatebase - pScrn->displayWidth * 
+-		    pScrn->virtualY - cPtr->FbSize16;
+ 	else	
+ 	    freespace = allocatebase - pScrn->displayWidth * 
+ 		    pScrn->virtualY * (pScrn->bitsPerPixel >> 3);
+@@ -4369,9 +4269,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	    AvailFBArea.y2 = cAcl->CacheEnd /
+ 		(pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
+ 
+-	    if (!(cPtr->Flags & ChipsOverlay8plus16)) {     
+-		xf86InitFBManager(pScreen, &AvailFBArea); 
+-	    }
++	    xf86InitFBManager(pScreen, &AvailFBArea); 
+ 	}
+ 	if (cPtr->Flags & ChipsAccelSupport) {
+ 	    if (IS_HiQV(cPtr)) {
+@@ -4425,16 +4323,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+     if (!miCreateDefColormap(pScreen))
+ 	return FALSE;
+     
+-    if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) {
+-	if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette,
+-		NULL, CMAP_RELOAD_ON_MODE_SWITCH))
+-	    return FALSE;
+-    } else {
+-	if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
++    if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
+ 		(pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette),
+ 		NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR))
+-	    return FALSE;
+-    }
++	return FALSE;
+     
+ #ifndef XSERVER_LIBPCIACCESS
+     racflag = RAC_COLORMAP;
+@@ -4448,8 +4340,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	xf86SetSilkenMouse(pScreen);
+ #endif
+ 
+-	if ((!(cPtr->Flags & ChipsOverlay8plus16)) 
+-	    && (cPtr->Flags & ChipsVideoSupport)
++	if ((cPtr->Flags & ChipsVideoSupport)
+ 	    && (cPtr->Flags & ChipsLinearSupport)) {
+ 	    CHIPSInitVideo(pScreen);
+     }
+@@ -4522,10 +4413,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
+ 	Base >>= 3;
+ 	break;
+     case 16:
+-	if (!(cPtr->Flags & ChipsOverlay8plus16))
+-	   Base >>= 1;
+-	else
+-	   Base >>= 2;
++	Base >>= 1;
+ 	break;
+     case 24:
+ 	if (!IS_HiQV(cPtr))
+@@ -4581,14 +4469,6 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
+ 	cPtr->writeMSS(cPtr, hwp, MSS);
+     }
+ 
+-    if (cPtr->Flags & ChipsOverlay8plus16) {
+-	Base = (Base << 3) & ~(unsigned long)0xF;
+-
+-	cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8);
+-	cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF);
+-	cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF);
+-    }
+-
+ }
+ 
+ /* Mandatory */
+@@ -4652,13 +4532,6 @@ CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     CHIPSPtr cPtr = CHIPSPTR(pScrn);
+ 
+-    if (flags & MODECHECK_FINAL) {
+-    /* Don't subtract FrambufferSize here as it should be subtracted already */
+-    if ((cPtr->Flags & ChipsOverlay8plus16) 
+-      && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY 
+-	  < 0))
+-	return MODE_MEM;
+-    }
+     /* The tests here need to be expanded */
+     if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD))
+ 	return MODE_NO_INTERLACE;
+@@ -5544,12 +5417,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+     } else {
+ 	ChipsStd->Attribute[0x10] = 0x01;   /* mode */
+     }
+-    if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) {
+-	/* Make sure that the overlay isn't visible in the overscan region */
+-	if (ChipsStd->Attribute[0x11] == pScrn->colorKey)
+-	    ChipsStd->Attribute[0x11] = pScrn->colorKey - 1;
+-    } else
+-	ChipsStd->Attribute[0x11] = 0x00;   /* overscan (border) color */
++    ChipsStd->Attribute[0x11] = 0x00;   /* overscan (border) color */
+     ChipsStd->Attribute[0x12] = 0x0F;   /* enable all color planes */
+     ChipsStd->Attribute[0x13] = 0x00;   /* horiz pixel panning 0 */
+ 
+@@ -5558,8 +5426,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+     /* set virtual screen width */
+     tmp = pScrn->displayWidth >> 3;
+     if (pScrn->bitsPerPixel == 16) {
+-	if (!(cPtr->Flags & ChipsOverlay8plus16))
+-	    tmp <<= 1;		       /* double the width of the buffer */
++	tmp <<= 1;		       /* double the width of the buffer */
+     } else if (pScrn->bitsPerPixel == 24) {
+ 	tmp += tmp << 1;
+     } else if (pScrn->bitsPerPixel == 32) {
+@@ -5688,8 +5555,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ 
+     /* centering/stretching */
+     if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) {
+-	if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) ||
+-	(cPtr->Flags & ChipsOverlay8plus16)) {
++	if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) {
+ 	    ChipsNew->FR[0x40] &= 0xDF;    /* Disable Horizontal stretching */
+ 	    ChipsNew->FR[0x48] &= 0xFB;    /* Disable vertical stretching */
+ 	    ChipsNew->XR[0xA0] = 0x10;     /* Disable cursor stretching */
+@@ -5709,8 +5575,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ 	}
+     }
+ 
+-    if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE))
+-		|| (cPtr->Flags & ChipsOverlay8plus16)) {
++    if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) {
+ 	ChipsNew->FR[0x40] |= 0x3;    /* Enable Horizontal centering */
+ 	ChipsNew->FR[0x48] |= 0x3;    /* Enable Vertical centering */
+     } else {
+@@ -5723,8 +5588,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ 	ChipsNew->XR[0x82] |=0x02;
+ 
+     /* software mode flag */
+-    ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ?
+-	8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
++    ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
+ 	min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) :
+ 	mode->CrtcHDisplay, mode->CrtcVDisplay);
+ #ifdef DEBUG
+@@ -5762,7 +5626,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+     	}
+     }	    
+     /* bpp depend */
+-    if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) {
++    if (pScrn->bitsPerPixel == 16) {
+ 	ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4;
+ 	if (cPtr->Flags & ChipsGammaSupport)
+ 	    ChipsNew->XR[0x82] |= 0x0C;
+@@ -5915,60 +5779,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+     /* Turn off multimedia by default as it degrades performance */
+     ChipsNew->XR[0xD0] &= 0x0f;	 
+     
+-    /* Setup the video/overlay */
+-    if (cPtr->Flags & ChipsOverlay8plus16) {
+-	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
+-#ifdef SAR04
+-	ChipsNew->XR[0x4F] = 0x2A;	/* SAR04 >352 pixel overlay width */
+-#endif
+-	ChipsNew->MR[0x1E] &= 0xE0;	/* Set Zoom and Direction */
+-	if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE))
+-	    ChipsNew->MR[0x1E] |= 0x10;	/* Interlace */
+-	ChipsNew->MR[0x1F] &= 0x14;	/* Mask reserved bits */
+-	ChipsNew->MR[0x1F] |= 0x08;	/* RGB 16bpp */
+-	if (pScrn->weight.green == 5)
+-	    ChipsNew->MR[0x1F] |= 0x01;	/* RGB 15bpp */
+-
+-	ChipsNew->MR[0x20] &= 0x03;	/* Mask reserved bits */
+-	ChipsNew->MR[0x20] |= 0x80;	/* Auto Centre, Use mem ptr1 */
+-	ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8;	/* Setup Pointer 1 */
+-	ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF;
+-	ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF;
+-	ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8;	/* Setup Pointer 2 */
+-	ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF;
+-	ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF;
+-	ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */ 
+-	ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1;
+-
+-	/* Left Edge of Overlay */
+-	ChipsNew->MR[0x2A] = cPtr->OverlaySkewX;
+-	ChipsNew->MR[0x2B] &= 0xF8;	/* Mask reserved bits */
+-	ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7);
+-	/* Right Edge of Overlay */
+-	ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth - 
+-							1) & 0xFF;
+-	ChipsNew->MR[0x2D] &= 0xF8;	/* Mask reserved bits */
+-	ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth -
+-							1) >> 8) & 0x07;
+-	/* Top Edge of Overlay */
+-	ChipsNew->MR[0x2E] = cPtr->OverlaySkewY;
+-	ChipsNew->MR[0x2F] &= 0xF8;
+-	ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7);
+-	/* Bottom Edge of Overlay*/
+-	ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF;
+-	ChipsNew->MR[0x31] &= 0xF8;	/* Mask reserved bits */
+-	ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY - 
+-							1 ) >> 8) & 0x07;
+-
+-	ChipsNew->MR[0x3C] &= 0x18;	/* Mask reserved bits */
+-	ChipsNew->MR[0x3C] |= 0x07;	/* Enable keyed overlay window */
+-	ChipsNew->MR[0x3D] = 0x00;
+-	ChipsNew->MR[0x3E] = 0x00;
+-	ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */
+-	ChipsNew->MR[0x40] = 0xFF;
+-	ChipsNew->MR[0x41] = 0xFF;
+-	ChipsNew->MR[0x42] = 0x00;
+-    } else if (cPtr->Flags & ChipsVideoSupport) {
++    if (cPtr->Flags & ChipsVideoSupport) {
+ #if 0   /* if we do this even though video isn't playing we kill performance */
+ 	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
+ #endif
+@@ -6877,8 +6688,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pScrn, CHIPSRegPtr Regs)
+ 	}
+ 
+ 	/* Set SAR04 multimedia register correctly */
+-	if ((cPtr->Flags & ChipsOverlay8plus16)
+-	    || (cPtr->Flags & ChipsVideoSupport)) {
++	if ((cPtr->Flags & ChipsVideoSupport)) {
+ #ifdef SAR04
+ 	    cPtr->writeXR(cPtr, 0x4E, 0x04);
+ 	    if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F])
+diff --git a/src/ct_driver.h b/src/ct_driver.h
+index d8ce228..10a24d4 100644
+--- a/src/ct_driver.h
++++ b/src/ct_driver.h
+@@ -114,7 +114,6 @@ typedef struct {
+ /* Options flags for the C&T chipsets */
+ #define ChipsHWCursor		0x00001000
+ #define ChipsShadowFB		0x00002000
+-#define ChipsOverlay8plus16	0x00004000
+ #define ChipsUseNewFB		0x00008000
+ 
+ /* Architecture type flags */
+diff --git a/src/ct_video.c b/src/ct_video.c
+index a68acb9..c9e5bb4 100644
+--- a/src/ct_video.c
++++ b/src/ct_video.c
+@@ -56,8 +56,7 @@ CHIPSInitVideo(ScreenPtr pScreen)
+     CHIPSPtr cPtr = CHIPSPTR(pScrn);
+     int num_adaptors;
+ 	
+-    if (!(cPtr->Flags & ChipsOverlay8plus16) &&
+-       (cPtr->Flags & ChipsVideoSupport)) {
++    if ((cPtr->Flags & ChipsVideoSupport)) {
+ 	newAdaptor = CHIPSSetupImageVideo(pScreen);
+ 	CHIPSInitOffscreenImages(pScreen);
+     }
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/staging/xf86-video-neomagic/PKGBUILD b/staging/xf86-video-neomagic/PKGBUILD
new file mode 100644
index 000000000..33637f4a0
--- /dev/null
+++ b/staging/xf86-video-neomagic/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 136420 2011-08-29 08:17:07Z jgc $
+#Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-neomagic
+pkgver=1.2.5
+pkgrel=5
+pkgdesc="X.org neomagic video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto')
+conflicts=('xorg-server<1.11.0')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/staging/xf86-video-nouveau/PKGBUILD b/staging/xf86-video-nouveau/PKGBUILD
new file mode 100644
index 000000000..eb970fd63
--- /dev/null
+++ b/staging/xf86-video-nouveau/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 136432 2011-08-29 08:59:19Z ibiru $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: buddabrod <buddabrod@gmail.com>
+
+pkgname=xf86-video-nouveau
+_gitdate=20110829
+pkgver=0.0.16_git${_gitdate} # see configure.ac
+pkgrel=1
+pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)"
+arch=('i686' 'x86_64')
+url="http://nouveau.freedesktop.org/wiki/"
+license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e
+depends=('libdrm' 'udev')
+optdepends=('nouveau-dri:	experimental gallium3d features')
+makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto')
+conflicts=('xorg-server<1.11.0')
+options=('!libtool')
+install=${pkgname}.install
+source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
+md5sums=('8f484f6602a3711f4adfbce74fd886c1')
+
+# source PKGBUILD && mksource
+mksource() {
+	mkdir /tmp/${pkgname}-${_gitdate}
+	pushd /tmp/${pkgname}-${_gitdate}
+	git clone -v --depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau
+	cd xf86-video-nouveau
+	git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2
+	popd
+}
+
+build() {
+  cd ${srcdir}/xf86-video-nouveau-${_gitdate}
+  ./autogen.sh --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/xf86-video-nouveau-${_gitdate}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/staging/xf86-video-nouveau/xf86-video-nouveau.install b/staging/xf86-video-nouveau/xf86-video-nouveau.install
new file mode 100644
index 000000000..027154ff3
--- /dev/null
+++ b/staging/xf86-video-nouveau/xf86-video-nouveau.install
@@ -0,0 +1,16 @@
+post_install () {
+   cat << _EOF
+  ==> make sure you use KernelModeSetting (KMS)
+  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
+_EOF
+}
+
+post_upgrade() {
+  if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then
+    cat << _EOF
+  ==> ATTENTION: Usermode support has been dropped
+  ==> make sure you use KernelModeSetting (KMS)
+  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
+_EOF
+ fi
+}
diff --git a/staging/xf86-video-nv/PKGBUILD b/staging/xf86-video-nv/PKGBUILD
new file mode 100644
index 000000000..c752fe8b2
--- /dev/null
+++ b/staging/xf86-video-nv/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 136430 2011-08-29 08:54:52Z jgc $
+# Maintainer:Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-nv
+pkgver=2.1.18
+pkgrel=4
+pkgdesc="X.org nv video driver"
+arch=(i686 x86_64)
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.11.0')
+conflicts=('xorg-server<1.11.0')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/staging/xf86-video-openchrome/PKGBUILD b/staging/xf86-video-openchrome/PKGBUILD
new file mode 100644
index 000000000..10153833b
--- /dev/null
+++ b/staging/xf86-video-openchrome/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 136434 2011-08-29 09:20:09Z jgc $
+# Contributor: Paul Mattal <paul@mattal.com>
+# Maintainer: Juergen Hoetzel <juergen@hoetzel.info>
+
+pkgname=xf86-video-openchrome
+pkgver=0.2.904
+_svnver=r933
+pkgrel=6
+pkgdesc="X.Org Openchrome drivers"
+arch=(i686 x86_64)
+license=('custom')
+url="http://www.openchrome.org"
+depends=('libdrm' 'libxvmc' 'unichrome-dri')
+makedepends=('xorg-server-devel>=1.11.0' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc' 'glproto')
+replaces=('openchrome' 'xf86-video-via')
+options=('!libtool' '!makeflags')
+conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.11.0')
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-${_svnver}.tar.bz2)
+md5sums=('d661460276a31d3d012d8cdb1a0a73c1')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/staging/xf86-video-r128/PKGBUILD b/staging/xf86-video-r128/PKGBUILD
new file mode 100644
index 000000000..214c11051
--- /dev/null
+++ b/staging/xf86-video-r128/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 136428 2011-08-29 08:48:55Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-r128
+pkgver=6.8.1
+pkgrel=7
+pkgdesc="X.org ati Rage128 video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc' 'r128-dri')
+makedepends=('xorg-server-devel>=1.11.0' 'xf86driproto' 'libdrm' 'mesa' 'glproto')
+conflicts=('xorg-server<1.11.0')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        git-fixes.patch)
+md5sums=('2b90854a62a4d45d652062f582dc8d13'
+         '3937776d4427861d0797e47119ac327d')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/git-fixes.patch"
+
+  autoreconf -fi
+  ./configure --prefix=/usr  --enable-dri
+  make
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/staging/xf86-video-r128/git-fixes.patch b/staging/xf86-video-r128/git-fixes.patch
new file mode 100644
index 000000000..933e8fb2a
--- /dev/null
+++ b/staging/xf86-video-r128/git-fixes.patch
@@ -0,0 +1,842 @@
+diff --git a/COPYING b/COPYING
+index 7f33cbf..05bcb74 100644
+--- a/COPYING
++++ b/COPYING
+@@ -1,12 +1,91 @@
+-This is a stub file.  This package has not yet had its complete licensing
+-information compiled.  Please see the individual source files for details on
+-your rights to use and modify this software.
++Copyright 2007 George Sapountzis
+ 
+-Please submit updated COPYING files to the Xorg bugzilla:
++Permission is hereby granted, free of charge, to any person obtaining a
++copy of this software and associated documentation files (the "Software"),
++to deal in the Software without restriction, including without limitation
++the rights to use, copy, modify, merge, publish, distribute, sublicense,
++and/or sell copies of the Software, and to permit persons to whom the
++Software is furnished to do so, subject to the following conditions:
+ 
+-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
++The above copyright notice and this permission notice (including the next
++paragraph) shall be included in all copies or substantial portions of the
++Software.
+ 
+-All licensing questions regarding this software should be directed at the
+-Xorg mailing list:
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++SOFTWARE.
++
++Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
++                     Precision Insight, Inc., Cedar Park, Texas, and
++                     VA Linux Systems Inc., Fremont, California.
++
++All Rights Reserved.
++
++Permission is hereby granted, free of charge, to any person obtaining
++a copy of this software and associated documentation files (the
++"Software"), to deal in the Software without restriction, including
++without limitation on the rights to use, copy, modify, merge,
++publish, distribute, sublicense, and/or sell copies of the Software,
++and to permit persons to whom the Software is furnished to do so,
++subject to the following conditions:
++
++The above copyright notice and this permission notice (including the
++next paragraph) shall be included in all copies or substantial
++portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++NON-INFRINGEMENT.  IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX
++SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
++OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++OTHER DEALINGS IN THE SOFTWARE.
++
++Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
++Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
++All Rights Reserved.
++
++Permission is hereby granted, free of charge, to any person obtaining a
++copy of this software and associated documentation files (the "Software"),
++to deal in the Software without restriction, including without limitation
++the rights to use, copy, modify, merge, publish, distribute, sublicense,
++and/or sell copies of the Software, and to permit persons to whom the
++Software is furnished to do so, subject to the following conditions:
++
++The above copyright notice and this permission notice (including the next
++paragraph) shall be included in all copies or substantial portions of the
++Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
++OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++DEALINGS IN THE SOFTWARE.
++
++Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
++
++Permission to use, copy, modify, distribute, and sell this software and its
++documentation for any purpose is hereby granted without fee, provided that
++the above copyright notice appear in all copies and that both that copyright
++notice and this permission notice appear in supporting documentation, and
++that the name of Marc Aurele La France not be used in advertising or
++publicity pertaining to distribution of the software without specific,
++written prior permission.  Marc Aurele La France makes no representations
++about the suitability of this software for any purpose.  It is provided
++"as-is" without express or implied warranty.
++
++MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
++EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++PERFORMANCE OF THIS SOFTWARE.
+ 
+-http://lists.freedesktop.org/mailman/listinfo/xorg
+diff --git a/Makefile.am b/Makefile.am
+index 1f4c3c4..4c278ba 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,21 +18,15 @@
+ #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+-AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = src man
++MAINTAINERCLEANFILES = ChangeLog INSTALL
+ 
+-if BUILD_LINUXDOC
+-README.r128: README.r128.sgml
+-	$(MAKE_TEXT) README.r128.sgml && mv README.r128.txt README.r128
++.PHONY: ChangeLog INSTALL
+ 
+-endif
+-
+-EXTRA_DIST = README.r128 README.r128.sgml ChangeLog
+-CLEANFILES = ChangeLog
+-
+-.PHONY: ChangeLog
++INSTALL:
++	$(INSTALL_CMD)
+ 
+ ChangeLog:
+ 	$(CHANGELOG_CMD)
+ 
+-dist-hook: ChangeLog
++dist-hook: ChangeLog INSTALL
+diff --git a/README b/README
+index cb61870..5c6f59d 100644
+--- a/README
++++ b/README
+@@ -1,4 +1,161 @@
+-xf86-video-r128 - ATI Rage 128 video driver for the Xorg X server
++  Information for ATI Rage 128 Users
++  Precision Insight, Inc., SuSE GmbH
++  13 June 2000
++  ____________________________________________________________
++
++  Table of Contents
++
++
++  1. Supported Hardware
++  2. Features
++  3. Technical Notes
++  4. Reported Working Video Cards
++  5. Configuration
++  6. Driver Options
++  7. Known Limitations
++  8. Authors
++
++
++  ______________________________________________________________________
++
++  1.  Supported Hardware
++
++
++  o  ATI Rage 128 based cards
++
++
++
++  2.  Features
++
++
++  o  Full support (including hardware accelerated 2D drawing) for 8, 15,
++     16, 24 bit pixel depths.
++
++  o  Hardware cursor support to reduce sprite flicker.
++
++  o  Support for high resolution video modes up to 1800x1440 @ 70Hz.
++
++  o  Support for doublescan video modes (e.g., 320x200 and 320x240).
++
++  o  Support for gamma correction at all pixel depths.
++
++  o  Fully programmable clock supported.
++
++  o  Robust text mode restore for VT switching.
++
++
++
++  3.  Technical Notes
++
++
++  o  None
++
++
++
++  4.  Reported Working Video Cards
++
++
++  o  Rage Fury AGP 32MB
++
++  o  XPERT 128 AGP 16MB
++
++  o  XPERT 99 AGP 8MB
++
++
++
++  5.  Configuration
++
++  The driver auto-detects all device information necessary to initialize
++  the card. The only lines you need in the "Device" section of your
++  xorg.conf file are:
++
++         Section "Device"
++             Identifier "Rage 128"
++             Driver     "r128"
++         EndSection
++
++
++  or let xorgconfig do this for you.
++
++  However, if you have problems with auto-detection, you can specify:
++
++  o  VideoRam - in kilobytes
++
++  o  MemBase - physical address of the linear framebuffer
++
++  o  IOBase - physical address of the memory mapped IO registers
++
++  o  ChipID - PCI DEVICE ID
++
++
++
++  6.  Driver Options
++
++
++  o  "hw_cursor" - request hardware cursor (default)
++
++  o  "sw_cursor" - software cursor only
++
++  o  "no_accel" - software rendering only
++
++  o  "dac_8_bit" - use color weight 888 in 8 bpp mode (default)
++
++  o  "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation)
++
++
++
++  7.  Known Limitations
++
++
++  o  None
++
++
++
++  8.  Authors
++
++  The X11R7.5 driver was originally part of XFree86 4.4 rc2.
++
++  The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
++
++  o  Rickard E. (Rik) Faith  <mailto:faith@precisioninsight.com>
++
++  o  Kevin E. Martin  <mailto:kevin@precisioninsight.com>
++
++  The XFree86 4 driver was funded by ATI and was donated to The XFree86
++  Project by:
++
++      Precision Insight, Inc.
++      Cedar Park, TX
++      USA
++
++
++  The XFree86 3.3.x driver used for the port was written by:
++
++  o  Rickard E. (Rik) Faith  <mailto:faith@precisioninsight.com>
++
++  o  Kevin E. Martin  <mailto:kevin@precisioninsight.com>
++
++     The XFree86 3.3.x driver was funded by ATI and was donated to The
++     XFree86 Project by Precision Insight, Inc. It was based in part on
++     an earlier driver that was written by:
++
++  o  Alan Hourihane  <mailto:alanh@fairlite.demon.co.uk>
++
++  o  Dirk Hohndel  <mailto:hohndel@suse.de>
++
++  This early driver was funded and donated to The XFree86 Project by:
++
++      SuSE GmbH
++      Schanzaekerstr. 10
++      90443 Nuernberg
++      Germany
++
++
++
++  http://www.precisioninsight.com
++
++  http://www.suse.com
++
+ 
+ Please submit bugs & patches to the Xorg bugzilla:
+ 
+diff --git a/README.r128 b/README.r128
+deleted file mode 100644
+index dcc2715..0000000
+--- a/README.r128
++++ /dev/null
+@@ -1,160 +0,0 @@
+-  Information for ATI Rage 128 Users
+-  Precision Insight, Inc., SuSE GmbH
+-  13 June 2000
+-  ____________________________________________________________
+-
+-  Table of Contents
+-
+-
+-  1. Supported Hardware
+-  2. Features
+-  3. Technical Notes
+-  4. Reported Working Video Cards
+-  5. Configuration
+-  6. Driver Options
+-  7. Known Limitations
+-  8. Authors
+-
+-
+-  ______________________________________________________________________
+-
+-  1.  Supported Hardware
+-
+-
+-  +o  ATI Rage 128 based cards
+-
+-
+-
+-  2.  Features
+-
+-
+-  +o  Full support (including hardware accelerated 2D drawing) for 8, 15,
+-     16, 24 bit pixel depths.
+-
+-  +o  Hardware cursor support to reduce sprite flicker.
+-
+-  +o  Support for high resolution video modes up to 1800x1440 @ 70Hz.
+-
+-  +o  Support for doublescan video modes (e.g., 320x200 and 320x240).
+-
+-  +o  Support for gamma correction at all pixel depths.
+-
+-  +o  Fully programmable clock supported.
+-
+-  +o  Robust text mode restore for VT switching.
+-
+-
+-
+-  3.  Technical Notes
+-
+-
+-  +o  None
+-
+-
+-
+-  4.  Reported Working Video Cards
+-
+-
+-  +o  Rage Fury AGP 32MB
+-
+-  +o  XPERT 128 AGP 16MB
+-
+-  +o  XPERT 99 AGP 8MB
+-
+-
+-
+-  5.  Configuration
+-
+-  The driver auto-detects all device information necessary to initialize
+-  the card.  The only lines you need in the "Device" section of your
+-  xorg.conf file are:
+-
+-         Section "Device"
+-             Identifier "Rage 128"
+-             Driver     "r128"
+-         EndSection
+-
+-
+-  or let xorgconfig do this for you.
+-
+-  However, if you have problems with auto-detection, you can specify:
+-
+-  +o  VideoRam - in kilobytes
+-
+-  +o  MemBase  - physical address of the linear framebuffer
+-
+-  +o  IOBase   - physical address of the memory mapped IO registers
+-
+-  +o  ChipID   - PCI DEVICE ID
+-
+-
+-
+-  6.  Driver Options
+-
+-
+-  +o  "hw_cursor" - request hardware cursor (default)
+-
+-  +o  "sw_cursor" - software cursor only
+-
+-  +o  "no_accel"  - software rendering only
+-
+-  +o  "dac_8_bit" - use color weight 888 in 8 bpp mode (default)
+-
+-  +o  "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation)
+-
+-
+-
+-  7.  Known Limitations
+-
+-
+-  +o  None
+-
+-
+-
+-  8.  Authors
+-
+-  The X11R6.8 driver was originally part of XFree86 4.4 rc2.
+-
+-  The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
+-
+-  +o  Rickard E. (Rik) Faith  <faith@precisioninsight.com>
+-
+-  +o  Kevin E. Martin  <kevin@precisioninsight.com>
+-
+-  The XFree86 4 driver was funded by ATI and was donated to The XFree86
+-  Project by:
+-
+-      Precision Insight, Inc.
+-      Cedar Park, TX
+-      USA
+-
+-
+-  The XFree86 3.3.x driver used for the port was written by:
+-
+-  +o  Rickard E. (Rik) Faith  <faith@precisioninsight.com>
+-
+-  +o  Kevin E. Martin  <kevin@precisioninsight.com>
+-
+-     The XFree86 3.3.x driver was funded by ATI and was donated to The
+-     XFree86 Project by Precision Insight, Inc.  It was based in part on
+-     an earlier driver that was written by:
+-
+-  +o  Alan Hourihane  <alanh@fairlite.demon.co.uk>
+-
+-  +o  Dirk Hohndel  <hohndel@suse.de>
+-
+-  This early driver was funded and donated to The XFree86 Project by:
+-
+-      SuSE GmbH
+-      Schanzaekerstr. 10
+-      90443 Nuernberg
+-      Germany
+-
+-
+-
+-  http://www.precisioninsight.com
+-
+-  http://www.suse.com
+-
+-
+-
+diff --git a/README.r128.sgml b/README.r128.sgml
+deleted file mode 100644
+index 8d7f448..0000000
+--- a/README.r128.sgml
++++ /dev/null
+@@ -1,138 +0,0 @@
+-<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
+-<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+-]>
+-
+-<article>
+-<title>Information for ATI Rage 128 Users
+-<author>Precision Insight, Inc., SuSE GmbH
+-<date>13 June 2000
+-
+-<ident>
+-</ident>
+-
+-<toc>
+-
+-<sect>Supported Hardware
+-<p>
+-<itemize>
+-  <item>ATI Rage 128 based cards
+-</itemize>
+-
+-
+-<sect>Features
+-<p>
+-<itemize>
+-  <item>Full support (including hardware accelerated 2D drawing) for 8, 15,
+-        16, 24 bit pixel depths.
+-  <item>Hardware cursor support to reduce sprite flicker.
+-  <item>Support for high resolution video modes up to 1800x1440 @ 70Hz.
+-  <item>Support for doublescan video modes (e.g., 320x200 and 320x240).
+-  <item>Support for gamma correction at all pixel depths.
+-  <item>Fully programmable clock supported.
+-  <item>Robust text mode restore for VT switching.
+-</itemize>
+-
+-
+-<sect>Technical Notes
+-<p>
+-<itemize>
+-  <item>None
+-</itemize>
+-
+-
+-<sect>Reported Working Video Cards
+-<p>
+-<itemize>
+-  <item>Rage Fury AGP 32MB
+-  <item>XPERT 128 AGP 16MB
+-  <item>XPERT 99 AGP 8MB
+-</itemize>
+-
+-
+-<sect>Configuration
+-<p>
+-The driver auto-detects all device information necessary to
+-initialize the card.  The only lines you need in the "Device"
+-section of your xorg.conf file are:
+-<verb>
+-       Section "Device"
+-           Identifier "Rage 128"
+-           Driver     "r128"
+-       EndSection
+-</verb>
+-or let <tt>xorgconfig</tt> do this for you.
+-
+-However, if you have problems with auto-detection, you can specify:
+-<itemize>
+-  <item>VideoRam - in kilobytes
+-  <item>MemBase  - physical address of the linear framebuffer
+-  <item>IOBase   - physical address of the memory mapped IO registers
+-  <item>ChipID   - PCI DEVICE ID
+-</itemize>
+-
+-
+-<sect>Driver Options
+-<p>
+-<itemize>
+-  <item>"hw_cursor" - request hardware cursor (default)
+-  <item>"sw_cursor" - software cursor only
+-  <item>"no_accel"  - software rendering only
+-  <item>"dac_8_bit" - use color weight 888 in 8 bpp mode (default)
+-  <item>"dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation)
+-</itemize>
+-
+-
+-<sect>Known Limitations
+-<p>
+-<itemize>
+-  <item>None
+-</itemize>
+-
+-
+-<sect>Authors
+-<p>
+-The X11R&relvers; driver was originally part of XFree86 4.4 rc2.
+-
+-The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
+-<itemize>
+-   <item>Rickard E. (Rik) Faith <email>faith@precisioninsight.com</email>
+-   <item>Kevin E. Martin <email>kevin@precisioninsight.com</email>
+-</itemize>
+-<p>
+-The XFree86 4 driver was funded by ATI and was donated to The XFree86
+-Project by:
+-<verb>
+-    Precision Insight, Inc.
+-    Cedar Park, TX
+-    USA
+-</verb>
+-<p>
+-The XFree86 3.3.x driver used for the port was written by:
+-<itemize>
+-   <item>Rickard E. (Rik) Faith <email>faith@precisioninsight.com</email>
+-   <item>Kevin E. Martin <email>kevin@precisioninsight.com</email>
+-</itemize>
+-The XFree86 3.3.x driver was funded by ATI and was donated to The XFree86
+-Project by Precision Insight, Inc.  It was based in part on an earlier
+-driver that was written by:
+-<itemize>
+-   <item>Alan Hourihane <email>alanh@fairlite.demon.co.uk</email>
+-   <item>Dirk Hohndel <email>hohndel@suse.de</email>
+-</itemize>
+-<p>This early driver was funded and donated to The XFree86 Project by:
+-<verb>
+-    SuSE GmbH
+-    Schanzaekerstr. 10
+-    90443 Nuernberg
+-    Germany
+-</verb>
+-
+-<p>
+-<htmlurl name="http://www.precisioninsight.com"
+-          url="http://www.precisioninsight.com">
+-<p>
+-<htmlurl name="http://www.suse.com"
+-          url="http://www.suse.com">
+-
+-
+-</article>
+diff --git a/configure.ac b/configure.ac
+index 4e0f463..d5a0821 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,28 +20,30 @@
+ #
+ # Process this file with autoconf to produce a configure script
+ 
+-AC_PREREQ(2.57)
++# Initialize Autoconf
++AC_PREREQ([2.60])
+ AC_INIT([xf86-video-r128],
+-        6.8.1,
++        [6.8.1],
+         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+-        xf86-video-r128)
+-
++        [xf86-video-r128])
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_AUX_DIR(.)
+ 
+-AM_INIT_AUTOMAKE([dist-bzip2])
++# Initialize Automake
++AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ 
+-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+-XORG_MACROS_VERSION(1.2)
++# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
++m4_ifndef([XORG_MACROS_VERSION],
++          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
++XORG_MACROS_VERSION(1.8)
++XORG_DEFAULT_OPTIONS
+ 
+ AM_MAINTAINER_MODE
+ 
+-# Checks for programs.
++# Initialize libtool
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
+ 
+ if test "x$GCC" = "xyes"; then
+ 	CPPFLAGS="$CPPFLAGS -Wall"
+@@ -49,38 +51,35 @@ fi
+ 
+ AH_TOP([#include "xorg-server.h"])
+ 
++# Define a configure option for an alternate module directory
+ AC_ARG_WITH(xorg-module-dir,
+-            AC_HELP_STRING([--with-xorg-module-dir=DIR],
++            AS_HELP_STRING([--with-xorg-module-dir=DIR],
+                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
+             [moduledir="$withval"],
+             [moduledir="$libdir/xorg/modules"])
+ 
+-AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
++AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
+                                   [Disable DRI support [[default=auto]]]),
+               [DRI="$enableval"],
+               [DRI=auto])
+ 
+-# Checks for extensions
+-XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
++# Store the list of server defined optional extensions in REQUIRED_MODULES
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+ XORG_DRIVER_CHECK_EXT(XV, videoproto)
+ XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto)
+ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ 
+-# Checks for pkg-config packages
++# Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
+ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+                   HAVE_XEXTPROTO_71="no")
+ AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
++sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
+ 
+ # Checks for libraries.
+ 
+-# Checks for header files.
+-AC_HEADER_STDC
+-
+ if test "$DRI" != no; then
+ 	AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+@@ -126,26 +125,20 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ fi
+ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+ 
+-AC_SUBST([XORG_CFLAGS])
+-AC_SUBST([DRI_CFLAGS])
+ AC_SUBST([moduledir])
+ 
+ DRIVER_NAME=r128
+ AC_SUBST([DRIVER_NAME])
+ 
+-XORG_MANPAGE_SECTIONS
+-XORG_RELEASE_VERSION
+-XORG_CHECK_LINUXDOC
+-XORG_CHANGELOG
+-
+ AC_MSG_NOTICE(
+ [Please change the Driver line in xorg.conf from "ati" to "r128" or install]
+ [the ati wrapper as well:]
+ [    git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati]
+ )
+ 
+-AC_OUTPUT([
+-	Makefile
+-	src/Makefile
+-	man/Makefile
++AC_CONFIG_FILES([
++                Makefile
++                src/Makefile
++                man/Makefile
+ ])
++AC_OUTPUT
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 858ba62..4e22d61 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -1,27 +1,24 @@
+ #
+ # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+-# 
+-# Permission to use, copy, modify, distribute, and sell this software and its
+-# documentation for any purpose is hereby granted without fee, provided that
+-# the above copyright notice appear in all copies and that both that
+-# copyright notice and this permission notice appear in supporting
+-# documentation.
+-# 
+-# The above copyright notice and this permission notice shall be included
+-# in all copies or substantial portions of the Software.
+-# 
+-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+-# OTHER DEALINGS IN THE SOFTWARE.
+-# 
+-# Except as contained in this notice, the name of the copyright holders shall
+-# not be used in advertising or otherwise to promote the sale, use or
+-# other dealings in this Software without prior written authorization
+-# from the copyright holders.
++#
++# Permission is hereby granted, free of charge, to any person obtaining a
++# copy of this software and associated documentation files (the "Software"),
++# to deal in the Software without restriction, including without limitation
++# the rights to use, copy, modify, merge, publish, distribute, sublicense,
++# and/or sell copies of the Software, and to permit persons to whom the
++# Software is furnished to do so, subject to the following conditions:
++#
++# The above copyright notice and this permission notice (including the next
++# paragraph) shall be included in all copies or substantial portions of the
++# Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++# DEALINGS IN THE SOFTWARE.
+ # 
+ 
+ drivermandir = $(DRIVER_MAN_DIR)
+@@ -34,25 +31,11 @@ EXTRA_DIST = r128.man
+ 
+ CLEANFILES = $(driverman_DATA)
+ 
+-SED = sed
+ 
+-# Strings to replace in man pages
+-XORGRELSTRING = @PACKAGE_STRING@
+-  XORGMANNAME = X Version 11
++# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+ 
+-MAN_SUBSTS = \
+-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+-	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+-	-e 's|__xservername__|Xorg|g' \
+-	-e 's|__xconfigfile__|xorg.conf|g' \
+-	-e 's|__projectroot__|$(prefix)|g' \
+-	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+-	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+-	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+ 
+ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+ 
+ .man.$(DRIVER_MAN_SUFFIX):
+-	sed $(MAN_SUBSTS) < $< > $@
++	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+diff --git a/man/r128.man b/man/r128.man
+index 5c7c4fe..4ba933d 100644
+--- a/man/r128.man
++++ b/man/r128.man
+@@ -1,4 +1,3 @@
+-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128.man,v 1.3 2001/06/01 02:10:05 dawes Exp $
+ .\" shorthand for double quote that works everywhere.
+ .ds q \N'34'
+ .TH R128 __drivermansuffix__ __vendorversion__
+diff --git a/src/r128_driver.c b/src/r128_driver.c
+index d6448b6..9d08d77 100644
+--- a/src/r128_driver.c
++++ b/src/r128_driver.c
+@@ -938,14 +938,6 @@ static Bool R128PreInitConfig(ScrnInfoPtr pScrn)
+ 				/* BIOS */
+     from              = X_PROBED;
+     info->BIOSAddr    = info->PciInfo->biosBase & 0xfffe0000;
+-    if (dev->BiosBase) {
+-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+-		   "BIOS address override, using 0x%08lx instead of 0x%08lx\n",
+-		   dev->BiosBase,
+-		   info->BIOSAddr);
+-	info->BIOSAddr = dev->BiosBase;
+-	from           = X_CONFIG;
+-    }
+     if (info->BIOSAddr) {
+ 	xf86DrvMsg(pScrn->scrnIndex, from,
+ 		   "BIOS at 0x%08lx\n", info->BIOSAddr);
diff --git a/staging/xf86-video-rendition/PKGBUILD b/staging/xf86-video-rendition/PKGBUILD
new file mode 100644
index 000000000..703577317
--- /dev/null
+++ b/staging/xf86-video-rendition/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 136426 2011-08-29 08:41:36Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-rendition
+pkgver=4.2.4
+pkgrel=5
+pkgdesc="X.org Rendition video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.11.0')
+conflicts=('xorg-server<1.11.0')
+options=('!libtool' '!strip')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('16148c25183f7829c22bc9dfdb588c1a16bf4565')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+  strip --strip-unneeded "${pkgdir}/usr/lib/xorg/modules/drivers/rendition_drv.so"
+}
diff --git a/staging/xf86-video-s3/LICENSE b/staging/xf86-video-s3/LICENSE
new file mode 100644
index 000000000..a4c8d5dd4
--- /dev/null
+++ b/staging/xf86-video-s3/LICENSE
@@ -0,0 +1,25 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+     Copyright 2001  Ani Joshi <ajoshi@unixbox.com>
+
+     XFree86 4.x driver for S3 chipsets
+
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation and
+that the name of Ani Joshi not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  Ani Joshi makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as-is" without express or implied warranty.
+
+ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
diff --git a/staging/xf86-video-s3/PKGBUILD b/staging/xf86-video-s3/PKGBUILD
new file mode 100644
index 000000000..943a07d97
--- /dev/null
+++ b/staging/xf86-video-s3/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 136424 2011-08-29 08:32:45Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-s3
+pkgver=0.6.3
+pkgrel=6
+pkgdesc="X.org S3 video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.11.0')
+conflicts=('xorg-server<1.11.0')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        git-fixes.patch)
+md5sums=('5eb06d88533fb327d067928faeb20860'
+         '77a455ce7e254c73b1cbd408c7f4ecf4')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/git-fixes.patch"
+  autoreconf -fi
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/staging/xf86-video-s3/git-fixes.patch b/staging/xf86-video-s3/git-fixes.patch
new file mode 100644
index 000000000..712b3c9c0
--- /dev/null
+++ b/staging/xf86-video-s3/git-fixes.patch
@@ -0,0 +1,458 @@
+diff --git a/COPYING b/COPYING
+index 7f33cbf..458ab5f 100644
+--- a/COPYING
++++ b/COPYING
+@@ -1,12 +1,70 @@
+-This is a stub file.  This package has not yet had its complete licensing
+-information compiled.  Please see the individual source files for details on
+-your rights to use and modify this software.
++     Copyright 2001  Ani Joshi <ajoshi@unixbox.com>
+ 
+-Please submit updated COPYING files to the Xorg bugzilla:
++     XFree86 4.x driver for S3 chipsets
+ 
+-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+ 
+-All licensing questions regarding this software should be directed at the
+-Xorg mailing list:
++Permission to use, copy, modify, distribute, and sell this software and its
++documentation for any purpose is hereby granted without fee, provided that
++the above copyright notice appear in all copies and that both that copyright
++notice and this permission notice appear in supporting documentation and
++that the name of Ani Joshi not be used in advertising or
++publicity pertaining to distribution of the software without specific,
++written prior permission.  Ani Joshi makes no representations
++about the suitability of this software for any purpose.  It is provided
++"as-is" without express or implied warranty.
++
++ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++PERFORMANCE OF THIS SOFTWARE.
++Copyright 2007 George Sapountzis
++
++Permission is hereby granted, free of charge, to any person obtaining a
++copy of this software and associated documentation files (the "Software"),
++to deal in the Software without restriction, including without limitation
++the rights to use, copy, modify, merge, publish, distribute, sublicense,
++and/or sell copies of the Software, and to permit persons to whom the
++Software is furnished to do so, subject to the following conditions:
++
++The above copyright notice and this permission notice (including the next
++paragraph) shall be included in all copies or substantial portions of the
++Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++SOFTWARE.
++
++Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
++
++Permission is hereby granted, free of charge, to any person obtaining a copy of
++this software and associated documentation files (the "Software"), to deal in
++the Software without restriction, including without limitation the rights to
++use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
++of the Software, and to permit persons to whom the Software is furnished to do
++so, subject to the following conditions:
++
++The above copyright notice and this permission notice shall be included in all
++copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
++NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++Except as contained in this notice, the name of the XFree86 Project shall not
++be used in advertising or otherwise to promote the sale, use or other dealings
++in this Software without prior written authorization from the XFree86 Project.
++
++
++Copyright 1995-1997 The XFree86 Project, Inc.
++Copyright (c) 1999,2000  The XFree86 Project Inc.
+ 
+-http://lists.freedesktop.org/mailman/listinfo/xorg
+diff --git a/ChangeLog b/ChangeLog
+deleted file mode 100644
+index ad0b227..0000000
+--- a/ChangeLog
++++ /dev/null
+@@ -1,133 +0,0 @@
+-2009-06-25  Evgeny M. zubok <evgeny.zubok@tochka.ru>
+-
+-	* src/s3_driver.c:
+-	Revert the old behaviour when the BIOS settings are used for
+-	intialization of DRAM/VRAM timings, i. e. we don't touch the
+-	timings during initialization phase until any memory option (like
+-	slow_edodram) is specified.
+-	
+-	Add manual page.	
+-
+-2009-05-25  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
+-	
+-	* src/s3_driver.c:
+-	* src/s3_video.c:
+-	
+-	Enable Xv extension for Trio64V+ (thanks to Egor Ivanov for 
+-	testing on real hardware) and Trio64UV+ (Tested only on Trio64V2 by
+-	overriding Chipset with "Trio64UV+" but not on real hardware).
+-
+-	S3 Trio64V+ now using NewMMIO. Trio64V+ chips have the same ChipId
+-	as Trio32/64 but only with chip revision greater or eq 0x40. So if 
+-	you have problems with NewMMIO, you may override ChipRev in "Device" 
+- 	section of your xorg.conf: "ChipRev" 0x00. Note: disabling the NewMMIO 
+-	also disables overlay video (Xv) because it isn't implemented for
+-	Old MMIO yet.
+-	
+-2009-05-04  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
+-
+-	* src/s3_driver.c:
+-	* src/s3_shadow.c:
+-
+-	Add shadowFB option. It can be used to speedup drawing when
+-	hardware acceleration is undesirable or unavailable (for colour depth
+-	24 with 24 bpp framebuffer, for example). shadowFB is disabled by
+-	default. Enabling shadowFB option disables HW acceleration. Thanks
+-	to Egor Ivanov for initial porting of shadowFB from s3virge.
+-
+-	Interlace mode support.
+-
+-	Close bug #14999.
+-	
+-2008-07-06  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
+-
+-	* src/s3_video.c: 
+-
+-	Streams Processor initialization.
+-
+-	XVideo support for 16, 24 and 32 bpp (only for TRIO64V2).
+-
+-	* src/s3_driver.c: 
+-
+-	Add XVideo option (enabled by default).
+-
+-	Replace "swcursor" by "hwcursor" option (HW cursor 
+-	not implemented yet for all chipsets).
+-
+-	Close bug #5527: 24-bit colour depth support (24bpp and 
+-	32bpp framebuffer) for TRIOs. Acceleration doesn't work
+-	with packed colour mode (24 bpp FB) but works with 32bpp 
+-	framebuffer mode (hardware limitation? -- need data).
+-
+-	Fix system hang-up when switching between console and X session.
+-
+-	Some minor changes of driver messages.
+-
+-2008-02-23  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
+-
+-	* src/s3_driver.c: Add DPMS support for S3 Trio64V2 and possibly
+-	others (need testing): S3 Trio64UV+. S3 Aurora64V+ and S3 Trio32/64
+-	* src/s3_Trio64DAC: Change clocks for S3 Trio64V2 to make
+-	the 1024x768@16bpp mode work.
+-	Thanks to Richard Driscoll for these patches.
+-	
+-2006-04-07  Adam Jackson  <ajax@freedesktop.org>
+-
+-	* configure.ac:
+-	* src/s3.h:
+-	Bump to 0.4.1 for Xv changes.
+-
+-2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
+-
+-	* src/s3_video.c: (S3PutImage):
+-	Add a DrawablePtr argument to the XV functions to pave the way for
+-	redirected video.
+-
+-2006-04-07  Adam Jackson  <ajax@freedesktop.org>
+-
+-	* configure.ac:
+-	* src/s3.h:
+-	* src/s3_IBMRGB.c:
+-	* src/s3_Ti.c:
+-	* src/s3_Trio64DAC.c:
+-	* src/s3_bios.c:
+-	* src/s3_cursor.c:
+-	* src/s3_dga.c:
+-	* src/s3_driver.c:
+-	* src/s3_video.c:
+-	Unlibcwrap.  Bump server version requirement.  Bump to 0.4.0.
+-
+-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+-
+-	* configure.ac:
+-	Update package version for X11R7 release.
+-
+-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+-
+-	* configure.ac:
+-	Update package version number for final X11R7 release candidate.
+-
+-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+-
+-	* configure.ac:
+-	Update package version number for X11R7 RC3 release.
+-
+-2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+-
+-	* configure.ac:
+-	Remove extraneous AC_MSG_RESULT.
+-
+-2005-11-29  Adam Jackson  <ajax@freedesktop.org>
+-
+-	* configure.ac:
+-	Only build dlloader modules by default.
+-
+-2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+-
+-	* configure.ac:
+-	Update package version number for X11R7 RC2 release.
+-
+-2005-11-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+-
+-	* configure.ac:
+-	Update pkgcheck dependencies to work with separate build roots.
+diff --git a/Makefile.am b/Makefile.am
+index 7052905..4c278ba 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,5 +18,15 @@
+ #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+-AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = src man
++MAINTAINERCLEANFILES = ChangeLog INSTALL
++
++.PHONY: ChangeLog INSTALL
++
++INSTALL:
++	$(INSTALL_CMD)
++
++ChangeLog:
++	$(CHANGELOG_CMD)
++
++dist-hook: ChangeLog INSTALL
+diff --git a/configure.ac b/configure.ac
+index 0eecc87..0ac34f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,42 +20,50 @@
+ #
+ # Process this file with autoconf to produce a configure script
+ 
+-AC_PREREQ(2.57)
++# Initialize Autoconf
++AC_PREREQ([2.60])
+ AC_INIT([xf86-video-s3],
+-        0.6.3,
++        [0.6.3],
+         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+-        xf86-video-s3)
+-
++        [xf86-video-s3])
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_AUX_DIR(.)
+ 
+-AM_INIT_AUTOMAKE([dist-bzip2])
+-
++# Initialize Automake
++AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+-# Checks for programs.
++# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
++m4_ifndef([XORG_MACROS_VERSION],
++          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
++XORG_MACROS_VERSION(1.8)
++XORG_DEFAULT_OPTIONS
++
++# Initialize libtool
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
++
++# Checks for programs.
++AM_PROG_CC_C_O
+ 
+ AH_TOP([#include "xorg-server.h"])
+ 
++# Define a configure option for an alternate module directory
+ AC_ARG_WITH(xorg-module-dir,
+-            AC_HELP_STRING([--with-xorg-module-dir=DIR],
++            AS_HELP_STRING([--with-xorg-module-dir=DIR],
+                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
+             [moduledir="$withval"],
+             [moduledir="$libdir/xorg/modules"])
+ 
+-# Checks for extensions
++# Store the list of server defined optional extensions in REQUIRED_MODULES
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+ XORG_DRIVER_CHECK_EXT(XV, videoproto)
+ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ 
+-# Checks for pkg-config packages
++# Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES])
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+ 
+ # Checks for libraries.
+ SAVE_CPPFLAGS="$CPPFLAGS"
+@@ -65,28 +73,20 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+               [#include "xorg-server.h"])
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ 
+-# Checks for header files.
+-AC_HEADER_STDC
+-
+ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+     PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+     XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+ fi
+ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+ 
+-AC_SUBST([XORG_CFLAGS])
+ AC_SUBST([moduledir])
+ 
+ DRIVER_NAME=s3
+ AC_SUBST([DRIVER_NAME])
+ 
+-XORG_MANPAGE_SECTIONS
+-XORG_RELEASE_VERSION
+-
+-XORG_CHECK_LINUXDOC
+-
+-AC_OUTPUT([
+-	Makefile
+-	src/Makefile
+-	man/Makefile
++AC_CONFIG_FILES([
++                Makefile
++                src/Makefile
++                man/Makefile
+ ])
++AC_OUTPUT
+diff --git a/man/Makefile.am b/man/Makefile.am
+index f0eb29b..b3688ce 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -1,27 +1,24 @@
+ #
+ # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+-# 
+-# Permission to use, copy, modify, distribute, and sell this software and its
+-# documentation for any purpose is hereby granted without fee, provided that
+-# the above copyright notice appear in all copies and that both that
+-# copyright notice and this permission notice appear in supporting
+-# documentation.
+-# 
+-# The above copyright notice and this permission notice shall be included
+-# in all copies or substantial portions of the Software.
+-# 
+-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+-# OTHER DEALINGS IN THE SOFTWARE.
+-# 
+-# Except as contained in this notice, the name of the copyright holders shall
+-# not be used in advertising or otherwise to promote the sale, use or
+-# other dealings in this Software without prior written authorization
+-# from the copyright holders.
++#
++# Permission is hereby granted, free of charge, to any person obtaining a
++# copy of this software and associated documentation files (the "Software"),
++# to deal in the Software without restriction, including without limitation
++# the rights to use, copy, modify, merge, publish, distribute, sublicense,
++# and/or sell copies of the Software, and to permit persons to whom the
++# Software is furnished to do so, subject to the following conditions:
++#
++# The above copyright notice and this permission notice (including the next
++# paragraph) shall be included in all copies or substantial portions of the
++# Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++# DEALINGS IN THE SOFTWARE.
+ # 
+ 
+ drivermandir = $(DRIVER_MAN_DIR)
+@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
+ 
+ CLEANFILES = $(driverman_DATA)
+ 
+-SED = sed
+ 
+-# Strings to replace in man pages
+-XORGRELSTRING = @PACKAGE_STRING@
+-  XORGMANNAME = X Version 11
++# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+ 
+-MAN_SUBSTS = \
+-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+-	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+-	-e 's|__xservername__|Xorg|g' \
+-	-e 's|__xconfigfile__|xorg.conf|g' \
+-	-e 's|__projectroot__|$(prefix)|g' \
+-	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+-	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+-	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+ 
+ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+ 
+ .man.$(DRIVER_MAN_SUFFIX):
+-	sed $(MAN_SUBSTS) < $< > $@
++	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+diff --git a/src/s3.h b/src/s3.h
+index 49b8a54..0875fc9 100644
+--- a/src/s3.h
++++ b/src/s3.h
+@@ -113,7 +113,6 @@ typedef struct _S3Rec {
+         XAAInfoRecPtr           pXAA;
+ 	xf86CursorInfoPtr	pCurs;
+ 	xf86Int10InfoPtr	pInt10;
+-	vbeInfoPtr		pVBE;
+         XF86VideoAdaptorPtr     adaptor;
+         S3PortPrivPtr           portPrivate;
+ 
+diff --git a/src/s3_driver.c b/src/s3_driver.c
+index 29e343d..4519b33 100644
+--- a/src/s3_driver.c
++++ b/src/s3_driver.c
+@@ -309,6 +309,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
+ 	S3Ptr pS3;
+ 	vgaHWPtr hwp;
+ 	ClockRangePtr clockRanges;
++	vbeInfoPtr pVBE;
+ 	rgb zeros = {0, 0, 0};
+ 	Gamma gzeros = {0.0, 0.0, 0.0};
+ 	int i, vgaCRIndex, vgaCRReg;
+@@ -436,7 +437,8 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
+ 	}
+ 
+ 	if (xf86LoadSubModule(pScrn, "vbe")) {
+-		pS3->pVBE = VBEInit(pS3->pInt10, pEnt->index);
++		pVBE = VBEInit(pS3->pInt10, pEnt->index);
++		vbeFree(pVBE);
+ 	}
+ 	
+ 	if (pS3->shadowFB) {
diff --git a/staging/xf86-video-sis/PKGBUILD b/staging/xf86-video-sis/PKGBUILD
new file mode 100644
index 000000000..a889a881e
--- /dev/null
+++ b/staging/xf86-video-sis/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 136422 2011-08-29 08:27:06Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-sis
+pkgver=0.10.3
+pkgrel=5
+pkgdesc="X.org SiS video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc' 'sis-dri')
+makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
+conflicts=('xorg-server<1.11.0')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('158673747e240b0c33499685a32d46bdaead7cd5')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --enable-dri
+  make
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/staging/xf86-video-sisimedia/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch b/staging/xf86-video-sisimedia/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch
new file mode 100644
index 000000000..fd87b6c8c
--- /dev/null
+++ b/staging/xf86-video-sisimedia/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch
@@ -0,0 +1,25 @@
+From e4f6a2fcd5712d0f994d3719b9c6c13f5b02bc7c Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri, 9 Jan 2009 16:34:01 -0800
+Subject: [PATCH 01/10] Remove xorgconfig & xorgcfg from See Also list in man page
+
+---
+ man/sis.man |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/man/sis.man b/man/sis.man
+index d743fe6..c321808 100644
+--- a/man/sis.man
++++ b/man/sis.man
+@@ -429,7 +429,7 @@ The amount is to be specified in megabyte, the default is 8.
+ none.
+ .SH "SEE ALSO"
+ #ifdef __xservername__
+-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
++__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+ #else
+ XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+ #endif
+-- 
+1.6.5.4
+
diff --git a/staging/xf86-video-sisimedia/0002-Remove-XFree86-Misc-PassMessage-support.patch b/staging/xf86-video-sisimedia/0002-Remove-XFree86-Misc-PassMessage-support.patch
new file mode 100644
index 000000000..860e593c6
--- /dev/null
+++ b/staging/xf86-video-sisimedia/0002-Remove-XFree86-Misc-PassMessage-support.patch
@@ -0,0 +1,91 @@
+diff -p -up xf86-video-sis-0.9.1/configure.ac.orig xf86-video-sis-0.9.1/configure.ac
+--- xf86-video-sis-0.9.1/configure.ac.orig	2010-01-27 15:34:26.000000000 -0500
++++ xf86-video-sis-0.9.1/configure.ac	2010-01-27 15:34:43.000000000 -0500
+@@ -58,7 +58,6 @@ XORG_DRIVER_CHECK_EXT(XINERAMA, xinerama
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+ XORG_DRIVER_CHECK_EXT(XV, videoproto)
+-XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto)
+ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ 
+ # Checks for pkg-config packages
+diff -p -up xf86-video-sis-0.9.1/src/sis_driver.c.orig xf86-video-sis-0.9.1/src/sis_driver.c
+--- xf86-video-sis-0.9.1/src/sis_driver.c.orig	2010-01-27 15:35:05.000000000 -0500
++++ xf86-video-sis-0.9.1/src/sis_driver.c	2010-01-27 15:35:39.000000000 -0500
+@@ -86,8 +86,6 @@
+ #include "mibank.h"
+ #include "mipointer.h"
+ #include "mibstore.h"
+-#define _XF86MISC_SERVER_
+-#include <X11/extensions/xf86misc.h>
+ #include "edid.h"
+ 
+ #define SIS_NEED_inSISREG
+@@ -506,11 +504,6 @@ xf86DrvMsg(0, X_INFO, "                 
+ 	    pScrn->FreeScreen       = SISFreeScreen;
+ 	    pScrn->ValidMode        = SISValidMode;
+ 	    pScrn->PMEvent          = SISPMEvent; /*add PM function for ACPI hotkey,Ivans*/
+-#ifdef X_XF86MiscPassMessage
+-//   if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) {
+-//	       pScrn->HandleMessage = SISHandleMessage;
+-//	    }
+-#endif
+ 	    foundScreen = TRUE;
+ 	}
+     #ifdef SISDUALHEAD
+diff -p -up xf86-video-sis-0.9.1/src/sis_driver.h.orig xf86-video-sis-0.9.1/src/sis_driver.h
+--- xf86-video-sis-0.9.1/src/sis_driver.h.orig	2010-01-27 15:35:49.000000000 -0500
++++ xf86-video-sis-0.9.1/src/sis_driver.h	2010-01-27 15:36:04.000000000 -0500
+@@ -791,10 +791,6 @@ static Bool SISHotkeySwitchMode(ScrnInfo
+ #ifdef SISDUALHEAD
+ static Bool	SISSaveScreenDH(ScreenPtr pScreen, int mode);
+ #endif
+-#ifdef X_XF86MiscPassMessage
+-extern int	SISHandleMessage(int scrnIndex, const char *msgtype,
+-				const char *msgval, char **retmsg);
+-#endif
+ static void     SISFreeScreen(int scrnIndex, int flags);
+ static ModeStatus SISValidMode(int scrnIndex, DisplayModePtr mode,
+ 				Bool verbose, int flags);
+diff -p -up xf86-video-sis-0.9.1/src/sis_utility.c.orig xf86-video-sis-0.9.1/src/sis_utility.c
+--- xf86-video-sis-0.9.1/src/sis_utility.c.orig	2010-01-27 15:36:23.000000000 -0500
++++ xf86-video-sis-0.9.1/src/sis_utility.c	2010-01-27 15:36:59.000000000 -0500
+@@ -40,8 +40,6 @@
+ #define NEED_EVENTS
+ #include <X11/X.h>
+ #include "dixstruct.h"
+-#define _XF86MISC_SERVER_
+-#include <X11/extensions/xf86misc.h>
+ 
+ #include "sis_videostr.h"
+ 
+@@ -262,9 +260,6 @@ typedef struct {
+     int		 (*HandleSiSDirectCommand[SISCTRL_MAX_SCREENS])(xSiSCtrlCommandReply *);
+ } xSiSCtrlScreenTable;
+ 
+-#ifdef X_XF86MiscPassMessage
+-int		SISHandleMessage(int scrnIndex, const char *msgtype, const char *msgval, char **retmsg);
+-#endif
+ void		SiSCtrlExtInit(ScrnInfoPtr pScrn);
+ void		SiSCtrlExtUnregister(SISPtr pSiS, int index);
+ 
+@@ -975,19 +970,6 @@ unsigned int SISVGADetected(ScrnInfoPtr 
+ }
+ 
+ /***********************************
+- *     MessageHandler interface    *
+- *   (unused now; use extension)   *
+- ***********************************/
+-
+-#ifdef X_XF86MiscPassMessage
+-int
+-SISHandleMessage(int scrnIndex, const char *msgtype, const char *msgval, char **retmsg)
+-{
+-    return BadMatch;
+-}
+-#endif
+-
+-/***********************************
+  *   SiSCtrl extension interface   *
+  ***********************************/
+ 
diff --git a/staging/xf86-video-sisimedia/0003-Fix-build-with-Werror-format-security.patch b/staging/xf86-video-sisimedia/0003-Fix-build-with-Werror-format-security.patch
new file mode 100644
index 000000000..4fc355bbb
--- /dev/null
+++ b/staging/xf86-video-sisimedia/0003-Fix-build-with-Werror-format-security.patch
@@ -0,0 +1,65 @@
+From 9b010b7db7f0c6730c1a1b3cd473d49b01ed5b5f Mon Sep 17 00:00:00 2001
+From: Ander Conselvan de Oliveira <ander@mandriva.com.br>
+Date: Mon, 22 Jun 2009 16:07:26 -0400
+Subject: [PATCH] Fix build with -Werror=format-security
+
+---
+ src/sis_driver.c   |    4 ++--
+ src/sis_mergedfb.c |    6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index 5b91004..0a154db 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -831,14 +831,14 @@ SISErrorLog(ScrnInfoPtr pScrn, const char *format, ...)
+     static const char *str = "**************************************************\n";
+ 
+     va_start(ap, format);
+-    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
++    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str);
+     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 	"                      ERROR:\n");
+     xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap);
+     va_end(ap);
+     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 	"                  END OF MESSAGE\n");
+-    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
++    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str);
+ }
+ 
+ static void
+diff --git a/src/sis_mergedfb.c b/src/sis_mergedfb.c
+index 61b4255..feca024 100644
+--- a/src/sis_mergedfb.c
++++ b/src/sis_mergedfb.c
+@@ -357,7 +357,7 @@ SiSCopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
+ 
+        strcat(printbuffer, namebuf1);
+ 
+-       xf86DrvMsg(pScrn->scrnIndex, X_INFO, printbuffer);
++       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%s", printbuffer);
+     }
+ 
+     mode->next = mode;
+@@ -2137,7 +2137,7 @@ SiSUpdateXineramaScreenInfo(ScrnInfoPtr pScrn1)
+        if(infochanged && !usenonrect) {
+ 	  xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb,
+ 			"Current screen size does not match maximum display modes...\n");
+-	  xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, rectxine);
++	  xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, "%s", rectxine);
+        }
+ 
+     } else if(infochanged && usenonrect) {
+@@ -2145,7 +2145,7 @@ SiSUpdateXineramaScreenInfo(ScrnInfoPtr pScrn1)
+        usenonrect = FALSE;
+        xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb,
+ 		"Only clone modes available for this screen size...\n");
+-       xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, rectxine);
++       xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, "%s", rectxine);
+ 
+     }
+ 
+-- 
+1.6.2.4
+
diff --git a/staging/xf86-video-sisimedia/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch b/staging/xf86-video-sisimedia/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch
new file mode 100644
index 000000000..68ec63138
--- /dev/null
+++ b/staging/xf86-video-sisimedia/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch
@@ -0,0 +1,32 @@
+From 49c641b638ac36d2a559555c04a3bd2777c8d071 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri, 1 May 2009 16:52:10 -0700
+Subject: [PATCH 04/10] Make sisRegs3D4 big enough to hold all values written to it
+
+Increase size from 0xff to 0x100 since SiS315Save (sis_dac.c line 752)
+writes values into sisRegs3D4[0x00..0xff] if ChipType >= XGI_20
+
+[This bug was found by the Parfait bug checking tool.
+ For more information see http://research.sun.com/projects/parfait ]
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+---
+ src/sis.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/sis.h b/src/sis.h
+index 9bafd4b..773f709 100644
+--- a/src/sis.h
++++ b/src/sis.h
+@@ -747,7 +747,7 @@ typedef struct {
+     UChar  sisRegsGR[10];
+     UChar  sisDAC[768];
+     UChar  sisRegs3C4[0x80];
+-    UChar  sisRegs3D4[0xff];
++    UChar  sisRegs3D4[0x100];
+     UChar  sisRegs3C2;
+     UChar  sisCapt[0x60];
+     UChar  sisVid[0x50];
+-- 
+1.6.5.4
+
diff --git a/staging/xf86-video-sisimedia/0005-Correct-bounds-check-of-blitClip-array-access.patch b/staging/xf86-video-sisimedia/0005-Correct-bounds-check-of-blitClip-array-access.patch
new file mode 100644
index 000000000..038322bf6
--- /dev/null
+++ b/staging/xf86-video-sisimedia/0005-Correct-bounds-check-of-blitClip-array-access.patch
@@ -0,0 +1,38 @@
+From 933dd8f860883c613acb5bcdf6b66100dbdfa952 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri, 1 May 2009 16:57:22 -0700
+Subject: [PATCH 05/10] Correct bounds check of blitClip array access
+
+Array is defined as blitClip[NUM_BLIT_PORTS], so invalid indexes
+are >= NUM_BLIT_PORTS, not just > NUM_BLIT_PORTS
+
+[This bug was found by the Parfait bug checking tool.
+ For more information see http://research.sun.com/projects/parfait ]
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+---
+ src/sis_video.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: xf86-video-sis-0.9.1/src/sis_video.c
+===================================================================
+--- xf86-video-sis-0.9.1.orig/src/sis_video.c
++++ xf86-video-sis-0.9.1/src/sis_video.c
+@@ -4656,7 +4656,7 @@ SISStopVideoBlit(ScrnInfoPtr pScrn, ULon
+     * adapt->flags but we provide it anyway.
+     */
+ 
+-   if(index > NUM_BLIT_PORTS) return;
++   if(index >= NUM_BLIT_PORTS) return;
+ 
+    REGION_EMPTY(pScrn->pScreen, &pPriv->blitClip[index]);
+ 
+@@ -4698,7 +4698,7 @@ SISPutImageBlit_671(
+    int	  xoffset = 0, yoffset = 0;
+    Bool   first;
+ 
+-   if(index > NUM_BLIT_PORTS)
++   if(index >= NUM_BLIT_PORTS)
+       return BadMatch;
+ 
+    if(!height || !width)
diff --git a/staging/xf86-video-sisimedia/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch b/staging/xf86-video-sisimedia/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch
new file mode 100644
index 000000000..f023c774e
--- /dev/null
+++ b/staging/xf86-video-sisimedia/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch
@@ -0,0 +1,25 @@
+From 910073e0ab3a7bf9e5c9d97437a879d97edc2714 Mon Sep 17 00:00:00 2001
+From: root <root@greentea.conectiva>
+Date: Wed, 1 Jul 2009 09:59:39 -0400
+Subject: [PATCH] Fix backlight off on SiS30x. video bridges.
+
+---
+ src/init301.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/init301.c b/src/init301.c
+index c179ae8..70a6aab 100644
+--- a/src/init301.c
++++ b/src/init301.c
+@@ -9261,7 +9261,7 @@ void
+ SiS_SiS30xBLOff(struct SiS_Private *SiS_Pr)
+ {
+   /* Switch off LCD backlight on SiS30xLV */
+-  SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x26,0xFE);
++  SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x26,0xFC);
+   SiS_DDC2Delay(SiS_Pr,0xff00);
+ }
+ 
+-- 
+1.5.4.3
+
diff --git a/staging/xf86-video-sisimedia/0006-Add-IgnoreHotkeyFlag-driver-option.patch b/staging/xf86-video-sisimedia/0006-Add-IgnoreHotkeyFlag-driver-option.patch
new file mode 100644
index 000000000..8ebc799a7
--- /dev/null
+++ b/staging/xf86-video-sisimedia/0006-Add-IgnoreHotkeyFlag-driver-option.patch
@@ -0,0 +1,89 @@
+From 072af02d180c1965f30246ea269d208292ed6f05 Mon Sep 17 00:00:00 2001
+From: root <root@greentea.conectiva>
+Date: Wed, 1 Jul 2009 14:13:52 -0400
+Subject: [PATCH] Add IgnoreHotkeyFlag driver option.
+
+Some BIOSes do not set the hotkey flag correctly. Without this option
+set, the driver won't change the mirroring state of LCD and VGA
+connections if the BIOS did not set this flag.
+---
+ src/sis.h        |    3 +++
+ src/sis_driver.c |    2 +-
+ src/sis_opt.c    |   13 ++++++++++++-
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/src/sis.h b/src/sis.h
+index c50690b..c82c302 100644
+--- a/src/sis.h
++++ b/src/sis.h
+@@ -1565,6 +1565,9 @@ typedef struct {
+ 
+   /* Enable special 1366x768x60hz mode of LVDS panel. Ivans@090109 */
+     Bool  EnablePanel_1366x768;
++
++    /* Ignore hotkey flag on capability changed APM events */
++    Bool IgnoreHotkeyFlag;
+ 	
+ } SISRec, *SISPtr;
+ 
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index c935c11..2a5001c 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -11370,7 +11370,7 @@ SISPMEvent(int scrnIndex, pmEvent event, Bool undo)
+ 	                inSISIDXREG(SISCR,0x3d,hotkeyflag);/*check device switch flag from BIOS CR 0x3d bit[2].*/
+                         
+ 			
+-			if(hotkeyflag & 0x04)
++			if(pSiS->IgnoreHotkeyFlag || (hotkeyflag & 0x04))
+ 			{	
+ 						
+ 			SISCRT1PreInit(pScrn); /*redetecting CRT1, pSiS->CRT1detected will update.*/
+diff --git a/src/sis_opt.c b/src/sis_opt.c
+index 4b79f7f..7f726ea 100644
+--- a/src/sis_opt.c
++++ b/src/sis_opt.c
+@@ -159,7 +159,8 @@ typedef enum {
+     OPTION_PSEUDO,
+     OPTION_FUTRO_TIMING, /*chaoyu's modified: for Fuji-Siemans specail timing*/
+     OPTION_TRACEVGAMISCW,
+-    OPTION_USETIMING1366  /*option of enable 1366x768 timing for LVDS panel. Ivans@090109*/
++    OPTION_USETIMING1366,  /*option of enable 1366x768 timing for LVDS panel. Ivans@090109*/
++    OPTION_IGNOREHOTKEYFLAG
+ } SISOpts;
+ 
+ static const OptionInfoRec SISOptions[] = {
+@@ -305,6 +306,7 @@ static const OptionInfoRec SISOptions[] = {
+     { OPTION_FUTRO_TIMING,		"FutroTiming",			OPTV_BOOLEAN,   {0}, FALSE },/*chaoyu's modified: for Fuji-seimans special timing*/
+     { OPTION_TRACEVGAMISCW,             "TraceVgaMISCW",                OPTV_BOOLEAN,   {0}, FALSE },/*Ivans added for helping detected CRT1 using BIOS setting.*/
+     { OPTION_USETIMING1366,              "UseTiming1366",                  OPTV_BOOLEAN,   {0}, FALSE },/*enable 1366 timing on LVDS, Ivans@090109*/
++    { OPTION_IGNOREHOTKEYFLAG,		"IgnoreHotkeyFlag",		OPTV_BOOLEAN,	{0}, FALSE },
+     { -1,				NULL,				OPTV_NONE,	{0}, FALSE }
+ };
+ 
+@@ -624,6 +626,7 @@ SiSOptions(ScrnInfoPtr pScrn)
+     pSiS->CRT2IsScrn0 = FALSE;
+ #endif
+ #endif
++    pSiS->IgnoreHotkeyFlag = FALSE;
+   
+     /* Chipset dependent defaults */
+ 
+@@ -2419,6 +2422,14 @@ SiSOptions(ScrnInfoPtr pScrn)
+                 pSiS->EnablePanel_1366x768 = TRUE;		
+         }
+     }
++    /* Ignore hotkey flag for video switch, switch on every
++     * XF86_APM_CAPABILITY_CHANGED event */ 
++    if(xf86GetOptValBool(pSiS->Options, OPTION_IGNOREHOTKEYFLAG, &val)){
++        if(val){
++                xf86DrvMsg(pScrn->scrnIndex, X_INFO,"Ignoring hotkey flag\n");
++                pSiS->IgnoreHotkeyFlag = TRUE;		
++        }
++    }
+ 
+ }
+ 
+-- 
+1.5.4.3
+
diff --git a/staging/xf86-video-sisimedia/0007-Remove-useless-loader-symbol-lists.patch b/staging/xf86-video-sisimedia/0007-Remove-useless-loader-symbol-lists.patch
new file mode 100644
index 000000000..395213375
--- /dev/null
+++ b/staging/xf86-video-sisimedia/0007-Remove-useless-loader-symbol-lists.patch
@@ -0,0 +1,249 @@
+From ae1a7dcebdac904c8068cc38fb77648c548f5075 Mon Sep 17 00:00:00 2001
+From: Paulo Ricardo Zanoni <pzanoni@mandriva.com>
+Date: Thu, 22 Apr 2010 11:19:29 -0300
+Subject: [PATCH] Remove useless loader symbol lists
+
+Adaption of xf86-video-sis patch 74553b5ee476a0dd28e136f5a33a546ea0c3ef28
+---
+ src/sis_driver.c |  150 +-----------------------------------------------------
+ 1 files changed, 1 insertions(+), 149 deletions(-)
+
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index d56182f..96255d3 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -227,126 +227,6 @@ static PciChipsets XGIPciChipsets[] = {
+     { -1,                   -1,                 RES_UNDEFINED }
+ };
+ 
+-#ifdef SIS_USE_XAA
+-static const char *xaaSymbols[] = {
+-    "XAACreateInfoRec",
+-    "XAADestroyInfoRec",
+-    "XAAHelpPatternROP",
+-    "XAAInit",
+-    NULL
+-};
+-#endif
+-
+-#ifdef SIS_USE_EXA
+-static const char *exaSymbols[] = {
+-    "exaGetVersion",
+-    "exaDriverInit",
+-    "exaDriverFini",
+-    "exaOffscreenAlloc",
+-    "exaOffscreenFree",
+-    NULL
+-};
+-#endif
+-
+-static const char *fbSymbols[] = {
+-    "fbPictureInit",
+-    "fbScreenInit",
+-    NULL
+-};
+-
+-static const char *shadowSymbols[] = {
+-    "ShadowFBInit",
+-    NULL
+-};
+-
+-static const char *ramdacSymbols[] = {
+-    "xf86CreateCursorInfoRec",
+-    "xf86DestroyCursorInfoRec",
+-    "xf86InitCursor",
+-    NULL
+-};
+-
+-static const char *ddcSymbols[] = {
+-    "xf86PrintEDID",
+-    "xf86InterpretEDID",
+-    NULL
+-};
+-
+-static const char *int10Symbols[] = {
+-    "xf86FreeInt10",
+-    "xf86InitInt10",
+-    NULL
+-};
+-
+-static const char *vbeSymbols[] = {
+-#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
+-    "VBEInit",
+-#else
+-    "VBEExtendedInit",
+-#endif
+-    "vbeDoEDID",
+-    "vbeFree",
+-    "VBEGetVBEInfo",
+-    "VBEFreeVBEInfo",
+-    "VBEGetModeInfo",
+-    "VBEFreeModeInfo",
+-    "VBESaveRestore",
+-    "VBESetVBEMode",
+-    "VBEGetVBEMode",
+-    "VBESetDisplayStart",
+-    "VBESetGetLogicalScanlineLength",
+-    NULL
+-};
+-
+-#ifdef XF86DRI
+-static const char *drmSymbols[] = {
+-    "drmAddMap",
+-    "drmAgpAcquire",
+-    "drmAgpRelease",
+-    "drmAgpAlloc",
+-    "drmAgpFree",
+-    "drmAgpBase",
+-    "drmAgpBind",
+-    "drmAgpUnbind",
+-    "drmAgpEnable",
+-    "drmAgpGetMode",
+-    "drmCtlInstHandler",
+-    "drmCtlUninstHandler",
+-    "drmGetInterruptFromBusID",
+-#ifndef SISHAVEDRMWRITE
+-    "drmSiSAgpInit",
+-#else
+-    "drmCommandWrite",
+-#endif
+-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
+-    "drmGetVersion",
+-    "drmFreeVersion",
+-#endif
+-    NULL
+-};
+-
+-static const char *driSymbols[] = {
+-    "DRICreateInfoRec",
+-    "DRIScreenInit",
+-    "DRIFinishScreenInit",
+-    "DRIDestroyInfoRec",
+-    "DRICloseScreen",
+-    "DRIGetSAREAPrivate",
+-    "DRILock",
+-    "DRIUnlock",
+-    "DRIQueryVersion",
+-    "GlxSetVisualConfigs",
+-    NULL
+-};
+-
+-#ifdef XFree86LOADER
+-static const char *driRefSymbols[] = {
+-    "DRICreatePCIBusID",  /* not REQUIRED, but eventually referenced */
+-    NULL
+-};
+-#endif
+-#endif  /* XF86DRI */
+-
+ #ifdef XFree86LOADER
+ 
+ static MODULESETUPPROTO(sisSetup);
+@@ -382,19 +262,6 @@ sisSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+     if(!setupDone) {
+        setupDone = TRUE;
+        xf86AddDriver(&SIS, module, SIS_HaveDriverFuncs);
+-       LoaderRefSymLists(fbSymbols,
+-#ifdef SIS_USE_XAA
+-			 xaaSymbols,
+-#endif
+-#ifdef SIS_USE_EXA
+-			 exaSymbols,
+-#endif
+-			 shadowSymbols, ramdacSymbols,
+-			 vbeSymbols, int10Symbols,
+-#ifdef XF86DRI
+-			 drmSymbols, driSymbols, driRefSymbols,
+-#endif
+-			 NULL);
+        return (pointer)TRUE;
+     }
+ 
+@@ -1068,7 +935,6 @@ SiS_LoadInitVBE(ScrnInfoPtr pScrn)
+        return;
+ 
+     if(xf86LoadSubModule(pScrn, "vbe")) {
+-       xf86LoaderReqSymLists(vbeSymbols, NULL);
+ #if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
+        pSiS->pVbe = VBEInit(pSiS->pInt, pSiS->pEnt->index);
+ #else
+@@ -1092,7 +958,6 @@ SiSLoadInitDDCModule(ScrnInfoPtr pScrn)
+        return TRUE;
+ 
+     if(xf86LoadSubModule(pScrn, "ddc")) {
+-       xf86LoaderReqSymLists(ddcSymbols, NULL);
+        pSiS->haveDDC = TRUE;
+        return TRUE;
+     }
+@@ -3586,7 +3451,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+ 	  xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ 		"Initializing adapter through int10\n");
+ 	  if(xf86LoadSubModule(pScrn, "int10")) {
+-	     xf86LoaderReqSymLists(int10Symbols, NULL);
+ 	     pSiS->pInt = xf86InitInt10(pSiS->pEnt->index);
+ 	  } else {
+ 	     SISErrorLog(pScrn, "Failed to load int10 module\n");
+@@ -3683,7 +3547,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+        SISErrorLog(pScrn, "Could not load ramdac module\n");
+        goto my_error_1;
+     }
+-    xf86LoaderReqSymLists(ramdacSymbols, NULL);
+ 
+     /* Set pScrn->monitor */
+     pScrn->monitor = pScrn->confScreen->monitor;
+@@ -5868,22 +5731,18 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+ 	SISErrorLog(pScrn, "Unsupported framebuffer bpp (%d)\n", pScrn->bitsPerPixel);
+ 	goto my_error_1;
+     }
+-    xf86LoaderReqSymLists(fbSymbols, NULL);
+ 
+     /* Load XAA/EXA (if needed) */
+     if(!pSiS->NoAccel) {
+        char *modName = NULL;
+-       const char **symNames = NULL;
+ #ifdef SIS_USE_XAA
+        if(!pSiS->useEXA) {
+ 	  modName = "xaa";
+-	  symNames = xaaSymbols;
+        }
+ #endif
+ #ifdef SIS_USE_EXA
+        if(pSiS->useEXA) {
+ 	  modName = "exa";
+-	  symNames = exaSymbols;
+        }
+ #endif
+        if(modName && (!xf86LoadSubModule(pScrn, modName))) {
+@@ -5894,9 +5753,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+ 	     pSiS->NoXvideo = TRUE;
+ 	  }
+ #endif
+-       } else if(symNames) {
+-	  xf86LoaderReqSymLists(symNames, NULL);
+-	  xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled, modename %s\n",modName);
+        }
+     }
+ 
+@@ -5909,8 +5765,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+ 	     pSiS->ShadowFB = FALSE;
+ 	     pSiS->Rotate = pSiS->Reflect = 0;
+ 	  }
+-       } else {
+-          xf86LoaderReqSymLists(shadowSymbols, NULL);
+        }
+     }
+ 
+@@ -5920,9 +5774,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+        if(!xf86LoaderCheckSymbol("DRIScreenInit")) {
+ 	  if(xf86LoadSubModule(pScrn, "dri")) {
+ 	     if(!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) {
+-	        if(xf86LoadSubModule(pScrn, "glx")) {
+-		   xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL);
+-		} else {
++	        if(! xf86LoadSubModule(pScrn, "glx")) {
+ 		   SISErrorLog(pScrn, "Failed to load glx module\n");
+ 		}
+ 	     }
+-- 
+1.6.4.4
+
diff --git a/staging/xf86-video-sisimedia/0008-update-to-xextproto-7-1-support.patch b/staging/xf86-video-sisimedia/0008-update-to-xextproto-7-1-support.patch
new file mode 100644
index 000000000..1dcbdf05c
--- /dev/null
+++ b/staging/xf86-video-sisimedia/0008-update-to-xextproto-7-1-support.patch
@@ -0,0 +1,45 @@
+From 59ea80738d22c69a2850fd7ff89bd75330cc310b Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu, 16 Jul 2009 01:55:25 +0000
+Subject: Update to xextproto 7.1 support.
+
+DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
+need to include dpmsconst.h if xextproto 7.1 is available.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+diff --git a/configure.ac b/configure.ac
+index 089c5fa..f19c1b7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,6 +62,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ 
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES])
++PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
++                  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
++                  HAVE_XEXTPROTO_71="no")
++AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
+ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+ 
+ # Checks for libraries.
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index ef7b522..a1ced97 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -78,8 +78,13 @@
+ 
+ #include "globals.h"
+ 
++#ifdef HAVE_XEXTPROTO_71
++#include <X11/extensions/dpmsconst.h>
++#else
+ #define DPMS_SERVER
+ #include <X11/extensions/dpms.h>
++#endif
++
+ 
+ #ifdef XF86DRI
+ #include "dri.h"
+--
+cgit v0.8.3-6-g21f6
diff --git a/staging/xf86-video-sisimedia/0009-update-for-rac-removal.patch b/staging/xf86-video-sisimedia/0009-update-for-rac-removal.patch
new file mode 100644
index 000000000..df1421798
--- /dev/null
+++ b/staging/xf86-video-sisimedia/0009-update-for-rac-removal.patch
@@ -0,0 +1,69 @@
+From 9e1ebb9530bbb71be7fcab9e6f8f9a475be72efe Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Tue, 28 Jul 2009 03:32:37 +0000
+Subject: sis: update for resources/RAC API removal
+
+---
+diff --git a/src/sis.h b/src/sis.h
+index 773f709..e859c78 100644
+--- a/src/sis.h
++++ b/src/sis.h
+@@ -77,7 +77,9 @@
+ #include "xf86Pci.h"
+ #include "xf86Priv.h"
+ #include "xf86_OSproc.h"
++#ifndef XSERVER_LIBPCIACCESS
+ #include "xf86Resources.h"
++#endif
+ #include "xf86.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Cursor.h"
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index a1ced97..bb11cbb 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -49,7 +49,9 @@
+ 
+ #include "sis.h"
+ 
++#ifndef XSERVER_LIBPCIACCESS
+ #include "xf86RAC.h"
++#endif
+ #include "dixstruct.h"
+ #include "shadowfb.h"
+ #include "fb.h"
+@@ -3552,6 +3554,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+     SiS_MapVGAMem(pScrn);
+ #endif
+ 
++#ifndef XSERVER_LIBPCIACCESS
+     /* Set operating state */
+ 
+     /* 1. memory */
+@@ -3581,6 +3584,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+     /* Operations for which I/O access is required */
+     pScrn->racIoFlags = RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
+ 
++#endif
++
+     /* Load ramdac module */
+     if(!xf86LoadSubModule(pScrn, "ramdac")) {
+        SISErrorLog(pScrn, "Could not load ramdac module\n");
+@@ -4424,6 +4429,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+     xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX (size %ldK)\n",
+ 	   (ULong)pSiS->IOAddress, pSiS->mmioSize);
+ 
++#ifndef XSERVER_LIBPCIACCESS
+     /* Register the PCI-assigned resources */
+     if(xf86RegisterResources(pSiS->pEnt->index, NULL, ResExclusive)) {
+        SISErrorLog(pScrn, "PCI resource conflicts detected\n");
+@@ -4435,6 +4441,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+        SISFreeRec(pScrn);
+        return FALSE;
+     }
++#endif
+ 
+     from = X_PROBED;
+     if(pSiS->pEnt->device->videoRam != 0) {
+--
+cgit v0.8.3-6-g21f6
diff --git a/staging/xf86-video-sisimedia/0010-change-to-use-abi-version-check.patch b/staging/xf86-video-sisimedia/0010-change-to-use-abi-version-check.patch
new file mode 100644
index 000000000..cb9fd7ea5
--- /dev/null
+++ b/staging/xf86-video-sisimedia/0010-change-to-use-abi-version-check.patch
@@ -0,0 +1,34 @@
+From 8c3eca873717e877048c2bde345c02b1e9099e50 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Tue, 28 Jul 2009 05:22:41 +0000
+Subject: sis: change to using ABI version check
+
+---
+diff --git a/src/sis.h b/src/sis.h
+index e859c78..400b83f 100644
+--- a/src/sis.h
++++ b/src/sis.h
+@@ -77,7 +77,7 @@
+ #include "xf86Pci.h"
+ #include "xf86Priv.h"
+ #include "xf86_OSproc.h"
+-#ifndef XSERVER_LIBPCIACCESS
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86Resources.h"
+ #endif
+ #include "xf86.h"
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index bb11cbb..994b02d 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -49,7 +49,7 @@
+ 
+ #include "sis.h"
+ 
+-#ifndef XSERVER_LIBPCIACCESS
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86RAC.h"
+ #endif
+ #include "dixstruct.h"
+--
+cgit v0.8.3-6-g21f6
diff --git a/staging/xf86-video-sisimedia/0011-more-rac-removal.patch b/staging/xf86-video-sisimedia/0011-more-rac-removal.patch
new file mode 100644
index 000000000..8175dea98
--- /dev/null
+++ b/staging/xf86-video-sisimedia/0011-more-rac-removal.patch
@@ -0,0 +1,13 @@
+diff -Nrup xf86-video-sis-0.9.1/src/sis_hwmc.c patched/src/sis_hwmc.c
+--- xf86-video-sis-0.9.1/src/sis_hwmc.c	2008-03-04 14:31:10.000000000 -0300
++++ patched/src/sis_hwmc.c	2010-04-20 17:10:21.073690167 -0300
+@@ -43,7 +43,9 @@ THE USE OR OTHER DEALINGS IN THE SOFTWAR
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
++#ifndef GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86Resources.h"
++#endif
+ #include "compiler.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
diff --git a/staging/xf86-video-sisimedia/COPYING b/staging/xf86-video-sisimedia/COPYING
new file mode 100644
index 000000000..d643012d7
--- /dev/null
+++ b/staging/xf86-video-sisimedia/COPYING
@@ -0,0 +1,139 @@
+Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1) Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2) Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3) The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Copyright (C) 1998, 1999 by Alan Hourihane, Wigan, England.
+Parts Copyright (C) 2001-2005 Thomas Winischhofer, Vienna, Austria.
+
+Licensed under the following terms:
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appears in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+and that the name of the copyright holder not be used in advertising
+or publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holder makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without expressed or implied warranty.
+
+THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright (C) 2003 Eric Anholt
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appears in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+and that the name of the copyright holder not be used in advertising
+or publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holder makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without expressed or implied warranty.
+
+THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright (C) 2000 by Alan Hourihane, Sychdyn, North Wales, UK.
+Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria
+
+Portions from radeon_dga.c which is
+         Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
+                        VA Linux Systems Inc., Fremont, California.
+
+Licensed under the following terms:
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of the providers not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  The providers make no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+THE PROVIDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE PROVIDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 2007 George Sapountzis
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Copyright (C) 1999-2004 by The XFree86 Project, Inc.
+based on code written by Mark Vojkovich
+Copyright (C) 2003-2005 Thomas Winischhofer
+
+Licensed under the following terms:
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appears in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+and that the name of the copyright holder not be used in advertising
+or publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holder makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without expressed or implied warranty.
+
+THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
diff --git a/staging/xf86-video-sisimedia/PKGBUILD b/staging/xf86-video-sisimedia/PKGBUILD
new file mode 100644
index 000000000..e4a3b1d78
--- /dev/null
+++ b/staging/xf86-video-sisimedia/PKGBUILD
@@ -0,0 +1,82 @@
+# $Id: PKGBUILD 136441 2011-08-29 10:48:07Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-sisimedia
+pkgver=0.9.1
+pkgrel=1
+pkgdesc="X.org SiS 671 video driver"
+arch=(i686 x86_64)
+url="http://www.linuxconsulting.ro/xorg-drivers/"
+license=('custom')
+depends=('glibc' 'sis-dri')
+makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
+conflicts=('xorg-server<1.11.0')
+options=('!libtool')
+source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-0.9.1_20091203.tar.bz2
+        xf86-video-sis-0.9.1-20102701.patch
+        0002-Remove-XFree86-Misc-PassMessage-support.patch
+        0003-Fix-build-with-Werror-format-security.patch
+        0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch
+        0006-Add-IgnoreHotkeyFlag-driver-option.patch
+        xf86-video-sis-0.9.1-dump-regs-after-video-init.patch
+        0007-Remove-useless-loader-symbol-lists.patch
+        0008-update-to-xextproto-7-1-support.patch
+        0009-update-for-rac-removal.patch
+        0010-change-to-use-abi-version-check.patch
+        0011-more-rac-removal.patch
+        0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch
+        0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch
+        0005-Correct-bounds-check-of-blitClip-array-access.patch
+        xserver19.patch
+        COPYING)
+sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430'
+          '61715bb86180decde55a56fad9a12d841c89fbb2'
+          '33fdea57187a2758802bcb9572d3a864aaab4d59'
+          '6f05eae535b099b01c2819e63c68d4489b940267'
+          'a6cb5da9312d32d729ad2619d8ae50cb26ba7d4d'
+          'df728052a89c4152abbe89826756040dac23b624'
+          '4bed1c2455ed447f7053cb0729e99cbe598b3274'
+          'd7802db5c49540ab136e71450cc846cfccd8b8d1'
+          'e2236d2d00338f1658c66d9b972919af39897071'
+          '0c6b9322e6cb22c67e04d50a0b818a2dd4585cf2'
+          '802829a8ebd2b7e35fcc86665d842b1594a8ba30'
+          'c26afe7508183735b7568b435be9c270ceeb62f1'
+          'd2fa2a21454f3a161bcd8ae4d349657561049edd'
+          '5e288526bfa2c534f1feabdb571da16da8a1c7a6'
+          'e86d702cb0b5e9bf43ff732696229965e176db7c'
+          'b5f260bed7e705808ec05620316e503ed5d52ee5'
+          'a64e244f274bcb155f892d0488a1a4b1b2f7d70d')
+
+build() {
+  cd "${srcdir}/xf86-video-sis-${pkgver}"
+  patch -Np1 -i "${srcdir}/xf86-video-sis-0.9.1-20102701.patch"
+  patch -Np1 -i "${srcdir}/0002-Remove-XFree86-Misc-PassMessage-support.patch"
+  patch -Np1 -i "${srcdir}/0003-Fix-build-with-Werror-format-security.patch"
+  patch -Np1 -i "${srcdir}/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch"
+  patch -Np1 -i "${srcdir}/0006-Add-IgnoreHotkeyFlag-driver-option.patch"
+  patch -Np1 -i "${srcdir}/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch"
+  patch -Np1 -i "${srcdir}/0007-Remove-useless-loader-symbol-lists.patch"
+  patch -Np1 -i "${srcdir}/0008-update-to-xextproto-7-1-support.patch"
+  patch -Np1 -i "${srcdir}/0009-update-for-rac-removal.patch"
+  patch -Np1 -i "${srcdir}/0010-change-to-use-abi-version-check.patch"
+  patch -Np1 -i "${srcdir}/0011-more-rac-removal.patch"
+  patch -Np1 -i "${srcdir}/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch"
+  patch -Np1 -i "${srcdir}/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch"
+  patch -Np1 -i "${srcdir}/0005-Correct-bounds-check-of-blitClip-array-access.patch"
+  patch -Np1 -i "${srcdir}/xserver19.patch"
+
+  sed -i -e 's,sis_drv,sisimedia_drv,g' src/Makefile.am
+  sed -i -e 's,\"sis\",\"sisimedia\",g' src/sis.h
+  sed -i -e 's,sisModuleData,sisimediaModuleData,g' src/sis_driver.c
+
+  autoreconf -fi
+
+  ./configure --prefix=/usr --enable-dri
+  make
+  make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}/usr/share/man"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/staging/xf86-video-sisimedia/xf86-video-sis-0.9.1-20102701.patch b/staging/xf86-video-sisimedia/xf86-video-sis-0.9.1-20102701.patch
new file mode 100644
index 000000000..944eceb12
--- /dev/null
+++ b/staging/xf86-video-sisimedia/xf86-video-sis-0.9.1-20102701.patch
@@ -0,0 +1,1376 @@
+diff -p -up xf86-video-sis-0.9.1/src/sis.h.orig xf86-video-sis-0.9.1/src/sis.h
+--- xf86-video-sis-0.9.1/src/sis.h.orig	2010-01-27 15:27:11.000000000 -0500
++++ xf86-video-sis-0.9.1/src/sis.h	2010-01-27 15:22:42.000000000 -0500
+@@ -98,6 +98,7 @@
+ #define XF86_VERSION_CURRENT XF86_VERSION_NUMERIC(4,3,99,902,0)
+ #endif
+ 
++#if 0
+ /*** Xorg Version Path <= X-Server 2.0 ***/
+ /* K.T for xorg 1.3 */
+ #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(2,0,0,0,0)
+@@ -109,33 +110,36 @@
+ #define NEW_XORG_VERSION 1
+ #endif
+ #endif
++#endif
++#define NEW_XORG_VERSION 1
+ 
+-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,0,0,0)
++//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,0,0,0)
+ #define SIS_HAVE_RR_FUNC
+ #ifdef HaveDriverFuncs
+ #undef  SIS_HaveDriverFuncs
+ #define SIS_HaveDriverFuncs HaveDriverFuncs
+ #define SIS_HAVE_DRIVER_FUNC
+ #endif /* HaveDriverFuncs */
+-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,900,0)
++//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,900,0)
+ #define SISISXORG6899900
+-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,901,0)
++//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,901,0)
+ #define SISISXORG6899901
+ #ifdef RANDR
+ #define SIS_HAVE_RR_GET_MODE_MM
+ #define SIS_HAVE_RANDR_SIZE_PATCH
+ #endif /* RANDR */
+-#endif /* >= 6.8.99.901 */
+-#endif /* >= 6.8.99.900 */
+-#endif /* >= 6.8.0.0    */
+-#else   /* XORG_VERSION_CURRENT */
+-#include "xf86Version.h"
+-#define SISMYSERVERNAME "XFree86"
++//#endif /* >= 6.8.99.901 */
++//#endif /* >= 6.8.99.900 */
++//#endif /* >= 6.8.0.0    */
++//#else   /* XORG_VERSION_CURRENT */
++//#include "xf86Version.h"
++//#define SISMYSERVERNAME "XFree86"
+ #endif
+ 
+ /*I.L. modified*/
+ //#define NEC_CASE  /*It used the old Xorg_Version with new PCI structure.*/
+ 
++#if 0
+ #ifdef XSERVER_LIBPCIACCESS
+ #ifdef NEC_CASE
+ #define XORG_VERSION_CURRENT (((7) * 10000000) + ((1) * 100000) + ((0) * 1000) + 0)
+@@ -143,6 +147,7 @@
+ #define XORG_VERSION_CURRENT (((7) * 10000000) + ((4) * 100000) + ((0) * 1000) + 0)
+ #endif
+ #endif
++#endif
+ 
+ 
+ #define SIS_NAME                "SIS"
+@@ -268,16 +273,16 @@
+ 
+ #undef SISCHECKOSSSE
+ #ifdef XORG_VERSION_CURRENT
+-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)
++//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)
+ #define SISCHECKOSSSE		/* Automatic check OS for SSE; requires SigIll facility */
+-#endif
++//#endif
+ #endif
+ 
+ #undef SISGAMMARAMP
+ #ifdef XORG_VERSION_CURRENT
+-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)
++//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)
+ #define SISGAMMARAMP		/* Driver can set gamma ramp; requires additional symbols in xf86sym.h */
+-#endif
++//#endif
+ #endif
+ 
+ #if 0	/* Perhaps for future use */
+@@ -1031,6 +1036,7 @@ typedef struct {
+ #endif
+     
+     PCITAG		PciTag;
++
+     int			PciBus, PciDevice, PciFunc;
+     EntityInfoPtr	pEnt;
+     int			Chipset;
+diff -p -up xf86-video-sis-0.9.1/src/sis300_accel.c.orig xf86-video-sis-0.9.1/src/sis300_accel.c
+--- xf86-video-sis-0.9.1/src/sis300_accel.c.orig	2007-05-29 22:12:02.000000000 -0400
++++ xf86-video-sis-0.9.1/src/sis300_accel.c	2010-01-27 15:21:54.000000000 -0500
+@@ -1231,8 +1231,8 @@ SiS300AccelInit(ScreenPtr pScreen)
+ 
+ #ifdef SIS_USE_EXA	/* ----------------------- EXA ----------------------- */
+ 	   if(pSiS->useEXA) {
+-#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
+-         
++//#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
++#if 0         
+ 	      if(pSiS->scrnOffset < 8192) {
+ 	         int obase = 0;
+ 	         /* data */
+@@ -1430,7 +1430,8 @@ SiS300AccelInit(ScreenPtr pScreen)
+ 	      pSiS->exa_scratch = exaOffscreenAlloc(pScreen, 128 * 1024, 16, TRUE,
+ 						SiSScratchSave, pSiS);
+     
+-    #if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
++//    #if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
++    #if 0
+               if(pSiS->exa_scratch) {
+ 		 pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
+ 		 pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch;
+diff -p -up xf86-video-sis-0.9.1/src/sis310_accel.c.orig xf86-video-sis-0.9.1/src/sis310_accel.c
+--- xf86-video-sis-0.9.1/src/sis310_accel.c.orig	2007-09-29 05:13:12.000000000 -0400
++++ xf86-video-sis-0.9.1/src/sis310_accel.c	2010-01-27 15:21:54.000000000 -0500
+@@ -65,9 +65,9 @@
+ #  define SIS_NEED_ARRAY
+ #  undef SISNEWRENDER
+ #  ifdef XORG_VERSION_CURRENT
+-#   if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0)
++//#   if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0)
+ #    define SISNEWRENDER
+-#   endif
++//#   endif
+ #  endif
+ # endif
+ #endif
+@@ -1463,7 +1463,7 @@ SiSUploadToScratch(PixmapPtr pSrc, Pixma
+ 	int dst_pitch, size, w, h, bytes;
+ 
+ 	w = pSrc->drawable.width;
+-
++/*
+ #if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
+ 	dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) +
+ 		     pSiS->EXADriverPtr->card.offscreenPitch - 1) &
+@@ -1472,17 +1472,17 @@ SiSUploadToScratch(PixmapPtr pSrc, Pixma
+ 	dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) +
+ 		     pSiS->EXADriverPtr->card.pixmapPitchAlign - 1) &
+ 		    ~(pSiS->EXADriverPtr->card.pixmapPitchAlign - 1);
+-#else
++#else*/
+ 	dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) +
+ 		     pSiS->EXADriverPtr->pixmapPitchAlign - 1) &
+ 		    ~(pSiS->EXADriverPtr->pixmapPitchAlign - 1);
+ 
+-#endif
++//#endif
+ 	size = dst_pitch * pSrc->drawable.height;
+ 
+ 	if(size > pSiS->exa_scratch->size)
+ 	   return FALSE;
+-
++/*
+ #if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
+ 	pSiS->exa_scratch_next = (pSiS->exa_scratch_next +
+ 				  pSiS->EXADriverPtr->card.offscreenByteAlign - 1) &
+@@ -1491,34 +1491,34 @@ SiSUploadToScratch(PixmapPtr pSrc, Pixma
+ 	pSiS->exa_scratch_next = (pSiS->exa_scratch_next +
+ 				  pSiS->EXADriverPtr->card.pixmapOffsetAlign - 1) &
+ 				  ~(pSiS->EXADriverPtr->card.pixmapOffsetAlign - 1);
+-#else
++#else*/
+ 	pSiS->exa_scratch_next = (pSiS->exa_scratch_next +
+ 				  pSiS->EXADriverPtr->pixmapOffsetAlign - 1) &
+ 				  ~(pSiS->EXADriverPtr->pixmapOffsetAlign - 1);
+-#endif
+-
++//#endif
++/*
+ #if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
+ 	if(pSiS->exa_scratch_next + size >
+ 	   pSiS->exa_scratch->offset + pSiS->exa_scratch->size) {
+ 	   (pSiS->EXADriverPtr->accel.WaitMarker)(pSrc->drawable.pScreen, 0);
+ 	   pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
+ 	}
+-#else
++#else*/
+ 	if(pSiS->exa_scratch_next + size >
+ 	   pSiS->exa_scratch->offset + pSiS->exa_scratch->size) {
+ 	   (pSiS->EXADriverPtr->WaitMarker)(pSrc->drawable.pScreen, 0);
+ 	   pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
+ 	}
+-#endif
++//#endif
+ 
+ 	memcpy(pDst, pSrc, sizeof(*pDst));
+ 	pDst->devKind = dst_pitch;
+ 
+-#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
+-	pDst->devPrivate.ptr = pSiS->EXADriverPtr->card.memoryBase + pSiS->exa_scratch_next;
+-#else
++//#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
++//	pDst->devPrivate.ptr = pSiS->EXADriverPtr->card.memoryBase + pSiS->exa_scratch_next;
++//#else
+ 	pDst->devPrivate.ptr = pSiS->EXADriverPtr->memoryBase + pSiS->exa_scratch_next;
+-#endif
++//#endif
+ 
+ 	pSiS->exa_scratch_next += size;
+ 
+@@ -1762,7 +1762,8 @@ SiS315AccelInit(ScreenPtr pScreen)
+ 
+ #ifdef SIS_USE_EXA	/* ----------------------- EXA ----------------------- */
+ 	   if(pSiS->useEXA) {
+-#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
++#if 0
++//#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
+ 
+ 	      int obase = 0;
+ 
+@@ -1952,11 +1953,11 @@ SiS315AccelInit(ScreenPtr pScreen)
+ 						SiSScratchSave, pSiS);
+ 	      if(pSiS->exa_scratch) {
+ 		 pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
+-        #if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
+-		 pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch;
+-	#else
++        //#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
++	//	 pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch;
++	//#else
+                  pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
+-        #endif
++        //#endif
+                }
+ 
+ 	   } else {
+diff -p -up xf86-video-sis-0.9.1/src/sis_3daccel.c.orig xf86-video-sis-0.9.1/src/sis_3daccel.c
+--- xf86-video-sis-0.9.1/src/sis_3daccel.c.orig	2007-08-10 04:22:16.000000000 -0400
++++ xf86-video-sis-0.9.1/src/sis_3daccel.c	2010-01-27 15:21:54.000000000 -0500
+@@ -64,9 +64,9 @@
+ #  define SIS_NEED_ARRAY
+ #  undef SISNEWRENDER
+ #  ifdef XORG_VERSION_CURRENT
+-#   if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0)
++//#   if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0)
+ #    define SISNEWRENDER
+-#   endif
++//#   endif
+ #  endif
+ # endif
+ #endif
+diff -p -up xf86-video-sis-0.9.1/src/sis_accel.c.orig xf86-video-sis-0.9.1/src/sis_accel.c
+--- xf86-video-sis-0.9.1/src/sis_accel.c.orig	2007-05-29 22:12:02.000000000 -0400
++++ xf86-video-sis-0.9.1/src/sis_accel.c	2010-01-27 15:21:54.000000000 -0500
+@@ -781,50 +781,50 @@ SiSAccelInit(ScreenPtr pScreen)
+ 
+ #ifdef SIS_USE_EXA	/* ----------------------- EXA ----------------------- */
+        if(pSiS->useEXA) {
+-#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
++//#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
+ 
+ 	  /* data */
+-	  pSiS->EXADriverPtr->card.memoryBase = pSiS->FbBase;
+-	  pSiS->EXADriverPtr->card.memorySize = pSiS->maxxfbmem;
+-	  pSiS->EXADriverPtr->card.offScreenBase = pScrn->displayWidth * pScrn->virtualY
+-						* (pScrn->bitsPerPixel >> 3);
+-	  if(pSiS->EXADriverPtr->card.memorySize > pSiS->EXADriverPtr->card.offScreenBase) {
+-	     pSiS->EXADriverPtr->card.flags = EXA_OFFSCREEN_PIXMAPS;
+-	  } else {
+-	     pSiS->NoXvideo = TRUE;
+-	     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+-		"Not enough video RAM for offscreen memory manager. Xv disabled\n");
+-	  }
+-#if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
+-	  pSiS->EXADriverPtr->card.offscreenByteAlign = 8;	/* src/dst: double quad word boundary */
+-	  pSiS->EXADriverPtr->card.offscreenPitch = 1;
+-#else
+-	  pSiS->EXADriverPtr->card.pixmapOffsetAlign = 8;	/* src/dst: double quad word boundary */
+-	  pSiS->EXADriverPtr->card.pixmapPitchAlign = 8;	/* could possibly be 1, but who knows for sure */
+-#endif
+-	  pSiS->EXADriverPtr->card.maxX = 2047;
+-	  pSiS->EXADriverPtr->card.maxY = 2047;
++//	  pSiS->EXADriverPtr->card.memoryBase = pSiS->FbBase;
++//	  pSiS->EXADriverPtr->card.memorySize = pSiS->maxxfbmem;
++//	  pSiS->EXADriverPtr->card.offScreenBase = pScrn->displayWidth * pScrn->virtualY
++//						* (pScrn->bitsPerPixel >> 3);
++//	  if(pSiS->EXADriverPtr->card.memorySize > pSiS->EXADriverPtr->card.offScreenBase) {
++//	     pSiS->EXADriverPtr->card.flags = EXA_OFFSCREEN_PIXMAPS;
++//	  } else {
++//	     pSiS->NoXvideo = TRUE;
++//	     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++//		"Not enough video RAM for offscreen memory manager. Xv disabled\n");
++//	  }
++//#if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
++//	  pSiS->EXADriverPtr->card.offscreenByteAlign = 8;	/* src/dst: double quad word boundary */
++//	  pSiS->EXADriverPtr->card.offscreenPitch = 1;
++//#else
++//	  pSiS->EXADriverPtr->card.pixmapOffsetAlign = 8;	/* src/dst: double quad word boundary */
++//	  pSiS->EXADriverPtr->card.pixmapPitchAlign = 8;	/* could possibly be 1, but who knows for sure */
++//#endif
++//	  pSiS->EXADriverPtr->card.maxX = 2047;
++//	  pSiS->EXADriverPtr->card.maxY = 2047;
+ 
+ 	  /* Sync */
+-	  pSiS->EXADriverPtr->accel.WaitMarker = SiSEXASync;
++//	  pSiS->EXADriverPtr->accel.WaitMarker = SiSEXASync;
+ 
+ 	  /* Solid fill */
+-	  pSiS->EXADriverPtr->accel.PrepareSolid = SiSPrepareSolid;
+-	  pSiS->EXADriverPtr->accel.Solid = SiSSolid;
+-	  pSiS->EXADriverPtr->accel.DoneSolid = SiSDoneSolid;
++//	  pSiS->EXADriverPtr->accel.PrepareSolid = SiSPrepareSolid;
++//	  pSiS->EXADriverPtr->accel.Solid = SiSSolid;
++//	  pSiS->EXADriverPtr->accel.DoneSolid = SiSDoneSolid;
+ 
+ 	  /* Copy */
+-	  pSiS->EXADriverPtr->accel.PrepareCopy = SiSPrepareCopy;
+-	  pSiS->EXADriverPtr->accel.Copy = SiSCopy;
+-	  pSiS->EXADriverPtr->accel.DoneCopy = SiSDoneCopy;
++//	  pSiS->EXADriverPtr->accel.PrepareCopy = SiSPrepareCopy;
++//	  pSiS->EXADriverPtr->accel.Copy = SiSCopy;
++//	  pSiS->EXADriverPtr->accel.DoneCopy = SiSDoneCopy;
+ 
+ 	  /* Composite not supported */
+ 
+ 	  /* Upload, download to/from Screen */
+-	  pSiS->EXADriverPtr->accel.UploadToScreen = SiSUploadToScreen;
+-	  pSiS->EXADriverPtr->accel.DownloadFromScreen = SiSDownloadFromScreen;
++//	  pSiS->EXADriverPtr->accel.UploadToScreen = SiSUploadToScreen;
++//	  pSiS->EXADriverPtr->accel.DownloadFromScreen = SiSDownloadFromScreen;
+ 
+-#else /*xorg>=7.0*/
++//#else /*xorg>=7.0*/
+ 
+ 	  pSiS->EXADriverPtr->exa_major = 2;
+ 	  pSiS->EXADriverPtr->exa_minor = 0;
+@@ -867,7 +867,7 @@ SiSAccelInit(ScreenPtr pScreen)
+ 
+ #endif  /*end of Xorg>=7.0 EXA Setting*/       
+        }
+-#endif /* EXA */
++//#endif /* EXA */
+ 
+     }  /* NoAccel */
+ 
+@@ -946,11 +946,11 @@ SiSAccelInit(ScreenPtr pScreen)
+ 						SiSScratchSave, pSiS);
+ 	  if(pSiS->exa_scratch) {
+ 	     pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
+-       #if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
+-             pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch;
+-       #else
++       //#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
++       //      pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch;
++       //#else
+              pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
+-       #endif
++       //#endif
+ 	  }
+ 
+        } else {
+diff -p -up xf86-video-sis-0.9.1/src/sis_dri.c.orig xf86-video-sis-0.9.1/src/sis_dri.c
+--- xf86-video-sis-0.9.1/src/sis_dri.c.orig	2008-11-04 08:27:14.000000000 -0500
++++ xf86-video-sis-0.9.1/src/sis_dri.c	2010-01-27 15:21:54.000000000 -0500
+@@ -56,7 +56,8 @@ extern Bool drmSiSAgpInit(int driSubFD, 
+ 
+ #ifdef XORG_VERSION_CURRENT
+ #define SISHAVECREATEBUSID
+-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,7,99,1,0)
++#if 0
++//#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,7,99,1,0)
+  /*I.L. modified*/
+ #ifndef XSERVER_LIBPCIACCESS
+ extern char *DRICreatePCIBusID(pciVideoPtr PciInfo);
+diff -p -up xf86-video-sis-0.9.1/src/sis_driver.c.orig xf86-video-sis-0.9.1/src/sis_driver.c
+--- xf86-video-sis-0.9.1/src/sis_driver.c.orig	2009-06-22 08:15:54.000000000 -0400
++++ xf86-video-sis-0.9.1/src/sis_driver.c	2010-01-27 15:21:54.000000000 -0500
+@@ -140,6 +140,17 @@ static int pix24bpp = 0;
+  * an upper-case version of the driver name.
+  */
+ 
++#if XSERVER_LIBPCIACCESS
++#define SIS_DEVICE_MATCH(d, i)\
++    {PCI_VENDOR_SIS, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
++
++static const struct pci_id_match SIS_device_match[] = {
++	SIS_DEVICE_MATCH (PCI_CHIP_SIS670, 0),
++	SIS_DEVICE_MATCH (PCI_CHIP_SIS671, 0),
++	{0, 0, 0 },
++	};
++#endif
++
+ #ifdef _X_EXPORT
+ _X_EXPORT
+ #endif
+@@ -147,7 +158,11 @@ DriverRec SIS = {
+     SIS_CURRENT_VERSION,
+     SIS_DRIVER_NAME,
+     SISIdentify,
++#if XSERVER_LIBPCIACCESS
++    NULL,
++#else
+     SISProbe,
++#endif
+     SISAvailableOptions,
+     NULL,
+     0
+@@ -155,6 +170,11 @@ DriverRec SIS = {
+      ,
+     SISDriverFunc
+ #endif
++#if XSERVER_LIBPCIACCESS
++    ,
++    SIS_device_match,
++    SIS_pci_probe
++#endif
+ };
+ 
+ static SymTabRec SISChipsets[] = {
+@@ -453,7 +473,94 @@ SISDriverFunc(ScrnInfoPtr pScrn, SISDRIV
+ /****************************************************/
+ /*                     Probe()                      */
+ /****************************************************/
++static Bool SIS_pci_probe (DriverPtr driver, int entity_num, struct pci_device *device, intptr_t match_data)
++{
++    ScrnInfoPtr pScrn;
++#ifdef SISDUALHEAD
++    EntityInfoPtr pEnt;
++    Bool    foundScreen = FALSE;
++#endif
++xf86DrvMsg(0, X_INFO, "SIS_pci_probe - begin, entity_num=%d\n", entity_num);
++xf86DrvMsg(0, X_INFO, "                       vendor_id=0x%x\n", device->vendor_id);
++xf86DrvMsg(0, X_INFO, "                       device_id=0x%x\n", device->device_id);
++xf86DrvMsg(0, X_INFO, "                       bus=%d\n", device->bus);
++xf86DrvMsg(0, X_INFO, "                       dev=%d\n", device->dev);
++xf86DrvMsg(0, X_INFO, "                       func=%d\n", device->func);
++    pScrn = NULL;
++    if((pScrn = xf86ConfigPciEntity(pScrn, 0,
++			entity_num,
++			SISPciChipsets,
++			NULL, NULL, NULL, NULL, NULL))) {
++	    xf86DrvMsg(0, X_INFO, "SIS_pci_probe - ConfigPciEntity found\n");
++	    /* Fill in what we can of the ScrnInfoRec */
++	    pScrn->driverVersion    = SIS_CURRENT_VERSION;
++	    pScrn->driverName       = SIS_DRIVER_NAME;
++	    pScrn->name             = SIS_NAME;
++	    pScrn->Probe            = NULL;//SISProbe;
++	    pScrn->PreInit          = SISPreInit;
++	    pScrn->ScreenInit       = SISScreenInit;
++	    pScrn->SwitchMode       = SISSwitchMode;
++	    pScrn->AdjustFrame      = SISAdjustFrame;
++	    pScrn->EnterVT          = SISEnterVT;
++	    pScrn->LeaveVT          = SISLeaveVT;
++	    pScrn->FreeScreen       = SISFreeScreen;
++	    pScrn->ValidMode        = SISValidMode;
++	    pScrn->PMEvent          = SISPMEvent; /*add PM function for ACPI hotkey,Ivans*/
++#ifdef X_XF86MiscPassMessage
++//   if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) {
++//	       pScrn->HandleMessage = SISHandleMessage;
++//	    }
++#endif
++	    foundScreen = TRUE;
++	}
++    #ifdef SISDUALHEAD
++	pEnt = xf86GetEntityInfo(entity_num);
++xf86DrvMsg(0, X_INFO, "SIS_pci_probe - GetEntityInfo chipset is 0x%x\n",pEnt->chipset);
++	switch(pEnt->chipset) {
++	case PCI_CHIP_SIS300:
++	case PCI_CHIP_SIS540:
++	case PCI_CHIP_SIS630:
++	case PCI_CHIP_SIS550:
++	case PCI_CHIP_SIS315:
++	case PCI_CHIP_SIS315H:
++	case PCI_CHIP_SIS315PRO:
++	case PCI_CHIP_SIS650:
++	case PCI_CHIP_SIS330:
++	case PCI_CHIP_SIS660:
++	case PCI_CHIP_SIS340:
++	case PCI_CHIP_SIS670:
++	case PCI_CHIP_SIS671:
++	case PCI_CHIP_XGIXG40:
++	    {
++	       SISEntPtr pSiSEnt = NULL;
++	       DevUnion  *pPriv;
++
++	       xf86SetEntitySharable(entity_num);
++	       if(SISEntityIndex < 0) {
++		  SISEntityIndex = xf86AllocateEntityPrivateIndex();
++	       }
++	       pPriv = xf86GetEntityPrivate(pScrn->entityList[0], SISEntityIndex);
++	       if(!pPriv->ptr) {
++		  pPriv->ptr = xnfcalloc(sizeof(SISEntRec), 1);
++		  pSiSEnt = pPriv->ptr;
++		  memset(pSiSEnt, 0, sizeof(SISEntRec));
++		  pSiSEnt->lastInstance = -1;
++	       } else {
++		  pSiSEnt = pPriv->ptr;
++	       }
++	       pSiSEnt->lastInstance++;
++	       xf86SetEntityInstanceForScreen(pScrn, pScrn->entityList[0],
++						pSiSEnt->lastInstance);
++	    }
++	    break;
+ 
++	default:
++	    break;
++	}
++#endif /* DUALHEAD */
++xf86DrvMsg(0, X_INFO, "SIS_pci_probe - end\n");
++    return foundScreen;
++}
+ 
+ static Bool
+ SISProbe(DriverPtr drv, int flags)
+@@ -464,7 +571,7 @@ SISProbe(DriverPtr drv, int flags)
+     int     numDevSections;
+     int     numUsed, numUsedSiS, numUsedXGI;
+     Bool    foundScreen = FALSE;
+-
++xf86DrvMsg(0, X_INFO, "SISPRobe() begin, flags=%d\n", flags);
+     /*
+      * The aim here is to find all cards that this driver can handle,
+      * and for the ones not already claimed by another driver, claim
+@@ -490,6 +597,7 @@ SISProbe(DriverPtr drv, int flags)
+         * There's no matching device section in the config file, so quit
+         * now.
+         */
++       xf86DrvMsg(0, X_INFO, "SISProbe - MatchDevice fail\n");
+        return FALSE;
+     }
+ 
+@@ -526,14 +634,16 @@ SISProbe(DriverPtr drv, int flags)
+     xfree(devSections);
+ 
+     numUsed = numUsedSiS + numUsedXGI;
+-
+-    if(numUsed <= 0)
++xf86DrvMsg(0, X_INFO, "SISPRobe - test1\n");
++    if(numUsed <= 0) {
++       xf86DrvMsg(0, X_INFO, "SISProbe - MatchPciInstances fail\n");
+        return FALSE;
++    }
+ 
+     if(flags & PROBE_DETECT) {
+ 
+ 	foundScreen = TRUE;
+-
++	xf86DrvMsg(0, X_INFO, "SISProbe - flags already probe");
+     } else for(i = 0; i < numUsed; i++) {
+ 
+ 	ScrnInfoPtr pScrn;
+@@ -548,6 +658,7 @@ SISProbe(DriverPtr drv, int flags)
+ 			(i < numUsedSiS) ? usedChipsSiS[i] : usedChipsXGI[i-numUsedSiS],
+ 			(i < numUsedSiS) ? SISPciChipsets  : XGIPciChipsets,
+ 			NULL, NULL, NULL, NULL, NULL))) {
++	    xf86DrvMsg(0, X_INFO, "SISProbe - ConfigPciEntity found\n");
+ 	    /* Fill in what we can of the ScrnInfoRec */
+ 	    pScrn->driverVersion    = SIS_CURRENT_VERSION;
+ 	    pScrn->driverName       = SIS_DRIVER_NAME;
+@@ -563,16 +674,16 @@ SISProbe(DriverPtr drv, int flags)
+ 	    pScrn->ValidMode        = SISValidMode;
+ 	    pScrn->PMEvent          = SISPMEvent; /*add PM function for ACPI hotkey,Ivans*/
+ #ifdef X_XF86MiscPassMessage
+-	    if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) {
+-	       pScrn->HandleMessage = SISHandleMessage;
++   if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) {
++//	       pScrn->HandleMessage = SISHandleMessage;
+ 	    }
+ #endif
+ 	    foundScreen = TRUE;
+ 	}
+-
++xf86DrvMsg(0, X_INFO, "SISProbe - test2\n");
+ #ifdef SISDUALHEAD
+ 	pEnt = xf86GetEntityInfo((i < numUsedSiS) ? usedChipsSiS[i] : usedChipsXGI[i-numUsedSiS]);
+-
++	xf86DrvMsg(0, X_INFO, "SISProbe - GetEntityInfo done\n");
+ 	switch(pEnt->chipset) {
+ 	case PCI_CHIP_SIS300:
+ 	case PCI_CHIP_SIS540:
+@@ -620,7 +731,7 @@ SISProbe(DriverPtr drv, int flags)
+ 
+     if(usedChipsSiS) xfree(usedChipsSiS);
+     if(usedChipsXGI) xfree(usedChipsXGI);
+-
++xf86DrvMsg(0, X_INFO, "SISProbe end\n");
+     return foundScreen;
+ }
+ 
+@@ -1306,7 +1417,11 @@ SiSReadROM(ScrnInfoPtr pScrn)
+ 	     }
+ 
+ 	     if(readpci) {
++#ifndef XSERVER_LIBPCIACCESS
+ 		xf86ReadPciBIOS(0, pSiS->PciTag, 0, pSiS->BIOS, biossize);
++#else
++		pci_device_read_rom(pSiS->PciInfo, pSiS->BIOS);
++#endif
+ 		if(SISCheckBIOS(pSiS, mypciid, mypcivendor, biossize)) {
+ 		   found = TRUE;
+ 		}
+@@ -2224,8 +2339,7 @@ SiSSetSyncRangeFromEdid(ScrnInfoPtr pScr
+        { 2, 0x04, 56.6 },
+        { 2, 0x02, 60.1 },
+        { 2, 0x01, 80.1 }
+-   }; 
+-   
++   };
+    const myvddctiming myvtiming[11] = {
+        { 1, 0x02, 56 },
+        { 1, 0x01, 60 },
+@@ -2240,11 +2354,6 @@ SiSSetSyncRangeFromEdid(ScrnInfoPtr pScr
+        { 2, 0x01, 75 }
+    };
+ 
+-// PCF
+-#ifdef TWDEBUG
+-   xf86DrvMsg(0, X_INFO, "SiSSetSyncRangeFromEdid\n");
+-#endif
+-	
+    if(flag) { /* HSync */
+ 
+       for(i = 0; i < 4; i++) {
+@@ -2350,12 +2459,6 @@ SiSSetSyncRangeFromEdid(ScrnInfoPtr pScr
+ static Bool
+ SiSAllowSyncOverride(SISPtr pSiS, Bool fromDDC, int mfbcrt)
+ {
+-// PCF
+-#ifdef TWDEBUG
+-   xf86DrvMsg(0, X_INFO, "SiSAllowSyncOverride\n");   
+-#endif
+-//   return TRUE;
+-   
+    if(!(pSiS->VBFlags2 & VB2_VIDEOBRIDGE)) return FALSE;
+ 
+ #ifdef SISDUALHEAD
+@@ -2382,11 +2485,10 @@ SiSAllowSyncOverride(SISPtr pSiS, Bool f
+    }
+ #endif
+ 
+-// PCF
+-//   if(!(pSiS->VBFlags & DISPTYPE_CRT1)) {
++   if(!(pSiS->VBFlags & DISPTYPE_CRT1)) {
+       if( (pSiS->VBFlags & CRT2_TV) ||
+ 	  ((pSiS->VBFlags & CRT2_LCD) && (!fromDDC)) ) return TRUE;
+-//   } else if((pSiS->VBFlags & CRT1_LCDA) && (!fromDDC)) return TRUE;
++   } else if((pSiS->VBFlags & CRT1_LCDA) && (!fromDDC)) return TRUE;
+ 
+    return FALSE;
+ }
+@@ -2394,8 +2496,6 @@ SiSAllowSyncOverride(SISPtr pSiS, Bool f
+ static Bool
+ SiSCheckForH(float hsync, MonPtr monitor)
+ {
+-
+-
+    int i;
+    for(i = 0; i < monitor->nHsync; i++) {
+       if((hsync > monitor->hsync[i].lo * (1.0 - SYNC_TOLERANCE)) &&
+@@ -2409,7 +2509,6 @@ SiSCheckForH(float hsync, MonPtr monitor
+ static Bool
+ SiSCheckForV(float vrefresh, MonPtr monitor)
+ {
+-
+    int i;
+    for(i = 0; i < monitor->nVrefresh; i++) {
+       if((vrefresh > monitor->vrefresh[i].lo * (1.0 - SYNC_TOLERANCE)) &&
+@@ -2424,21 +2523,11 @@ static Bool
+ SiSCheckAndOverruleH(ScrnInfoPtr pScrn, MonPtr monitor)
+ {
+    DisplayModePtr mode = monitor->Modes;
+-// PCF
+    float mymin = 30.0, mymax = 80.0, hsync;
+-
+    Bool doit = FALSE;
+ 
+-// PCF
+-#ifdef TWDEBUG
+-   xf86DrvMsg(0, X_INFO, "SiSCheckAndOverruleH\n");
+-#endif
+- 	
+    for(hsync = mymin; hsync <= mymax; hsync += .5) {
+-      if(!SiSCheckForH(hsync, monitor)) 
+-      {
+-      	doit = TRUE;
+-      }
++      if(!SiSCheckForH(hsync, monitor)) doit = TRUE;
+    }
+ 
+    if(mode) {
+@@ -2461,7 +2550,6 @@ SiSCheckAndOverruleH(ScrnInfoPtr pScrn, 
+       return TRUE;
+    }
+ 
+-
+    return FALSE;
+ }
+ 
+@@ -2469,20 +2557,11 @@ static Bool
+ SiSCheckAndOverruleV(ScrnInfoPtr pScrn, MonPtr monitor)
+ {
+    DisplayModePtr mode = monitor->Modes;
+-// PCF
+-   float mymin = 57.0, mymax = 63.0, vrefresh;
++   float mymin = 59.0, mymax = 61.0, vrefresh;
+    Bool doit = FALSE, ret = FALSE;
+-   
+-// PCF
+-#ifdef TWDEBUG
+-   xf86DrvMsg(0, X_INFO, "SiSCheckAndOverruleV\n");
+-#endif
+ 
+    for(vrefresh = mymin; vrefresh <= mymax; vrefresh += 1.0) {
+-      if(!SiSCheckForV(vrefresh, monitor)) 
+-      {
+-      	doit = TRUE;
+-      }
++      if(!SiSCheckForV(vrefresh, monitor)) doit = TRUE;
+    }
+ 
+    if(mode) {
+@@ -2515,7 +2594,6 @@ SiSCheckAndOverruleV(ScrnInfoPtr pScrn, 
+       monitor->nVrefresh++;
+       ret = TRUE;
+    }
+-
+    return ret;
+ }
+ 
+@@ -2529,11 +2607,6 @@ SiSFixupHVRanges(ScrnInfoPtr pScrn, int 
+     static const char *saneh = "Correcting %s CRT%d monitor HSync range\n";
+     static const char *sanev = "Correcting %s CRT%d monitor VRefresh range\n";
+     int crtnum;
+-    
+-// PCF
+-#ifdef TWDEBUG
+-    xf86DrvMsg(0, X_INFO, "SiSFixupHVRanges\n");
+-#endif
+ 
+ #ifdef SISDUALHEAD
+     if(pSiS->DualHeadMode) {
+@@ -2610,8 +2683,7 @@ SiSFixupHVRanges(ScrnInfoPtr pScrn, int 
+ 	  }
+        }
+     }
+-// PCF
+-//    return TRUE;
++
+     return freqoverruled;
+ }
+ 
+@@ -2623,11 +2695,6 @@ SiSMakeOwnModeList(ScrnInfoPtr pScrn, Bo
+                    Bool isfordvi, Bool *havecustommodes, Bool fakecrt2modes, Bool IsForCRT2)
+ {
+     DisplayModePtr tempmode, delmode, mymodes;
+-    
+-    // PCF
+-#ifdef TWDEBUG
+-    xf86DrvMsg(0, X_INFO, "SiSMakeOwnModeList\n");
+-#endif
+ 
+     if((mymodes = SiSBuildBuiltInModeList(pScrn, includelcdmodes, isfordvi, fakecrt2modes, IsForCRT2))) {
+        if(!acceptcustommodes) {
+@@ -2676,11 +2743,6 @@ SiSSetupModeListParmsCRT1(SISPtr pSiS, u
+ 		Bool *acceptcustommodes, Bool *includelcdmodes, Bool *isfordvi,
+ 		Bool *fakecrt2modes, Bool *IsForCRT2, Bool *AllowInterlace)
+ {
+-// PCF
+-#ifdef TWDEBUG
+-    xf86DrvMsg(0, X_INFO, "SiSSetupModeListParmsCRT1\n");
+-#endif
+- 	
+     (*acceptcustommodes) = TRUE;  /* Accept user modelines */
+     (*includelcdmodes)   = TRUE;  /* Include modes reported by DDC */
+     (*isfordvi)          = FALSE; /* Is for digital DVI output */
+@@ -2815,11 +2877,6 @@ SiSReplaceModeList(ScrnInfoPtr pScrn, Cl
+      *   -) crt2 device is not TV, and
+      *   -) crt1 is not LCDA, unless bridge is TMDS/LCDA capable (301C)
+      */
+-// PCF
+-#ifdef TWDEBUG
+-    xf86DrvMsg(0, X_INFO, "SiSReplaceModeList\n");
+-#endif
+- 	
+ 
+     if((pSiS->VGAEngine == SIS_300_VGA) || (pSiS->VGAEngine == SIS_315_VGA)) {
+ 
+@@ -2881,11 +2938,6 @@ SiSClearModesPrivate(DisplayModePtr mode
+ {
+     DisplayModePtr tempmode;
+ 
+-// PCF
+-#ifdef TWDEBUG
+-    xf86DrvMsg(0, X_INFO, "SiSClearModesPrivate\n");
+-#endif
+-
+     /* Make sure that the Private field is NULL */
+     /* (This way we don't have to care for MergedFB
+      * when freeing the mode; just check the Private
+@@ -2904,11 +2956,6 @@ SiSDuplicateMode(DisplayModePtr source)
+ {
+     DisplayModePtr dest = NULL;
+ 
+-// PCF
+-#ifdef TWDEBUG
+-    xf86DrvMsg(0, X_INFO, "SiSDuplicateMode\n");
+-#endif
+-    
+     if(source) {
+        if((dest = xalloc(sizeof(DisplayModeRec)))) {
+ 	  memcpy(dest, source, sizeof(DisplayModeRec));
+@@ -2972,11 +3019,6 @@ SiSBuildVesaModeList(ScrnInfoPtr pScrn, 
+     SISPtr pSiS = SISPTR(pScrn);
+     int i = 0;
+ 
+-// PCF
+-#ifdef TWDEBUG
+-    xf86DrvMsg(0, X_INFO, "SiSBuildVesaModeList\n");
+-#endif
+- 	
+     while(vbe->VideoModePtr[i] != 0xffff) {
+        sisModeInfoPtr m;
+        VbeModeInfoBlock *mode;
+@@ -3014,7 +3056,7 @@ SiSSetMinMaxPixelClock(ScrnInfoPtr pScrn
+ {
+     SISPtr pSiS = SISPTR(pScrn);
+     MessageType from;
+-    
++
+     /* Set the min pixel clock */
+     pSiS->MinClock = 5000;
+     if((pSiS->VGAEngine == SIS_300_VGA) || (pSiS->VGAEngine == SIS_315_VGA)) {
+@@ -3061,11 +3103,6 @@ SiSRemoveUnsuitableModes(ScrnInfoPtr pSc
+     int maxUsedClock = 0;
+     static const char *notsuitablestr = "Not using mode \"%s\" (not suitable for %s mode)\n";
+ 
+-// PCF
+-#ifdef TWDEBUG
+-    xf86DrvMsg(0, X_INFO, "SiSRemoveUnsuitableModes\n");
+-#endif
+- 	
+     if((p = first = initial)) {
+ 
+        do {
+@@ -3222,11 +3259,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+     static const char *crtsetupstr = "*************************** CRT%d setup ***************************\n";
+ #endif
+ 
+-// PCF
+-#ifdef TWDEBUG
+-    xf86DrvMsg(0, X_INFO, "SISPreInit Start\n");
+-#endif
+-
+     if(flags & PROBE_DETECT) {
+ 
+        vbeInfoPtr   pVbe;
+@@ -4716,10 +4748,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+ 	         mymax = 8192 * 1024;
+ 	      else if(total <= 32768)			/* <= 32MB: Use 16MB for X */
+ 	         mymax = 16384 * 1024;
+-	      else
+-// PCF					/* Otherwise: Use 20MB for X */
+-//	         mymax = 20 * 1024 * 1024;
+-		 mymax = 20 * 1024 *1024;		
++	      else					/* Otherwise: Use 20MB for X */
++	         mymax = 20 * 1024 * 1024;
+ 	      /* availMem is right now adjusted to not use the UMA
+ 	       * area. Make sure that our default doesn't reach
+ 	       * into the UMA area either.
+@@ -4758,9 +4788,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+ 	         if(pScrn->videoRam <= 65536)
+ 	            pSiS->maxxfbmem = 16384 * 1024;	/* On >=315 series and <=64MB, use 16MB */
+ 		 else
+-// PCF
+-//		    pSiS->maxxfbmem = 20 * 1024 * 1024;	/* On >=315 series and > 64MB, use 20MB */
+-		    pSiS->maxxfbmem = 20 * 1024 * 1024;
++		    pSiS->maxxfbmem = 20 * 1024 * 1024;	/* On >=315 series and > 64MB, use 20MB */
+ 	      } else
+ 	         pSiS->maxxfbmem = 12288 * 1024;	/* On <315 series, use 12MB */
+ 
+@@ -4980,7 +5008,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+      *   via CRT2.)
+      *   (TODO: This might need some modification for the
+      *   307 bridges, if these are capable of driving
+-     *   LCDs > via channel B)
++     *   LCDs > 1600 via channel B)
+      */
+     if((pSiS->SiS_SD_Flags & SiS_SD_SUPPORTLCDA) &&
+        (pSiS->VBFlags & CRT2_LCD) &&
+@@ -4995,10 +5023,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+ 		*/
+ 		if(pSiS->ChipType < SIS_662 || pSiS->ChipType >= XGI_20)	pSiS->ForceCRT1Type = CRT1_LCDA;
+ 	     pSiS->ForceCRT2Type = CRT2_TV;
+-// PCF
+-//	  } else if(pSiS->LCDwidth > 1600) {
+-	  } else if(pSiS->LCDwidth > 1920) {
+-
++	  } else if(pSiS->LCDwidth > 1600) {
+ 	     /* If LCD is > 1600, default to LCDA if we don't need CRT1/VGA for other head */
+ 	     Bool NeedCRT1VGA = FALSE;
+ #ifdef SISDUALHEAD
+@@ -5591,11 +5616,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+     clockRanges->minClock = pSiS->MinClock;
+     clockRanges->maxClock = pSiS->MaxClock;
+     clockRanges->clockIndex = -1;               /* programmable */
+-// PCF
+-//    clockRanges->interlaceAllowed = TRUE;
+-//    clockRanges->doubleScanAllowed = TRUE;
+-    clockRanges->interlaceAllowed = FALSE;
+-    clockRanges->doubleScanAllowed = FALSE;
++    clockRanges->interlaceAllowed = TRUE;
++    clockRanges->doubleScanAllowed = TRUE;
+ 
+     /* Replace default mode list */
+     SiSReplaceModeList(pScrn, clockRanges, FALSE);
+@@ -5623,11 +5645,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+           break;
+        case SIS_300_VGA:
+        case SIS_315_VGA:
+-// PCF
+           maxpitch = 4088;
+-          maxheight = 4096;	
+-//	  maxpitch = 1600;
+-//        maxheight = 1200;
++          maxheight = 4096;
+           break;
+        default:
+           maxpitch = 2048;
+@@ -5688,12 +5707,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+           pScrn->monitor->DDC = NULL;
+        }
+ #endif
+-// PCF
+-#ifdef TWDEBUG
+-       xf86DrvMsg(0, X_INFO,"xf86ValidateModes Start\n");
+-       xf86DrvMsg(0, X_INFO,"virtualX = %d, virtualY = %d, maxpitch = %d, maxheight = %d, maxxfbmem = %ld \n",
+-       	  	  pScrn->display->virtualX,pScrn->display->virtualY,maxpitch,maxheight,pSiS->maxxfbmem/1024);
+-#endif
++
+        i = xf86ValidateModes(pScrn,
+ 			pScrn->monitor->Modes,
+ 			pScrn->display->modes,
+@@ -5703,13 +5717,9 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+ 			pScrn->bitsPerPixel * 8,
+ 			minheight, maxheight,
+ 			pScrn->display->virtualX,
+-			pScrn->display->virtualY,		
++			pScrn->display->virtualY,
+ 			pSiS->maxxfbmem,
+ 			LOOKUP_BEST_REFRESH);
+-// PCF
+-#ifdef TWDEBUG	
+-       xf86DrvMsg(0, X_INFO,"xf86ValidateModes End\n");
+-#endif
+ 
+        pScrn->monitor->DDC = backupddc;
+     }
+@@ -5745,28 +5755,17 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+ #endif
+ 
+     /* Prune the modes marked as invalid */
+-// PCF
+-//    xf86DrvMsg(0, X_INFO,"xf86PruneDriverModes Start\n");
+     xf86PruneDriverModes(pScrn);
+-//    xf86DrvMsg(0, X_INFO,"xf86PruneDriverModes End\n");
+- 
+ 
+     if(i == 0 || pScrn->modes == NULL) {
+        SISErrorLog(pScrn, "No valid modes found - check VertRefresh/HorizSync\n");
+        goto my_error_1;
+     }
+ 
+-// PCF
+-//    xf86DrvMsg(0, X_INFO,"xf86SetCrtcForModes Start\n");
+     xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V);
+-//    xf86DrvMsg(0, X_INFO,"xf86SetCrtcForModes End\n");
+-  
+ 
+     /* Clear the modes' Private field */
+-// PCF
+-//    xf86DrvMsg(0, X_INFO,"SiSClearModesPrivate Start\n");
+     SiSClearModesPrivate(pScrn->modes);
+-//    xf86DrvMsg(0, X_INFO,"SiSClearModesPrivate End\n");
+ 
+     /* Save virtualX/Y calculated by ValidateModes
+      * and overwrite them with our values assumed to
+@@ -5823,23 +5822,9 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+        }
+ 
+        if(usemyprint) {
+-// PCF
+-#ifdef TWDEBUG
+-          xf86DrvMsg(0, X_INFO,"SiSPrintModes Start\n");
+-#endif
+ 	  SiSPrintModes(pScrn, printfreq);
+-#ifdef TWDEBUG
+-          xf86DrvMsg(0, X_INFO,"SiSPrintModes End\n");
+-#endif
+        } else {
+-// PCF
+-#ifdef TWDEBUG
+-          xf86DrvMsg(0, X_INFO,"xf86PrintModes Start\n");
+-#endif
+ 	  xf86PrintModes(pScrn);
+-#ifdef TWDEBUG
+-	  xf86DrvMsg(0, X_INFO,"xf86PrintModes End\n");
+-#endif
+        }
+     }
+ 
+@@ -6072,10 +6057,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+     	
+     /*xf86DrvMsg(0,X_INFO,"CurrentMode=%d. \n",pSiS->Hkey_Device_Switch_State);
+     xf86DrvMsg(0,X_INFO,"Init_VBFlags=0X%x. \n",pSiS->VBFlags);*/
+-// PCF
+-#ifdef TWDEBUG  
+-    xf86DrvMsg(0,X_INFO,"SISPreInit End\n");   
+-#endif
++    
+     return TRUE;
+ 
+     /* ---- */
+@@ -7523,9 +7505,7 @@ SiSPreSetMode(ScrnInfoPtr pScrn, Display
+     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, SISVERBLEVEL, "VBFlags=0x%x\n", pSiS->VBFlags);
+ 
+     CR30 = 0x00;
+-// PCF
+-//    CR31 &= ~0x60;  /* Clear VB_Drivermode & VB_OutputDisable */
+-    CR31 &= ~0x20;  /* Clear VB_Drivermode & VB_OutputDisable */
++    CR31 &= ~0x60;  /* Clear VB_Drivermode & VB_OutputDisable */
+     CR31 |= 0x04;   /* Set VB_NotSimuMode (not for 30xB/1400x1050?) */
+     CR35 = 0x00;
+ 
+@@ -8633,11 +8613,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
+     SISEntPtr pSiSEnt = NULL;
+ #endif
+ 
+-// PCF 
+-#ifdef TWDEBUG 
+-    xf86DrvMsg(0, X_INFO,"SISModeInit\n");
+-#endif
+-   
+     andSISIDXREG(SISCR,0x11,0x7f);	/* Unlock CRTC registers */
+ 
+     SISModifyModeInfo(mode);		/* Quick check of the mode parameters */
+@@ -8647,14 +8622,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
+     }
+ 
+     if(pSiS->UseVESA) {  /* With VESA: */
+-// PCF   
+-#ifdef TWDEBUG 
+-    	xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n");  
+-    	xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n");   
+-    	xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n");   
+-    	xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n");   
+-    	xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n");     	
+-#endif
+ 
+ #ifdef SISDUALHEAD
+        /* No dual head mode when using VESA */
+@@ -8679,7 +8646,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
+ 	  SISErrorLog(pScrn, "SiSSetVESAMode() failed\n");
+ 	  return FALSE;
+        }
+-       
+        sisSaveUnlockExtRegisterLock(pSiS, NULL, NULL);
+        if(pSiS->VGAEngine == SIS_300_VGA || pSiS->VGAEngine == SIS_315_VGA) {
+ 	  SiSPreSetMode(pScrn, mode, SIS_MODE_SIMU);
+@@ -8697,21 +8663,11 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
+        SiSVGAProtect(pScrn, TRUE);
+        (*pSiS->SiSRestore)(pScrn, &pSiS->ModeReg);
+        SiSVGAProtect(pScrn, FALSE);
+-//       xf86DrvMsg(0, X_INFO,"VESA DualHeadMode SetMode\n");
++
+     } else { /* Without VESA: */
+-// PCF
+-#ifdef TWDEBUG
+-       xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n");	
+-       xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n");	
+-       xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n");	
+-       xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n");	
+-       xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n");	
+-#endif
+ 
+ #ifdef SISDUALHEAD
+        if(pSiS->DualHeadMode) {
+-       	
+-       	  xf86DrvMsg(0, X_INFO,"SISModeInit DualHeadMode\n");	  
+ 
+ 	  if(!(*pSiS->ModeInit)(pScrn, mode)) {
+ 	     SISErrorLog(pScrn, "ModeInit() failed\n");
+@@ -8730,10 +8686,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
+ 		SISErrorLog(pScrn, "SiSBIOSSetModeCRT2() failed\n");
+ 		return FALSE;
+ 	     }
+-// PCF
+-#ifdef TWDEBUG
+-	     xf86DrvMsg(0, X_INFO,"DualHeadMode SetCRT2\n");
+-#endif	     
+ 	     SiSPostSetMode(pScrn, &pSiS->ModeReg);
+ 	     if(pSiSEnt->pScrn_2) {
+ 	        /* No need to go through pScrn->AdjustFrame; the coords
+@@ -8752,11 +8704,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
+ 		SISErrorLog(pScrn, "SiSBIOSSetModeCRT1() failed\n");
+ 		return FALSE;
+ 	     }
+-// PCF
+-#ifdef TWDEBUG
+-     	     xf86DrvMsg(0, X_INFO,"DualHeadMode SetCRT1\n");
+-#endif
+-
+ 	     SiS_SiSLVDSBackLight(pSiS, TRUE);
+ 	     SiSPostSetMode(pScrn, &pSiS->ModeReg);
+ 	     if(pSiSEnt->pScrn_1) {
+@@ -8771,20 +8718,8 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
+ 
+        } else {
+ #endif
+-// PCF
+-#ifdef TWDEBUG
+-       	  xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); 
+-       	  xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); 	       	
+-       	  xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); 	       	
+-       	  xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); 	       	
+-       	  xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); 	       	  	
+-#endif
+ 
+ 	  if(pSiS->VGAEngine == SIS_300_VGA || pSiS->VGAEngine == SIS_315_VGA) {
+-// PCF
+-#ifdef TWDEBUG  
+-             xf86DrvMsg(0, X_INFO,"SISModeInit SIS_315_VGA\n"); 	       	  	
+-#endif
+ 
+ 	     if(!(*pSiS->ModeInit)(pScrn, mode)) {
+ 		SISErrorLog(pScrn, "ModeInit() failed\n");
+@@ -8795,10 +8730,7 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
+ 
+ #ifdef SISMERGED
+ 	     if(pSiS->MergedFB) {
+-// PCF
+-#ifdef TWDEBUG     	
+-        	xf86DrvMsg(0, X_INFO,"SISModeInit SISMERGED\n"); 	       	
+-#endif
++
+ 		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Setting MergedFB mode %dx%d\n",
+ 				mode->HDisplay, mode->VDisplay);
+ 
+@@ -8813,10 +8745,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
+ 		   SISErrorLog(pScrn, "SiSBIOSSetModeCRT1() failed\n");
+ 		   return FALSE;
+ 		}
+-// PCF
+-#ifdef TWDEBUG
+-    	        xf86DrvMsg(0, X_INFO,"SISMERGED SetCRT1\n");	
+-#endif
+ 
+ 		SiSPreSetMode(pScrn, mode, SIS_MODE_CRT2);
+ 
+@@ -8827,10 +8755,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
+ 		   SISErrorLog(pScrn, "SiSBIOSSetModeCRT2() failed\n");
+ 		   return FALSE;
+ 		}
+-// PCF
+-#ifdef TWDEBUG
+-    	        xf86DrvMsg(0, X_INFO,"SISMERGED SetCRT2\n");	
+-#endif
+ 
+ 		SiS_SiSLVDSBackLight(pSiS, TRUE);
+ 
+@@ -8838,25 +8762,9 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
+ 
+ 	     } else {
+ #endif
+-// PCF
+-#ifdef TWDEBUG
+-        	xf86DrvMsg(0, X_INFO,"SISModeInit Not SISMERGED\n"); 	       	
+-#endif
+ 
+ 		if((pSiS->VBFlags & CRT1_LCDA) || (!(mode->type & M_T_DEFAULT))) {
+-// PCF               	   
+-#ifdef TWDEBUG
+- 		   xf86DrvMsg(0, X_INFO,"SISModeInit #1\n"); 
+-		   if(pSiS->VBFlags & CRT1_LCDA)
+-		   {
+-		   	xf86DrvMsg(0, X_INFO,"SISModeInit #1 LCDA\n");
+- 	       		
+-         	   }
+-         	   else
+-         	   {         	   	
+-         		xf86DrvMsg(0, X_INFO,"SISModeInit #1 LCDB\n");
+-         	   }     	   			   
+-#endif
++
+ 		   pSiS->SiS_Pr->SiS_EnableBackLight = FALSE;
+ 
+ 		   SiSPreSetMode(pScrn, mode, SIS_MODE_CRT1);
+@@ -8867,10 +8775,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
+ 		      SISErrorLog(pScrn, "SiSBIOSSetModeCRT1() failed\n");
+ 		      return FALSE;
+ 		   }
+-// PCF
+-#ifdef TWDEBUG
+- 		   xf86DrvMsg(0, X_INFO,"NoVESA SetCRT1\n");	
+-#endif
+ 
+ 		   SiSPreSetMode(pScrn, mode, SIS_MODE_CRT2);
+ 
+@@ -8880,28 +8784,10 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
+ 		      SISErrorLog(pScrn, "SiSBIOSSetModeCRT2() failed\n");
+ 		      return FALSE;
+ 		   }
+-// PCF
+-#ifdef TWDEBUG		 
+-    		   xf86DrvMsg(0, X_INFO,"NoVESA SetCRT2\n");	
+-#endif    		   
+-
+ 
+ 		   SiS_SiSLVDSBackLight(pSiS, TRUE);
+ 
+ 		} else {
+-// PCF
+-#ifdef TWDEBUG		
+-               	   xf86DrvMsg(0, X_INFO,"SISModeInit #2\n"); 	       	
+-		
+-                   if(pSiS->VBFlags & CRT1_LCDA)
+-		   {
+-		   	xf86DrvMsg(0, X_INFO,"SISModeInit #2 LCDA\n"); 	       		
+-         	   }
+-         	   else
+-         	   {
+-         	   	xf86DrvMsg(0, X_INFO,"SISModeInit #2 LCDB\n"); 	       		
+-         	   }     
+-#endif              	  	   			
+ 
+ 		   pSiS->SiS_Pr->SiS_EnableBackLight = TRUE;
+ 
+@@ -8918,11 +8804,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
+ #ifdef SISMERGED
+ 	     }
+ #endif
+-// PCF
+-#ifdef TWDEBUG		
+-             xf86DrvMsg(0, X_INFO,"SISModeInit #3\n"); 	       	
+-#endif             
+-
+ 	     SiSPostSetMode(pScrn, &pSiS->ModeReg);
+ #ifdef TWDEBUG
+ 	     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VBFlags %lx\n", pSiS->VBFlags);
+@@ -8932,10 +8813,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
+ #endif
+ 
+ 	  } else {
+-// PCF
+-#ifdef TWDEBUG			  	
+-	  	xf86DrvMsg(0, X_INFO,"SISModeInit Old method\n"); 	       
+-#endif	  
+ 
+ 	     /* For other chipsets, use the old method */
+ 
+@@ -9147,7 +9024,7 @@ SISSaveScreenDH(ScreenPtr pScreen, int m
+ static void
+ SISDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags)
+ {
+-	   SISPtr pSiS = SISPTR(pScrn);
++    SISPtr pSiS = SISPTR(pScrn);
+     Bool   docrt1 = TRUE, docrt2 = TRUE, backlight = TRUE;
+     UChar  sr1=0, cr17=0, cr63=0, pmreg=0, sr7=0;
+     UChar  p1_13=0, p2_0=0, oldpmreg=0;
+@@ -10237,7 +10114,6 @@ SISScreenInit(int scrnIndex, ScreenPtr p
+ static Bool
+ SiSValidLCDUserMode(SISPtr pSiS, unsigned int VBFlags, DisplayModePtr mode, Bool isforlcda)
+ {
+-
+    if(mode->Flags & V_INTERLACE) return FALSE;
+ 
+    if(mode->HDisplay > 2048) return FALSE;
+@@ -10352,7 +10228,7 @@ SiS_CheckModeCRT1(ScrnInfoPtr pScrn, Dis
+       }
+ 
+    }
+-  
++
+    return(SiS_GetModeID(pSiS->VGAEngine, VBFlags, mode->HDisplay, mode->VDisplay,
+    			i, pSiS->FSTN, pSiS->LCDwidth, pSiS->LCDheight));
+ }
+@@ -10370,12 +10246,8 @@ SiS_CheckModeCRT2(ScrnInfoPtr pScrn, Dis
+    xf86DrvMsg(0, X_INFO, "Inside CheckCalcModeIndex (VBFlags %lx, mode %dx%d)\n",
+ 	VBFlags,mode->HDisplay, mode->VDisplay);
+ #endif
++
+    if(VBFlags & CRT2_LCD) {			/* CRT2 is LCD */
+-  
+-// PCF
+-#ifdef TWDEBUG
+-      xf86DrvMsg(0, X_INFO, "SiS_CheckModeCRT2 LCDwidth= %d, LCDheight= %d\n",pSiS->LCDwidth,pSiS->LCDheight);
+-#endif
+ 
+       if((pSiS->VBFlags2 & VB2_SISTMDSBRIDGE) && (!(pSiS->VBFlags2 & VB2_30xBDH))) {
+ 
+@@ -10403,7 +10275,6 @@ SiS_CheckModeCRT2(ScrnInfoPtr pScrn, Dis
+             return 0xfe;
+ 
+       }
+-// PCF
+ 
+       if( ((mode->HDisplay <= pSiS->LCDwidth) &&
+            (mode->VDisplay <= pSiS->LCDheight)) ||
+@@ -10415,15 +10286,11 @@ SiS_CheckModeCRT2(ScrnInfoPtr pScrn, Dis
+ 	   (((mode->HDisplay == 1024) && (mode->HDisplay == 768)) ||
+ 	    ((mode->HDisplay ==  800) && (mode->HDisplay == 600)))) ||
+ 	   ((pSiS->EnablePanel_1366x768)&&(pSiS->LCDwidth==1366)&&(mode->HDisplay==1368))) {/*let 1366x768 mode valid. Ivans@090109*/
+-/*
+-      if( (mode->HDisplay <= pSiS->LCDwidth) &&
+-          (mode->VDisplay <= pSiS->LCDheight)) {
+-*/
++
+ 	 ModeIndex = SiS_GetModeID_LCD(pSiS->VGAEngine, VBFlags, mode->HDisplay, mode->VDisplay, i,
+ 				pSiS->FSTN, pSiS->SiS_Pr->SiS_CustomT, pSiS->LCDwidth, pSiS->LCDheight,
+ 				pSiS->VBFlags2);
+-// PCF
+-//	 xf86DrvMsg(0, X_INFO, "SiS_CheckModeCRT2 LCDwidth= %d, LCDheight= %d, ModeID= %x\n",pSiS->LCDwidth,pSiS->LCDheight,ModeIndex);
++
+       }
+ 
+    } else if(VBFlags & CRT2_TV) {		/* CRT2 is TV */
+@@ -10514,7 +10381,7 @@ SISValidMode(int scrnIndex, DisplayModeP
+ 	  if(SiS_CheckModeCRT2(pScrn, mode, pSiS->VBFlags,
+ 			pSiS->VBFlags3, pSiS->HaveCustomModes) < 0x14){
+ 	       #ifdef TWDEBUG
+-		  xf86DrvMsg(0,X_INFO,"[SISValidMode()]: else condition. passing CheckModeCRT2 and MODE_Fail.\n");
++		  xf86DrvMsg(0,X_INFO,"[SISValidMode()]: else condition. passing CheckModeCRT2 and MODE_OK.\n");
+ 	       #endif	  
+ 	       return MODE_BAD;
+ 	  }
+@@ -10629,18 +10496,12 @@ SISSwitchMode(int scrnIndex, DisplayMode
+     * (In non-MergedFB mode this is also here in order
+     * to get a cheap update of the HWCursor image)
+     */
+-    
+-// PCF
+-#ifdef TWDEBUG
+-    xf86DrvMsg(0,X_INFO,"SISSwitchMode\n");
+-#endif
+ 
+     if(!pSiS->skipswitchcheck) {
+        if(SISValidMode(scrnIndex, mode, TRUE, flags) != MODE_OK) {
+           return FALSE;
+        }
+     }
+-    
+ /* Mark for 3D full-screen bug */
+ /*
+ #ifdef XF86DRI    
+@@ -11510,12 +11371,6 @@ SISHotkeySwitchMode(ScrnInfoPtr pScrn, B
+    int dotclock=65146;
+    int hdisplay=1024;
+ 
+-// PCF
+-#ifdef TWDEBUG
+-   xf86DrvMsg(0,X_INFO,"SISHotkeySwitchMode\n");
+-#endif
+-
+-
+    if(!VidModeGetCurrentModeline(pScrn->scrnIndex,&hkeymode,&dotClock))
+    return FALSE;
+           
+diff -p -up xf86-video-sis-0.9.1/src/sis_driver.h.orig xf86-video-sis-0.9.1/src/sis_driver.h
+--- xf86-video-sis-0.9.1/src/sis_driver.h.orig	2008-09-02 10:19:02.000000000 -0400
++++ xf86-video-sis-0.9.1/src/sis_driver.h	2010-01-27 15:21:54.000000000 -0500
+@@ -779,6 +779,9 @@ static Bool SISSwitchMode(int scrnIndex,
+ static void SISNewAdjustFrame(int scrnIndex, int x, int y, int flags);
+ static Bool SISPMEvent(int scrnIndex, pmEvent event, Bool undo);/*APM-ACPI, adding by Ivans.*/
+ 
++#if XSERVER_LIBPCIACCESS
++static Bool SIS_pci_probe(DriverPtr driver, int entity_num, struct pci_device *device, intptr_t match_data);
++#endif
+ /* ACPI Device Switch functions */
+ static Bool SISHotkeySwitchCRT1Status(ScrnInfoPtr pScrn,int onoff);/*hotkey pressing: switch CRT1 on/off*/
+ static Bool SISHotkeySwitchCRT2Status(ScrnInfoPtr pScrn,ULong newvbflags ,ULong newvbflags3);/*LCD on/off*/
diff --git a/staging/xf86-video-sisimedia/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch b/staging/xf86-video-sisimedia/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch
new file mode 100644
index 000000000..415985921
--- /dev/null
+++ b/staging/xf86-video-sisimedia/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch
@@ -0,0 +1,89 @@
+--- xf86-video-sis-0.9.1/src/sis_driver.c.orig	2010-01-18 13:17:56.000000000 -0500
++++ xf86-video-sis-0.9.1/src/sis_driver.c	2010-01-25 16:35:40.000000000 -0500
+@@ -11677,7 +11677,64 @@ SISPMEvent(int scrnIndex, pmEvent event,
+   return 1;/*TRUE*/
+ }
+ 
++void
++sis_print_registers(SISPtr pSiS)
++{
++#define print(...)	xf86ErrorFVerb(1, __VA_ARGS__)
++    auto void print_range(char *name, int base, int first, int last) {
++	int		i, j;
++	unsigned char	c;
++	char		buffer[9];
++	print("%s:\n", name);
++	buffer[8] = 0;
++	for (i = first; i <= last; i++) {
++	    inSISIDXREG(base, i, c);
++	    for (j = 0; j < 8; j++)
++		buffer[7 - j] = c & (1 << j) ? '1' : '0';
++	    print("\t%02x: %02x:%s\n", i, c, buffer);
++	}
++    }
+ 
++    auto void print_range_int(char *name, int base, int first, int last) {
++	int		i, j;
++	unsigned int	l;
++	char		buffer[33];
++	print("%s:\n", name);
++	buffer[32] = 0;
++	for (i = first; i <= last; i += 4) {
++	    l = inSISREGL(base + i);
++	    for (j = 0; j < 32; j++)
++		buffer[31 - j] = l & (1 << j) ? '1' : '0';
++	    print("\t%02x: %08x:%s\n", i, l, buffer);
++	}
++    }
+ 
+-
+-
++    print_range_int	("PCI: CNF00 - CNF1B", pSiS->RelIO, 0x00, 0x1b);
++    print_range_int	("PCI: CNF2C - CNF47", pSiS->RelIO, 0x2C, 0x47);
++    print_range_int	("AGP: CNF50 - CNF5B", pSiS->RelIO, 0x50, 0x5B);
++    print_range		("CRT1: SR05 - SR12", SISSR, 0x05, 0x12);
++    print_range		("CRT1: SR13 - SR16 (reserved)", SISSR, 0x13, 0x16);
++    print		("CRT1: SR19 - SR1A (reserved)\n");
++    print_range		("CRT1: SR1B - SR3A", SISSR, 0x1b, 0x3a);
++    print		("CRT1: SR3B (reserved)\n");
++    print_range		("CRT1: SR3C - SR3F", SISSR, 0x3c, 0x3f);
++    print_range		("CRT1: CR19 - CR1A", SISCR, 0x19, 0x1a);
++    print		("CRT1: CR1B - CR27 (undocumented?)\n");
++    print_range		("CRT1: CR28 - CR2E", SISCR, 0x28, 0x2e);
++    print		("CRT1: CR2F (reserved)\n");
++    print_range		("VGA BIOS: CR30 - CR3F", SISCR, 0x30, 0x3f);
++    print_range		("CRT1: CR40 - CR43", SISCR, 0x40, 0x43);
++    print		("CRT1: CR44 - CR45 (reserved)\n");
++    print_range		("CRT1: CR46 - CR67", SISCR, 0x46, 0x67);
++    print		("CRT1: CR68 - CR6F (DRAM registers reserved for backward compatibility with 760)\n");
++    print		("CRT1: CR70 - CR77 (undocumented?)\n");
++    print_range		("SMA BIOS: CR78 - CR7F", SISCR, 0x78, 0x7f);
++    print_range_int	("CRT1: CR80 - CR9B", SISCR, 0x80, 0xb3);
++    print_range_int	("CRT1: CRC0 - CRF3", SISCR, 0xc0, 0xf3);
++    print_range		("CRT2: SIGNAL REGISTERS, PART1 00 - 45", SISPART1, 0x00, 0x45);
++    print_range		("CRT2: TV SIGNAL REGISTERS, PART2 00 - 4d", SISPART2, 0x00, 0x4d);
++    print_range		("CRT2: TV COPY PROTECTION, PART3 00 - 40", SISPART3, 0x00, 0x40);
++    print_range		("CRT2: SIGNAL REGISTERS, PART4 00 - 3A", SISPART4, 0x00, 0x3a);
++    print_range		("CRT2: PALETTE SIGNAL REGISTERS, PART5 00 - 00 (?)", SISPART5, 0x00, 0x00);
++#undef print
++}
+--- xf86-video-sis-0.9.1/src/sis_video.c.orig	2010-01-18 13:17:56.000000000 -0500
++++ xf86-video-sis-0.9.1/src/sis_video.c	2010-01-26 13:38:13.000000000 -0500
+@@ -129,6 +129,8 @@
+ 
+ #include "sis_video.h"
+ 
++extern void sis_print_registers(SISPtr pSiS);
++
+ void SiSInitMC(ScreenPtr pScreen);
+ 
+ /*********************************
+@@ -712,6 +714,8 @@ SISResetVideo(ScrnInfoPtr pScrn)
+ #ifdef SISMERGED
+     pPriv->mustresettap2 = TRUE;
+ #endif
++
++    sis_print_registers(pSiS);
+ }
+ 
+ 
diff --git a/staging/xf86-video-sisimedia/xserver19.patch b/staging/xf86-video-sisimedia/xserver19.patch
new file mode 100644
index 000000000..67ef6f585
--- /dev/null
+++ b/staging/xf86-video-sisimedia/xserver19.patch
@@ -0,0 +1,30 @@
+Index: xf86-video-sis-0.9.1/src/sis_driver.c
+===================================================================
+--- xf86-video-sis-0.9.1.orig/src/sis_driver.c
++++ xf86-video-sis-0.9.1/src/sis_driver.c
+@@ -85,7 +85,6 @@
+ #include "shadowfb.h"
+ #include "fb.h"
+ #include "micmap.h"
+-#include "mibank.h"
+ #include "mipointer.h"
+ #include "mibstore.h"
+ #include "edid.h"
+Index: xf86-video-sis-0.9.1/src/sis_mergedfb.c
+===================================================================
+--- xf86-video-sis-0.9.1.orig/src/sis_mergedfb.c
++++ xf86-video-sis-0.9.1/src/sis_mergedfb.c
+@@ -2948,11 +2948,11 @@ SiSXineramaExtensionInit(ScrnInfoPtr pSc
+ 
+        while(SiSXineramaGeneration != serverGeneration) {
+ 
+-	  ClientType = CreateNewResourceType(SiSXineramaFreeClient);
++	  ClientType = CreateNewResourceType(SiSXineramaFreeClient, "XineramaClient");
+ 	  if(!ClientType)
+ 	     break;
+ 
+-	  EventType = CreateNewResourceType(SiSXineramaFreeEvents);
++	  EventType = CreateNewResourceType(SiSXineramaFreeEvents, "XineramaEvents");
+ 	  if(!EventType)
+ 	     break;
+ 
diff --git a/staging/xorg-server/PKGBUILD b/staging/xorg-server/PKGBUILD
index 67ef9db6b..26bd56ee8 100644
--- a/staging/xorg-server/PKGBUILD
+++ b/staging/xorg-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135080 2011-08-10 07:26:57Z jgc $
+# $Id: PKGBUILD 136404 2011-08-29 07:29:48Z 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.99.902
+pkgver=1.11.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
@@ -15,7 +15,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         xvfb-run
         xvfb-run.1
         10-quirks.conf)
-sha1sums=('27cfd505a1d6c2ac6adf0af135676a96cb693c9e'
+sha1sums=('5fa0c0a190fbe1030a14e435de2d5a3259ca70be'
           '0249b892f27243d8fe6fe6d226bf4c2391cedf49'
           'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
           '6838fc00ef4618c924a77e0fb03c05346080908a'
diff --git a/testing/bind/127.0.0.zone b/testing/bind/127.0.0.zone
new file mode 100644
index 000000000..509c311f6
--- /dev/null
+++ b/testing/bind/127.0.0.zone
@@ -0,0 +1,11 @@
+$ORIGIN 0.0.127.in-addr.arpa.
+
+@			1D IN SOA	localhost. root.localhost. (
+					42		; serial (yyyymmdd##)
+					3H		; refresh
+					15M		; retry
+					1W		; expiry
+					1D )		; minimum ttl
+
+			1D IN NS	localhost.
+1			1D IN PTR	localhost.
diff --git a/testing/bind/PKGBUILD b/testing/bind/PKGBUILD
new file mode 100644
index 000000000..c67de70cb
--- /dev/null
+++ b/testing/bind/PKGBUILD
@@ -0,0 +1,88 @@
+# $Id: PKGBUILD 136400 2011-08-29 05:28:19Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+# Contributor: Mario Vazquez <mario_vazq@hotmail.com>
+
+pkgname=bind
+
+# Use a period and not a hyphen before the patch level for proper versioning.
+pkgver=9.8.0.P4
+_pkgver=9.8.0-P4
+pkgrel=2
+
+pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
+url='http://www.isc.org/software/bind/'
+license=('custom:ISC')
+arch=('i686' 'x86_64')
+depends=('openssl' 'krb5' 'libxml2')
+options=('!makeflags' '!libtool')
+source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
+        'root.hint::ftp://ftp.rs.internic.net/domain/db.cache'
+        'so_bsdcompat.patch'
+        'remove-tools.patch'
+        'named'
+        'named.conf'
+        'named.conf.d'
+        'named.logrotate'
+        'localhost.zone'
+        '127.0.0.zone')
+sha1sums=('969864200c1516a8bea54266de60f316d79182b4'
+          'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
+          'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb'
+          '18f477f510df31e6c6f547ee2d5fc46e973479bf'
+          '46232e9db243c6c05e170a1781d7a7f413be5d03'
+          '5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
+          '7848edbfb9a848843f57c11c02b0289eefd42d00'
+          '9ffb5c3f72390a517aeae557e32349d5d278cb63'
+          '76a0d4cd1b913db177a5a375bebc47e5956866ec'
+          '53be0f1437ebe595240d8dbdd819939582b97fb9')
+
+provides=('dns-server')
+
+install=install
+backup=('etc/logrotate.d/named'
+        'etc/conf.d/named'
+        'etc/named.conf')
+
+build() {
+	cd "${srcdir}/bind-${_pkgver}"
+
+	patch -p1 -i ../remove-tools.patch
+	patch -p1 -i ../so_bsdcompat.patch
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-linux-caps \
+		--with-openssl \
+		--with-gssapi \
+		--with-libxml2 \
+		--with-libtool \
+		--with-dlz-dlopen \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/bind-${_pkgver}"
+
+	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+	make DESTDIR="${pkgdir}" install
+
+	rmdir "${pkgdir}/var/run"
+	install -d "${pkgdir}"/usr/share/doc/bind
+	install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/
+
+	install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
+	install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
+	install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named
+	install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf
+
+	install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named
+	install    -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named/
+	install    -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named/
+	install    -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named/
+}
diff --git a/testing/bind/install b/testing/bind/install
new file mode 100644
index 000000000..287d0e05b
--- /dev/null
+++ b/testing/bind/install
@@ -0,0 +1,21 @@
+post_install() {
+	getent group named &>/dev/null || groupadd -g 40 named
+	getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named
+	passwd -l named &>/dev/null
+
+	touch var/log/named.log
+	chown named:named var/log/named.log
+
+	# create an rndc.key if it doesn't already exist
+	if [[ ! -s etc/rndc.key ]]; then
+		usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key
+		chown root:named etc/rndc.key
+		chmod 640 etc/rndc.key
+	fi
+}
+
+pre_remove() {
+	getent passwd named &>/dev/null && userdel named >/dev/null
+	getent group named &>/dev/null && groupdel named >/dev/null
+	return 0
+}
diff --git a/testing/bind/localhost.zone b/testing/bind/localhost.zone
new file mode 100644
index 000000000..e3ff9641c
--- /dev/null
+++ b/testing/bind/localhost.zone
@@ -0,0 +1,10 @@
+$ORIGIN localhost.
+@			1D IN SOA	@ root (
+					42		; serial (yyyymmdd##)
+					3H		; refresh
+					15M		; retry
+					1W		; expiry
+					1D )		; minimum ttl
+
+			1D IN NS	@
+			1D IN A		127.0.0.1
diff --git a/testing/bind/named b/testing/bind/named
new file mode 100755
index 000000000..7907f9983
--- /dev/null
+++ b/testing/bind/named
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/named
+
+[[ -d /var/run/named ]] || mkdir -p /var/run/named
+chown named:named /var/run/named
+
+PIDFILE=/var/run/named/named.pid
+PID=$(cat $PIDFILE 2>/dev/null)
+readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; }
+
+case "$1" in
+  start)
+    stat_busy "Starting BIND"
+    [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS}
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon named
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping BIND"
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon named
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  reload)
+    stat_busy "Reloading BIND"
+    [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      stat_done
+    fi
+    ;;
+  *)
+    echo "usage: $0 {start|stop|reload|restart}"
+esac
+exit 0
diff --git a/testing/bind/named.conf b/testing/bind/named.conf
new file mode 100644
index 000000000..38fb12cbe
--- /dev/null
+++ b/testing/bind/named.conf
@@ -0,0 +1,64 @@
+// 
+// /etc/named.conf
+//
+
+options {
+	directory "/var/named";
+	pid-file "/var/run/named/named.pid";
+	auth-nxdomain yes;
+	datasize default;
+// Uncomment these to enable IPv6 connections support
+// IPv4 will still work:
+//	listen-on-v6 { any; };
+// Add this for no IPv4:
+//	listen-on { none; };
+
+	// Default security settings.
+	allow-recursion { 127.0.0.1; };
+	allow-transfer { none; };
+	allow-update { none; };
+    version none;
+    hostname none;
+    server-id none;
+};
+
+zone "localhost" IN {
+	type master;
+	file "localhost.zone";
+	allow-transfer { any; };
+};
+
+zone "0.0.127.in-addr.arpa" IN {
+	type master;
+	file "127.0.0.zone";
+	allow-transfer { any; };
+};
+
+zone "." IN {
+	type hint;
+	file "root.hint";
+};
+
+//zone "example.org" IN {
+//	type slave;
+//	file "example.zone";
+//	masters {
+//		192.168.1.100; 
+//	};
+//	allow-query { any; };
+//	allow-transfer { any; };
+//};
+
+logging {
+        channel xfer-log {
+                file "/var/log/named.log";
+                print-category yes;
+                print-severity yes;
+                print-time yes;
+                severity info;
+        };
+        category xfer-in { xfer-log; };
+        category xfer-out { xfer-log; };
+        category notify { xfer-log; };
+};
+
diff --git a/testing/bind/named.conf.d b/testing/bind/named.conf.d
new file mode 100644
index 000000000..aecbd2307
--- /dev/null
+++ b/testing/bind/named.conf.d
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to BIND
+#
+NAMED_ARGS="-u named"
diff --git a/testing/bind/named.logrotate b/testing/bind/named.logrotate
new file mode 100644
index 000000000..ef1a2d032
--- /dev/null
+++ b/testing/bind/named.logrotate
@@ -0,0 +1,6 @@
+/var/log/named.log {
+   missingok
+   postrotate
+      /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true
+   endscript
+}
diff --git a/testing/bind/remove-tools.patch b/testing/bind/remove-tools.patch
new file mode 100644
index 000000000..cbd1c53ad
--- /dev/null
+++ b/testing/bind/remove-tools.patch
@@ -0,0 +1,12 @@
+diff -aur old/bin/Makefile.in new/bin/Makefile.in
+--- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
++++ new/bin/Makefile.in	2011-08-28 19:14:17.025674400 -0700
+@@ -19,7 +19,7 @@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
++SUBDIRS =	named rndc dnssec tests tools nsupdate \
+ 		check confgen @PKCS11_TOOLS@
+ TARGETS =
+ 
diff --git a/testing/bind/so_bsdcompat.patch b/testing/bind/so_bsdcompat.patch
new file mode 100644
index 000000000..4d7031fcc
--- /dev/null
+++ b/testing/bind/so_bsdcompat.patch
@@ -0,0 +1,12 @@
+diff -aur old/lib/isc/unix/socket.c new/lib/isc/unix/socket.c
+--- old/lib/isc/unix/socket.c	2011-02-18 05:01:16.000000000 +0100
++++ new/lib/isc/unix/socket.c	2011-05-27 10:12:01.685269374 +0200
+@@ -712,6 +712,8 @@
+ }
+ #endif
+ 
++#undef SO_BSDCOMPAT
++
+ static void
+ socket_log(isc__socket_t *sock, isc_sockaddr_t *address,
+ 	   isc_logcategory_t *category, isc_logmodule_t *module, int level,
diff --git a/testing/bzr/PKGBUILD b/testing/bzr/PKGBUILD
new file mode 100644
index 000000000..58b6598b4
--- /dev/null
+++ b/testing/bzr/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 136469 2011-08-29 21:41:53Z eric $
+# Maintainer :
+# Contributor: Hugo Doria <hugo@archlinux.org>
+
+pkgname=bzr
+pkgver=2.4.0
+pkgrel=1
+pkgdesc="A decentralized revision control system (bazaar)"
+arch=('i686' 'x86_64')
+url="http://bazaar.canonical.com/en/"
+license=('GPL')
+depends=('python2')
+optdepends=('python-paramiko: for sftp support')
+source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+md5sums=('087c65e4b79f454b9e733c21607bdd56')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|man/man1|share/man/man1|' setup.py
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+    bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py}
+  python2 setup.py build
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
+
+  # bash-completion
+  install -D -m644 contrib/bash/bzr "${pkgdir}/etc/bash_completion.d/bzr"
+}
diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD
new file mode 100644
index 000000000..a310318f1
--- /dev/null
+++ b/testing/dnsutils/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 136402 2011-08-29 05:30:27Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: kevin <kevin@archlinux.org>
+# Contributor: mario <mario_vazq@hotmail.com>
+
+pkgname=dnsutils
+
+# Use a period and not a hyphen before the patch level for proper versioning.
+pkgver=9.8.0.P4
+_pkgver=9.8.0-P4
+pkgrel=2
+
+pkgdesc='DNS utilities: dig host nslookup'
+url='http://www.isc.org/software/bind/'
+license=('custom:ISC')
+arch=('i686' 'x86_64')
+depends=('openssl' 'idnkit')
+options=('!makeflags')
+source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
+        'remove-bind.patch')
+sha1sums=('969864200c1516a8bea54266de60f316d79182b4'
+          'b465ef6160b004838f04de9978fe1be8422af777')
+
+replaces=('bind-tools' 'host')
+
+build() {
+	cd "${srcdir}/bind-${_pkgver}"
+
+	patch -p1 -i ../remove-bind.patch
+	export STD_CDEFINES='-DDIG_SIGCHASE'
+
+	# hack to remove unused bloat from the binaries
+	CFLAGS+=' -fdata-sections -ffunction-sections'
+	LDFLAGS+=' -Wl,--gc-sections'
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-linux-caps \
+		--with-openssl \
+		--with-idn \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/bind-${_pkgver}"
+
+	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+	cd bin
+	make DESTDIR="${pkgdir}" install
+
+}
diff --git a/testing/dnsutils/remove-bind.patch b/testing/dnsutils/remove-bind.patch
new file mode 100644
index 000000000..19d650964
--- /dev/null
+++ b/testing/dnsutils/remove-bind.patch
@@ -0,0 +1,25 @@
+diff -aur old/bin/Makefile.in new/bin/Makefile.in
+--- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
++++ new/bin/Makefile.in	2011-08-28 19:16:17.245495043 -0700
+@@ -19,8 +19,7 @@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
+-		check confgen @PKCS11_TOOLS@
++SUBDIRS =	dig
+ TARGETS =
+ 
+ @BIND9_MAKE_RULES@
+diff -aur old/lib/Makefile.in new/lib/Makefile.in
+--- old/lib/Makefile.in	2007-06-19 16:47:13.000000000 -0700
++++ new/lib/Makefile.in	2011-08-28 19:17:50.828688599 -0700
+@@ -23,7 +23,7 @@
+ # Attempt to disable parallel processing.
+ .NOTPARALLEL:
+ .NO_PARALLEL:
+-SUBDIRS =	isc isccc dns isccfg bind9 lwres tests
++SUBDIRS =	isc dns isccfg bind9 lwres
+ TARGETS =
+ 
+ @BIND9_MAKE_RULES@
diff --git a/testing/libevent/PKGBUILD b/testing/libevent/PKGBUILD
new file mode 100644
index 000000000..88a9d6c56
--- /dev/null
+++ b/testing/libevent/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 136467 2011-08-29 20:57:46Z eric $
+# Maintainer: 
+# Contributor: Judd <jvinet@zeroflux.org>
+
+pkgname=libevent
+pkgver=2.0.13
+pkgrel=1
+pkgdesc="An event notification library"
+arch=('i686' 'x86_64')
+url="http://www.monkey.org/~provos/libevent/"
+license=('GPL2')
+depends=('openssl')
+optdepends=('python2: to use event_rpcgen.py')
+options=('!libtool')
+source=("http://www.monkey.org/~provos/libevent-$pkgver-stable.tar.gz")
+md5sums=('af786b4b3f790c9d3279792edf7867fc')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}-stable"
+  sed -i 's#python#python2#' event_rpcgen.py
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}-stable"
+  make check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}-stable"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/nspr/PKGBUILD b/testing/nspr/PKGBUILD
new file mode 100644
index 000000000..90dbcb6f6
--- /dev/null
+++ b/testing/nspr/PKGBUILD
@@ -0,0 +1,63 @@
+# $Id: PKGBUILD 136448 2011-08-29 14:19:50Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
+pkgname=nspr
+pkgver=4.8.9
+pkgrel=2
+pkgdesc="Netscape Portable Runtime"
+arch=(i686 x86_64)
+url="http://www.mozilla.org/projects/nspr/"
+license=('MPL' 'GPL')
+depends=('glibc')
+makedepends=('zip')
+options=(!emptydirs)
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
+        nspr.pc.in)
+md5sums=('60770d45dc08c0f181b22cdfce5be3e8'
+         'bce1611f3117b53fc904cab549c09967')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  if [ "$CARCH" = "x86_64" ]; then
+    confflags="--enable-64bit"
+  else
+    confflags=""
+  fi
+
+  sed -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+      -i mozilla/nsprpub/config/rules.mk
+
+  ./mozilla/nsprpub/configure \
+      --prefix=/usr \
+      --libdir=/usr/lib \
+      --includedir=/usr/include/nspr \
+      --enable-optimize \
+      --disable-debug ${confflags}
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  NSPR_LIBS=`./config/nspr-config --libs`
+  NSPR_CFLAGS=`./config/nspr-config --cflags`
+  NSPR_VERSION=`./config/nspr-config --version`
+  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+  sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib," \
+  	-e "s,%prefix%,/usr," \
+	-e "s,%exec_prefix%,/usr/bin," \
+	-e "s,%includedir%,/usr/include/nspr," \
+	-e "s,%NSPR_VERSION%,${NSPR_VERSION}," \
+	-e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \
+	-e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${pkgdir}/usr/lib/pkgconfig/nspr.pc"
+  chmod 644 "${pkgdir}/usr/lib/pkgconfig/nspr.pc"
+  ln -sf nspr.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nspr.pc"
+
+  chmod 644 ${pkgdir}/usr/lib/*.a
+
+  rm -rf "${pkgdir}/usr/bin/compile-et.pl" \
+	"${pkgdir}/usr/bin/prerr.properties" \
+	"${pkgdir}/usr/share/aclocal/nspr.m4" \
+	"${pkgdir}/usr/include/nspr/md"
+}
diff --git a/testing/nspr/nspr.pc.in b/testing/nspr/nspr.pc.in
new file mode 100644
index 000000000..1d8f4a0ca
--- /dev/null
+++ b/testing/nspr/nspr.pc.in
@@ -0,0 +1,10 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSPR
+Description: The Netscape Portable Runtime
+Version: %NSPR_VERSION%
+Libs: %FULL_NSPR_LIBS%
+Cflags: %FULL_NSPR_CFLAGS%
diff --git a/testing/nss/PKGBUILD b/testing/nss/PKGBUILD
new file mode 100644
index 000000000..5e5fd134f
--- /dev/null
+++ b/testing/nss/PKGBUILD
@@ -0,0 +1,105 @@
+# $Id: PKGBUILD 136450 2011-08-29 14:44:54Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=nss
+pkgver=3.12.11
+pkgrel=2
+pkgdesc="Mozilla Network Security Services"
+arch=(i686 x86_64)
+url="http://www.mozilla.org/projects/security/pki/nss/"
+license=('MPL' 'GPL')
+_nsprver=4.8.9
+depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh')
+makedepends=('perl')
+replaces=('nss-nspr')
+options=('!strip')
+source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
+        nss-no-rpath.patch
+        nss.pc.in
+        nss-config.in
+        add_spi+cacert_ca_certs.patch
+        ssl-renegotiate-transitional.patch)
+md5sums=('ca0ca058380be200cf247ea2496b5352'
+         'e5c97db0c884d5f4cfda21e562dc9bba'
+         'c547b030c57fe1ed8b77c73bf52b3ded'
+         '46bee81908f1e5b26d6a7a2e14c64d9f'
+         '7f39c19b1dfd62d7db7d8bf19f156fed'
+         'd83c7b61abb7e9f8f7bcd157183d1ade')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian
+  patch -Np1 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
+  # Adds transitional SSL renegotiate support - patch from Debian
+  patch -Np1 -i "${srcdir}/ssl-renegotiate-transitional.patch"
+  # Removes rpath
+  patch -Np0 -i "${srcdir}/nss-no-rpath.patch"
+
+  # Respect LDFLAGS
+  sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
+      -i mozilla/security/coreconf/rules.mk
+
+  cd mozilla/security/nss/lib/ckfw/builtins
+  make generate
+
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  export BUILD_OPT=1
+  export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+  export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+  export NSS_USE_SYSTEM_SQLITE=1
+  export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
+  export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
+  export XCFLAGS="${CFLAGS}"
+
+  [ "$CARCH" = "x86_64" ] && export USE_64=1
+
+  make -j 1 -C mozilla/security/coreconf
+  make -j 1 -C mozilla/security/dbm
+  make -j 1 -C mozilla/security/nss
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+  install -m755 -d "${pkgdir}/usr/bin"
+  install -m755 -d "${pkgdir}/usr/include/nss"
+
+  NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
+  NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
+  NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
+
+  sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib,g" \
+  				-e "s,%prefix%,/usr,g" \
+				-e "s,%exec_prefix%,/usr/bin,g" \
+				-e "s,%includedir%,/usr/include/nss,g" \
+				-e "s,%NSPR_VERSION%,${pkgver},g" \
+				-e "s,%NSS_VERSION%,${pkgver},g" > \
+			"${pkgdir}/usr/lib/pkgconfig/nss.pc"
+  ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc"
+  chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc
+
+  sed "${srcdir}/nss-config.in" -e "s,@libdir@,/usr/lib,g" \
+  				    -e "s,@prefix@,/usr/bin,g" \
+				    -e "s,@exec_prefix@,/usr/bin,g" \
+				    -e "s,@includedir@,/usr/include/nss,g" \
+				    -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
+				    -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
+				    -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
+			    > "${pkgdir}/usr/bin/nss-config"
+  chmod 755 "${pkgdir}/usr/bin/nss-config"
+
+  for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
+              libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
+  do
+    install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/"
+  done
+
+  install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/"
+  install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/"
+
+  for file in certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap; do
+    install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/"
+  done
+
+  install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/"
+}
diff --git a/testing/nss/add_spi+cacert_ca_certs.patch b/testing/nss/add_spi+cacert_ca_certs.patch
new file mode 100644
index 000000000..1cc7c18f5
--- /dev/null
+++ b/testing/nss/add_spi+cacert_ca_certs.patch
@@ -0,0 +1,561 @@
+--- a/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
++++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+@@ -20926,3 +20926,558 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
++
++#
++# Certificate "CAcert.org Class 1 Root CA"
++#
++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
++CKA_TOKEN CK_BBOOL CK_TRUE
++CKA_PRIVATE CK_BBOOL CK_FALSE
++CKA_MODIFIABLE CK_BBOOL CK_FALSE
++CKA_LABEL UTF8 "CAcert.org Class 1 Root CA"
++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
++CKA_SUBJECT MULTILINE_OCTAL
++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
++\100\143\141\143\145\162\164\056\157\162\147
++END
++CKA_ID UTF8 "0"
++CKA_ISSUER MULTILINE_OCTAL
++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
++\100\143\141\143\145\162\164\056\157\162\147
++END
++CKA_SERIAL_NUMBER MULTILINE_OCTAL
++\002\001\000
++END
++CKA_VALUE MULTILINE_OCTAL
++\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000
++\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
++\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
++\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
++\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
++\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
++\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
++\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
++\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
++\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063
++\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060
++\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016
++\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
++\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
++\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
++\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
++\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
++\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
++\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
++\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
++\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
++\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007
++\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002
++\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011
++\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315
++\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230
++\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272
++\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016
++\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052
++\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262
++\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140
++\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150
++\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273
++\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022
++\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234
++\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334
++\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070
++\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232
++\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044
++\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355
++\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252
++\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352
++\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276
++\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306
++\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320
++\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167
++\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335
++\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324
++\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246
++\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106
++\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272
++\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334
++\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304
++\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060
++\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265
++\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071
++\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230
++\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260
++\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016
++\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
++\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
++\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
++\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
++\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
++\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
++\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
++\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001
++\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037
++\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160
++\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157
++\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006
++\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164
++\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164
++\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060
++\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045
++\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162
++\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077
++\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102
++\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165
++\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164
++\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040
++\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167
++\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006
++\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001
++\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201
++\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275
++\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234
++\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323
++\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073
++\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140
++\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353
++\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160
++\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334
++\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231
++\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116
++\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145
++\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031
++\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363
++\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330
++\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367
++\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260
++\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223
++\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335
++\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026
++\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005
++\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361
++\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371
++\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246
++\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206
++\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153
++\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344
++\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143
++\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362
++\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226
++\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175
++\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305
++\103
++END
++
++# Trust for Certificate "CAcert.org Class 1 Root CA"
++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
++CKA_TOKEN CK_BBOOL CK_TRUE
++CKA_PRIVATE CK_BBOOL CK_FALSE
++CKA_MODIFIABLE CK_BBOOL CK_FALSE
++CKA_LABEL UTF8 "CAcert.org Class 1 Root CA"
++CKA_CERT_SHA1_HASH MULTILINE_OCTAL
++\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106
++\166\316\217\063
++END
++CKA_CERT_MD5_HASH MULTILINE_OCTAL
++\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153
++END
++CKA_ISSUER MULTILINE_OCTAL
++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
++\100\143\141\143\145\162\164\056\157\162\147
++END
++CKA_SERIAL_NUMBER MULTILINE_OCTAL
++\002\001\000
++END
++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
++
++#
++# Certificate "CAcert.org Class 3 Root CA"
++#
++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
++CKA_TOKEN CK_BBOOL CK_TRUE
++CKA_PRIVATE CK_BBOOL CK_FALSE
++CKA_MODIFIABLE CK_BBOOL CK_FALSE
++CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
++CKA_SUBJECT MULTILINE_OCTAL
++\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143
++\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004
++\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101
++\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004
++\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040
++\063\040\122\157\157\164
++END
++CKA_ID UTF8 "0"
++CKA_ISSUER MULTILINE_OCTAL
++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
++\100\143\141\143\145\162\164\056\157\162\147
++END
++CKA_SERIAL_NUMBER MULTILINE_OCTAL
++\002\001\001
++END
++CKA_VALUE MULTILINE_OCTAL
++\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001
++\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
++\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
++\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
++\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
++\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
++\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
++\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
++\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
++\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065
++\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060
++\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022
++\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156
++\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164
++\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157
++\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143
++\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164
++\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
++\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
++\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335
++\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175
++\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163
++\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144
++\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001
++\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171
++\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313
++\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011
++\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353
++\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277
++\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331
++\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205
++\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073
++\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161
++\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371
++\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047
++\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252
++\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102
++\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064
++\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133
++\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242
++\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137
++\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325
++\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150
++\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230
++\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140
++\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347
++\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321
++\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206
++\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257
++\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164
++\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373
++\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003
++\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006
++\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006
++\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072
++\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162
++\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034
++\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162
++\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003
++\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001
++\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002
++\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101
++\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160
++\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206
++\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241
++\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072
++\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135
++\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253
++\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364
++\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172
++\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302
++\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214
++\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074
++\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154
++\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025
++\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352
++\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231
++\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213
++\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325
++\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242
++\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214
++\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027
++\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057
++\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224
++\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134
++\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356
++\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005
++\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355
++\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143
++\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123
++\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243
++\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005
++\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156
++\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317
++\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360
++\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101
++\322\156\245\033\231\047\200\347\013\251\250\000
++END
++
++# Trust for Certificate "CAcert.org Class 3 Root CA"
++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
++CKA_TOKEN CK_BBOOL CK_TRUE
++CKA_PRIVATE CK_BBOOL CK_FALSE
++CKA_MODIFIABLE CK_BBOOL CK_FALSE
++CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
++CKA_CERT_SHA1_HASH MULTILINE_OCTAL
++\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304
++\030\116\052\055
++END
++CKA_CERT_MD5_HASH MULTILINE_OCTAL
++\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266
++END
++CKA_ISSUER MULTILINE_OCTAL
++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
++\100\143\141\143\145\162\164\056\157\162\147
++END
++CKA_SERIAL_NUMBER MULTILINE_OCTAL
++\002\001\001
++END
++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
++
++#
++# Certificate "Software in the Public Interest, Inc. Root CA (2008)"
++#
++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
++CKA_TOKEN CK_BBOOL CK_TRUE
++CKA_PRIVATE CK_BBOOL CK_FALSE
++CKA_MODIFIABLE CK_BBOOL CK_FALSE
++CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)"
++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
++CKA_SUBJECT MULTILINE_OCTAL
++\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
++\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
++\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
++\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
++\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
++\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
++\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
++\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
++\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
++\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
++\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
++\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
++END
++CKA_ID UTF8 "0"
++CKA_ISSUER MULTILINE_OCTAL
++\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
++\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
++\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
++\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
++\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
++\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
++\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
++\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
++\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
++\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
++\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
++\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
++END
++CKA_SERIAL_NUMBER MULTILINE_OCTAL
++\002\011\000\350\216\266\311\370\052\024\050
++END
++CKA_VALUE MULTILINE_OCTAL
++\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000
++\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206
++\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003
++\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010
++\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125
++\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163
++\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167
++\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151
++\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003
++\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061
++\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146
++\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061
++\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026
++\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151
++\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063
++\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060
++\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125
++\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023
++\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004
++\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061
++\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141
++\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143
++\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125
++\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036
++\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151
++\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045
++\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150
++\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156
++\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
++\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
++\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051
++\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074
++\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271
++\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240
++\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321
++\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265
++\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175
++\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375
++\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161
++\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342
++\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172
++\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056
++\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247
++\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310
++\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361
++\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356
++\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110
++\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151
++\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316
++\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307
++\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320
++\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205
++\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123
++\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154
++\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275
++\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356
++\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250
++\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204
++\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147
++\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305
++\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057
++\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124
++\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060
++\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161
++\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122
++\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346
++\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102
++\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061
++\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016
++\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025
++\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141
++\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037
++\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040
++\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061
++\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141
++\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103
++\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157
++\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015
++\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100
++\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216
++\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377
++\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206
++\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035
++\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102
++\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151
++\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164
++\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102
++\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141
++\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055
++\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206
++\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057
++\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143
++\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125
++\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164
++\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016
++\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015
++\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002
++\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162
++\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030
++\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255
++\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065
++\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014
++\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306
++\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051
++\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017
++\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302
++\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213
++\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017
++\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162
++\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152
++\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357
++\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266
++\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104
++\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177
++\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253
++\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206
++\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217
++\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265
++\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225
++\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140
++\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207
++\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252
++\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340
++\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254
++\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275
++\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132
++\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151
++\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005
++\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004
++\243\140
++END
++
++# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)"
++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
++CKA_TOKEN CK_BBOOL CK_TRUE
++CKA_PRIVATE CK_BBOOL CK_FALSE
++CKA_MODIFIABLE CK_BBOOL CK_FALSE
++CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)"
++CKA_CERT_SHA1_HASH MULTILINE_OCTAL
++\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044
++\251\220\103\034
++END
++CKA_CERT_MD5_HASH MULTILINE_OCTAL
++\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170
++END
++CKA_ISSUER MULTILINE_OCTAL
++\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
++\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
++\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
++\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
++\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
++\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
++\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
++\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
++\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
++\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
++\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
++\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
++END
++CKA_SERIAL_NUMBER MULTILINE_OCTAL
++\002\011\000\350\216\266\311\370\052\024\050
++END
++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff --git a/testing/nss/nss-config.in b/testing/nss/nss-config.in
new file mode 100644
index 000000000..f8f893e71
--- /dev/null
+++ b/testing/nss/nss-config.in
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_PATCH_VERSION@
+
+usage()
+{
+	cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--includedir[=DIR]]
+	[--libdir[=DIR]]
+	[--version]
+	[--libs]
+	[--cflags]
+Dynamic Libraries:
+	nss
+	nssutil
+	ssl
+	smime
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+lib_ssl=yes
+lib_smime=yes
+lib_nss=yes
+lib_nssutil=yes
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      ;;
+    --prefix)
+      echo_prefix=yes
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --includedir=*)
+      includedir=$optarg
+      ;;
+    --includedir)
+      echo_includedir=yes
+      ;;
+    --libdir=*)
+      libdir=$optarg
+      ;;
+    --libdir)
+      echo_libdir=yes
+      ;;
+    --version)
+      echo ${major_version}.${minor_version}.${patch_version}
+      ;;
+    --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    ssl)
+      lib_ssl=yes
+      ;;
+    smime)
+      lib_smime=yes
+      ;;
+    nss)
+      lib_nss=yes
+      ;;
+    nssutil)
+      lib_nssutil=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+    exec_prefix=`pkg-config --variable=exec_prefix nss`
+fi
+if test -z "$includedir"; then
+    includedir=`pkg-config --variable=includedir nss`
+fi
+if test -z "$libdir"; then
+    libdir=`pkg-config --variable=libdir nss`
+fi
+
+if test "$echo_prefix" = "yes"; then
+    echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+    echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+    echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+    echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+    echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
+      if test -n "$lib_ssl"; then
+	libdirs="$libdirs -lssl${major_version}"
+      fi
+      if test -n "$lib_smime"; then
+	libdirs="$libdirs -lsmime${major_version}"
+      fi
+      if test -n "$lib_nss"; then
+	libdirs="$libdirs -lnss${major_version}"
+      fi
+      if test -n "$lib_nssutil"; then
+	libdirs="$libdirs -lnssutil${major_version}"
+      fi
+      echo $libdirs
+fi      
+
diff --git a/testing/nss/nss-no-rpath.patch b/testing/nss/nss-no-rpath.patch
new file mode 100644
index 000000000..35ea57315
--- /dev/null
+++ b/testing/nss/nss-no-rpath.patch
@@ -0,0 +1,14 @@
+--- ./mozilla/security/nss/cmd/platlibs.mk.withrpath	2007-02-19 07:17:06.000000000 +0100
++++ ./mozilla/security/nss/cmd/platlibs.mk	2007-02-19 07:18:07.000000000 +0100
+@@ -52,9 +52,9 @@
+ 
+ ifeq ($(OS_ARCH), Linux)
+ ifeq ($(USE_64), 1)
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
+ else
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
+ endif
+ endif
+ 
diff --git a/testing/nss/nss.pc.in b/testing/nss/nss.pc.in
new file mode 100644
index 000000000..d47b9e146
--- /dev/null
+++ b/testing/nss/nss.pc.in
@@ -0,0 +1,11 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS
+Description: Network Security Services
+Version: %NSS_VERSION%
+Requires: nspr >= %NSPR_VERSION%
+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
+Cflags: -I${includedir}
diff --git a/testing/nss/ssl-renegotiate-transitional.patch b/testing/nss/ssl-renegotiate-transitional.patch
new file mode 100644
index 000000000..f457c5551
--- /dev/null
+++ b/testing/nss/ssl-renegotiate-transitional.patch
@@ -0,0 +1,21 @@
+Enable transitional scheme for ssl renegotiation:
+
+(from mozilla/security/nss/lib/ssl/ssl.h)
+Disallow unsafe renegotiation in server sockets only, but allow clients
+to continue to renegotiate with vulnerable servers.
+This value should only be used during the transition period when few
+servers have been upgraded.
+
+diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c
+index f1d1921..c074360 100644
+--- a/mozilla/security/nss/lib/ssl/sslsock.c
++++ b/mozilla/security/nss/lib/ssl/sslsock.c
+@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = {
+     PR_FALSE,   /* noLocks            */
+     PR_FALSE,   /* enableSessionTickets */
+     PR_FALSE,   /* enableDeflate      */
+-    2,          /* enableRenegotiation (default: requires extension) */
++    3,          /* enableRenegotiation (default: transitional) */
+     PR_FALSE,   /* requireSafeNegotiation */
+ };
+ 
diff --git a/testing/sysvinit/PKGBUILD b/testing/sysvinit/PKGBUILD
new file mode 100644
index 000000000..59201d756
--- /dev/null
+++ b/testing/sysvinit/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 136463 2011-08-29 20:29:35Z tomegun $
+# Maintainer: Eric Belanger <eric@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=sysvinit
+pkgver=2.88
+pkgrel=3
+pkgdesc="Linux System V Init"
+arch=('i686' 'x86_64')
+url="http://savannah.nongnu.org/projects/sysvinit"
+license=('GPL')
+groups=('base')
+depends=('shadow' 'util-linux' 'coreutils' 'glibc' 'awk')
+install=sysvinit.install
+source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgname}-${pkgver}dsf.tar.bz2)
+md5sums=('6eda8a97b86e0a6f59dabbf25202aa6f')
+sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}dsf"
+  make 
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}dsf"
+  make ROOT="${pkgdir}" install
+
+  # mountpoint is now provided by util-linux instead
+  cd "${pkgdir}"
+  rm bin/mountpoint
+  rm usr/share/man/man1/mountpoint.1
+}
diff --git a/testing/sysvinit/sysvinit.install b/testing/sysvinit/sysvinit.install
new file mode 100644
index 000000000..2f0e62e74
--- /dev/null
+++ b/testing/sysvinit/sysvinit.install
@@ -0,0 +1,3 @@
+post_upgrade() {
+  [ -x sbin/init ] && sbin/init u
+}
diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD
index 4a6a3e29f..c01f9882b 100644
--- a/testing/util-linux/PKGBUILD
+++ b/testing/util-linux/PKGBUILD
@@ -1,42 +1,43 @@
-# $Id: PKGBUILD 135567 2011-08-15 22:49:41Z tomegun $
+# $Id: PKGBUILD 136465 2011-08-29 20:31:00Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
-pkgver=2.19.1
-pkgrel=3
+pkgver=2.20
+pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://userweb.kernel.org/~kzak/util-linux-ng/"
 arch=('i686' 'x86_64')
 groups=('base')
-depends=('bash' 'ncurses>=5.7' 'zlib' 'filesystem')
+depends=('filesystem')
 replaces=('linux32' 'util-linux-ng')
 conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2')
 provides=('linux32' "util-linux-ng=${pkgver}")
 license=('GPL2')
 options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.19/${pkgname}-${pkgver}.tar.bz2
-       mount-segfault-2.19.1.patch
-       two-component-linux.patch)
+source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2)
 optdepends=('perl: for chkdupexe support')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # add support for linux 3.0, which is needed mkswap
-  patch -Np1 -i ../two-component-linux.patch
-  # fix https://bugs.archlinux.org/task/24261
-  patch -Np1 -i ../mount-segfault-2.19.1.patch
+
   # hardware clock
-  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c
-  ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-partx
+  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
+
+  ./configure --enable-arch\
+              --enable-write\
+              --enable-raw\
+              --disable-wall\
+              --enable-partx
+
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   install -dm755 "${pkgdir}/var/lib/hwclock"
+
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('3eab06f05163dfa65479c44e5231932c'
-         '3247b52f0e4b8044f23f2f7218e2fdea'
-         '6eb23edb484adf7192e107d1c6d94bd3')
+md5sums=('4dcacdbdafa116635e52b977d9d0e879')