author: Martin Wilke <miwi@FreeBSD.org> 2010-05-01 11:41:07 +0000
committer: Martin Wilke <miwi@FreeBSD.org> 2010-05-01 11:41:07 +0000
commit: f4936121f95e76555bebbc39e5b73dc12b0ff91f (patch)
tree: fcac9880f7998d69245463508464761e7b89a20e /x11-drivers
parent: 693ef828a26aa5cb92848177be5fcb2afa9dd055 (diff)
download: ports-f4936121f95e76555bebbc39e5b73dc12b0ff91f.tar.gz
ports-f4936121f95e76555bebbc39e5b73dc12b0ff91f.zip
120 files changed, 1202 insertions, 263 deletions
diff --git a/x11-drivers/input-wacom/Makefile b/x11-drivers/input-wacom/Makefile
index b3a20c1238d8..37b71cf507e3 100644
--- a/x11-drivers/input-wacom/Makefile
+++ b/x11-drivers/input-wacom/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	input-wacom
 PORTVERSION=	${KLD_VERSION}.${WACOM_VERSION:C/-/./g}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers kld
 MASTER_SITES=	http://www.chillt.de/bsdwacom/:bsdwacom \
 		SF/linuxwacom/linuxwacom/${WACOM_VERSION}:linuxwacom
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
index 3cfaa5bcf972..51ad8d266732 100644
--- a/x11-drivers/xf86-input-acecad/Makefile
+++ b/x11-drivers/xf86-input-acecad/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-input-acecad
-PORTVERSION=	1.3.0
-PORTREVISION=	2
+PORTVERSION=	1.4.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-acecad/distinfo b/x11-drivers/xf86-input-acecad/distinfo
index 2c5d21b59bd8..c4f044b87643 100644
--- a/x11-drivers/xf86-input-acecad/distinfo
+++ b/x11-drivers/xf86-input-acecad/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-acecad-1.3.0.tar.bz2) = dd8821ea9239d86d67a84912f4702adf
-SHA256 (xorg/driver/xf86-input-acecad-1.3.0.tar.bz2) = aedd5657984d45d76045cc61d54709f9c71e4296a4c06b318086ee320209b504
-SIZE (xorg/driver/xf86-input-acecad-1.3.0.tar.bz2) = 247705
+MD5 (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 51247dc0d73185e35bec326283bc49a5
+SHA256 (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 48341d8b6b0060228134b36543986c949ea828d6ce6d0484d29b3dde9ddbd556
+SIZE (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 255888
diff --git a/x11-drivers/xf86-input-citron/Makefile b/x11-drivers/xf86-input-citron/Makefile
index 6ac8f3c019a9..4c49036ad882 100644
--- a/x11-drivers/xf86-input-citron/Makefile
+++ b/x11-drivers/xf86-input-citron/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-input-citron
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile
index c5aff7545f79..c322e840ad3a 100644
--- a/x11-drivers/xf86-input-hyperpen/Makefile
+++ b/x11-drivers/xf86-input-hyperpen/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-input-hyperpen
 PORTVERSION=	1.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
index 650e01e43fd5..7ac0f4635173 100644
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-input-joystick
-PORTVERSION=	1.4.1
-PORTREVISION=	2
+PORTVERSION=	1.5.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-joystick/distinfo b/x11-drivers/xf86-input-joystick/distinfo
index 617c2fb79819..9be38201d193 100644
--- a/x11-drivers/xf86-input-joystick/distinfo
+++ b/x11-drivers/xf86-input-joystick/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-joystick-1.4.1.tar.bz2) = 4d25fd27d6b4416b9754f6d4ed66cbb4
-SHA256 (xorg/driver/xf86-input-joystick-1.4.1.tar.bz2) = b4d3143f68b99eae3f186e382437faf8522eb72f9de58d4af2343b090f5fe160
-SIZE (xorg/driver/xf86-input-joystick-1.4.1.tar.bz2) = 289900
+MD5 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 79b20f86d1b2e625ae65e35c3457027f
+SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
+SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
diff --git a/x11-drivers/xf86-input-joystick/pkg-plist b/x11-drivers/xf86-input-joystick/pkg-plist
index 2c94a5896b99..1a0ab467f87b 100644
--- a/x11-drivers/xf86-input-joystick/pkg-plist
+++ b/x11-drivers/xf86-input-joystick/pkg-plist
@@ -5,4 +5,3 @@ libdata/pkgconfig/xorg-joystick.pc
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
-@dirrmtry include/xorg
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index f42febe49885..a24488f4a6cc 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-input-keyboard
-PORTVERSION=	1.3.2
-PORTREVISION=	3
+PORTVERSION=	1.4.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo
index 87aab6634f0c..bc439114f1df 100644
--- a/x11-drivers/xf86-input-keyboard/distinfo
+++ b/x11-drivers/xf86-input-keyboard/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-keyboard-1.3.2.tar.bz2) = d6fe929c4f6085d6dd67f197ae9c42f6
-SHA256 (xorg/driver/xf86-input-keyboard-1.3.2.tar.bz2) = 33939ec65dbf56f49e1e7de854a1cf95446e40c533950431901567e67112aef2
-SIZE (xorg/driver/xf86-input-keyboard-1.3.2.tar.bz2) = 269634
+MD5 (xorg/driver/xf86-input-keyboard-1.4.0.tar.bz2) = fd17158ffeacecc8cc670604460cb98b
+SHA256 (xorg/driver/xf86-input-keyboard-1.4.0.tar.bz2) = 842d36cfca68ddab4f2c562c73bfd43ba76de2d490d60034f0c5dd524aa6d6a5
+SIZE (xorg/driver/xf86-input-keyboard-1.4.0.tar.bz2) = 287234
diff --git a/x11-drivers/xf86-input-keyboard/files/patch-bsd_kbd.c b/x11-drivers/xf86-input-keyboard/files/patch-bsd_kbd.c
deleted file mode 100644
index cc82bd4dde9a..000000000000
--- a/x11-drivers/xf86-input-keyboard/files/patch-bsd_kbd.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/bsd_kbd.c.orig	Mon Oct  3 18:46:14 2005
-+++ src/bsd_kbd.c	Fri Sep 29 23:26:17 2006
-@@ -74,6 +74,17 @@
-     KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
-     int real_leds = 0;
- 
-+#if defined (SYSCONS_SUPPORT)
-+    if (pKbd->sunKbd) {
-+  	if (leds & 0x08) real_leds |= XLED1;
-+  	if (leds & 0x04) real_leds |= XLED4;
-+  	if (leds & 0x02) real_leds |= XLED3;
-+  	if (leds & 0x01) real_leds |= XLED2;
-+        leds = real_leds;
-+        real_leds = 0;
-+    }
-+#endif
-+
- #ifdef LED_CAP
-     if (leds & XLED1)  real_leds |= LED_CAP;
- #endif
-@@ -82,8 +93,12 @@
- #endif
- #ifdef LED_SCR
-     if (leds & XLED3)  real_leds |= LED_SCR;
-+#ifdef LED_COMP
-+    if (leds & XLED4)  real_leds |= LED_COMP;
-+#else
-     if (leds & XLED4)  real_leds |= LED_SCR;
- #endif
-+#endif
- 
-     switch (pKbd->consType) {
- 
diff --git a/x11-drivers/xf86-input-keyboard/files/patch-kbd.c b/x11-drivers/xf86-input-keyboard/files/patch-kbd.c
deleted file mode 100644
index d43b9056148b..000000000000
--- a/x11-drivers/xf86-input-keyboard/files/patch-kbd.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/kbd.c.orig	Wed Nov  9 22:31:23 2005
-+++ src/kbd.c	Sat Oct  7 21:09:40 2006
-@@ -635,7 +635,6 @@
- 	      return;
-   }
-   
--#ifndef __sparc64__
-   /*
-    * PC keyboards generate separate key codes for
-    * Alt+Print and Control+Pause but in the X keyboard model
-@@ -648,7 +647,6 @@
-     else if (scanCode == KEY_Break)
-       scanCode = KEY_Pause;
-   }
--#endif
- 
- sunKeyboards:
-   /*
diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile
index 41da9b0a1d7f..74d6a909115a 100644
--- a/x11-drivers/xf86-input-magictouch/Makefile
+++ b/x11-drivers/xf86-input-magictouch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-input-magictouch
 PORTVERSION=	1.0.0.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index f629e4f44908..088123373dfc 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-input-mouse
-PORTVERSION=	1.4.0
-PORTREVISION=	7
+PORTVERSION=	1.5.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo
index 9864f5a0bfcf..017bdcb38fa3 100644
--- a/x11-drivers/xf86-input-mouse/distinfo
+++ b/x11-drivers/xf86-input-mouse/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-mouse-1.4.0.tar.bz2) = e7dc0759c14a9bfd373917a49e5f7c7d
-SHA256 (xorg/driver/xf86-input-mouse-1.4.0.tar.bz2) = e6e1dbd64d41c826619a5881c5aeed46095bfdcb87c3e27d65292fc12a5bb7c7
-SIZE (xorg/driver/xf86-input-mouse-1.4.0.tar.bz2) = 292626
+MD5 (xorg/driver/xf86-input-mouse-1.5.0.tar.bz2) = c58629fddf0782dad5c02da6aeb35521
+SHA256 (xorg/driver/xf86-input-mouse-1.5.0.tar.bz2) = f303e20872ab2fb20e07a7f734d17723346d2b4b8687ea2086f7a7468d1ab397
+SIZE (xorg/driver/xf86-input-mouse-1.5.0.tar.bz2) = 308189
diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile
index b76430cb25ad..0ddebee520c7 100644
--- a/x11-drivers/xf86-input-mutouch/Makefile
+++ b/x11-drivers/xf86-input-mutouch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-input-mutouch
 PORTVERSION=	1.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile
index 4510c5c029d5..2565374554f7 100644
--- a/x11-drivers/xf86-input-penmount/Makefile
+++ b/x11-drivers/xf86-input-penmount/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-input-penmount
 PORTVERSION=	1.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index dccccac65bfa..5ee9b9158b14 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-input-synaptics
-PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo
index 316c486ad47c..c437e96a1aee 100644
--- a/x11-drivers/xf86-input-synaptics/distinfo
+++ b/x11-drivers/xf86-input-synaptics/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-synaptics-1.1.2.tar.bz2) = c8fd6516f9636a3751e401e4b836e160
-SHA256 (xorg/driver/xf86-input-synaptics-1.1.2.tar.bz2) = e4cd4e4d04beab0f0cf1e34ba4e6eb61f591ce3b648b7078b1418ed3df684ced
-SIZE (xorg/driver/xf86-input-synaptics-1.1.2.tar.bz2) = 293527
+MD5 (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = 29a6f9da5123149e4abc8ff83880ed5c
+SHA256 (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6
+SIZE (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = 295524
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
index a747a312ec36..8fd03d1cc963 100644
--- a/x11-drivers/xf86-input-vmmouse/Makefile
+++ b/x11-drivers/xf86-input-vmmouse/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	xf86-input-vmmouse
-PORTVERSION=	12.6.3
-PORTREVISION=	3
+PORTVERSION=	12.6.6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org vmmouse input driver
 
 XORG_CAT=	driver
-CONFIGURE_ARGS= --with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
+CONFIGURE_ARGS=	--with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
 
 MAN1=		vmmouse_detect.1
 MAN4=		vmmouse.4x
diff --git a/x11-drivers/xf86-input-vmmouse/distinfo b/x11-drivers/xf86-input-vmmouse/distinfo
index f7fa6a5e46aa..e39e90063383 100644
--- a/x11-drivers/xf86-input-vmmouse/distinfo
+++ b/x11-drivers/xf86-input-vmmouse/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-vmmouse-12.6.3.tar.bz2) = f5933143d7789557983ecb527092d14e
-SHA256 (xorg/driver/xf86-input-vmmouse-12.6.3.tar.bz2) = c39fe6f2a17c8c609421ed17447221209dd416ca142d6f3d0b1052808ef7d604
-SIZE (xorg/driver/xf86-input-vmmouse-12.6.3.tar.bz2) = 252631
+MD5 (xorg/driver/xf86-input-vmmouse-12.6.6.tar.bz2) = 1c57338928a8897b7ca0b5524fcb1223
+SHA256 (xorg/driver/xf86-input-vmmouse-12.6.6.tar.bz2) = 0cb2896b7a284efd6337c019c599fd4d5a6de74a58c6e6c31c31ed399efa8171
+SIZE (xorg/driver/xf86-input-vmmouse-12.6.6.tar.bz2) = 272965
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
index 4ee20da5e4fa..cd7f6a7d1606 100644
--- a/x11-drivers/xf86-input-void/Makefile
+++ b/x11-drivers/xf86-input-void/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-input-void
-PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTVERSION=	1.3.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-void/distinfo b/x11-drivers/xf86-input-void/distinfo
index 9f1c941e7593..3e3b4f9a65d4 100644
--- a/x11-drivers/xf86-input-void/distinfo
+++ b/x11-drivers/xf86-input-void/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-void-1.2.0.tar.bz2) = c81fbd9368abbe1488b423ddef477e88
-SHA256 (xorg/driver/xf86-input-void-1.2.0.tar.bz2) = b01706192b00a777640f2be0a0635bbded70c2ef38863d268372d27d2b53e2a5
-SIZE (xorg/driver/xf86-input-void-1.2.0.tar.bz2) = 235491
+MD5 (xorg/driver/xf86-input-void-1.3.0.tar.bz2) = 53bdac9ca56418f4675810ed8a78b3e8
+SHA256 (xorg/driver/xf86-input-void-1.3.0.tar.bz2) = e2165ddf637703e21b3c45d83d56485c39b082b9440053d3885557c4d52b130f
+SIZE (xorg/driver/xf86-input-void-1.3.0.tar.bz2) = 247917
diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile
index 805be5ea98dc..cce06334402a 100644
--- a/x11-drivers/xf86-video-apm/Makefile
+++ b/x11-drivers/xf86-video-apm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-apm
-PORTVERSION=	1.2.1
-PORTREVISION=	3
+PORTVERSION=	1.2.2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-apm/distinfo b/x11-drivers/xf86-video-apm/distinfo
index 9515277f34f0..0d79c320a648 100644
--- a/x11-drivers/xf86-video-apm/distinfo
+++ b/x11-drivers/xf86-video-apm/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-apm-1.2.1.tar.bz2) = 673c93df004bb857dc89ae9c78ccf907
-SHA256 (xorg/driver/xf86-video-apm-1.2.1.tar.bz2) = f88e2550f970135b535febc180407b92f6cd0b3b0997fb6f0ce282e3a675c4fe
-SIZE (xorg/driver/xf86-video-apm-1.2.1.tar.bz2) = 282068
+MD5 (xorg/driver/xf86-video-apm-1.2.2.tar.bz2) = 48441a19aaf015570b267f2a8e67d8ab
+SHA256 (xorg/driver/xf86-video-apm-1.2.2.tar.bz2) = 678edd063e1d5e7c7f72ccdda2388c5857559847b3d313c94d659f9bd51c1752
+SIZE (xorg/driver/xf86-video-apm-1.2.2.tar.bz2) = 286085
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
index b748f7fc8b53..05ff06d4cc61 100644
--- a/x11-drivers/xf86-video-ark/Makefile
+++ b/x11-drivers/xf86-video-ark/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-ark
-PORTVERSION=	0.7.1
-PORTREVISION=	3
+PORTVERSION=	0.7.2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ark/distinfo b/x11-drivers/xf86-video-ark/distinfo
index e7f2a3b8b6ea..df4e7cd29569 100644
--- a/x11-drivers/xf86-video-ark/distinfo
+++ b/x11-drivers/xf86-video-ark/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-ark-0.7.1.tar.bz2) = be91391f061863617018403cdbd2944f
-SHA256 (xorg/driver/xf86-video-ark-0.7.1.tar.bz2) = 14c34fb3fc894aad7ca24141cbc2283d955849eec920d058ba1aca2a1f5e3b86
-SIZE (xorg/driver/xf86-video-ark-0.7.1.tar.bz2) = 237009
+MD5 (xorg/driver/xf86-video-ark-0.7.2.tar.bz2) = 4745f5c722b030962cc56eb2443894a0
+SHA256 (xorg/driver/xf86-video-ark-0.7.2.tar.bz2) = db1ef3e15ebd382837f16c1143035dfd9fa6465a77ae2e850201f71508065741
+SIZE (xorg/driver/xf86-video-ark-0.7.2.tar.bz2) = 240099
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index 73500001a5c5..52b55d95499c 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-ati
-PORTVERSION=	6.12.4
-PORTREVISION=	1
+PORTVERSION=	6.13.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo
index 6961aa235c12..2cd830527045 100644
--- a/x11-drivers/xf86-video-ati/distinfo
+++ b/x11-drivers/xf86-video-ati/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-ati-6.12.4.tar.bz2) = e662348f6f957fcedf52818d668ab9f5
-SHA256 (xorg/driver/xf86-video-ati-6.12.4.tar.bz2) = cfde066a7087a19b624f79e95cb9a6c97a847b8802cf38d4ae6022758bf338f6
-SIZE (xorg/driver/xf86-video-ati-6.12.4.tar.bz2) = 915124
+MD5 (xorg/driver/xf86-video-ati-6.13.0.tar.bz2) = 7b2642442091808002963920c7693aeb
+SHA256 (xorg/driver/xf86-video-ati-6.13.0.tar.bz2) = 6d07847d63798f92237175f2645bf964d083b18c4c439e6c787a5f0c3dd68e31
+SIZE (xorg/driver/xf86-video-ati-6.13.0.tar.bz2) = 1015392
diff --git a/x11-drivers/xf86-video-ati613/Makefile b/x11-drivers/xf86-video-ati613/Makefile
index 73500001a5c5..52b55d95499c 100644
--- a/x11-drivers/xf86-video-ati613/Makefile
+++ b/x11-drivers/xf86-video-ati613/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-ati
-PORTVERSION=	6.12.4
-PORTREVISION=	1
+PORTVERSION=	6.13.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati613/distinfo b/x11-drivers/xf86-video-ati613/distinfo
index 6961aa235c12..2cd830527045 100644
--- a/x11-drivers/xf86-video-ati613/distinfo
+++ b/x11-drivers/xf86-video-ati613/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-ati-6.12.4.tar.bz2) = e662348f6f957fcedf52818d668ab9f5
-SHA256 (xorg/driver/xf86-video-ati-6.12.4.tar.bz2) = cfde066a7087a19b624f79e95cb9a6c97a847b8802cf38d4ae6022758bf338f6
-SIZE (xorg/driver/xf86-video-ati-6.12.4.tar.bz2) = 915124
+MD5 (xorg/driver/xf86-video-ati-6.13.0.tar.bz2) = 7b2642442091808002963920c7693aeb
+SHA256 (xorg/driver/xf86-video-ati-6.13.0.tar.bz2) = 6d07847d63798f92237175f2645bf964d083b18c4c439e6c787a5f0c3dd68e31
+SIZE (xorg/driver/xf86-video-ati-6.13.0.tar.bz2) = 1015392
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
index 2a3546402c68..0c95049dc15d 100644
--- a/x11-drivers/xf86-video-chips/Makefile
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-chips
-PORTVERSION=	1.2.1
-PORTREVISION=	3
+PORTVERSION=	1.2.2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo
index b2d97d5f4784..5f2228bb0cca 100644
--- a/x11-drivers/xf86-video-chips/distinfo
+++ b/x11-drivers/xf86-video-chips/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-chips-1.2.1.tar.bz2) = 2f2643fca6335f18024bffa6c4e0c12f
-SHA256 (xorg/driver/xf86-video-chips-1.2.1.tar.bz2) = ed3531c5b283b9b0df7e8fc4aa1b42df89c65a5b48889f786c1a9066190833f3
-SIZE (xorg/driver/xf86-video-chips-1.2.1.tar.bz2) = 340894
+MD5 (xorg/driver/xf86-video-chips-1.2.2.tar.bz2) = a3969c28c3b36ab2caa852a9324e9b70
+SHA256 (xorg/driver/xf86-video-chips-1.2.2.tar.bz2) = ff6fef2cffc62feb3b23f3fee375e502ab7356d571517a89b4de67f0f6037f0e
+SIZE (xorg/driver/xf86-video-chips-1.2.2.tar.bz2) = 346931
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
index b80aff020bae..1909893324a0 100644
--- a/x11-drivers/xf86-video-cirrus/Makefile
+++ b/x11-drivers/xf86-video-cirrus/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-cirrus
-PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTVERSION=	1.3.2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cirrus/distinfo b/x11-drivers/xf86-video-cirrus/distinfo
index 6e87cf94c9b6..e1d7b3199924 100644
--- a/x11-drivers/xf86-video-cirrus/distinfo
+++ b/x11-drivers/xf86-video-cirrus/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-cirrus-1.3.0.tar.bz2) = cb614f24698188beb399bd35f1d8906e
-SHA256 (xorg/driver/xf86-video-cirrus-1.3.0.tar.bz2) = 626e3ee292e251465decb569a92ffde8aaa8218e6226d79cc722b5ef8fe2e17e
-SIZE (xorg/driver/xf86-video-cirrus-1.3.0.tar.bz2) = 269386
+MD5 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 8195d03ed0be0975c03441e66a9f53b3
+SHA256 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
+SIZE (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 286949
diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile
index 32f742101b22..c6c36fbf03b9 100644
--- a/x11-drivers/xf86-video-cyrix/Makefile
+++ b/x11-drivers/xf86-video-cyrix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-cyrix
 PORTVERSION=	1.1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
index 217cd44548a3..7885594523c7 100644
--- a/x11-drivers/xf86-video-dummy/Makefile
+++ b/x11-drivers/xf86-video-dummy/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-dummy
-PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTVERSION=	0.3.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-dummy/distinfo b/x11-drivers/xf86-video-dummy/distinfo
index 70010142b5fd..ffe3f1af2962 100644
--- a/x11-drivers/xf86-video-dummy/distinfo
+++ b/x11-drivers/xf86-video-dummy/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-dummy-0.3.1.tar.bz2) = e7920f4820d3450e9e5cb454fc620895
-SHA256 (xorg/driver/xf86-video-dummy-0.3.1.tar.bz2) = bcd0111f8cba45125613f45ec67b9425ac6d39194c4d2c896c631efc51e93ba0
-SIZE (xorg/driver/xf86-video-dummy-0.3.1.tar.bz2) = 233757
+MD5 (xorg/driver/xf86-video-dummy-0.3.3.tar.bz2) = 3ffe3a28f4452e66bf56180e7da9cbc5
+SHA256 (xorg/driver/xf86-video-dummy-0.3.3.tar.bz2) = df3f55de7953dba6d7ce10cc5f355da1a6164f781ad9393a38dae502dba4955d
+SIZE (xorg/driver/xf86-video-dummy-0.3.3.tar.bz2) = 250155
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
index 598f3476be34..bcd7abca5717 100644
--- a/x11-drivers/xf86-video-fbdev/Makefile
+++ b/x11-drivers/xf86-video-fbdev/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-fbdev
-PORTVERSION=	0.4.0
-PORTREVISION=	3
+PORTVERSION=	0.4.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-fbdev/distinfo b/x11-drivers/xf86-video-fbdev/distinfo
index c9115eba6f52..01f11b987388 100644
--- a/x11-drivers/xf86-video-fbdev/distinfo
+++ b/x11-drivers/xf86-video-fbdev/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-fbdev-0.4.0.tar.bz2) = 6572b39fec77b8e6de1c858a93992924
-SHA256 (xorg/driver/xf86-video-fbdev-0.4.0.tar.bz2) = bba725daeb2a313b83f2b92855a9ae8aa72c4cc8581f9f62f101ebdf00ac359d
-SIZE (xorg/driver/xf86-video-fbdev-0.4.0.tar.bz2) = 242435
+MD5 (xorg/driver/xf86-video-fbdev-0.4.1.tar.bz2) = 79ce1eb9f9d2ed56de70d8e06cb767d9
+SHA256 (xorg/driver/xf86-video-fbdev-0.4.1.tar.bz2) = 2bf857179523433a9cc6c6eea059298db4c865e649aa58dfc67c828f28b7288f
+SIZE (xorg/driver/xf86-video-fbdev-0.4.1.tar.bz2) = 244592
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
index 21704384442c..99e349c89a61 100644
--- a/x11-drivers/xf86-video-glint/Makefile
+++ b/x11-drivers/xf86-video-glint/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-glint
-PORTVERSION=	1.2.2
-PORTREVISION=	3
+PORTVERSION=	1.2.4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-glint/distinfo b/x11-drivers/xf86-video-glint/distinfo
index 0a29c808517c..3816aab63197 100644
--- a/x11-drivers/xf86-video-glint/distinfo
+++ b/x11-drivers/xf86-video-glint/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-glint-1.2.2.tar.bz2) = 4295a46a75fa98470c6dfb0e1a4f7e9f
-SHA256 (xorg/driver/xf86-video-glint-1.2.2.tar.bz2) = 41df8be5719a96abd7de5343925023296491fad10a3a9e691acf50f976970bad
-SIZE (xorg/driver/xf86-video-glint-1.2.2.tar.bz2) = 348742
+MD5 (xorg/driver/xf86-video-glint-1.2.4.tar.bz2) = 960df34e129faa411e58c0d6b56d79a3
+SHA256 (xorg/driver/xf86-video-glint-1.2.4.tar.bz2) = 5f8d6e3b02c261d235bae63d95510b940b6c9a775301146b3c229926ed99d76f
+SIZE (xorg/driver/xf86-video-glint-1.2.4.tar.bz2) = 353189
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
index 01c9af4b8404..a75a6f96e5b3 100644
--- a/x11-drivers/xf86-video-i128/Makefile
+++ b/x11-drivers/xf86-video-i128/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-i128
-PORTVERSION=	1.3.1
-PORTREVISION=	3
+PORTVERSION=	1.3.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i128/distinfo b/x11-drivers/xf86-video-i128/distinfo
index b04208191181..a6f6bc7eccbc 100644
--- a/x11-drivers/xf86-video-i128/distinfo
+++ b/x11-drivers/xf86-video-i128/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-i128-1.3.1.tar.bz2) = 3b170a6df5114420cd4021a057918a09
-SHA256 (xorg/driver/xf86-video-i128-1.3.1.tar.bz2) = 49bb23625654ebcd74d0d23f534b074188f4b21c3cd443b06ac83b9485bf9a75
-SIZE (xorg/driver/xf86-video-i128-1.3.1.tar.bz2) = 265350
+MD5 (xorg/driver/xf86-video-i128-1.3.3.tar.bz2) = a597e8efeec6ab8bc6ba6d87fceb2dba
+SHA256 (xorg/driver/xf86-video-i128-1.3.3.tar.bz2) = 4d0691ce8e3b54075d05cc34717350be42915174b3930b2c9b7f5e309b32b02e
+SIZE (xorg/driver/xf86-video-i128-1.3.3.tar.bz2) = 280135
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
index 253268a0947e..7513b721e0c7 100644
--- a/x11-drivers/xf86-video-i740/Makefile
+++ b/x11-drivers/xf86-video-i740/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-i740
-PORTVERSION=	1.2.0
-PORTREVISION=	3
+PORTVERSION=	1.3.2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i740/distinfo b/x11-drivers/xf86-video-i740/distinfo
index a75899d29888..02368923587d 100644
--- a/x11-drivers/xf86-video-i740/distinfo
+++ b/x11-drivers/xf86-video-i740/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-i740-1.2.0.tar.bz2) = d0e5a805c546b29b1dd3b55a68d16dc4
-SHA256 (xorg/driver/xf86-video-i740-1.2.0.tar.bz2) = 59c8f6ee465bef033c1c20bfff8121a318efda9656d5dc29f674bb655f18486f
-SIZE (xorg/driver/xf86-video-i740-1.2.0.tar.bz2) = 268468
+MD5 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 4ac1318788f62159965f15131c869e7a
+SHA256 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
+SIZE (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 273853
diff --git a/x11-drivers/xf86-video-imstt/Makefile b/x11-drivers/xf86-video-imstt/Makefile
index f60095248f68..0598e509f6e5 100644
--- a/x11-drivers/xf86-video-imstt/Makefile
+++ b/x11-drivers/xf86-video-imstt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-imstt
 PORTVERSION=	1.1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index 4b8c60596743..901919ca66f1 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-intel
 PORTVERSION=	2.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_ch7017_ch7017.c b/x11-drivers/xf86-video-intel/files/patch-src_ch7017_ch7017.c
new file mode 100644
index 000000000000..278354a4b266
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_ch7017_ch7017.c
@@ -0,0 +1,17 @@
+--- src/ch7017/ch7017.c.orig	2009-04-08 18:59:47.000000000 -0500
++++ src/ch7017/ch7017.c	2010-02-21 12:40:12.000000000 -0600
+@@ -34,13 +34,11 @@
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "miscstruct.h"
+ #include "xf86i2c.h"
+ #include "xf86Crtc.h"
+-#define DPMS_SERVER
+-#include <X11/extensions/dpms.h>
++#include <X11/extensions/dpmsconst.h>
+ 
+ #include "../i2c_vid.h"
+ #include "ch7017_reg.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_ch7xxx_ch7xxx.c b/x11-drivers/xf86-video-intel/files/patch-src_ch7xxx_ch7xxx.c
new file mode 100644
index 000000000000..6dbc0a7c36a4
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_ch7xxx_ch7xxx.c
@@ -0,0 +1,17 @@
+--- src/ch7xxx/ch7xxx.c.orig	2010-02-21 12:42:11.000000000 -0600
++++ src/ch7xxx/ch7xxx.c	2010-02-21 12:44:40.000000000 -0600
+@@ -34,13 +34,11 @@
+ #include <string.h>
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "miscstruct.h"
+ #include "xf86i2c.h"
+ #include "xf86Crtc.h"
+-#define DPMS_SERVER
+-#include <X11/extensions/dpms.h>
++#include <X11/extensions/dpmsconst.h>
+ 
+ #include "../i2c_vid.h"
+ #include "ch7xxx.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i810_driver.c b/x11-drivers/xf86-video-intel/files/patch-src_i810_driver.c
new file mode 100644
index 000000000000..5ccb55a33daf
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i810_driver.c
@@ -0,0 +1,111 @@
+--- src/i810_driver.c.orig	2010-02-21 12:55:16.000000000 -0600
++++ src/i810_driver.c	2010-02-21 13:17:04.000000000 -0600
+@@ -69,8 +69,6 @@
+  */
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+-#include "xf86RAC.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+ #include "mibstore.h"
+@@ -490,20 +488,6 @@
+ 		    );
+ 
+       /*
+-       * Tell the loader about symbols from other modules that this module
+-       * might refer to.
+-       */
+-      LoaderRefSymLists(I810vgahwSymbols,
+-			I810fbSymbols, I810xaaSymbols, I810ramdacSymbols,
+-#ifdef XF86DRI
+-			I810drmSymbols,
+-			I810driSymbols,
+-#endif
+-			I810shadowFBSymbols,
+-			I810vbeSymbols, vbeOptionalSymbols,
+-			I810ddcSymbols, NULL);
+-
+-      /*
+        * The return value must be non-NULL on success even though there
+        * is no TearDownProc.
+        */
+@@ -809,7 +793,6 @@
+    }
+ 
+    if (xf86LoadSubModule(pScrn, "vbe") && (pVbe = VBEInit(NULL, index))) {
+-      xf86LoaderReqSymLists(I810vbeSymbols, NULL);
+       MonInfo = vbeDoEDID(pVbe, NULL);
+       xf86PrintEDID(MonInfo);
+       xf86SetDDCproperties(pScrn, MonInfo);
+@@ -864,8 +847,6 @@
+    if (!xf86LoadSubModule(pScrn, "vgahw"))
+       return FALSE;
+ 
+-   xf86LoaderReqSymLists(I810vgahwSymbols, NULL);
+-
+    /* Allocate a vgaHWRec */
+    if (!vgaHWGetHWRec(pScrn))
+       return FALSE;
+@@ -878,10 +859,6 @@
+ 			  pI810->PciInfo->func);
+ #endif
+ 
+-   if (xf86RegisterResources(pI810->pEnt->index, NULL, ResNone))
+-      return FALSE;
+-   pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
+-
+    /* Set pScrn->monitor */
+    pScrn->monitor = pScrn->confScreen->monitor;
+ 
+@@ -960,7 +937,6 @@
+ 	 I810FreeRec(pScrn);
+ 	 return FALSE;
+       }
+-      xf86LoaderReqSymLists(I810xaaSymbols, NULL);
+    }
+    
+ #ifdef XF86DRI
+@@ -1244,14 +1220,12 @@
+       I810FreeRec(pScrn);
+       return FALSE;
+    }
+-   xf86LoaderReqSymLists(I810fbSymbols, NULL);
+ 
+    if (!xf86ReturnOptValBool(pI810->Options, OPTION_SW_CURSOR, FALSE)) {
+       if (!xf86LoadSubModule(pScrn, "ramdac")) {
+ 	 I810FreeRec(pScrn);
+ 	 return FALSE;
+       }
+-      xf86LoaderReqSymLists(I810ramdacSymbols, NULL);
+    }
+ 
+    if (xf86GetOptValInteger
+@@ -1278,9 +1252,6 @@
+ 	 xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
+ 		    "Couldn't load shadowfb module:\n");
+        }
+-       else {
+-	 xf86LoaderReqSymLists(I810shadowFBSymbols, NULL);
+-       }
+      }
+      
+      xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "page flipping %s\n",
+@@ -1312,16 +1283,12 @@
+ #ifdef XF86DRI
+    /* Load the dri module if requested. */
+    if (xf86ReturnOptValBool(pI810->Options, OPTION_DRI, FALSE)) {
+-      if (xf86LoadSubModule(pScrn, "dri")) {
+-	 xf86LoaderReqSymLists(I810driSymbols, I810drmSymbols, NULL);
+-      }
++   	xf86LoadSubModule(pScrn, "dri");
+    }
+ #endif
+ 
+    /*  We won't be using the VGA access after the probe */
+    I810SetMMIOAccess(pI810);
+-   xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr);
+-   xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr);
+ 
+    return TRUE;
+ }
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i810_hwmc.c b/x11-drivers/xf86-video-intel/files/patch-src_i810_hwmc.c
new file mode 100644
index 000000000000..ffb2ac39cadf
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i810_hwmc.c
@@ -0,0 +1,10 @@
+--- src/i810_hwmc.c.orig	2010-02-21 13:40:44.000000000 -0600
++++ src/i810_hwmc.c	2010-02-21 13:41:16.000000000 -0600
+@@ -42,7 +42,6 @@
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i810_video.c b/x11-drivers/xf86-video-intel/files/patch-src_i810_video.c
new file mode 100644
index 000000000000..c10b5e668836
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i810_video.c
@@ -0,0 +1,10 @@
+--- src/i810_video.c.orig	2010-02-21 13:17:58.000000000 -0600
++++ src/i810_video.c	2010-02-21 13:18:37.000000000 -0600
+@@ -42,7 +42,6 @@
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_dri.c b/x11-drivers/xf86-video-intel/files/patch-src_i830_dri.c
new file mode 100644
index 000000000000..05bdb931e945
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i830_dri.c
@@ -0,0 +1,14 @@
+--- src/i830_dri.c.orig	2010-02-21 13:30:37.000000000 -0600
++++ src/i830_dri.c	2010-02-21 13:39:02.000000000 -0600
+@@ -1731,9 +1731,10 @@
+     info.driverName = IS_I965G(pI830) ? "i965" : "i915";
+     info.deviceName = p;
+     info.version = 1;
+-
++#if 0
+     info.CreateBuffers = I830DRI2CreateBuffers;
+     info.DestroyBuffers = I830DRI2DestroyBuffers;
++#endif
+     info.CopyRegion = I830DRI2CopyRegion;
+ 
+     pI830->drmSubFD = info.fd;
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_driver.c b/x11-drivers/xf86-video-intel/files/patch-src_i830_driver.c
new file mode 100644
index 000000000000..776b67f915d1
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i830_driver.c
@@ -0,0 +1,97 @@
+--- src/i830_driver.c.orig	2010-02-21 13:20:12.000000000 -0600
++++ src/i830_driver.c	2010-02-21 13:26:14.000000000 -0600
+@@ -175,8 +175,6 @@
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+-#include "xf86RAC.h"
+ #include "xf86Priv.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+@@ -1050,7 +1048,6 @@
+    if (!xf86LoadSubModule(pScrn, "ddc")) {
+       pI830->ddc2 = FALSE;
+    } else {
+-      xf86LoaderReqSymLists(I810ddcSymbols, NULL);
+       pI830->ddc2 = TRUE;
+    }
+ 
+@@ -1058,8 +1055,6 @@
+    /* Load I2C if we have the code to use it */
+    if (pI830->ddc2) {
+       if (xf86LoadSubModule(pScrn, "i2c")) {
+-	 xf86LoaderReqSymLists(I810i2cSymbols, NULL);
+-
+ 	 pI830->ddc2 = TRUE;
+       } else {
+ 	 pI830->ddc2 = FALSE;
+@@ -1511,11 +1506,9 @@
+     /* The vgahw module should be loaded here when needed */
+     if (!xf86LoadSubModule(pScrn, "vgahw"))
+ 	return FALSE;
+-    xf86LoaderReqSymLists(I810vgahwSymbols, NULL);
+ 
+     if (!xf86LoadSubModule(pScrn, "ramdac"))
+        return FALSE;
+-    xf86LoaderReqSymLists(I810ramdacSymbols, NULL);
+ 
+     return TRUE;
+ }
+@@ -1854,12 +1847,6 @@
+ 			  pI830->PciInfo->func);
+ #endif
+ 
+-   if (xf86RegisterResources(pI830->pEnt->index, NULL, ResNone)) {
+-      PreInitCleanup(pScrn);
+-      return FALSE;
+-   }
+-
+-   pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
+    pScrn->monitor = pScrn->confScreen->monitor;
+    pScrn->progClock = TRUE;
+    pScrn->rgbBits = 8;
+@@ -1942,8 +1929,6 @@
+       return FALSE;
+    }
+ 
+-   xf86LoaderReqSymLists(I810fbSymbols, NULL);
+-
+    switch (pI830->accel) {
+ #ifdef I830_USE_XAA
+    case ACCEL_XAA:
+@@ -1951,7 +1936,6 @@
+ 	 PreInitCleanup(pScrn);
+ 	 return FALSE;
+       }
+-      xf86LoaderReqSymLists(I810xaaSymbols, NULL);
+       break;
+ #endif
+ 
+@@ -1973,7 +1957,6 @@
+ 	 PreInitCleanup(pScrn);
+ 	 return FALSE;
+       }
+-      xf86LoaderReqSymLists(I830exaSymbols, NULL);
+       break;
+    }
+ #endif
+@@ -1988,17 +1971,13 @@
+ 
+        /*  We won't be using the VGA access after the probe. */
+        I830SetMMIOAccess(pI830);
+-       xf86SetOperatingState(resVgaIo, pI830->pEnt->index, ResUnusedOpr);
+-       xf86SetOperatingState(resVgaMem, pI830->pEnt->index, ResDisableOpr);
+    }
+ 
+ #if defined(XF86DRI)
+    /* Load the dri module if requested. */
+    if (xf86ReturnOptValBool(pI830->Options, OPTION_DRI, FALSE) &&
+        pI830->directRenderingType != DRI_DISABLED) {
+-      if (xf86LoadSubModule(pScrn, "dri")) {
+-	 xf86LoaderReqSymLists(I810driSymbols, I810drmSymbols, NULL);
+-      }
++      xf86LoadSubModule(pScrn, "dri");
+    }
+ #endif
+ 
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_i2c.c b/x11-drivers/xf86-video-intel/files/patch-src_i830_i2c.c
new file mode 100644
index 000000000000..1f4461cd9fe1
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i830_i2c.c
@@ -0,0 +1,11 @@
+--- src/i830_i2c.c.orig	2010-02-21 13:27:07.000000000 -0600
++++ src/i830_i2c.c	2010-02-21 13:27:45.000000000 -0600
+@@ -31,8 +31,6 @@
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+-#include "xf86RAC.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+ #include "mibstore.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_render.c b/x11-drivers/xf86-video-intel/files/patch-src_i830_render.c
new file mode 100644
index 000000000000..e292a7dedbf7
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i830_render.c
@@ -0,0 +1,78 @@
+--- src/i830_render.c.orig	2009-05-12 19:12:11.000000000 -0500
++++ src/i830_render.c	2010-03-07 15:30:45.000000000 -0600
+@@ -210,26 +210,8 @@
+ 	(dblend << S8_DST_BLEND_FACTOR_SHIFT);
+ }
+ 
+-static Bool i830_check_composite_texture(PicturePtr pPict, int unit)
++static Bool i830_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict, int unit)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+-    int i;
+-
+-    if ((w > 2048) || (h > 2048))
+-        I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
+-
+-    for (i = 0; i < sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]);
+-	 i++)
+-    {
+-        if (i830_tex_formats[i].fmt == pPict->format)
+-            break;
+-    }
+-    if (i == sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]))
+-        I830FALLBACK("Unsupported picture format 0x%x\n",
+-		     (int)pPict->format);
+-
+     if (pPict->repeatType > RepeatReflect)
+         I830FALLBACK("Unsupported picture repeat %d\n", pPict->repeatType);
+ 
+@@ -239,6 +221,26 @@
+         I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
+     }
+ 
++    if (pPict->pDrawable)
++    {
++	int w, h, i;
++
++	w = pPict->pDrawable->width;
++	h = pPict->pDrawable->height;
++	if ((w > 2048) || (h > 2048))
++	    I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
++
++	for (i = 0; i < sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]);
++	     i++)
++	{
++	    if (i830_tex_formats[i].fmt == pPict->format)
++		break;
++	}
++	if (i == sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]))
++	    I830FALLBACK("Unsupported picture format 0x%x\n",
++			 (int)pPict->format);
++    }
++
+     return TRUE;
+ }
+ 
+@@ -376,9 +378,9 @@
+ 			     "alpha and source value blending.\n");
+     }
+ 
+-    if (!i830_check_composite_texture(pSrcPicture, 0))
++    if (!i830_check_composite_texture(pScrn, pSrcPicture, 0))
+         I830FALLBACK("Check Src picture texture\n");
+-    if (pMaskPicture != NULL && !i830_check_composite_texture(pMaskPicture, 1))
++    if (pMaskPicture != NULL && !i830_check_composite_texture(pScrn, pMaskPicture, 1))
+         I830FALLBACK("Check Mask picture texture\n");
+ 
+     if (!i830_get_dest_format(pDstPicture, &tmp1))
+@@ -392,7 +394,7 @@
+ 		       PicturePtr pMaskPicture, PicturePtr pDstPicture,
+ 		       PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
++    ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+     I830Ptr pI830 = I830PTR(pScrn);
+     uint32_t dst_format, dst_pitch;
+     Bool is_affine_src, is_affine_mask;
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_video.c b/x11-drivers/xf86-video-intel/files/patch-src_i830_video.c
new file mode 100644
index 000000000000..b93a98e24932
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i830_video.c
@@ -0,0 +1,10 @@
+--- src/i830_video.c.orig	2010-02-21 13:28:37.000000000 -0600
++++ src/i830_video.c	2010-02-21 13:29:05.000000000 -0600
+@@ -57,7 +57,6 @@
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i915_hwmc.c b/x11-drivers/xf86-video-intel/files/patch-src_i915_hwmc.c
new file mode 100644
index 000000000000..ab7f679fb4ac
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i915_hwmc.c
@@ -0,0 +1,10 @@
+--- src/i915_hwmc.c.orig	2010-02-21 13:42:21.000000000 -0600
++++ src/i915_hwmc.c	2010-02-21 13:42:38.000000000 -0600
+@@ -32,7 +32,6 @@
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i915_render.c b/x11-drivers/xf86-video-intel/files/patch-src_i915_render.c
new file mode 100644
index 000000000000..53b1a0e1e850
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i915_render.c
@@ -0,0 +1,69 @@
+--- src/i915_render.c.orig	2009-05-12 19:12:11.000000000 -0500
++++ src/i915_render.c	2010-03-07 15:30:45.000000000 -0600
+@@ -167,26 +167,8 @@
+     return TRUE;
+ }
+ 
+-static Bool i915_check_composite_texture(PicturePtr pPict, int unit)
++static Bool i915_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict, int unit)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+-    int i;
+-
+-    if ((w > 2048) || (h > 2048))
+-        I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
+-
+-    for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
+-	 i++)
+-    {
+-        if (i915_tex_formats[i].fmt == pPict->format)
+-            break;
+-    }
+-    if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]))
+-        I830FALLBACK("Unsupported picture format 0x%x\n",
+-		     (int)pPict->format);
+-
+     if (pPict->repeatType > RepeatReflect)
+         I830FALLBACK("Unsupported picture repeat %d\n", pPict->repeatType);
+ 
+@@ -194,6 +176,26 @@
+         pPict->filter != PictFilterBilinear)
+         I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
+ 
++    if (pPict->pDrawable)
++    {
++	int w, h, i;
++
++	w = pPict->pDrawable->width;
++	h = pPict->pDrawable->height;
++	if ((w > 2048) || (h > 2048))
++	    I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
++
++	for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
++	     i++)
++	{
++	    if (i915_tex_formats[i].fmt == pPict->format)
++		break;
++	}
++	if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]))
++	    I830FALLBACK("Unsupported picture format 0x%x\n",
++			 (int)pPict->format);
++    }
++
+     return TRUE;
+ }
+ 
+@@ -220,9 +222,9 @@
+ 			     "alpha and source value blending.\n");
+     }
+ 
+-    if (!i915_check_composite_texture(pSrcPicture, 0))
++    if (!i915_check_composite_texture(pScrn, pSrcPicture, 0))
+         I830FALLBACK("Check Src picture texture\n");
+-    if (pMaskPicture != NULL && !i915_check_composite_texture(pMaskPicture, 1))
++    if (pMaskPicture != NULL && !i915_check_composite_texture(pScrn, pMaskPicture, 1))
+         I830FALLBACK("Check Mask picture texture\n");
+ 
+     if (!i915_get_dest_format(pDstPicture, &tmp1))
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i965_render.c b/x11-drivers/xf86-video-intel/files/patch-src_i965_render.c
new file mode 100644
index 000000000000..99b7d787267b
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i965_render.c
@@ -0,0 +1,78 @@
+--- src/i965_render.c.orig	2009-05-12 19:12:11.000000000 -0500
++++ src/i965_render.c	2010-03-07 15:30:45.000000000 -0600
+@@ -181,26 +181,8 @@
+     return TRUE;
+ }
+ 
+-static Bool i965_check_composite_texture(PicturePtr pPict, int unit)
++static Bool i965_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict, int unit)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+-    int i;
+-
+-    if ((w > 8192) || (h > 8192))
+-        I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
+-
+-    for (i = 0; i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
+-	 i++)
+-    {
+-        if (i965_tex_formats[i].fmt == pPict->format)
+-            break;
+-    }
+-    if (i == sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]))
+-        I830FALLBACK("Unsupported picture format 0x%x\n",
+-		     (int)pPict->format);
+-
+     if (pPict->repeatType > RepeatReflect)
+ 	I830FALLBACK("extended repeat (%d) not supported\n",
+ 		     pPict->repeatType);
+@@ -211,6 +193,26 @@
+         I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
+     }
+ 
++    if (pPict->pDrawable)
++    {
++	int w, h, i;
++
++	w = pPict->pDrawable->width;
++	h = pPict->pDrawable->height;
++	if ((w > 8192) || (h > 8192))
++	    I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
++
++	for (i = 0; i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
++	     i++)
++	{
++	    if (i965_tex_formats[i].fmt == pPict->format)
++		break;
++	}
++	if (i == sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]))
++	    I830FALLBACK("Unsupported picture format 0x%x\n",
++			 (int)pPict->format);
++    }
++
+     return TRUE;
+ }
+ 
+@@ -239,9 +241,9 @@
+ 	}
+     } 
+ 
+-    if (!i965_check_composite_texture(pSrcPicture, 0))
++    if (!i965_check_composite_texture(pScrn, pSrcPicture, 0))
+         I830FALLBACK("Check Src picture texture\n");
+-    if (pMaskPicture != NULL && !i965_check_composite_texture(pMaskPicture, 1))
++    if (pMaskPicture != NULL && !i965_check_composite_texture(pScrn, pMaskPicture, 1))
+         I830FALLBACK("Check Mask picture texture\n");
+ 
+     if (!i965_get_dest_format(pDstPicture, &tmp1))
+@@ -1258,7 +1260,7 @@
+ 		       PicturePtr pMaskPicture, PicturePtr pDstPicture,
+ 		       PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
++    ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+     I830Ptr pI830 = I830PTR(pScrn);
+     struct gen4_render_state *render_state= pI830->gen4_render_state;
+     gen4_composite_op *composite_op = &render_state->composite_op;
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_ivch_ivch.c b/x11-drivers/xf86-video-intel/files/patch-src_ivch_ivch.c
new file mode 100644
index 000000000000..b54885d9b0d8
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_ivch_ivch.c
@@ -0,0 +1,17 @@
+--- src/ivch/ivch.c.orig	2010-02-21 12:47:05.000000000 -0600
++++ src/ivch/ivch.c	2010-02-21 12:48:09.000000000 -0600
+@@ -31,13 +31,11 @@
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "miscstruct.h"
+ #include "xf86i2c.h"
+ #include "xf86Crtc.h"
+-#define DPMS_SERVER
+-#include <X11/extensions/dpms.h>
++#include <X11/extensions/dpmsproto.h>
+ #include <unistd.h>
+ 
+ #include "../i2c_vid.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_sil164_sil164.c b/x11-drivers/xf86-video-intel/files/patch-src_sil164_sil164.c
new file mode 100644
index 000000000000..f9d717794304
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_sil164_sil164.c
@@ -0,0 +1,17 @@
+--- src/sil164/sil164.c.orig	2010-02-21 12:49:54.000000000 -0600
++++ src/sil164/sil164.c	2010-02-21 12:50:40.000000000 -0600
+@@ -35,13 +35,11 @@
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "miscstruct.h"
+ #include "xf86i2c.h"
+ #include "xf86Crtc.h"
+-#define DPMS_SERVER
+-#include <X11/extensions/dpms.h>
++#include <X11/extensions/dpmsproto.h>
+ 
+ #include "../i2c_vid.h"
+ #include "sil164.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_tfp410_tfp410.c b/x11-drivers/xf86-video-intel/files/patch-src_tfp410_tfp410.c
new file mode 100644
index 000000000000..89927b3311b2
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_tfp410_tfp410.c
@@ -0,0 +1,17 @@
+--- src/tfp410/tfp410.c.orig	2010-02-21 12:52:35.000000000 -0600
++++ src/tfp410/tfp410.c	2010-02-21 12:53:19.000000000 -0600
+@@ -34,13 +34,11 @@
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "miscstruct.h"
+ #include "xf86i2c.h"
+ #include "xf86Crtc.h"
+-#define DPMS_SERVER
+-#include <X11/extensions/dpms.h>
++#include <X11/extensions/dpmsconst.h>
+ 
+ #include "../i2c_vid.h"
+ #include "tfp410.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-uxa_uxa-priv.h b/x11-drivers/xf86-video-intel/files/patch-uxa_uxa-priv.h
new file mode 100644
index 000000000000..46eb72ea63c4
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-uxa_uxa-priv.h
@@ -0,0 +1,32 @@
+--- uxa/uxa-priv.h.orig	2009-05-12 19:12:11.000000000 -0500
++++ uxa/uxa-priv.h	2010-02-21 12:27:32.000000000 -0600
+@@ -42,8 +42,7 @@
+ #define NEED_EVENTS
+ #include <X11/Xproto.h>
+ #ifdef MITSHM
+-#define _XSHM_SERVER_
+-#include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ #endif
+ #include "scrnintstr.h"
+ #include "pixmapstr.h"
+@@ -319,17 +318,11 @@
+ extern const GCOps uxa_ops;
+ 
+ #ifdef MITSHM
+-extern ShmFuncs uxa_shm_funcs;
+-
+ /* XXX these come from shmint.h, which isn't exported by the server */
+-void
+-ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
+ 
+-void
+-ShmSetPixmapFormat(ScreenPtr pScreen, int format);
++#include "shmint.h"
+ 
+-void
+-fbShmPutImage(XSHM_PUT_IMAGE_ARGS);
++extern ShmFuncs uxa_shm_funcs;
+ 
+ #endif
+ 
diff --git a/x11-drivers/xf86-video-intel29/Makefile b/x11-drivers/xf86-video-intel29/Makefile
index 4b8c60596743..30edcb182ff2 100644
--- a/x11-drivers/xf86-video-intel29/Makefile
+++ b/x11-drivers/xf86-video-intel29/Makefile
@@ -5,15 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	xf86-video-intel
-PORTVERSION=	2.7.1
-PORTREVISION=	1
+PORTNAME=	xf86-video-intel29
+PORTVERSION=	2.9.1
 CATEGORIES=	x11-drivers
+DISTNAME=	xf86-video-intel-${PORTVERSION}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Driver for Intel integrated graphics chipsets
 
-CONFLICTS=	xf86-video-i810-[0-9]*
+CONFLICTS=	xf86-video-i810-[0-9]* xf86-video-intel-[0-9]*
 
 ONLY_FOR_ARCHS=	amd64 i386
 USE_GL=		gl
@@ -22,4 +22,6 @@ XORG_CAT=	driver
 USE_XORG=	xvmc xineramaproto xextproto x11 xf86driproto glproto
 MAN4=		intel.4x
 
+IGNORE=		we have to wait of GEM support to get ironlake chips to work
+
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-intel29/distinfo b/x11-drivers/xf86-video-intel29/distinfo
index 954e3df937f5..a9b91d4ffbf9 100644
--- a/x11-drivers/xf86-video-intel29/distinfo
+++ b/x11-drivers/xf86-video-intel29/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 0eed17138da18ff1fb2b8ab0f076d957
-SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
-SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
+MD5 (xorg/driver/xf86-video-intel-2.9.1.tar.bz2) = 8951d0366c16991badb7f9050556f4f3
+SHA256 (xorg/driver/xf86-video-intel-2.9.1.tar.bz2) = 95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76
+SIZE (xorg/driver/xf86-video-intel-2.9.1.tar.bz2) = 789001
diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile
index db0cd0bc7951..40877d30b348 100644
--- a/x11-drivers/xf86-video-mach64/Makefile
+++ b/x11-drivers/xf86-video-mach64/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-mach64
-PORTVERSION=	6.8.1
-PORTREVISION=	1
+PORTVERSION=	6.8.2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-mach64/distinfo b/x11-drivers/xf86-video-mach64/distinfo
index 907a460d60b9..cdec12ebd7f9 100644
--- a/x11-drivers/xf86-video-mach64/distinfo
+++ b/x11-drivers/xf86-video-mach64/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-mach64-6.8.1.tar.bz2) = 0856d9c8435cf4350b68fbd57ca6d4fc
-SHA256 (xorg/driver/xf86-video-mach64-6.8.1.tar.bz2) = 7ce5cfa0f5b14181ca2f36858ebbefc6fb89e89028bd97e2bbea6cf41f8055ce
-SIZE (xorg/driver/xf86-video-mach64-6.8.1.tar.bz2) = 465530
+MD5 (xorg/driver/xf86-video-mach64-6.8.2.tar.bz2) = 6c0522b2b72a0a47c48d718443616651
+SHA256 (xorg/driver/xf86-video-mach64-6.8.2.tar.bz2) = b91194033023a41793a525a631789df1d229b228af0d44dcbe20b06ed66c671d
+SIZE (xorg/driver/xf86-video-mach64-6.8.2.tar.bz2) = 486282
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index 3b9b5c3c19b9..8ffe2ccff5f6 100644
--- a/x11-drivers/xf86-video-mga/Makefile
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-mga
-PORTVERSION=	1.4.10
-PORTREVISION=	1
+PORTVERSION=	1.4.11
 PORTEPOCH=	2
 CATEGORIES=	x11-drivers
 
diff --git a/x11-drivers/xf86-video-mga/distinfo b/x11-drivers/xf86-video-mga/distinfo
index e8fc684882f5..03f6bca6cc5f 100644
--- a/x11-drivers/xf86-video-mga/distinfo
+++ b/x11-drivers/xf86-video-mga/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-mga-1.4.10.tar.bz2) = e2515e7476185a2d0482a3004a84cfd9
-SHA256 (xorg/driver/xf86-video-mga-1.4.10.tar.bz2) = 8d3f196a7b1ddc0efe11c652702dc73f35719c9602e58f93c80a24cd608bcbbb
-SIZE (xorg/driver/xf86-video-mga-1.4.10.tar.bz2) = 409965
+MD5 (xorg/driver/xf86-video-mga-1.4.11.tar.bz2) = 9d1ca965cedb0856296b47442f3c739d
+SHA256 (xorg/driver/xf86-video-mga-1.4.11.tar.bz2) = c91922316f486f74d41ddbda92ff94a7917cea151ad802cf25603ab6b90f97e6
+SIZE (xorg/driver/xf86-video-mga-1.4.11.tar.bz2) = 415829
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga.h b/x11-drivers/xf86-video-mga/files/patch-src__mga.h
new file mode 100644
index 000000000000..2550f2c9e8a0
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/files/patch-src__mga.h
@@ -0,0 +1,21 @@
+--- ./src/mga.h.orig	2009-07-27 17:24:51.000000000 -0700
++++ ./src/mga.h	2010-03-09 17:58:54.154420020 -0800
+@@ -133,6 +133,10 @@
+ #define PCI_CHIP_MGAG200_EV_PCI 0x0530
+ #endif
+ 
++#ifndef PCI_CHIP_MGAG200_EH_PCI
++#define PCI_CHIP_MGAG200_EH_PCI 0x0533
++#endif
++
+ /*
+  * Read/write to the DAC via MMIO 
+  */
+@@ -474,6 +478,7 @@
+     int is_G200SE:1;
+     int is_G200WB:1;
+     int is_G200EV:1;
++    int is_G200EH:1;
+ 
+     int KVM;
+ 
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga_dacG.c b/x11-drivers/xf86-video-mga/files/patch-src__mga_dacG.c
new file mode 100644
index 000000000000..b71a68fd518b
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/files/patch-src__mga_dacG.c
@@ -0,0 +1,232 @@
+--- ./src/mga_dacG.c.orig	2010-03-09 17:58:54.152419708 -0800
++++ ./src/mga_dacG.c	2010-03-09 17:58:54.157420208 -0800
+@@ -211,6 +211,55 @@
+ }
+ 
+ static void
++MGAG200EHComputePLLParam(ScrnInfoPtr pScrn, long lFo, int *M, int *N, int *P)
++{
++    unsigned int ulComputedFo;
++    unsigned int ulFDelta;
++    unsigned int ulFPermitedDelta;
++    unsigned int ulFTmpDelta;
++    unsigned int ulTestP;
++    unsigned int ulTestM;
++    unsigned int ulTestN;
++    unsigned int ulVCOMax;
++    unsigned int ulVCOMin;
++    unsigned int ulPLLFreqRef;
++
++    ulVCOMax        = 800000;
++    ulVCOMin        = 400000;
++    ulPLLFreqRef    = 33333;
++
++    ulFDelta = 0xFFFFFFFF;
++    /* Permited delta is 0.5% as VESA Specification */
++    ulFPermitedDelta = lFo * 5 / 1000;  
++
++    /* Then we need to minimize the M while staying within 0.5% */
++    for (ulTestP = 16; ulTestP > 0; ulTestP>>= 1) {
++        if ((lFo * ulTestP) > ulVCOMax) continue;
++        if ((lFo * ulTestP) < ulVCOMin) continue;
++
++        for (ulTestM = 1; ulTestM <= 32; ulTestM++) {
++           for (ulTestN = 17; ulTestN <= 256; ulTestN++) {
++               ulComputedFo = (ulPLLFreqRef * ulTestN) / (ulTestM * ulTestP);
++               if (ulComputedFo > lFo)
++		           ulFTmpDelta = ulComputedFo - lFo;
++               else
++                   ulFTmpDelta = lFo - ulComputedFo;
++
++               if (ulFTmpDelta < ulFDelta) {
++                   ulFDelta = ulFTmpDelta;
++                   *M = (CARD8)(ulTestM - 1);
++                   *N = (CARD8)(ulTestN - 1);
++                   *P = (CARD8)(ulTestP - 1);
++               }
++
++               if ((lFo * ulTestP) >= 600000)
++                   *P |= 0x80;
++           }
++        }
++    }
++}
++
++static void
+ MGAG200EVPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
+ {
+     MGAPtr pMga = MGAPTR(pScrn);
+@@ -483,6 +532,89 @@
+     outMGAdac(MGA1064_GEN_IO_DATA, ucTmpData);
+ }
+ 
++static void
++MGAG200EHPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
++{
++    MGAPtr pMga = MGAPTR(pScrn);
++
++    unsigned long ulFallBackCounter, ulLoopCount, ulLockCheckIterations = 0, ulTempCount, ulVCount;
++    unsigned char ucTempByte, ucPixCtrl, ucPLLLocked = FALSE;
++    unsigned char ucM;
++    unsigned char ucN;
++    unsigned char ucP;
++    unsigned char ucS;
++
++    while(ulLockCheckIterations <= 32 && ucPLLLocked == FALSE)
++    {
++        // Set pixclkdis to 1
++        ucPixCtrl = inMGAdac(MGA1064_PIX_CLK_CTL);
++        ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_DIS;
++        outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
++
++        // Select PLL Set C
++        ucTempByte = INREG8(MGAREG_MEM_MISC_READ);
++        ucTempByte |= 0x3<<2; //select MGA pixel clock
++        OUTREG8(MGAREG_MEM_MISC_WRITE, ucTempByte);
++
++        ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_POW_DOWN;
++        ucPixCtrl &= ~0x80;
++        outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
++
++        // Wait 500 us
++        usleep(500);
++
++        // Program the Pixel PLL Register
++        outMGAdac(MGA1064_EH_PIX_PLLC_N, mgaReg->PllN);
++        outMGAdac(MGA1064_EH_PIX_PLLC_M, mgaReg->PllM);
++        outMGAdac(MGA1064_EH_PIX_PLLC_P, mgaReg->PllP);
++
++        // Wait 500 us
++        usleep(500);
++
++        // Select the pixel PLL by setting pixclksel to 1
++        ucTempByte = inMGAdac(MGA1064_PIX_CLK_CTL);
++        ucTempByte &= ~MGA1064_PIX_CLK_CTL_SEL_MSK;
++        ucTempByte |= MGA1064_PIX_CLK_CTL_SEL_PLL;
++        outMGAdac(MGA1064_PIX_CLK_CTL, ucTempByte);
++
++        // Reset dotclock rate bit.
++        OUTREG8(MGAREG_SEQ_INDEX, 1);
++        ucTempByte = INREG8(MGAREG_SEQ_DATA);
++        OUTREG8(MGAREG_SEQ_DATA, ucTempByte & ~0x8);
++
++        // Set pixclkdis to 0 and pixplldn to 0
++        ucTempByte = inMGAdac(MGA1064_PIX_CLK_CTL);
++        ucTempByte &= ~MGA1064_PIX_CLK_CTL_CLK_DIS;
++        ucTempByte &= ~MGA1064_PIX_CLK_CTL_CLK_POW_DOWN;
++        outMGAdac(MGA1064_PIX_CLK_CTL, ucTempByte);
++
++        // Poll VCount. If it increments twice inside 150us, 
++        // we assume that the PLL has locked.
++        ulLoopCount = 0;
++        ulVCount = INREG(MGAREG_VCOUNT);
++
++        while(ulLoopCount < 30 && ucPLLLocked == FALSE)
++        {
++            ulTempCount = INREG(MGAREG_VCOUNT);
++
++            if(ulTempCount < ulVCount)
++            {
++                ulVCount = 0;
++            }
++            if ((ucTempByte - ulVCount) > 2)
++            {
++                ucPLLLocked = TRUE;
++            }
++            else
++            {
++                usleep(5);
++            }
++            ulLoopCount++;
++        }
++        ulLockCheckIterations++;
++    }
++}
++
+ /**
+  * Calculate the PLL settings (m, n, p, s).
+  *
+@@ -631,6 +763,12 @@
+ 	    pReg->PllM = m;
+ 	    pReg->PllN = n;
+ 	    pReg->PllP = p;
++    } else if (pMga->is_G200EH) {
++	    MGAG200EHComputePLLParam(pScrn, f_out, &m, &n, &p);
++
++	    pReg->PllM = m;
++	    pReg->PllN = n;
++	    pReg->PllP = p;
+         } else {
+ 	    /* Do the calculations for m, n, p and s */
+ 	    MGAGCalcClock( pScrn, f_out, &m, &n, &p, &s );
+@@ -828,6 +966,15 @@
+                 pReg->Option2 = 0x0000b000;
+                 break;
+ 
++        case PCI_CHIP_MGAG200_EH_PCI:
++                pReg->DacRegs[MGA1064_MISC_CTL] =
++                    MGA1064_MISC_CTL_VGA8 |
++                    MGA1064_MISC_CTL_DAC_RAM_CS;
++
++                pReg->Option = 0x00000120;
++                pReg->Option2 = 0x0000b000;
++                break;
++
+ 	case PCI_CHIP_MGAG200:
+ 	case PCI_CHIP_MGAG200_PCI:
+ 	default:
+@@ -1177,7 +1324,7 @@
+ 	      if (pMga->is_G200SE
+ 		  && ((i == 0x2C) || (i == 0x2D) || (i == 0x2E)))
+ 	         continue;
+-	      if ( (pMga->is_G200EV || pMga->is_G200WB) &&
++	      if ( (pMga->is_G200EV || pMga->is_G200WB || pMga->is_G200EH) &&
+ 		   (i >= 0x44) && (i <= 0x4E))
+ 	         continue;
+ 
+@@ -1218,6 +1365,8 @@
+                MGAG200EVPIXPLLSET(pScrn, mgaReg);
+            } else if (pMga->is_G200WB) {
+                MGAG200WBPIXPLLSET(pScrn, mgaReg);
++           } else if (pMga->is_G200EH) {
++               MGAG200EHPIXPLLSET(pScrn, mgaReg);
+            }
+ );	/* MGA_NOT_HAL */
+ #ifdef USEMGAHAL
+@@ -1402,6 +1551,10 @@
+             mgaReg->PllM = inMGAdac(MGA1064_EV_PIX_PLLC_M);
+             mgaReg->PllN = inMGAdac(MGA1064_EV_PIX_PLLC_N);
+             mgaReg->PllP = inMGAdac(MGA1064_EV_PIX_PLLC_P);
++        } else if (pMga->is_G200EH) {
++            mgaReg->PllM = inMGAdac(MGA1064_EH_PIX_PLLC_M);
++            mgaReg->PllN = inMGAdac(MGA1064_EH_PIX_PLLC_N);
++            mgaReg->PllP = inMGAdac(MGA1064_EH_PIX_PLLC_P);
+         }
+ 
+         mgaReg->PIXPLLCSaved = TRUE;
+@@ -1584,6 +1737,7 @@
+     { (1 << 0), (1 << 2) },
+     { (1 << 4), (1 << 5) },
+     { (1 << 0), (1 << 1) },  /* G200SE, G200EV and G200WB I2C bits */
++    { (1 << 1), (1 << 0) },  /* G200EH I2C bits */
+ };
+ 
+ 
+@@ -1596,6 +1750,8 @@
+ 
+   if (pMga->is_G200SE || pMga->is_G200WB || pMga->is_G200EV)
+     i2c_index = 3;
++  else if (pMga->is_G200EH)
++    i2c_index = 4;
+   else
+     i2c_index = 0;
+ 
+@@ -1695,6 +1851,8 @@
+ 
+         if (pMga->is_G200SE || pMga->is_G200WB || pMga->is_G200EV)
+             i2c_index = 3;
++        else if (pMga->is_G200EH)
++            i2c_index = 4;
+         else
+             i2c_index = 0;
+ 
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga_driver.c b/x11-drivers/xf86-video-mga/files/patch-src__mga_driver.c
new file mode 100644
index 000000000000..cd3f68d96cc6
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/files/patch-src__mga_driver.c
@@ -0,0 +1,115 @@
+--- ./src/mga_driver.c.orig	2009-07-27 22:11:40.000000000 -0700
++++ ./src/mga_driver.c	2010-03-09 17:58:54.163419467 -0800
+@@ -388,6 +388,22 @@
+ 	8192, 0x4000,          /* Memory probe size & offset values */
+     },
+ 
++    /* G200EH */
++    [14] = { 0, 1, 0, 0, 1, 0, 0, 0, new_BARs,
++            (TRANSC_SOLID_FILL | TWO_PASS_COLOR_EXPAND | USE_LINEAR_EXPANSION),
++	{
++	    { 50000, 230000 }, /* System VCO frequencies */
++	    { 50000, 203400 }, /* Pixel VCO frequencies */
++	    { 0, 0 },          /* Video VCO frequencies */
++	    45000,            /* Memory clock */
++	    27050,             /* PLL reference frequency */
++	    0,                 /* Supports fast bitblt? */
++	    MGA_HOST_PCI       /* Host interface */
++	},
++
++	8192, 0x4000,          /* Memory probe size & offset values */
++    },
++
+ };
+ 
+ #ifdef XSERVER_LIBPCIACCESS
+@@ -415,6 +431,8 @@
+ 
+     MGA_DEVICE_MATCH( PCI_CHIP_MGAG200_WINBOND_PCI, 13 ),
+ 
++    MGA_DEVICE_MATCH( PCI_CHIP_MGAG200_EH_PCI, 14 ),
++
+     { 0, 0, 0 },
+ };
+ #endif
+@@ -433,6 +451,7 @@
+     { PCI_CHIP_MGAG200_SE_B_PCI,	"mgag200 SE B PCI" },
+     { PCI_CHIP_MGAG200_EV_PCI,	"mgag200 EV Maxim" },
+     { PCI_CHIP_MGAG200_WINBOND_PCI,	"mgag200 eW Nuvoton" },
++    { PCI_CHIP_MGAG200_EH_PCI,	"mgag200eH" },
+     { PCI_CHIP_MGAG400,		"mgag400" },
+     { PCI_CHIP_MGAG550,		"mgag550" },
+     {-1,			NULL }
+@@ -455,6 +474,8 @@
+ 	RES_SHARED_VGA },
+     { PCI_CHIP_MGAG200_WINBOND_PCI, PCI_CHIP_MGAG200_WINBOND_PCI,
+ 	RES_SHARED_VGA },
++    { PCI_CHIP_MGAG200_EH_PCI, PCI_CHIP_MGAG200_EH_PCI,
++	RES_SHARED_VGA },
+     { PCI_CHIP_MGAG400,	    PCI_CHIP_MGAG400,	RES_SHARED_VGA },
+     { PCI_CHIP_MGAG550,	    PCI_CHIP_MGAG550,	RES_SHARED_VGA },
+     { -1,			-1,		RES_UNDEFINED }
+@@ -889,6 +910,10 @@
+                 attrib_no = 13;
+                 break;
+ 
++            case PCI_CHIP_MGAG200_EH_PCI:
++                attrib_no = 14;
++                break;
++
+ 	    default:
+ 		return FALSE;
+             }
+@@ -1112,7 +1137,7 @@
+ 	OUTREG8(MGAREG_CRTCEXT_DATA, tmp | 0x80);
+ 
+ 	/* apparently the G200 IP don't have a BIOS to read */
+-	if (pMga->is_G200SE || pMga->is_G200EV || pMga->is_G200WB) {
++	if (pMga->is_G200SE || pMga->is_G200EV || pMga->is_G200WB || pMga->is_G200EH) {
+ 	    CARD32 MemoryAt0, MemoryAt1, Offset;
+ 	    CARD32 FirstMemoryVal1, FirstMemoryVal2;
+ 	    CARD32 SecondMemoryVal1, SecondMemoryVal2;
+@@ -1594,6 +1619,7 @@
+ 	|| (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI);
+     pMga->is_G200EV = (pMga->Chipset == PCI_CHIP_MGAG200_EV_PCI);
+     pMga->is_G200WB = (pMga->Chipset == PCI_CHIP_MGAG200_WINBOND_PCI);
++    pMga->is_G200EH = (pMga->Chipset == PCI_CHIP_MGAG200_EH_PCI);
+ 
+ #ifdef USEMGAHAL
+     if (pMga->chip_attribs->HAL_chipset) {
+@@ -2115,6 +2141,7 @@
+     case PCI_CHIP_MGAG200_SE_B_PCI:
+     case PCI_CHIP_MGAG200_WINBOND_PCI:
+     case PCI_CHIP_MGAG200_EV_PCI:
++    case PCI_CHIP_MGAG200_EH_PCI:
+     case PCI_CHIP_MGAG400:
+     case PCI_CHIP_MGAG550:
+ 	MGAGSetupFuncs(pScrn);
+@@ -2227,6 +2254,7 @@
+ 	  case PCI_CHIP_MGAG200_SE_B_PCI:
+           case PCI_CHIP_MGAG200_WINBOND_PCI:
+ 	  case PCI_CHIP_MGAG200_EV_PCI:
++      case PCI_CHIP_MGAG200_EH_PCI:
+ 	    pMga->SrcOrg = 0;
+ 	    pMga->DstOrg = 0;
+ 	    break;
+@@ -2413,6 +2441,7 @@
+ 	case PCI_CHIP_MGAG200_SE_B_PCI:
+         case PCI_CHIP_MGAG200_WINBOND_PCI:
+ 	case PCI_CHIP_MGAG200_EV_PCI:
++    case PCI_CHIP_MGAG200_EH_PCI:
+ 	case PCI_CHIP_MGAG400:
+ 	case PCI_CHIP_MGAG550:
+ 	   maxPitch = 4096;
+@@ -4316,7 +4345,10 @@
+ 	    return MODE_BANDWIDTH;
+     } else if (pMga->is_G200EV
+ 	       && (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 327)) {
+-	return MODE_BANDWIDTH;
++        return MODE_BANDWIDTH;
++    } else if (pMga->is_G200EH
++               && (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 375)) {
++        return MODE_BANDWIDTH;
+     }
+ 
+     lace = 1 + ((mode->Flags & V_INTERLACE) != 0);
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga_merge.c b/x11-drivers/xf86-video-mga/files/patch-src__mga_merge.c
new file mode 100644
index 000000000000..779727093141
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/files/patch-src__mga_merge.c
@@ -0,0 +1,18 @@
+--- ./src/mga_merge.c.orig	2009-07-27 17:24:03.000000000 -0700
++++ ./src/mga_merge.c	2010-03-09 17:58:54.164420182 -0800
+@@ -362,6 +362,7 @@
+     case PCI_CHIP_MGAG200_SE_B_PCI:
+     case PCI_CHIP_MGAG200_WINBOND_PCI:
+     case PCI_CHIP_MGAG200_EV_PCI:
++    case PCI_CHIP_MGAG200_EH_PCI:
+     case PCI_CHIP_MGAG400:
+     case PCI_CHIP_MGAG550:
+ 	MGAGSetupFuncs(pScrn);
+@@ -516,6 +517,7 @@
+ 	case PCI_CHIP_MGAG200_SE_B_PCI:
+         case PCI_CHIP_MGAG200_WINBOND_PCI:
+         case PCI_CHIP_MGAG200_EV_PCI:
++        case PCI_CHIP_MGAG200_EH_PCI:
+ 	case PCI_CHIP_MGAG400:
+ 	case PCI_CHIP_MGAG550:
+ 	   maxPitch = 4096;
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga_reg.h b/x11-drivers/xf86-video-mga/files/patch-src__mga_reg.h
new file mode 100644
index 000000000000..25e03a8c22f4
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/files/patch-src__mga_reg.h
@@ -0,0 +1,14 @@
+--- ./src/mga_reg.h.orig	2009-07-26 20:37:46.000000000 -0700
++++ ./src/mga_reg.h	2010-03-09 17:58:54.165420896 -0800
+@@ -432,6 +432,11 @@
+ #define MGA1064_EV_PIX_PLLC_N	0xb7
+ #define MGA1064_EV_PIX_PLLC_P	0xb8
+ 
++/* Modified PLL for G200 EH */
++#define MGA1064_EH_PIX_PLLC_M   0xb6
++#define MGA1064_EH_PIX_PLLC_N   0xb7
++#define MGA1064_EH_PIX_PLLC_P   0xb8
++
+ 
+ #define MGA1064_DISP_CTL        0x8a
+ #define MGA1064_DISP_CTL_DAC1OUTSEL_MASK       0x01
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga_storm.c b/x11-drivers/xf86-video-mga/files/patch-src__mga_storm.c
new file mode 100644
index 000000000000..39f5565e12e0
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/files/patch-src__mga_storm.c
@@ -0,0 +1,10 @@
+--- ./src/mga_storm.c.orig	2009-07-26 20:37:46.000000000 -0700
++++ ./src/mga_storm.c	2010-03-09 17:58:54.168419688 -0800
+@@ -1130,6 +1130,7 @@
+     case PCI_CHIP_MGAG200_SE_B_PCI:
+     case PCI_CHIP_MGAG200_WINBOND_PCI:
+     case PCI_CHIP_MGAG200_EV_PCI:
++    case PCI_CHIP_MGAG200_EH_PCI:
+ 	pMga->SrcOrg = 0;
+ 	OUTREG(MGAREG_SRCORG, pMga->realSrcOrg);
+ 	OUTREG(MGAREG_DSTORG, pMga->DstOrg);
diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
index 439a433e7749..f9d20360c356 100644
--- a/x11-drivers/xf86-video-neomagic/Makefile
+++ b/x11-drivers/xf86-video-neomagic/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-neomagic
-PORTVERSION=	1.2.2
-PORTREVISION=	3
+PORTVERSION=	1.2.4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-neomagic/distinfo b/x11-drivers/xf86-video-neomagic/distinfo
index 7bf3dd043bc6..6dbde59ce4c7 100644
--- a/x11-drivers/xf86-video-neomagic/distinfo
+++ b/x11-drivers/xf86-video-neomagic/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-neomagic-1.2.2.tar.bz2) = 896864e1a2d7333c16333a24eac17d00
-SHA256 (xorg/driver/xf86-video-neomagic-1.2.2.tar.bz2) = 1c0dfeb749ad2faacb74cc75e865878e4dde2c6c3dace04be4f65286e6ae966a
-SIZE (xorg/driver/xf86-video-neomagic-1.2.2.tar.bz2) = 278452
+MD5 (xorg/driver/xf86-video-neomagic-1.2.4.tar.bz2) = 2d722ee9b9fe8da49109f280689c9c25
+SHA256 (xorg/driver/xf86-video-neomagic-1.2.4.tar.bz2) = 434da2986d007243f4590a86d16a1632a9611b71de44d6e46f28bd3cdb898353
+SIZE (xorg/driver/xf86-video-neomagic-1.2.4.tar.bz2) = 281374
diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile
index 67a9945f6da1..18fce8099af6 100644
--- a/x11-drivers/xf86-video-newport/Makefile
+++ b/x11-drivers/xf86-video-newport/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-newport
-PORTVERSION=	0.2.1
-PORTREVISION=	6
+PORTVERSION=	0.2.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-newport/distinfo b/x11-drivers/xf86-video-newport/distinfo
index 76c0473d19ce..e3ca5b8d5392 100644
--- a/x11-drivers/xf86-video-newport/distinfo
+++ b/x11-drivers/xf86-video-newport/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-newport-0.2.1.tar.bz2) = 2bd8e5b9ea68e0dcd80dfcaca0eff82c
-SHA256 (xorg/driver/xf86-video-newport-0.2.1.tar.bz2) = 66ac855452690ef896400577806dc1dd86318940f8a62ce20039037318b1ce08
-SIZE (xorg/driver/xf86-video-newport-0.2.1.tar.bz2) = 257576
+MD5 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 923baa1ee0429f03ed19ec0be6a4f62b
+SHA256 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
+SIZE (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 266377
diff --git a/x11-drivers/xf86-video-nouveau/Makefile b/x11-drivers/xf86-video-nouveau/Makefile
index 27df6a316bf2..3b523be26344 100644
--- a/x11-drivers/xf86-video-nouveau/Makefile
+++ b/x11-drivers/xf86-video-nouveau/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xf86-video-nouveau
 PORTVERSION=	0.0.10.${SNAPDATE}
 DISTVERSIONSUFFIX=.${SNAPREV}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 MASTER_SITES=	ftp://ftp.lissyara.su/users/Guest/distfiles/
 
diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile
index 32ea54e37089..e9980edaa84b 100644
--- a/x11-drivers/xf86-video-nv/Makefile
+++ b/x11-drivers/xf86-video-nv/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-nv
-PORTVERSION=	2.1.13
-PORTREVISION=	2
+PORTVERSION=	2.1.16
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-nv/distinfo b/x11-drivers/xf86-video-nv/distinfo
index ab52ff0559d3..1ed8eada2f0a 100644
--- a/x11-drivers/xf86-video-nv/distinfo
+++ b/x11-drivers/xf86-video-nv/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-nv-2.1.13.tar.bz2) = c3231c8808a11eb4ca066e43e0f1a273
-SHA256 (xorg/driver/xf86-video-nv-2.1.13.tar.bz2) = 60179d0f406ea6a84e5ec6beb80d8b7b472f97c81c63bc5acc3064b5a64c13a3
-SIZE (xorg/driver/xf86-video-nv-2.1.13.tar.bz2) = 397630
+MD5 (xorg/driver/xf86-video-nv-2.1.16.tar.bz2) = fb02d5506e35054348d1c2b2c924530d
+SHA256 (xorg/driver/xf86-video-nv-2.1.16.tar.bz2) = 4bf2f964b78d309769faa6a5d21c90a9907886623adf1f30ea890b4329bf578d
+SIZE (xorg/driver/xf86-video-nv-2.1.16.tar.bz2) = 389417
diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile
index f0fa802b9252..d3087e5335f7 100644
--- a/x11-drivers/xf86-video-openchrome/Makefile
+++ b/x11-drivers/xf86-video-openchrome/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-openchrome
 PORTVERSION=	0.2.904
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 MASTER_SITES=	http://www.openchrome.org/releases/
 
diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile
index 91c4f38a548b..899a8e3528dc 100644
--- a/x11-drivers/xf86-video-r128/Makefile
+++ b/x11-drivers/xf86-video-r128/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-r128
-PORTVERSION=	6.8.0
-PORTREVISION=	4
+PORTVERSION=	6.8.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-r128/distinfo b/x11-drivers/xf86-video-r128/distinfo
index b94c1aeb03b8..9d2081ab52ca 100644
--- a/x11-drivers/xf86-video-r128/distinfo
+++ b/x11-drivers/xf86-video-r128/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-r128-6.8.0.tar.bz2) = 007bec0c6b07d9d3aeca4da18e561efb
-SHA256 (xorg/driver/xf86-video-r128-6.8.0.tar.bz2) = 5689ca714fee9c9272bee12883b07a0ef2c40358ffb19fa684e963027b56567b
-SIZE (xorg/driver/xf86-video-r128-6.8.0.tar.bz2) = 409166
+MD5 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 2b90854a62a4d45d652062f582dc8d13
+SHA256 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
+SIZE (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 418251
diff --git a/x11-drivers/xf86-video-radeonhd-devel/Makefile b/x11-drivers/xf86-video-radeonhd-devel/Makefile
index 56482c91b688..56e47fdee3c9 100644
--- a/x11-drivers/xf86-video-radeonhd-devel/Makefile
+++ b/x11-drivers/xf86-video-radeonhd-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-radeonhd
 PORTVERSION=	1.3.0.20091101
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	nork
diff --git a/x11-drivers/xf86-video-radeonhd/Makefile b/x11-drivers/xf86-video-radeonhd/Makefile
index a4a546f22ad9..63dae81ad6fd 100644
--- a/x11-drivers/xf86-video-radeonhd/Makefile
+++ b/x11-drivers/xf86-video-radeonhd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-radeonhd
 PORTVERSION=	1.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-rdc/Makefile b/x11-drivers/xf86-video-rdc/Makefile
index 28c69df4a0d8..68c45d32363f 100644
--- a/x11-drivers/xf86-video-rdc/Makefile
+++ b/x11-drivers/xf86-video-rdc/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	xf86-video-rdc
 MASTER_SITES=	http://www.SpringDaemons.com/stas/
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
index e40f2a687b46..434b64c36633 100644
--- a/x11-drivers/xf86-video-rendition/Makefile
+++ b/x11-drivers/xf86-video-rendition/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-rendition
-PORTVERSION=	4.2.1
-PORTREVISION=	2
+PORTVERSION=	4.2.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-rendition/distinfo b/x11-drivers/xf86-video-rendition/distinfo
index 47272be254be..fd5521f4fd54 100644
--- a/x11-drivers/xf86-video-rendition/distinfo
+++ b/x11-drivers/xf86-video-rendition/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-rendition-4.2.1.tar.bz2) = c6b49b99586cc0955295cb1ca93fcac7
-SHA256 (xorg/driver/xf86-video-rendition-4.2.1.tar.bz2) = 54209ec16c8f032b38cee88752783a7869139b2b30a537f8305d60404f40b0bb
-SIZE (xorg/driver/xf86-video-rendition-4.2.1.tar.bz2) = 313792
+MD5 (xorg/driver/xf86-video-rendition-4.2.3.tar.bz2) = 9a0a916fe1e7b5c81cd4c80a08e646cc
+SHA256 (xorg/driver/xf86-video-rendition-4.2.3.tar.bz2) = 9d5559fd3029feee5af2493ab8f558c58c426fc89776a1109dab97e3a4764d94
+SIZE (xorg/driver/xf86-video-rendition-4.2.3.tar.bz2) = 315369
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
index b035b64c28a2..c5f0f62fdc2f 100644
--- a/x11-drivers/xf86-video-s3/Makefile
+++ b/x11-drivers/xf86-video-s3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-s3
-PORTVERSION=	0.6.1
-PORTREVISION=	3
+PORTVERSION=	0.6.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -15,5 +14,6 @@ COMMENT=	X.Org s3 display driver
 
 XORG_CAT=	driver
 USE_XORG=	videoproto xextproto
+MAN4=		s3.4x
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-s3/distinfo b/x11-drivers/xf86-video-s3/distinfo
index edf7adc3f184..b8cd9c295804 100644
--- a/x11-drivers/xf86-video-s3/distinfo
+++ b/x11-drivers/xf86-video-s3/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-s3-0.6.1.tar.bz2) = a5f1f2f93a50e56bd3aeed009c407337
-SHA256 (xorg/driver/xf86-video-s3-0.6.1.tar.bz2) = 66646138dcc7ebdf84abc3566802fcd3bf86709a1e34abd78741565e4a786596
-SIZE (xorg/driver/xf86-video-s3-0.6.1.tar.bz2) = 264633
+MD5 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 5eb06d88533fb327d067928faeb20860
+SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
+SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
index 57f7f742e521..bfda8931ca44 100644
--- a/x11-drivers/xf86-video-s3virge/Makefile
+++ b/x11-drivers/xf86-video-s3virge/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-s3virge
-PORTVERSION=	1.10.2
-PORTREVISION=	3
+PORTVERSION=	1.10.4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3virge/distinfo b/x11-drivers/xf86-video-s3virge/distinfo
index 93aac418c6ad..d196e281f5a4 100644
--- a/x11-drivers/xf86-video-s3virge/distinfo
+++ b/x11-drivers/xf86-video-s3virge/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-s3virge-1.10.2.tar.bz2) = 69784e4964d75487d81be4eae3d467dd
-SHA256 (xorg/driver/xf86-video-s3virge-1.10.2.tar.bz2) = f96bc804b123f8371f22b0ca99d77b2d209e6f46d0426d7a4f98fe57b778cb52
-SIZE (xorg/driver/xf86-video-s3virge-1.10.2.tar.bz2) = 297071
+MD5 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 6517bbbf808c700502d51acdc44662f8
+SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
+SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 300224
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index df4d9dc0ba2f..d518df3c2120 100644
--- a/x11-drivers/xf86-video-savage/Makefile
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-savage
-PORTVERSION=	2.2.1
-PORTREVISION=	3
+PORTVERSION=	2.3.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo
index e33089f37e45..126a6b6394dc 100644
--- a/x11-drivers/xf86-video-savage/distinfo
+++ b/x11-drivers/xf86-video-savage/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-savage-2.2.1.tar.bz2) = 62b8aba48b54eaefeae87df502bf219c
-SHA256 (xorg/driver/xf86-video-savage-2.2.1.tar.bz2) = adf95cae0fbaf72326c51c4c9e61486eef062bb1706f6ab46d942f2c36d8a37e
-SIZE (xorg/driver/xf86-video-savage-2.2.1.tar.bz2) = 305286
+MD5 (xorg/driver/xf86-video-savage-2.3.1.tar.bz2) = 66c319f610e3699c3de0f3ef630abb32
+SHA256 (xorg/driver/xf86-video-savage-2.3.1.tar.bz2) = 2b4adcdd820a6f3acba6f3c0995f5899edc8f5e33fb4c4666c4c7a78090ddaab
+SIZE (xorg/driver/xf86-video-savage-2.3.1.tar.bz2) = 327377
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
index 304c9a12b77d..cfa486f576bd 100644
--- a/x11-drivers/xf86-video-siliconmotion/Makefile
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-siliconmotion
-PORTVERSION=	1.7.1
-PORTREVISION=	1
+PORTVERSION=	1.7.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo
index 9d89dcdd4ce9..f2fea3b3cda5 100644
--- a/x11-drivers/xf86-video-siliconmotion/distinfo
+++ b/x11-drivers/xf86-video-siliconmotion/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-siliconmotion-1.7.1.tar.bz2) = 744e5e68caaa545ac7e8523f74fc6579
-SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.1.tar.bz2) = 4bac7a7101208f494be7301aaa410a75e37d815a9b191629add52cad533320f5
-SIZE (xorg/driver/xf86-video-siliconmotion-1.7.1.tar.bz2) = 335351
+MD5 (xorg/driver/xf86-video-siliconmotion-1.7.3.tar.bz2) = 29fb322cd3adab52cc7f1ac86f9315bb
+SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.3.tar.bz2) = ebda468be42695c08ceaa4043da3cf5bcd5f9ab15d1482311fd6e826a8060b2b
+SIZE (xorg/driver/xf86-video-siliconmotion-1.7.3.tar.bz2) = 330623
diff --git a/x11-drivers/xf86-video-sis-intel/Makefile b/x11-drivers/xf86-video-sis-intel/Makefile
index 5b72150c01ab..1ceee027e66d 100644
--- a/x11-drivers/xf86-video-sis-intel/Makefile
+++ b/x11-drivers/xf86-video-sis-intel/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xf86-video-sis-intel
 PORTVERSION=	300407
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 MASTER_SITES=	http://downloadmirror.intel.com/15443/eng/
 DISTNAME=	sis_drv_src_300407
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index deebbae0c5ac..9e69a2401da0 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-sis
-PORTVERSION=	0.10.1
-PORTREVISION=	3
+PORTVERSION=	0.10.2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sis/distinfo b/x11-drivers/xf86-video-sis/distinfo
index dfb418922f61..f792633f66a4 100644
--- a/x11-drivers/xf86-video-sis/distinfo
+++ b/x11-drivers/xf86-video-sis/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-sis-0.10.1.tar.bz2) = 9f57c2f5ccbd8340db32da1c74083771
-SHA256 (xorg/driver/xf86-video-sis-0.10.1.tar.bz2) = 11529f094cbdcdaba505596488eda623e0f0bd3c51139359d587ea58b6527307
-SIZE (xorg/driver/xf86-video-sis-0.10.1.tar.bz2) = 637423
+MD5 (xorg/driver/xf86-video-sis-0.10.2.tar.bz2) = f04baa307e49e9f0e5a5c3d2e89a5576
+SHA256 (xorg/driver/xf86-video-sis-0.10.2.tar.bz2) = 3aad701799e355669b9027a9baedd623fe6b7ce93da9ac22b6902fd7e38128c2
+SIZE (xorg/driver/xf86-video-sis-0.10.2.tar.bz2) = 642160
diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile
index d017eec28f6f..c8ff25160d4f 100644
--- a/x11-drivers/xf86-video-sunffb/Makefile
+++ b/x11-drivers/xf86-video-sunffb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-sunffb
 PORTVERSION=	1.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
index 168fc1ba623b..e06236683aaa 100644
--- a/x11-drivers/xf86-video-tdfx/Makefile
+++ b/x11-drivers/xf86-video-tdfx/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-tdfx
-PORTVERSION=	1.4.1
-PORTREVISION=	3
+PORTVERSION=	1.4.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tdfx/distinfo b/x11-drivers/xf86-video-tdfx/distinfo
index ab907ff4c5ed..23751ea9a894 100644
--- a/x11-drivers/xf86-video-tdfx/distinfo
+++ b/x11-drivers/xf86-video-tdfx/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-tdfx-1.4.1.tar.bz2) = 59acf2a4f721f9b7abbd121748467b16
-SHA256 (xorg/driver/xf86-video-tdfx-1.4.1.tar.bz2) = d741c68a9a90b8bec4dd94e43844346237e9c5cffec98fee8719ec92933b9498
-SIZE (xorg/driver/xf86-video-tdfx-1.4.1.tar.bz2) = 286452
+MD5 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 8161bbf2b100c21b609163f0010766b3
+SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
+SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 290172
diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile
index 0a31b376727b..4ffe5dfbf894 100644
--- a/x11-drivers/xf86-video-tga/Makefile
+++ b/x11-drivers/xf86-video-tga/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-tga
-PORTVERSION=	1.2.0
-PORTREVISION=	3
+PORTVERSION=	1.2.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tga/distinfo b/x11-drivers/xf86-video-tga/distinfo
index 2375ee35d233..1647a5cb26d6 100644
--- a/x11-drivers/xf86-video-tga/distinfo
+++ b/x11-drivers/xf86-video-tga/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-tga-1.2.0.tar.bz2) = f3bddf0a64932ca9bd72041ccd3b5501
-SHA256 (xorg/driver/xf86-video-tga-1.2.0.tar.bz2) = a92f8cad0e21318be465719a9f30a50d5719b0b70bf8e15f3937e7850cf1aea6
-SIZE (xorg/driver/xf86-video-tga-1.2.0.tar.bz2) = 269406
+MD5 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = bcbceda78395de74544c83b46a7700cd
+SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
+SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 273334
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
index 3f6d7e9cad7c..97b3c1d368ff 100644
--- a/x11-drivers/xf86-video-trident/Makefile
+++ b/x11-drivers/xf86-video-trident/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-trident
-PORTVERSION=	1.3.1
-PORTREVISION=	3
+PORTVERSION=	1.3.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-trident/distinfo b/x11-drivers/xf86-video-trident/distinfo
index 8ea730bbbda8..2121775ed9ee 100644
--- a/x11-drivers/xf86-video-trident/distinfo
+++ b/x11-drivers/xf86-video-trident/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-trident-1.3.1.tar.bz2) = 9f280bef235426394013cb5e1854b823
-SHA256 (xorg/driver/xf86-video-trident-1.3.1.tar.bz2) = c74b2af84c4b4f11ea2068ec056574a1ba0402459bada3518c4800307ab7c8bf
-SIZE (xorg/driver/xf86-video-trident-1.3.1.tar.bz2) = 293180
+MD5 (xorg/driver/xf86-video-trident-1.3.3.tar.bz2) = 47f3c5da1942017218355f178f02ef84
+SHA256 (xorg/driver/xf86-video-trident-1.3.3.tar.bz2) = 6241eab6f3f0a075380be6b614e33ad72256242c865115bc8b696f83a75d11f5
+SIZE (xorg/driver/xf86-video-trident-1.3.3.tar.bz2) = 297110
diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile
index 923c50fc86e2..51c45edb1b85 100644
--- a/x11-drivers/xf86-video-tseng/Makefile
+++ b/x11-drivers/xf86-video-tseng/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-tseng
-PORTVERSION=	1.2.1
-PORTREVISION=	3
+PORTVERSION=	1.2.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tseng/distinfo b/x11-drivers/xf86-video-tseng/distinfo
index 888a56163072..d2d3236add8e 100644
--- a/x11-drivers/xf86-video-tseng/distinfo
+++ b/x11-drivers/xf86-video-tseng/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-tseng-1.2.1.tar.bz2) = 2f687eddae5dafa5dcc05116561e267c
-SHA256 (xorg/driver/xf86-video-tseng-1.2.1.tar.bz2) = 540bb96efb0f2ec61e08fe1cc6e2e887fba34a6332ddf7e947ace59f0fad34ba
-SIZE (xorg/driver/xf86-video-tseng-1.2.1.tar.bz2) = 280383
+MD5 (xorg/driver/xf86-video-tseng-1.2.3.tar.bz2) = 79f63999c88477801ae54dc486272ad6
+SHA256 (xorg/driver/xf86-video-tseng-1.2.3.tar.bz2) = 0556bb3e79da4be87e880f82e2b8504527e760e284680f9463a08f9572507187
+SIZE (xorg/driver/xf86-video-tseng-1.2.3.tar.bz2) = 283944
diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
index 87b633999231..815964632a39 100644
--- a/x11-drivers/xf86-video-vesa/Makefile
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-vesa
-PORTVERSION=	2.1.0
-PORTREVISION=	3
+PORTVERSION=	2.3.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vesa/distinfo b/x11-drivers/xf86-video-vesa/distinfo
index 1309765ad9e6..4bd2425a375f 100644
--- a/x11-drivers/xf86-video-vesa/distinfo
+++ b/x11-drivers/xf86-video-vesa/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-vesa-2.1.0.tar.bz2) = d813269613b4d63ff6dbfbfbd104cc84
-SHA256 (xorg/driver/xf86-video-vesa-2.1.0.tar.bz2) = de06caf86d3c1a1f086b8b55c054d60218fdf3956e93e411d9ee0d96bb42a6f8
-SIZE (xorg/driver/xf86-video-vesa-2.1.0.tar.bz2) = 245147
+MD5 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 07fa32958aff9b463dd3af5481ef6626
+SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
+SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539
diff --git a/x11-drivers/xf86-video-via/Makefile b/x11-drivers/xf86-video-via/Makefile
index cf4cbd121739..427d009c8fb2 100644
--- a/x11-drivers/xf86-video-via/Makefile
+++ b/x11-drivers/xf86-video-via/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-via
 PORTVERSION=	0.2.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
index 2442d417229e..61970eb9a522 100644
--- a/x11-drivers/xf86-video-vmware/Makefile
+++ b/x11-drivers/xf86-video-vmware/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-vmware
-PORTVERSION=	10.16.5
-PORTREVISION=	3
+PORTVERSION=	10.16.9
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vmware/distinfo b/x11-drivers/xf86-video-vmware/distinfo
index 0988761da421..78e8246a2526 100644
--- a/x11-drivers/xf86-video-vmware/distinfo
+++ b/x11-drivers/xf86-video-vmware/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-vmware-10.16.5.tar.bz2) = 6d78c82ea7c2bb0fcb587d7bb4e8f60a
-SHA256 (xorg/driver/xf86-video-vmware-10.16.5.tar.bz2) = 3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366
-SIZE (xorg/driver/xf86-video-vmware-10.16.5.tar.bz2) = 278790
+MD5 (xorg/driver/xf86-video-vmware-10.16.9.tar.bz2) = 3b3d38abfa1f8be4b1e26dcd236bc94f
+SHA256 (xorg/driver/xf86-video-vmware-10.16.9.tar.bz2) = 835a5e45b54837cbbd963a48bd09db709717e097e931dd76e68e397a167e8bc1
+SIZE (xorg/driver/xf86-video-vmware-10.16.9.tar.bz2) = 275787
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
index 57233112d49a..7cc591a48b3d 100644
--- a/x11-drivers/xf86-video-voodoo/Makefile
+++ b/x11-drivers/xf86-video-voodoo/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-voodoo
-PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTVERSION=	1.2.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-voodoo/distinfo b/x11-drivers/xf86-video-voodoo/distinfo
index e7e19d782326..463af94c9189 100644
--- a/x11-drivers/xf86-video-voodoo/distinfo
+++ b/x11-drivers/xf86-video-voodoo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-voodoo-1.2.1.tar.bz2) = ed4ce3a5406ca7958865d39558259726
-SHA256 (xorg/driver/xf86-video-voodoo-1.2.1.tar.bz2) = a2ea804932ea47dd3d9e4b6ea4475b768305e5041dc1899393004ece558b3cda
-SIZE (xorg/driver/xf86-video-voodoo-1.2.1.tar.bz2) = 258827
+MD5 (xorg/driver/xf86-video-voodoo-1.2.3.tar.bz2) = c164effcc839eca1fc1d43a42f4086db
+SHA256 (xorg/driver/xf86-video-voodoo-1.2.3.tar.bz2) = 025d4d99ab19325b72417fadbb099c757412988f800c9511be3e2c3993ae29e9
+SIZE (xorg/driver/xf86-video-voodoo-1.2.3.tar.bz2) = 259096
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index 65209779132d..338b26b579fe 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xorg-drivers
-PORTVERSION=	7.4
-PORTREVISION=	3
+PORTVERSION=	7.5
 CATEGORIES=	x11-drivers
 MASTER_SITES=	# none
 DISTFILES=	# none
author	Martin Wilke <miwi@FreeBSD.org>	2010-05-01 11:41:07 +0000
committer	Martin Wilke <miwi@FreeBSD.org>	2010-05-01 11:41:07 +0000
commit	f4936121f95e76555bebbc39e5b73dc12b0ff91f (patch)
tree	fcac9880f7998d69245463508464761e7b89a20e /x11-drivers
parent	693ef828a26aa5cb92848177be5fcb2afa9dd055 (diff)
download	ports-f4936121f95e76555bebbc39e5b73dc12b0ff91f.tar.gz ports-f4936121f95e76555bebbc39e5b73dc12b0ff91f.zip