Xorg-server update to 1.17.2 with related driver updates and bumps.

Update fontproto to 2.1.3.
Update libXfont to 1.5.1.
Update xf86-input-keyboard 1.8.1.
Update xf86-input-vmmouse to 13.1.0.
Update xf86-input-void to 1.4.1.
Update xf86-video-chips to 1.2.6.
Update xf86-video-cirrus to 1.5.3.
Update xf86-video-mach64 to 6.9.5.
Update xf86-video-neomagic to 1.2.9.
Update xf86-video-r128 to 6.10.0.
Update xf86-video-s3virge to 1.10.7.
Update xf86-video-savage to 2.3.8.
Update xf86-video-siliconmotion to 1.7.8.
Update xf86-video-sis to 0.10.8.
Update xf86-video-trident to 1.3.7.
Update xf86-video-vesa to 2.3.4.

* All other xf86-* drivers where bump and/or patched to allow them to
  compile and work with the new xorg-server.
* The ATI-ums driver is removed because the API it depends on was
  removed from the xorg-server.
* Add patch to sunffb to make the lack of XAA non-fatal
  (not build/run tested due to lack of hardware).
* Remove the extra patches in xorg-server for arm. The code seems to
  support it now natively. Please file a bug if this is not the case.
* Update the xorg-server support in virtualbox-ose-additions for vboxmouse. [1]

Submitted by:	jkim@ [1]
Obtained from:	Graphics devel repo

81 files changed, 201 insertions, 357 deletions

diff --git a/x11-drivers/Makefile b/x11-drivers/Makefile
index 201473476dab..5706acd5b212 100644
--- a/x11-drivers/Makefile
+++ b/x11-drivers/Makefile
@@ -22,7 +22,6 @@
     SUBDIR += xf86-video-apm
     SUBDIR += xf86-video-ark
     SUBDIR += xf86-video-ati
-    SUBDIR += xf86-video-ati-ums
     SUBDIR += xf86-video-chips
     SUBDIR += xf86-video-cirrus
     SUBDIR += xf86-video-dummy
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
index 07901d6d9c54..3c7a395f1593 100644
--- a/x11-drivers/xf86-input-acecad/Makefile
+++ b/x11-drivers/xf86-input-acecad/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-acecad
 PORTVERSION=	1.5.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-egalax/Makefile b/x11-drivers/xf86-input-egalax/Makefile
index 15a0f7327f86..917eb59d78b7 100644
--- a/x11-drivers/xf86-input-egalax/Makefile
+++ b/x11-drivers/xf86-input-egalax/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xf86-input-egalax
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	glebius@FreeBSD.org
@@ -18,7 +19,8 @@ LICENSE=	BSD2CLAUSE
 GNU_CONFIGURE=	yes
 USES=		autoreconf libtool pkgconfig
 USE_XORG=	xorg-server xproto xi inputproto xf86driproto glproto \
-		randrproto renderproto resourceproto scrnsaverproto xorg-macros
+		randrproto renderproto resourceproto scrnsaverproto \
+		xorg-macros presentproto
 CONFIGURE_ENV=	DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
 INSTALL_TARGET=	install-strip
 
diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile
index ae0699dcd33a..843b5df113b9 100644
--- a/x11-drivers/xf86-input-elographics/Makefile
+++ b/x11-drivers/xf86-input-elographics/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-elographics
 PORTVERSION=	1.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-evdev/Makefile b/x11-drivers/xf86-input-evdev/Makefile
index 44e7f0fab2b7..3c89199088de 100644
--- a/x11-drivers/xf86-input-evdev/Makefile
+++ b/x11-drivers/xf86-input-evdev/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-input-evdev
 PORTVERSION=	2.9.2
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile
index 09a989e52d85..323693362b4c 100644
--- a/x11-drivers/xf86-input-fpit/Makefile
+++ b/x11-drivers/xf86-input-fpit/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-fpit
 PORTVERSION=	1.4.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile
index 0c268764050c..4d06099724e9 100644
--- a/x11-drivers/xf86-input-hyperpen/Makefile
+++ b/x11-drivers/xf86-input-hyperpen/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-hyperpen
 PORTVERSION=	1.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
index 0514a0ca596d..52bb4c52bd19 100644
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-joystick
 PORTVERSION=	1.6.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 23bdd4b874f9..4b9636d45b4e 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-keyboard
-PORTVERSION=	1.8.0
-PORTREVISION=	7
+PORTVERSION=	1.8.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo
index 158af292e26b..5179c5d1935a 100644
--- a/x11-drivers/xf86-input-keyboard/distinfo
+++ b/x11-drivers/xf86-input-keyboard/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-keyboard-1.8.0.tar.bz2) = 41c51c4e0a87aad6a1c4973c68a8de23b61162d0223f4ab36c627c307830cb5b
-SIZE (xorg/driver/xf86-input-keyboard-1.8.0.tar.bz2) = 323838
+SHA256 (xorg/driver/xf86-input-keyboard-1.8.1.tar.bz2) = 1ac8ff39bf9da7d2fc7fd6c24515726e8138340c0518ab8c606e008cf93ca211
+SIZE (xorg/driver/xf86-input-keyboard-1.8.1.tar.bz2) = 319232
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index e84acae49bd1..c883d3a0bc7e 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-input-mouse
 PORTVERSION=	1.9.1
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile
index 0a54bf44f296..3944364c58d9 100644
--- a/x11-drivers/xf86-input-mutouch/Makefile
+++ b/x11-drivers/xf86-input-mutouch/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-mutouch
 PORTVERSION=	1.3.0
-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 e0d77ee5fb00..7fbdb9df0a2f 100644
--- a/x11-drivers/xf86-input-penmount/Makefile
+++ b/x11-drivers/xf86-input-penmount/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-penmount
 PORTVERSION=	1.5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index b6e5f64e4c73..de7eb03a1e47 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-input-synaptics
 PORTVERSION=	1.8.2
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
index 63ac52501f31..863522ed8f16 100644
--- a/x11-drivers/xf86-input-vmmouse/Makefile
+++ b/x11-drivers/xf86-input-vmmouse/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-vmmouse
-PORTVERSION=	13.0.0
-PORTREVISION=	5
+PORTVERSION=	13.1.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-vmmouse/distinfo b/x11-drivers/xf86-input-vmmouse/distinfo
index 0445b6b023c3..30071599d3c5 100644
--- a/x11-drivers/xf86-input-vmmouse/distinfo
+++ b/x11-drivers/xf86-input-vmmouse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c
-SIZE (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 314269
+SHA256 (xorg/driver/xf86-input-vmmouse-13.1.0.tar.bz2) = 0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319
+SIZE (xorg/driver/xf86-input-vmmouse-13.1.0.tar.bz2) = 319188
diff --git a/x11-drivers/xf86-input-vmmouse/pkg-plist b/x11-drivers/xf86-input-vmmouse/pkg-plist
index 142e1cfefc50..b5d9fc7b54c7 100644
--- a/x11-drivers/xf86-input-vmmouse/pkg-plist
+++ b/x11-drivers/xf86-input-vmmouse/pkg-plist
@@ -1,5 +1,6 @@
 bin/vmmouse_detect
 libexec/hal/scripts/hal-probe-vmmouse
+@comment lib/udev/rules.d/69-xorg-vmmouse.rules
 lib/xorg/modules/input/vmmouse_drv.so
 man/man1/vmmouse_detect.1.gz
 man/man4/vmmouse.4x.gz
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
index 6f6aa9c35cce..cba17192fbfe 100644
--- a/x11-drivers/xf86-input-void/Makefile
+++ b/x11-drivers/xf86-input-void/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-void
-PORTVERSION=	1.4.0
-PORTREVISION=	3
+PORTVERSION=	1.4.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-void/distinfo b/x11-drivers/xf86-input-void/distinfo
index 5787ac7fde64..9157858d08c1 100644
--- a/x11-drivers/xf86-input-void/distinfo
+++ b/x11-drivers/xf86-input-void/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-void-1.4.0.tar.bz2) = 2ab95865252c64cc88050fa0089a74e063c357b71907bf9be7886047c4987505
-SIZE (xorg/driver/xf86-input-void-1.4.0.tar.bz2) = 273454
+SHA256 (xorg/driver/xf86-input-void-1.4.1.tar.bz2) = f96e4f0a622821bf43a74bd419f2a18423343996c9d243c7e1430ba2d142339c
+SIZE (xorg/driver/xf86-input-void-1.4.1.tar.bz2) = 271597
diff --git a/x11-drivers/xf86-input-wacom/Makefile b/x11-drivers/xf86-input-wacom/Makefile
index 2685a2cae07c..acb22792c32c 100644
--- a/x11-drivers/xf86-input-wacom/Makefile
+++ b/x11-drivers/xf86-input-wacom/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-wacom
 PORTVERSION=	0.31.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 MASTER_SITES=	SF/linuxwacom/${PORTNAME}
 
diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile
index 628dd5eff346..f1b5628275bd 100644
--- a/x11-drivers/xf86-video-apm/Makefile
+++ b/x11-drivers/xf86-video-apm/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-apm
 PORTVERSION=	1.2.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
index 4c5b279fac6d..44c723868e1b 100644
--- a/x11-drivers/xf86-video-ark/Makefile
+++ b/x11-drivers/xf86-video-ark/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-ark
 PORTVERSION=	0.7.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati-ums/Makefile b/x11-drivers/xf86-video-ati-ums/Makefile
deleted file mode 100644
index 37ecc714a0fa..000000000000
--- a/x11-drivers/xf86-video-ati-ums/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	xf86-video-ati
-PORTVERSION=	6.14.6
-PORTREVISION=	5
-PKGNAMESUFFIX=	-ums
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org ati display driver
-
-USE_GL=		gl
-XORG_CAT=	driver
-USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
-
-CONFIGURE_ARGS+=--disable-kms
-INSTALL_TARGET=	install-strip
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ati-ums/distinfo b/x11-drivers/xf86-video-ati-ums/distinfo
deleted file mode 100644
index baa6ed57a8e1..000000000000
--- a/x11-drivers/xf86-video-ati-ums/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36
-SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495
diff --git a/x11-drivers/xf86-video-ati-ums/files/patch-configure b/x11-drivers/xf86-video-ati-ums/files/patch-configure
deleted file mode 100644
index bfb78a38d7e0..000000000000
--- a/x11-drivers/xf86-video-ati-ums/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	2012-06-29 13:47:16 UTC
-+++ configure
-@@ -17642,10 +17642,6 @@ else
- fi
- 
- 
--
--$as_echo "#define USE_XAA 1" >>confdefs.h
--
--
- # Properly handle EXA.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable EXA support" >&5
- $as_echo_n "checking whether to enable EXA support... " >&6; }
diff --git a/x11-drivers/xf86-video-ati-ums/files/patch-configure.ac b/x11-drivers/xf86-video-ati-ums/files/patch-configure.ac
deleted file mode 100644
index 0f2801886530..000000000000
--- a/x11-drivers/xf86-video-ati-ums/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2012-06-29 13:46:11 UTC
-+++ configure.ac
-@@ -163,8 +163,6 @@ fi
- AM_CONDITIONAL(DRM_MODE, test x$DRM_MODE = xyes)
- AM_CONDITIONAL(LIBUDEV, test x$LIBUDEV = xyes)
- 
--AC_DEFINE(USE_XAA, 1, [Build support for XAA])
--
- # Properly handle EXA.
- AC_MSG_CHECKING([whether to enable EXA support])
- if test "x$EXA" = xyes; then
diff --git a/x11-drivers/xf86-video-ati-ums/files/patch-src__radeon_dri2.c b/x11-drivers/xf86-video-ati-ums/files/patch-src__radeon_dri2.c
deleted file mode 100644
index 144b7de36261..000000000000
--- a/x11-drivers/xf86-video-ati-ums/files/patch-src__radeon_dri2.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/radeon_dri2.c.orig	2012-06-25 08:19:41 UTC
-+++ src/radeon_dri2.c
-@@ -590,7 +590,7 @@ static void
- radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer data, pointer calldata)
- {
-     DRI2ClientEventsPtr pClientEventsPriv;
--    DRI2FrameEventPtr ref;
-+    DRI2FrameEventPtr ref = NULL;
-     NewClientInfoRec *clientinfo = calldata;
-     ClientPtr pClient = clientinfo->client;
-     pClientEventsPriv = GetDRI2ClientEvents(pClient);
diff --git a/x11-drivers/xf86-video-ati-ums/files/patch-src_radeon__driver.c b/x11-drivers/xf86-video-ati-ums/files/patch-src_radeon__driver.c
deleted file mode 100644
index d00590c13a4a..000000000000
--- a/x11-drivers/xf86-video-ati-ums/files/patch-src_radeon__driver.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/radeon_driver.c.orig	2012-06-25 08:19:41 UTC
-+++ src/radeon_driver.c
-@@ -3756,7 +3756,6 @@ Bool RADEONScreenInit(SCREEN_INIT_ARGS_D
-     /* Backing store setup */
-     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
- 		   "Initializing backing store\n");
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
- 
-     /* DRI finalisation */
diff --git a/x11-drivers/xf86-video-ati-ums/files/patch-src_radeon_accel.c b/x11-drivers/xf86-video-ati-ums/files/patch-src_radeon_accel.c
deleted file mode 100644
index 73d311a98c82..000000000000
--- a/x11-drivers/xf86-video-ati-ums/files/patch-src_radeon_accel.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/radeon_accel.c.orig	2012-06-25 10:19:41.000000000 +0200
-+++ src/radeon_accel.c	2012-07-30 02:11:51.000000000 +0200
-@@ -967,10 +967,9 @@
- 
- 	    for (; nwords > 0; --nwords, ++d, ++s)
- #ifdef __powerpc__
--		asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
-+		asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
- #else
--		*d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
--			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
-+		*d = (*s >> 8) | (*s << 8);
- #endif
- 	    return;
-         }
diff --git a/x11-drivers/xf86-video-ati-ums/pkg-descr b/x11-drivers/xf86-video-ati-ums/pkg-descr
deleted file mode 100644
index fe1b01b2281a..000000000000
--- a/x11-drivers/xf86-video-ati-ums/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-video-ati driver.
diff --git a/x11-drivers/xf86-video-ati-ums/pkg-plist b/x11-drivers/xf86-video-ati-ums/pkg-plist
deleted file mode 100644
index f2276d0cc921..000000000000
--- a/x11-drivers/xf86-video-ati-ums/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-lib/xorg/modules/drivers/ati_drv.so
-lib/xorg/modules/drivers/radeon_drv.so
-lib/xorg/modules/multimedia/theatre200_drv.so
-lib/xorg/modules/multimedia/theatre_detect_drv.so
-lib/xorg/modules/multimedia/theatre_drv.so
-man/man4/ati.4x.gz
-man/man4/radeon.4x.gz
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index 3f7cb4341fb5..16904db63923 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-ati
 PORTVERSION=	7.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
index defe938e66c0..7618f8563c2f 100644
--- a/x11-drivers/xf86-video-chips/Makefile
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-chips
-PORTVERSION=	1.2.5
-PORTREVISION=	5
+PORTVERSION=	1.2.6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo
index a6eb707f460c..287632a10e7e 100644
--- a/x11-drivers/xf86-video-chips/distinfo
+++ b/x11-drivers/xf86-video-chips/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2
-SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 398804
+SHA256 (xorg/driver/xf86-video-chips-1.2.6.tar.bz2) = 99aef5cf9f58391eefab5b4983814f417fd1cf2e4a0f93564de1e9bd75636b1c
+SIZE (xorg/driver/xf86-video-chips-1.2.6.tar.bz2) = 413528
diff --git a/x11-drivers/xf86-video-chips/files/patch-src_ct__driver.c b/x11-drivers/xf86-video-chips/files/patch-src_ct__driver.c
deleted file mode 100644
index 2737a0f247d3..000000000000
--- a/x11-drivers/xf86-video-chips/files/patch-src_ct__driver.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/ct_driver.c.orig	2012-07-16 03:35:59 UTC
-+++ src/ct_driver.c
-@@ -96,9 +96,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
- 
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- /* All drivers using the mi banking wrapper need this */
- #ifdef HAVE_ISA
- #include "mibank.h"
-@@ -4145,7 +4142,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
- 	    pBankInfo = NULL;
- 	    return FALSE;
- 	}
--	miInitializeBackingStore(pScreen);
- 	xf86SetBackingStore(pScreen);
- 
- 	/* Initialise cursor functions */
-@@ -4296,7 +4292,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
- 	    }
- 	}
- 	
--	miInitializeBackingStore(pScreen);
- 	xf86SetBackingStore(pScreen);
- #ifdef ENABLE_SILKEN_MOUSE
- 	xf86SetSilkenMouse(pScreen);
diff --git a/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
deleted file mode 100644
index 2ec5982b0be0..000000000000
--- a/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
---- util/Makefile.am.orig	2013-03-25 20:49:28.885754151 +0100
-+++ util/Makefile.am	2013-03-25 20:50:10.467748226 +0100
-@@ -3,7 +3,7 @@
- noinst_PROGRAMS = dRegs mRegs modClock memClock
- endif
- 
--dRegs_SOURCES = dRegs.c AsmMacros.h
--mRegs_SOURCES = mRegs.c AsmMacros.h
--modClock_SOURCES = modClock.c AsmMacros.h
-+dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
-+mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
-+modClock_SOURCES = modClock.c AsmMacros.h iopl.h
- memClock_SOURCES = modClock.c AsmMacros.h
diff --git a/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
deleted file mode 100644
index b8d96245a190..000000000000
--- a/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- util/Makefile.in.orig	2013-03-25 20:50:53.827746698 +0100
-+++ util/Makefile.in	2013-03-25 20:50:55.499747558 +0100
-@@ -238,9 +238,9 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--dRegs_SOURCES = dRegs.c AsmMacros.h
--mRegs_SOURCES = mRegs.c AsmMacros.h
--modClock_SOURCES = modClock.c AsmMacros.h
-+dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
-+mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
-+modClock_SOURCES = modClock.c AsmMacros.h iopl.h
- memClock_SOURCES = modClock.c AsmMacros.h
- all: all-am
- 
diff --git a/x11-drivers/xf86-video-chips/files/patch-util_iopl.h b/x11-drivers/xf86-video-chips/files/patch-util_iopl.h
deleted file mode 100644
index 50db4d1a3700..000000000000
--- a/x11-drivers/xf86-video-chips/files/patch-util_iopl.h
+++ /dev/null
@@ -1,63 +0,0 @@
---- util/iopl.h.orig	2013-03-25 20:48:15.486758154 +0100
-+++ util/iopl.h	2013-03-25 20:47:56.000000000 +0100
-@@ -0,0 +1,60 @@
-+#ifdef __NetBSD__
-+#  include <sys/types.h>
-+#  include <machine/pio.h>
-+#  include <machine/sysarch.h>
-+#else
-+#  if defined(__linux__)
-+/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
-+ * #    include <sys/io.h>
-+ */
-+int iopl(int level);
-+#  endif
-+#  if defined(SVR4) && defined(i386)
-+#    include <sys/types.h>
-+#    ifdef NCR
-+       /* broken NCR <sys/sysi86.h> */
-+#      define __STDC
-+#      include <sys/sysi86.h>
-+#      undef __STDC
-+#    else
-+#      include <sys/sysi86.h>
-+#    endif
-+#    ifdef SVR4
-+#      if !defined(sun)
-+#        include <sys/seg.h>
-+#      endif
-+#    endif
-+#    include <sys/v86.h>
-+#    if defined(sun)
-+#      include <sys/psw.h>
-+#    endif
-+#  endif
-+#  include "AsmMacros.h"
-+#endif /* NetBSD */
-+
-+#include <unistd.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#ifdef __NetBSD__
-+#  define SET_IOPL() i386_iopl(3)
-+#  define RESET_IOPL() i386_iopl(0)
-+#else
-+#  if defined(SVR4) && defined(i386)
-+#    ifndef SI86IOPL
-+#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
-+#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
-+#    else
-+#      define SET_IOPL() sysi86(SI86IOPL,3)
-+#      define RESET_IOPL() sysi86(SI86IOPL,0)
-+#    endif
-+#  else
-+#    ifdef linux
-+#      define SET_IOPL() iopl(3)
-+#      define RESET_IOPL() iopl(0)
-+#    else
-+#      define SET_IOPL() (void)0
-+#      define RESET_IOPL() (void)0
-+#    endif
-+#  endif
-+#endif
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
index ac2b50e3a3f4..fbc8d9b03f35 100644
--- a/x11-drivers/xf86-video-cirrus/Makefile
+++ b/x11-drivers/xf86-video-cirrus/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-cirrus
-PORTVERSION=	1.5.2
-PORTREVISION=	5
+PORTVERSION=	1.5.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cirrus/distinfo b/x11-drivers/xf86-video-cirrus/distinfo
index cd297e476047..4360800ad435 100644
--- a/x11-drivers/xf86-video-cirrus/distinfo
+++ b/x11-drivers/xf86-video-cirrus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
-SIZE (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 327547
+SHA256 (xorg/driver/xf86-video-cirrus-1.5.3.tar.bz2) = edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab
+SIZE (xorg/driver/xf86-video-cirrus-1.5.3.tar.bz2) = 338930
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
index d0f9426b6c3f..14de28233c40 100644
--- a/x11-drivers/xf86-video-dummy/Makefile
+++ b/x11-drivers/xf86-video-dummy/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-dummy
 PORTVERSION=	0.3.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
index 5b3ae501c650..73457eb9f00f 100644
--- a/x11-drivers/xf86-video-fbdev/Makefile
+++ b/x11-drivers/xf86-video-fbdev/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-fbdev
 PORTVERSION=	0.4.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
index 89e7c3adb1b4..f8ac400cef6d 100644
--- a/x11-drivers/xf86-video-glint/Makefile
+++ b/x11-drivers/xf86-video-glint/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-glint
 PORTVERSION=	1.2.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
index e4d853847c58..dad6c5bf46f8 100644
--- a/x11-drivers/xf86-video-i128/Makefile
+++ b/x11-drivers/xf86-video-i128/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-i128
 PORTVERSION=	1.3.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
index 3efba7c01b21..9e940e82a8ce 100644
--- a/x11-drivers/xf86-video-i740/Makefile
+++ b/x11-drivers/xf86-video-i740/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-i740
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index a47c24e9d9dc..3157ebe21c35 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xf86-video-intel
 PORTVERSION=	2.21.15
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile
index 18e0fd5dd79e..67e231079626 100644
--- a/x11-drivers/xf86-video-mach64/Makefile
+++ b/x11-drivers/xf86-video-mach64/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-mach64
-PORTVERSION=	6.9.4
-PORTREVISION=	5
+PORTVERSION=	6.9.5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-mach64/distinfo b/x11-drivers/xf86-video-mach64/distinfo
index 9a74999e34fa..a17476cfa588 100644
--- a/x11-drivers/xf86-video-mach64/distinfo
+++ b/x11-drivers/xf86-video-mach64/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-mach64-6.9.4.tar.bz2) = 97f108b8d7c0a8426bef9562683323ab6369956f18b0e220ee0d1a66b740855e
-SIZE (xorg/driver/xf86-video-mach64-6.9.4.tar.bz2) = 517239
+SHA256 (xorg/driver/xf86-video-mach64-6.9.5.tar.bz2) = 3e98985b6e044189efd42342862208f472881c25debf22230a1d54a96d71b41f
+SIZE (xorg/driver/xf86-video-mach64-6.9.5.tar.bz2) = 520883
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index 50de347658ea..2659797742f2 100644
--- a/x11-drivers/xf86-video-mga/Makefile
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-mga
 PORTVERSION=	1.6.4
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	x11-drivers
 
diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
index a095adc70b98..2d6591a5c763 100644
--- a/x11-drivers/xf86-video-neomagic/Makefile
+++ b/x11-drivers/xf86-video-neomagic/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-neomagic
-PORTVERSION=	1.2.8
-PORTREVISION=	6
+PORTVERSION=	1.2.9
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-neomagic/distinfo b/x11-drivers/xf86-video-neomagic/distinfo
index cfe2a2187d04..f257b0b9e6c0 100644
--- a/x11-drivers/xf86-video-neomagic/distinfo
+++ b/x11-drivers/xf86-video-neomagic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-neomagic-1.2.8.tar.bz2) = 50abf6ac02547900edeaa5073c5f6d2f153f12dd47067cc7e4758e1b74d78874
-SIZE (xorg/driver/xf86-video-neomagic-1.2.8.tar.bz2) = 334223
+SHA256 (xorg/driver/xf86-video-neomagic-1.2.9.tar.bz2) = 72f89396b10527549337cb72a7eafb1194cf140144f9236a94ad2becdf140bf2
+SIZE (xorg/driver/xf86-video-neomagic-1.2.9.tar.bz2) = 340789
diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile
index 4a0cad92f7ed..d65548cc6e68 100644
--- a/x11-drivers/xf86-video-nv/Makefile
+++ b/x11-drivers/xf86-video-nv/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-nv
 PORTVERSION=	2.1.20
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile
index e153139b9e07..4ab6773a781d 100644
--- a/x11-drivers/xf86-video-openchrome/Makefile
+++ b/x11-drivers/xf86-video-openchrome/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-openchrome
 PORTVERSION=	0.3.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile
index 95d33649bf1e..15b2a4a3a8f2 100644
--- a/x11-drivers/xf86-video-r128/Makefile
+++ b/x11-drivers/xf86-video-r128/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-r128
-PORTVERSION=	6.9.2
-PORTREVISION=	5
+PORTVERSION=	6.10.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-r128/distinfo b/x11-drivers/xf86-video-r128/distinfo
index fbb5aa3c3d98..d2e9f01814aa 100644
--- a/x11-drivers/xf86-video-r128/distinfo
+++ b/x11-drivers/xf86-video-r128/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-r128-6.9.2.tar.bz2) = 8b2d295f1842d07304a75da1cfb9bf139b320a6539970eaf8d5ecc010cd36ee0
-SIZE (xorg/driver/xf86-video-r128-6.9.2.tar.bz2) = 462266
+SHA256 (xorg/driver/xf86-video-r128-6.10.0.tar.bz2) = 80d531a07168230a408b88809a5440cfd48f9098666d12702d0012148a0d353d
+SIZE (xorg/driver/xf86-video-r128-6.10.0.tar.bz2) = 494884
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
index 9888f66bd602..15949523f523 100644
--- a/x11-drivers/xf86-video-rendition/Makefile
+++ b/x11-drivers/xf86-video-rendition/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-rendition
 PORTVERSION=	4.2.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c b/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c
index ab994241d18e..5d5bb0047117 100644
--- a/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c
+++ b/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c
@@ -1,5 +1,5 @@
---- src/rendition.c.orig	2012-07-17 05:32:12 UTC
-+++ src/rendition.c
+--- src/rendition.c.orig	2015-10-11 22:31:51.242126000 +0200
++++ src/rendition.c	2015-10-11 22:32:20.465605000 +0200
 @@ -1173,7 +1173,6 @@ renditionScreenInit(SCREEN_INIT_ARGS_DEC
      fbPictureInit (pScreen, 0, 0);
  
@@ -8,3 +8,44 @@
     
      /*********************************************************/
      /* The actual setup of the driver-specific code          */
+@@ -1372,6 +1371,18 @@ renditionMapMem(ScrnInfoPtr pScreenInfo)
+        /* Override on users request */
+     WriteCombine
+ 	= xf86ReturnOptValBool(pRendition->Options, OPTION_FBWC, WriteCombine);
++#ifdef XSERVER_LIBPCIACCESS
++    mapOption = PCI_DEV_MAP_FLAG_WRITABLE;
++    if (WriteCombine)
++	mapOption |= PCI_DEV_MAP_FLAG_WRITE_COMBINE;
++
++    err = pci_device_map_range(pRendition->PciInfo,
++			       pRendition->PciInfo->regions[0].base_addr,
++			       pRendition->PciInfo->regions[0].size,
++			       mapOption, (void *)&pRendition->board.vmem_base);
++
++    return (err == 0);
++#else
+     if (WriteCombine) {
+ 	xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG,
+ 		   ("Requesting Write-Combined memory access\n"));
+@@ -1382,12 +1393,6 @@ renditionMapMem(ScrnInfoPtr pScreenInfo)
+ 	mapOption = VIDMEM_MMIO;
+     }
+ 
+-#ifdef XSERVER_LIBPCIACCESS
+-    err = pci_device_map_region(pRendition->PciInfo, 0, TRUE);
+-    pRendition->board.vmem_base = pRendition->PciInfo->regions[0].memory;
+-
+-    return (err == 0);
+-#else
+     pRendition->board.vmem_base=
+         xf86MapPciMem(pScreenInfo->scrnIndex, mapOption,
+ 		      pRendition->pcitag,
+@@ -1416,7 +1421,7 @@ renditionUnmapMem(ScrnInfoPtr pScreenInf
+ #else
+     pci_device_unmap_range(pRendition->PciInfo, 
+ 			   pRendition->board.vmem_base,
+-			   pScreenInfo->videoRam * 1024);
++			   pRendition->PciInfo->regions[0].size);
+ #endif
+     return TRUE;
+ #ifdef DEBUG0
diff --git a/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h b/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h
index 81b528a854d5..75a5fa411b62 100644
--- a/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h
+++ b/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h
@@ -1,6 +1,16 @@
---- src/rendition.h.orig	2012-07-16 02:42:28 UTC
-+++ src/rendition.h
-@@ -28,9 +28,6 @@
+--- src/rendition.h.orig	2015-10-11 22:31:54.085176000 +0200
++++ src/rendition.h	2015-10-11 22:32:12.657760000 +0200
+@@ -14,9 +14,6 @@
+ /* Everything using inb/outb, etc needs "compiler.h" */
+ #include "compiler.h"
+ 
+-/* Drivers for PCI hardware need this */
+-#include "xf86PciInfo.h"
+-
+ /* Drivers that need to access the PCI config space directly need this */
+ #include "xf86Pci.h"
+ 
+@@ -28,9 +25,6 @@
  /* All drivers initialising the SW cursor need this */
  #include "mipointer.h"
  
@@ -10,3 +20,12 @@
  /* All drivers using the mi colormap manipulation need this */
  #include "micmap.h"
  
+@@ -69,4 +63,8 @@
+ 
+ #include "compat-api.h"
+ /* end of __RENDITION_H__ */
++
++#define PCI_CHIP_V1000 0x0001
++#define PCI_CHIP_V2x00 0x2000
++
+ #endif
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
index 8ccba04b2523..e9d71f2cf38c 100644
--- a/x11-drivers/xf86-video-s3/Makefile
+++ b/x11-drivers/xf86-video-s3/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-s3
 PORTVERSION=	0.6.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
index 40c67152850e..ccd229d5c4bc 100644
--- a/x11-drivers/xf86-video-s3virge/Makefile
+++ b/x11-drivers/xf86-video-s3virge/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-s3virge
-PORTVERSION=	1.10.6
-PORTREVISION=	5
+PORTVERSION=	1.10.7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3virge/distinfo b/x11-drivers/xf86-video-s3virge/distinfo
index 8eabf45be469..1f9a71dec061 100644
--- a/x11-drivers/xf86-video-s3virge/distinfo
+++ b/x11-drivers/xf86-video-s3virge/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e
-SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790
+SHA256 (xorg/driver/xf86-video-s3virge-1.10.7.tar.bz2) = 5dbe68de05483f902fdc48e97ce8d9fdd1d2ade14cb53c0c3642f0259f65a4da
+SIZE (xorg/driver/xf86-video-s3virge-1.10.7.tar.bz2) = 374129
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index 968d308a30d5..00d6c981c843 100644
--- a/x11-drivers/xf86-video-savage/Makefile
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-savage
-PORTVERSION=	2.3.7
-PORTREVISION=	5
+PORTVERSION=	2.3.8
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo
index 766fc87a52e5..e4338f5659ca 100644
--- a/x11-drivers/xf86-video-savage/distinfo
+++ b/x11-drivers/xf86-video-savage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-savage-2.3.7.tar.bz2) = 041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba8cccc54a44
-SIZE (xorg/driver/xf86-video-savage-2.3.7.tar.bz2) = 395249
+SHA256 (xorg/driver/xf86-video-savage-2.3.8.tar.bz2) = fdcea4a86532bceb50095eaf0fe2f38bbfa160e98463b815f4b549eb9985fa63
+SIZE (xorg/driver/xf86-video-savage-2.3.8.tar.bz2) = 418649
diff --git a/x11-drivers/xf86-video-scfb/Makefile b/x11-drivers/xf86-video-scfb/Makefile
index d068e212221f..423476e1e57e 100644
--- a/x11-drivers/xf86-video-scfb/Makefile
+++ b/x11-drivers/xf86-video-scfb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xf86-video-scfb
 PORTVERSION=	0.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	ray@FreeBSD.org
@@ -19,7 +19,7 @@ DIST_SUBDIR=	xorg/driver
 USE_XORG=	xorg-server xproto randrproto xi renderproto xextproto \
 		inputproto kbproto fontsproto videoproto dri2proto \
 		xf86driproto glproto xineramaproto resourceproto \
-		scrnsaverproto
+		scrnsaverproto presentproto
 CONFIGURE_ENV=	DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
 INSTALL_TARGET=	install-strip
 
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
index c67858b0d120..5e265916d9f5 100644
--- a/x11-drivers/xf86-video-siliconmotion/Makefile
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-siliconmotion
-PORTVERSION=	1.7.7
-PORTREVISION=	5
+PORTVERSION=	1.7.8
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo
index 536d2c25ccf7..65ea6f2d2118 100644
--- a/x11-drivers/xf86-video-siliconmotion/distinfo
+++ b/x11-drivers/xf86-video-siliconmotion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa
-SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957
+SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.8.tar.bz2) = e9d449a9fd9e58b4e018447b6c64005f7874cffb1777e513ac9fc41a86071beb
+SIZE (xorg/driver/xf86-video-siliconmotion-1.7.8.tar.bz2) = 398928
diff --git a/x11-drivers/xf86-video-siliconmotion/files/patch-src_smi__driver.c b/x11-drivers/xf86-video-siliconmotion/files/patch-src_smi__driver.c
deleted file mode 100644
index d74ae969cdf8..000000000000
--- a/x11-drivers/xf86-video-siliconmotion/files/patch-src_smi__driver.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/smi_driver.c.orig	2012-07-17 04:53:21 UTC
-+++ src/smi_driver.c
-@@ -1750,8 +1750,6 @@ SMI_ScreenInit(SCREEN_INIT_ARGS_DECL)
- 		   "Done writing mode.  Register dump:\n");
-     SMI_PrintRegs(pScrn);
- 
--    miInitializeBackingStore(pScreen);
--
- #ifdef HAVE_XMODES
-     xf86DiDGAInit(pScreen, (unsigned long)(pSmi->FBBase + pScrn->fbOffset));
- #endif
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index caf13364f693..60e1c9bebc11 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-sis
-PORTVERSION=	0.10.7
-PORTREVISION=	5
+PORTVERSION=	0.10.8
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sis/distinfo b/x11-drivers/xf86-video-sis/distinfo
index 7a8c42ed1fea..a3f0744fe587 100644
--- a/x11-drivers/xf86-video-sis/distinfo
+++ b/x11-drivers/xf86-video-sis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0
-SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = 699499
+SHA256 (xorg/driver/xf86-video-sis-0.10.8.tar.bz2) = c8f3f2577f69334dfcc4bf96477dce45161170555f3abdfa105599e61bc7d3fe
+SIZE (xorg/driver/xf86-video-sis-0.10.8.tar.bz2) = 734785
diff --git a/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c b/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c
index a42b69bce79f..df6ac872fab4 100644
--- a/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c
+++ b/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c
@@ -1,27 +1,6 @@
---- src/sis_driver.c.orig	2012-07-17 05:20:28 UTC
-+++ src/sis_driver.c
-@@ -57,7 +57,6 @@
- #include "fb.h"
- #include "micmap.h"
- #include "mipointer.h"
--#include "mibstore.h"
- #include "edid.h"
- 
- #define SIS_NEED_inSISREG
-@@ -8859,7 +8858,6 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL)
-     }
-     pSiS->SiSFastVidCopyDone = TRUE;
- 
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
- 
-@@ -9351,11 +9349,12 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg,
- 	}
-      }
-      if(doit) {
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 20 /* screw it */
- 	sigstate = xf86BlockSIGIO();
+--- src/sis_driver.c.orig	2015-09-23 09:54:07.196489000 +0200
++++ src/sis_driver.c	2015-09-23 09:56:45.740035000 +0200
+@@ -9390,7 +9390,7 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg,
  #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
          {
              double dx = x, dy = y;
@@ -30,11 +9,3 @@
              x = (int)dx;
              y = (int)dy;
          }
-@@ -9368,6 +9367,7 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg,
- 	miPointerAbsoluteCursor(x, y, currentTime.milliseconds);
- #endif
- 	xf86UnblockSIGIO(sigstate);
-+#endif
- 	return;
-      }
-   }
diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile
index ba1abd9bef32..96849c60cde6 100644
--- a/x11-drivers/xf86-video-sunffb/Makefile
+++ b/x11-drivers/xf86-video-sunffb/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-sunffb
 PORTVERSION=	1.2.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sunffb/files/patch-src_ffb__driver.c b/x11-drivers/xf86-video-sunffb/files/patch-src_ffb__driver.c
new file mode 100644
index 000000000000..a11731b49e7b
--- /dev/null
+++ b/x11-drivers/xf86-video-sunffb/files/patch-src_ffb__driver.c
@@ -0,0 +1,33 @@
+From 181b60190c1f81fc9b9b5deb07d536b78f2536ab Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Mon, 10 Jun 2013 21:51:08 +0200
+Subject: Unbreak when XAA is not present.
+
+Turn accel off if loading XAA fails.
+
+Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+diff --git a/src/ffb_driver.c b/src/ffb_driver.c
+index af13484..7f17d64 100644
+--- src/ffb_driver.c
++++ src/ffb_driver.c
+@@ -413,9 +413,12 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags)
+ 	return FALSE;
+     }
+ 
+-    if (xf86LoadSubModule(pScrn, "xaa") == NULL) {
+-	FFBFreeRec(pScrn);
+-	return FALSE;
++    if (!pFfb->NoAccel) {
++        if (xf86LoadSubModule(pScrn, "xaa") == NULL) {
++            xf86DrvMsg(pScrn->scrnIndex, X_INFO,
++                       "Loading XAA failed, acceleration disabled\n");
++            pFfb->NoAccel = TRUE;
++        }
+     }
+ 
+     if (pFfb->HWCursor && xf86LoadSubModule(pScrn, "ramdac") == NULL) {
+-- 
+cgit v0.10.2
+
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
index 44934653d1a6..61bdc3f8afa1 100644
--- a/x11-drivers/xf86-video-tdfx/Makefile
+++ b/x11-drivers/xf86-video-tdfx/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-tdfx
 PORTVERSION=	1.4.6
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
index 3a8c405d656b..dff0680ecb3d 100644
--- a/x11-drivers/xf86-video-trident/Makefile
+++ b/x11-drivers/xf86-video-trident/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-trident
-PORTVERSION=	1.3.6
-PORTREVISION=	6
+PORTVERSION=	1.3.7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-trident/distinfo b/x11-drivers/xf86-video-trident/distinfo
index db131b880e21..8e9f34afc40c 100644
--- a/x11-drivers/xf86-video-trident/distinfo
+++ b/x11-drivers/xf86-video-trident/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104
-SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 356092
+SHA256 (xorg/driver/xf86-video-trident-1.3.7.tar.bz2) = ecd518de627a0d49e17c158bfc72ab657386c6907c91ef89fa09332558e413ae
+SIZE (xorg/driver/xf86-video-trident-1.3.7.tar.bz2) = 376898
diff --git a/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c b/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c
deleted file mode 100644
index 22bdff27d1ca..000000000000
--- a/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/trident_driver.c.orig	2012-07-16 02:16:00 UTC
-+++ src/trident_driver.c
-@@ -56,7 +56,6 @@
- 
- #include "mipointer.h"
- 
--#include "mibstore.h"
- #include "shadow.h"
- #include "trident.h"
- #include "trident_regs.h"
-@@ -3037,7 +3036,6 @@ TRIDENTScreenInit(SCREEN_INIT_ARGS_DECL)
-     	TridentAccelInit(pScreen);
-     }
- 
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
- 
-     /* Initialise cursor functions */
diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile
index ef4a214de065..59f4b4552008 100644
--- a/x11-drivers/xf86-video-tseng/Makefile
+++ b/x11-drivers/xf86-video-tseng/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-tseng
 PORTVERSION=	1.2.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
index ac29d9e333d5..2a6d248a4854 100644
--- a/x11-drivers/xf86-video-vesa/Makefile
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-vesa
-PORTVERSION=	2.3.3
-PORTREVISION=	5
+PORTVERSION=	2.3.4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vesa/distinfo b/x11-drivers/xf86-video-vesa/distinfo
index f973eae2fb52..867416d7156e 100644
--- a/x11-drivers/xf86-video-vesa/distinfo
+++ b/x11-drivers/xf86-video-vesa/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-vesa-2.3.3.tar.bz2) = ce8b75e5a40e9dae76f2ac9e2880f7f73a848653ca2eed5880f52dc2c0d3aef8
-SIZE (xorg/driver/xf86-video-vesa-2.3.3.tar.bz2) = 300571
+SHA256 (xorg/driver/xf86-video-vesa-2.3.4.tar.bz2) = 7bddf4d879dd6f67088ecb203a31e12334aab980174bd0909930a21f32e251c1
+SIZE (xorg/driver/xf86-video-vesa-2.3.4.tar.bz2) = 285675
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
index 2442ed211214..2113ace6b228 100644
--- a/x11-drivers/xf86-video-voodoo/Makefile
+++ b/x11-drivers/xf86-video-voodoo/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-voodoo
 PORTVERSION=	1.2.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h b/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h
new file mode 100644
index 000000000000..e10001f5135c
--- /dev/null
+++ b/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h
@@ -0,0 +1,23 @@
+From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Mon, 22 Sep 2014 10:56:02 +1000
+Subject: don't use PCITAG in struct anymore
+
+
+diff --git a/src/voodoo.h b/src/voodoo.h
+index bfed497..c3eb64e 100644
+--- src/voodoo.h
++++ src/voodoo.h
+@@ -23,7 +23,9 @@ typedef struct {
+   
+   Bool		      Voodoo2;		/* Set if Voodoo2 */
+   pciVideoPtr	      PciInfo;		/* PCI data */
++#ifndef XSERVER_LIBPCIACCESS
+   PCITAG	      PciTag;
++#endif
+   CARD32	      PhysBase;
+   
+   CARD32	      Width;		/* Current width */
+-- 
+cgit v0.10.2
+