diff --git a/MOVED b/MOVED
index 6a164de..86aa5ba 100644
--- a/MOVED
+++ b/MOVED
@@ -7321,3 +7321,8 @@ textproc/xerces-c2-devel|textproc/xerces-c3|2014-12-12|Unused, conflicting with
 games/empire|games/vms-empire|2014-12-15|Moved to match upstream name
 devel/preps-gui||2014-12-15|Has expired: upstream disappeared
 devel/prepstools||2014-12-15|Has expired: upstream disappeared
+x11-drivers/xf86-input-egalax||2014-12-18|Removed: Depends on removed xorg-server 1.7
+x11-drivers/xf86-video-newport||2014-12-18|Removed: Depends on removed xorg-server 1.12
+x11-drivers/xf86-video-tga||2014-12-18|Removed: Alpha support was removed in FreeBSD 7.0
+x11/nvidia-driver-71||2014-12-18|Removed: Not compatible with xserver 1.14
+x11/nvidia-driver-96||2014-12-18|Removed: Not compatible with xserver 1.14
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk
index d1190fc..f9d2d68 100644
--- a/Mk/bsd.xorg.mk
+++ b/Mk/bsd.xorg.mk
@@ -142,10 +142,6 @@ USE_XORG+=	pciaccess xextproto videoproto fontsproto dri2proto fontutil:build
 
 .endif
 
-.if exists(${LOCALBASE}/bin/X)
-XSERVER_VER!=	${LOCALBASE}/bin/X -version 2>&1 | sed -n 's;^X\.Org X Server \([^ ]*\).*;\1;p'
-.endif
-
 .if defined(_POSTMKINCLUDED) && !defined(Xorg_Post_Include)
 
 Xorg_Post_Include=		bsd.xorg.mk
diff --git a/UPDATING b/UPDATING
index b1f9e7c..b52d90e 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,24 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20141218:
+  AFFECTS: users of x11/xorg and all xorg ports
+  AUTHOR: dumbbell@FreeBSD.org
+
+  The X.Org server (x11-servers/xorg-server) is updated to 1.14. All
+  ports which provide X.Org drivers must be updated simultaneously, i.e.
+  x11-drivers/xf86-*, emulators/virtualbox-ose-additions, net/tigervnc,
+  etc.
+
+  The input device autodetection backend is switched from HAL to devd.
+  If you configure you keyboard layout through HAL .fdi files, you need
+  to migrate this configuration to plain X.Org configuration files.
+
+  Up-to-date instructions and a description of the changes brought by
+  this update are detailed in a blog post:
+
+  http://blogs.freebsdish.org/graphics/2014/11/19/xserver-1-14-update-ready/
+
 20141217:
   AFFECTS: users of lang/perl5.*
   AUTHOR: mat@FreeBSD.org
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index ad14c9c..541188c 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	virtualbox-ose
 DISTVERSION=	4.3.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile
index f974a55..16938e6 100644
--- a/net/tigervnc/Makefile
+++ b/net/tigervnc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tigervnc
 PORTVERSION=	1.3.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net x11-servers
 MASTER_SITES=	SF:tigervnc
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc
@@ -100,7 +100,7 @@ MAKE_ARGS+=	TIGERVNC_SRCDIR=${WRKSRC}
 CONFIGURE_ARGS+=	\
 		--prefix=${PREFIX} --mandir=${PREFIX}/man/ \
 		--docdir=${PREFIX}/share/doc/${PORTNAME}/ --with-pic --without-dtrace \
-		--disable-static --disable-dri \
+		--disable-static --disable-dri --disable-unit-tests \
 		--disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \
 		--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
 		--disable-config-dbus --disable-config-hal \
@@ -109,20 +109,12 @@ CONFIGURE_ARGS+=	\
 		--with-xkb-path=${LOCALBASE}/share/X11/xkb \
 		--with-xkb-bin-directory=${LOCALBASE}/bin \
 		--with-serverconfig-path=${LOCALBASE}/lib/X11 \
-		--disable-selective-werror
-.ifdef WITH_NEW_XORG
-CONFIGURE_ARGS+=	--with-fontrootdir=${LOCALBASE}/share/fonts
-.else
-CONFIGURE_ARGS+=	--with-fontdir=${LOCALBASE}/share/fonts
-.endif
+		--disable-selective-werror \
+		--with-fontrootdir=${LOCALBASE}/share/fonts
 
 .include <bsd.port.pre.mk>
 
-.ifdef WITH_NEW_XORG
-TIGERVNC_XORG_PATCH_VER=	112
-.else
-TIGERVNC_XORG_PATCH_VER=	17
-.endif
+TIGERVNC_XORG_PATCH_VER=	114
 
 # import from x11-server/xorg-server/Makefile
 .ifdef WITH_OPENSSL_BASE
diff --git a/net/tigervnc/files/patch-unix_xserver114.patch b/net/tigervnc/files/patch-unix_xserver114.patch
new file mode 100644
index 0000000..5a5c6aa
--- /dev/null
+++ b/net/tigervnc/files/patch-unix_xserver114.patch
@@ -0,0 +1,11 @@
+--- unix/xserver114.patch.orig	2013-05-08 11:23:13 UTC
++++ unix/xserver114.patch
+@@ -66,7 +66,7 @@ diff -up xserver/mi/miinitext.c.vnc xser
+  #include "globals.h"
+  
+ +#ifdef TIGERVNC
+-+extern void vncExtensionInit(INITARGS);
+++extern void vncExtensionInit(void);
+ +#endif
+ +
+  /* The following is only a small first step towards run-time
diff --git a/x11-drivers/Makefile b/x11-drivers/Makefile
index 3ca4101..b4da56f 100644
--- a/x11-drivers/Makefile
+++ b/x11-drivers/Makefile
@@ -4,7 +4,6 @@
     COMMENT = X11 drivers
 
     SUBDIR += xf86-input-acecad
-    SUBDIR += xf86-input-egalax
     SUBDIR += xf86-input-elographics
     SUBDIR += xf86-input-fpit
     SUBDIR += xf86-input-hyperpen
@@ -32,7 +31,6 @@
     SUBDIR += xf86-video-mach64
     SUBDIR += xf86-video-mga
     SUBDIR += xf86-video-neomagic
-    SUBDIR += xf86-video-newport
     SUBDIR += xf86-video-nv
     SUBDIR += xf86-video-openchrome
     SUBDIR += xf86-video-r128
@@ -45,7 +43,6 @@
     SUBDIR += xf86-video-sis
     SUBDIR += xf86-video-sunffb
     SUBDIR += xf86-video-tdfx
-    SUBDIR += xf86-video-tga
     SUBDIR += xf86-video-trident
     SUBDIR += xf86-video-tseng
     SUBDIR += xf86-video-vesa
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
index d9c30ee..07901d6 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=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-acecad/pkg-plist b/x11-drivers/xf86-input-acecad/pkg-plist
index 1374270..1ea1bfd 100644
--- a/x11-drivers/xf86-input-acecad/pkg-plist
+++ b/x11-drivers/xf86-input-acecad/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/input/acecad_drv.so
 man/man4/acecad.4x.gz
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-egalax/Makefile b/x11-drivers/xf86-input-egalax/Makefile
deleted file mode 100644
index c64aaae..0000000
--- a/x11-drivers/xf86-input-egalax/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: Gleb Smirnoff <glebius@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	xf86-input-egalax
-PORTVERSION=	0.2
-PORTREVISION=	2
-CATEGORIES=	x11-drivers
-MASTER_SITES=	LOCAL/glebius
-
-MAINTAINER=	glebius@FreeBSD.org
-COMMENT=	eGalax touch screen input driver for X.Org
-
-LICENSE=	BSD2CLAUSE
-
-XORG_CAT=	driver
-INSTALL_CMD=	install-strip
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_NEW_XORG)
-IGNORE=		does not build with X server 1.12
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/x11-drivers/xf86-input-egalax/distinfo b/x11-drivers/xf86-input-egalax/distinfo
deleted file mode 100644
index 44b527e..0000000
--- a/x11-drivers/xf86-input-egalax/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-input-egalax-0.2.tar.bz2) = 4396e74bd6db1f8ce4f6a95deacfd1209f01e78362a7379af970ec0e6023f895
-SIZE (xorg/driver/xf86-input-egalax-0.2.tar.bz2) = 189887
diff --git a/x11-drivers/xf86-input-egalax/pkg-descr b/x11-drivers/xf86-input-egalax/pkg-descr
deleted file mode 100644
index 731bf6e2..0000000
--- a/x11-drivers/xf86-input-egalax/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-input-egalax driver. See also uep(4).
diff --git a/x11-drivers/xf86-input-egalax/pkg-plist b/x11-drivers/xf86-input-egalax/pkg-plist
deleted file mode 100644
index 63a9d8d..0000000
--- a/x11-drivers/xf86-input-egalax/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/input/egalax_drv.so
-man/man4/egalax.4x.gz
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile
index 2da350f..ae0699d 100644
--- a/x11-drivers/xf86-input-elographics/Makefile
+++ b/x11-drivers/xf86-input-elographics/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-elographics
-PORTVERSION=	${ELO_VERSION}
-PORTREVISION=	${ELO_REVISION}
+PORTVERSION=	1.4.1
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,14 +10,4 @@ COMMENT=	X.Org elographics input driver
 
 XORG_CAT=	driver
 
-.include <bsd.port.options.mk>
-
-.if defined(WITH_NEW_XORG)
-ELO_VERSION=	1.4.1
-ELO_REVISION=	2
-.else
-ELO_VERSION=	1.2.4
-ELO_REVISION=	2
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-elographics/distinfo b/x11-drivers/xf86-input-elographics/distinfo
index ab72654..f726f44 100644
--- a/x11-drivers/xf86-input-elographics/distinfo
+++ b/x11-drivers/xf86-input-elographics/distinfo
@@ -1,4 +1,2 @@
-SHA256 (xorg/driver/xf86-input-elographics-1.2.4.tar.bz2) = dfede47c14c40e51294c84bf8f9bec5f5e0b17c80f370ae2ac6bddad79f9e66b
-SIZE (xorg/driver/xf86-input-elographics-1.2.4.tar.bz2) = 259101
 SHA256 (xorg/driver/xf86-input-elographics-1.4.1.tar.bz2) = a21af744d57f158e6dff9d60a68aaac46b8d726d602911940cb61f4d6bb2c6a4
 SIZE (xorg/driver/xf86-input-elographics-1.4.1.tar.bz2) = 280311
diff --git a/x11-drivers/xf86-input-elographics/pkg-plist b/x11-drivers/xf86-input-elographics/pkg-plist
index 743dc1b..3863f8a 100644
--- a/x11-drivers/xf86-input-elographics/pkg-plist
+++ b/x11-drivers/xf86-input-elographics/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/input/elographics_drv.so
 man/man4/elographics.4x.gz
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile
index 97f4313..09a989e 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=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -11,10 +11,4 @@ COMMENT=	X.Org fpit input driver
 XORG_CAT=	driver
 USE_XORG=	xrandr
 
-.include <bsd.port.options.mk>
-
-.if !defined(WITH_NEW_XORG)
-IGNORE=		does not build with X server 1.7.7
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-fpit/pkg-plist b/x11-drivers/xf86-input-fpit/pkg-plist
index 2d84806..977039d 100644
--- a/x11-drivers/xf86-input-fpit/pkg-plist
+++ b/x11-drivers/xf86-input-fpit/pkg-plist
@@ -1,7 +1,3 @@
 lib/xorg/modules/input/fpit_drv.so
 share/X11/xorg.conf.d/50-fpit.conf
 man/man4/fpit.4x.gz
-@dirrmtry share/X11/xorg.conf.d
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile
index 3e329ec..0c26876 100644
--- a/x11-drivers/xf86-input-hyperpen/Makefile
+++ b/x11-drivers/xf86-input-hyperpen/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-hyperpen
-PORTVERSION=	${HYPERVER}
-PORTREVISION=	${HYPERREVISION}
+PORTVERSION=	1.4.1
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,15 +10,4 @@ COMMENT=	X.Org hyperpen input driver
 
 XORG_CAT=	driver
 
-.include <bsd.port.options.mk>
-
-.if defined(WITH_NEW_XORG)
-HYPERVER=	1.4.1
-HYPERREVISION=	2
-.else
-HYPERVER=	1.3.0
-HYPERREVISION=	8
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-hyperpen/distinfo b/x11-drivers/xf86-input-hyperpen/distinfo
index 7ccfb9b..37edd2b 100644
--- a/x11-drivers/xf86-input-hyperpen/distinfo
+++ b/x11-drivers/xf86-input-hyperpen/distinfo
@@ -1,4 +1,2 @@
-SHA256 (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = e7a13a7597fa32f05d595d05a66cf94c529ba8ce1d03249bb9da5be9512c4b7b
-SIZE (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = 236593
 SHA256 (xorg/driver/xf86-input-hyperpen-1.4.1.tar.bz2) = 31a816f032a2adf4be10909811831191a7528152347e1726b04810ff88436816
 SIZE (xorg/driver/xf86-input-hyperpen-1.4.1.tar.bz2) = 266891
diff --git a/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c b/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c
deleted file mode 100644
index 7071307..0000000
--- a/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c
+++ /dev/null
@@ -1,75 +0,0 @@
---- src/xf86HyperPen.c.orig	2009-02-26 16:31:24.000000000 -0600
-+++ src/xf86HyperPen.c	2010-05-03 12:29:11.000000000 -0500
-@@ -719,6 +719,9 @@
- {
-     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;
-     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+    Atom axis_labels[3] = { 0 };
-+#endif
- 
-     if (xf86HypOpen(local) != Success) {
- 	if (local->fd >= 0) {
-@@ -730,6 +733,9 @@
- /* Set the real values */
-     InitValuatorAxisStruct(pHyp,
- 			   0,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+			   axis_labels[0],
-+#endif
- 			   0, /* min val */
- 			   priv->hypXSize, /* max val */
- 			   LPI2CPM(priv->hypRes), /* resolution */
-@@ -737,6 +743,9 @@
- 			   LPI2CPM(priv->hypRes)); /* max_res */
-     InitValuatorAxisStruct(pHyp,
- 			   1,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+			   axis_labels[1],
-+#endif
- 			   0, /* min val */
- 			   priv->hypYSize, /* max val */
- 			   LPI2CPM(priv->hypRes), /* resolution */
-@@ -744,6 +753,9 @@
- 			   LPI2CPM(priv->hypRes)); /* max_res */
-     InitValuatorAxisStruct(pHyp,
- 			   2,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+			   axis_labels[2],
-+#endif
- 			   0, /* min val */
- 			   511, /* max val */
- 			   512, /* resolution */
-@@ -765,8 +777,10 @@
-     int			loop;
-     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;
-     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);
--
--
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+    Atom btn_labels[4] = { 0 };
-+    Atom axis_labels[3] = { 0 };
-+#endif
- 
-     switch (what) {
- 	case DEVICE_INIT:
-@@ -779,6 +793,9 @@
- 
- 	    if (InitButtonClassDeviceStruct(pHyp,
- 					    nbbuttons,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+					    btn_labels,
-+#endif
- 					    map) == FALSE) {
- 		ErrorF("unable to allocate Button class device\n");
- 		return !Success;
-@@ -802,6 +819,9 @@
- 
- 	    if (InitValuatorClassDeviceStruct(pHyp,
- 		   nbaxes,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+		   axis_labels,
-+#endif
- #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
- 		   xf86GetMotionEvents,
- #endif
diff --git a/x11-drivers/xf86-input-hyperpen/pkg-plist b/x11-drivers/xf86-input-hyperpen/pkg-plist
index ac8638a..7633c54 100644
--- a/x11-drivers/xf86-input-hyperpen/pkg-plist
+++ b/x11-drivers/xf86-input-hyperpen/pkg-plist
@@ -1,4 +1 @@
 lib/xorg/modules/input/hyperpen_drv.so
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
index d68cde4..0514a0c 100644
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-joystick
-PORTVERSION=	${JOYVER}
-PORTREVISION=	${JOYREVISION}
+PORTVERSION=	1.6.2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,16 +10,6 @@ COMMENT=	X.Org joystick input driver
 
 XORG_CAT=	driver
 
-.include <bsd.port.options.mk>
-
-.if defined(WITH_NEW_XORG)
-JOYVER=		1.6.2
-JOYREVISION=	2
-.else
-JOYVER=		1.5.0
-JOYREVISION=	3
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile.in
diff --git a/x11-drivers/xf86-input-joystick/distinfo b/x11-drivers/xf86-input-joystick/distinfo
index 821ce73..e1266a3 100644
--- a/x11-drivers/xf86-input-joystick/distinfo
+++ b/x11-drivers/xf86-input-joystick/distinfo
@@ -1,4 +1,2 @@
-SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
-SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
 SHA256 (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d
 SIZE (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = 327539
diff --git a/x11-drivers/xf86-input-joystick/pkg-plist b/x11-drivers/xf86-input-joystick/pkg-plist
index f51b691..b4d8547 100644
--- a/x11-drivers/xf86-input-joystick/pkg-plist
+++ b/x11-drivers/xf86-input-joystick/pkg-plist
@@ -2,6 +2,3 @@ include/xorg/joystick-properties.h
 lib/xorg/modules/input/joystick_drv.so
 libdata/pkgconfig/xorg-joystick.pc
 man/man4/joystick.4x.gz
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 61d5944..23bdd4b 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-keyboard
 PORTVERSION=	1.8.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-keyboard/pkg-plist b/x11-drivers/xf86-input-keyboard/pkg-plist
index 26a84c9..66a716e 100644
--- a/x11-drivers/xf86-input-keyboard/pkg-plist
+++ b/x11-drivers/xf86-input-keyboard/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/input/kbd_drv.so
 man/man4/kbd.4x.gz
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index 324b18b6..c70cd0e 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-mouse
 PORTVERSION=	1.9.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mouse/pkg-plist b/x11-drivers/xf86-input-mouse/pkg-plist
index 1df1af7..0d937b1 100644
--- a/x11-drivers/xf86-input-mouse/pkg-plist
+++ b/x11-drivers/xf86-input-mouse/pkg-plist
@@ -2,7 +2,3 @@ include/xorg/xf86-mouse-properties.h
 lib/xorg/modules/input/mouse_drv.so
 libdata/pkgconfig/xorg-mouse.pc
 man/man4/mousedrv.4x.gz
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
-@dirrmtry include/xorg
diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile
index 7eb63ca..0a54bf4 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=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,10 +10,4 @@ COMMENT=	X.Org mutouch input driver
 
 XORG_CAT=	driver
 
-.include <bsd.port.options.mk>
-
-.if !defined(WITH_NEW_XORG)
-IGNORE=		does not build with xorg-server 1.7.7
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-mutouch/pkg-plist b/x11-drivers/xf86-input-mutouch/pkg-plist
index d431104..b578946 100644
--- a/x11-drivers/xf86-input-mutouch/pkg-plist
+++ b/x11-drivers/xf86-input-mutouch/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/input/mutouch_drv.so
 man/man4/mutouch.4x.gz
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile
index c29c1d50..e0d77ee 100644
--- a/x11-drivers/xf86-input-penmount/Makefile
+++ b/x11-drivers/xf86-input-penmount/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-penmount
-PORTVERSION=	${PEN_VERSION}
-PORTREVISION=	${PEN_REVISION}
+PORTVERSION=	1.5.0
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,14 +10,4 @@ COMMENT=	X.Org penmount input driver
 
 XORG_CAT=	driver
 
-.include <bsd.port.options.mk>
-
-.if defined(WITH_NEW_XORG)
-PEN_VERSION=	1.5.0
-PEN_REVISION=	2
-.else
-PEN_VERSION=	1.4.1
-PEN_REVISION=	3
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-penmount/distinfo b/x11-drivers/xf86-input-penmount/distinfo
index 0b6998d..d8eaa47 100644
--- a/x11-drivers/xf86-input-penmount/distinfo
+++ b/x11-drivers/xf86-input-penmount/distinfo
@@ -1,4 +1,2 @@
-SHA256 (xorg/driver/xf86-input-penmount-1.4.1.tar.bz2) = 6f281a7bce9db34772bcf762eb0ed57b8121a204a6f15d5405fe870a0af57182
-SIZE (xorg/driver/xf86-input-penmount-1.4.1.tar.bz2) = 255951
 SHA256 (xorg/driver/xf86-input-penmount-1.5.0.tar.bz2) = f45a85911a59647ba24f84c15f49d31d5f62a9bb86ca56881bf3ecbc21113ce7
 SIZE (xorg/driver/xf86-input-penmount-1.5.0.tar.bz2) = 276864
diff --git a/x11-drivers/xf86-input-penmount/pkg-plist b/x11-drivers/xf86-input-penmount/pkg-plist
index 154995f..d68df5d 100644
--- a/x11-drivers/xf86-input-penmount/pkg-plist
+++ b/x11-drivers/xf86-input-penmount/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/input/penmount_drv.so
 man/man4/penmount.4x.gz
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index cd070cc..064b462 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-synaptics
-PORTVERSION=	${SYNAPTICS_VERSION}
-PORTREVISION=	${SYNAPTICS_REVISION}
+PORTVERSION=	1.7.4
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,17 +14,4 @@ USES=		pathfix
 USE_XORG=	x11 xtst
 XORG_CAT=	driver
 
-.include <bsd.port.options.mk>
-
-.if defined(WITH_NEW_XORG)
-SYNAPTICS_VERSION=	1.7.4
-SYNAPTICS_REVISION=	2
-PLIST_SUB+=	NEW="" OLD="@comment "
-.else
-SYNAPTICS_VERSION=	1.6.4
-SYNAPTICS_REVISION=	2
-PLIST_SUB+=	NEW="@comment " OLD=""
-EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo
index a7440fb..47b09f2 100644
--- a/x11-drivers/xf86-input-synaptics/distinfo
+++ b/x11-drivers/xf86-input-synaptics/distinfo
@@ -1,4 +1,2 @@
-SHA256 (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = fe15b1afc61b40800f74a0dcf976c15b299ca0680ae5e537baef543455a732ee
-SIZE (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = 447004
 SHA256 (xorg/driver/xf86-input-synaptics-1.7.4.tar.bz2) = 56a2d2df7bd39e29f56102c62f153e023f3e9b2f5e255309d33fab8e81945af7
 SIZE (xorg/driver/xf86-input-synaptics-1.7.4.tar.bz2) = 451614
diff --git a/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in b/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
deleted file mode 100644
index 957f9fc..0000000
--- a/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2013-04-04 14:47:16.881259598 +0200
-+++ Makefile.in	2013-04-04 14:47:20.568244417 +0200
-@@ -321,7 +321,7 @@
- 	--with-sdkdir='$${includedir}/xorg' \
- 	--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
- 
--SUBDIRS = include src man tools conf test
-+SUBDIRS = include src man tools test
- MAINTAINERCLEANFILES = ChangeLog INSTALL
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = xorg-synaptics.pc
diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist
index 10ce5a3..bcb4e1c 100644
--- a/x11-drivers/xf86-input-synaptics/pkg-plist
+++ b/x11-drivers/xf86-input-synaptics/pkg-plist
@@ -1,15 +1,9 @@
 bin/synclient
 bin/syndaemon
 include/xorg/synaptics-properties.h
-%%OLD%%include/xorg/synaptics.h
 lib/xorg/modules/input/synaptics_drv.so
 libdata/pkgconfig/xorg-synaptics.pc
 man/man1/synclient.1.gz
 man/man1/syndaemon.1.gz
 man/man4/synaptics.4x.gz
-%%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
-%%NEW%%@dirrmtry share/X11/xorg.conf.d
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
-@dirrmtry include/xorg
+share/X11/xorg.conf.d/50-synaptics.conf
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
index 4d1752f..63ac525 100644
--- a/x11-drivers/xf86-input-vmmouse/Makefile
+++ b/x11-drivers/xf86-input-vmmouse/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xf86-input-vmmouse
 PORTVERSION=	13.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -18,12 +18,4 @@ CONFIGURE_ARGS=	--with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	The vmmouse protocol is only supported on x86-compatible architectures.
 
-.include <bsd.port.options.mk>
-
-.if defined(WITH_NEW_XORG)
-PLIST_SUB+=	NEW=""
-.else
-PLIST_SUB+=	NEW="@comment "
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-vmmouse/pkg-plist b/x11-drivers/xf86-input-vmmouse/pkg-plist
index b9caa46..142e1cf 100644
--- a/x11-drivers/xf86-input-vmmouse/pkg-plist
+++ b/x11-drivers/xf86-input-vmmouse/pkg-plist
@@ -3,9 +3,5 @@ libexec/hal/scripts/hal-probe-vmmouse
 lib/xorg/modules/input/vmmouse_drv.so
 man/man1/vmmouse_detect.1.gz
 man/man4/vmmouse.4x.gz
-%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
+share/X11/xorg.conf.d/50-vmmouse.conf
 share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
-%%NEW%%@dirrmtry share/X11/xorg.conf.d
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
index 233f114..6f6aa9c 100644
--- a/x11-drivers/xf86-input-void/Makefile
+++ b/x11-drivers/xf86-input-void/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-void
-PORTVERSION=	${VOID_VERSION}
-PORTREVISION=	${VOID_REVISION}
+PORTVERSION=	1.4.0
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,14 +10,4 @@ COMMENT=	X.Org void input driver
 
 XORG_CAT=	driver
 
-.include <bsd.port.options.mk>
-
-.if defined(WITH_NEW_XORG)
-VOID_VERSION=	1.4.0
-VOID_REVISION=	2
-.else
-VOID_VERSION=	1.3.1
-VOID_REVISION=	2
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-void/distinfo b/x11-drivers/xf86-input-void/distinfo
index a8c34de..5787ac7 100644
--- a/x11-drivers/xf86-input-void/distinfo
+++ b/x11-drivers/xf86-input-void/distinfo
@@ -1,4 +1,2 @@
-SHA256 (xorg/driver/xf86-input-void-1.3.1.tar.bz2) = aba69784ac83f5951af3e164312adb4b8b1c91a8f79ab35dc5165c534e14c674
-SIZE (xorg/driver/xf86-input-void-1.3.1.tar.bz2) = 242189
 SHA256 (xorg/driver/xf86-input-void-1.4.0.tar.bz2) = 2ab95865252c64cc88050fa0089a74e063c357b71907bf9be7886047c4987505
 SIZE (xorg/driver/xf86-input-void-1.4.0.tar.bz2) = 273454
diff --git a/x11-drivers/xf86-input-void/pkg-plist b/x11-drivers/xf86-input-void/pkg-plist
index 5ce860f..586d25a 100644
--- a/x11-drivers/xf86-input-void/pkg-plist
+++ b/x11-drivers/xf86-input-void/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/input/void_drv.so
 man/man4/void.4x.gz
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-wacom/Makefile b/x11-drivers/xf86-input-wacom/Makefile
index 340742a..213fd4d 100644
--- a/x11-drivers/xf86-input-wacom/Makefile
+++ b/x11-drivers/xf86-input-wacom/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-input-wacom
 PORTVERSION=	0.27.0
+PORTREVISION=	1
 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 c3c73b2..628dd5e 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=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-apm/files/patch-src_apm.h b/x11-drivers/xf86-video-apm/files/patch-src_apm.h
new file mode 100644
index 0000000..be96b0c
--- /dev/null
+++ b/x11-drivers/xf86-video-apm/files/patch-src_apm.h
@@ -0,0 +1,12 @@
+--- src/apm.h.orig	2012-07-17 04:52:01 UTC
++++ src/apm.h
+@@ -33,9 +33,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* I2C support */
+ #include "xf86i2c.h"
+ 
diff --git a/x11-drivers/xf86-video-apm/pkg-plist b/x11-drivers/xf86-video-apm/pkg-plist
index de5ff78..1069d09 100644
--- a/x11-drivers/xf86-video-apm/pkg-plist
+++ b/x11-drivers/xf86-video-apm/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/apm_drv.so
 man/man4/apm.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
index 9e18423..4c5b279 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=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ark/files/patch-src_ark__driver.c b/x11-drivers/xf86-video-ark/files/patch-src_ark__driver.c
new file mode 100644
index 0000000..d83c651
--- /dev/null
+++ b/x11-drivers/xf86-video-ark/files/patch-src_ark__driver.c
@@ -0,0 +1,18 @@
+--- src/ark_driver.c.orig	2012-07-17 04:51:36 UTC
++++ src/ark_driver.c
+@@ -39,7 +39,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+-#include "mibstore.h"
+ #include "fb.h"
+ #include "ark.h"
+ 
+@@ -538,7 +537,6 @@ static Bool ARKScreenInit(SCREEN_INIT_AR
+ 
+ 	fbPictureInit (pScreen, 0, 0);
+ 
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ 
+ 	if (!pARK->NoAccel) {
diff --git a/x11-drivers/xf86-video-ark/pkg-plist b/x11-drivers/xf86-video-ark/pkg-plist
index db7f65e..4e7dfa5 100644
--- a/x11-drivers/xf86-video-ark/pkg-plist
+++ b/x11-drivers/xf86-video-ark/pkg-plist
@@ -1,4 +1 @@
 lib/xorg/modules/drivers/ark_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-ati-ums/Makefile b/x11-drivers/xf86-video-ati-ums/Makefile
index aed4d04..37ecc71 100644
--- a/x11-drivers/xf86-video-ati-ums/Makefile
+++ b/x11-drivers/xf86-video-ati-ums/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-ati
 PORTVERSION=	6.14.6
-PORTREVISION=	4
+PORTREVISION=	5
 PKGNAMESUFFIX=	-ums
 CATEGORIES=	x11-drivers
 
diff --git a/x11-drivers/xf86-video-ati-ums/files/extra-src__radeon_kms.c b/x11-drivers/xf86-video-ati-ums/files/extra-src__radeon_kms.c
deleted file mode 100644
index 9de83f0..0000000
--- a/x11-drivers/xf86-video-ati-ums/files/extra-src__radeon_kms.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/radeon_kms.c.orig	2013-08-07 10:44:09.000000000 +0200
-+++ src/radeon_kms.c	2013-08-31 19:29:11.369001510 +0200
-@@ -30,6 +30,8 @@
- 
- #include <errno.h>
- #include <sys/ioctl.h>
-+#include <sys/param.h>
-+#include <sys/linker.h>
- /* Driver data structures */
- #include "radeon.h"
- #include "radeon_reg.h"
-@@ -270,7 +272,7 @@
- radeon_dirty_update(ScreenPtr screen)
- {
- 	RegionPtr region;
--	PixmapDirtyUpdatePtr ent;
-+	PixmapDirtyUpdatePtr ent = NULL;
- 
- 	if (xorg_list_is_empty(&screen->pixmap_dirty_list))
- 		return;
-@@ -606,6 +608,16 @@
- 		      dev->domain, dev->bus, dev->dev, dev->func);
- #endif
- 
-+    err = kldload("radeonkms");
-+    if (err == -1 && errno != EEXIST) {
-+
-+	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+		   "[drm] Failed to load kernel module for %s: %s\n",
-+		   busid, strerror(errno));
-+	free(busid);
-+	return FALSE;
-+    }
-+
-     info->dri2.drm_fd = drmOpen("radeon", busid);
-     if (info->dri2.drm_fd == -1) {
- 
diff --git a/x11-drivers/xf86-video-ati-ums/files/patch-configure b/x11-drivers/xf86-video-ati-ums/files/patch-configure
new file mode 100644
index 0000000..bfb78a3
--- /dev/null
+++ b/x11-drivers/xf86-video-ati-ums/files/patch-configure
@@ -0,0 +1,13 @@
+--- 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
new file mode 100644
index 0000000..0f28018
--- /dev/null
+++ b/x11-drivers/xf86-video-ati-ums/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- 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
index 3de34a1..144b7de 100644
--- 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
@@ -1,6 +1,6 @@
---- src/radeon_dri2.c.orig	2013-02-22 19:31:34.000000000 +0000
-+++ src/radeon_dri2.c	2013-02-22 19:31:47.000000000 +0000
-@@ -578,7 +578,7 @@
+--- 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;
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
new file mode 100644
index 0000000..d00590c
--- /dev/null
+++ b/x11-drivers/xf86-video-ati-ums/files/patch-src_radeon__driver.c
@@ -0,0 +1,10 @@
+--- 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/Makefile b/x11-drivers/xf86-video-ati/Makefile
index 241f268..eee705a 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-ati
 PORTVERSION=	7.5.0
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
index a1c4cee..defe938 100644
--- a/x11-drivers/xf86-video-chips/Makefile
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-chips
 PORTVERSION=	1.2.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
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
new file mode 100644
index 0000000..2737a0f
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/files/patch-src_ct__driver.c
@@ -0,0 +1,28 @@
+--- 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/pkg-plist b/x11-drivers/xf86-video-chips/pkg-plist
index 0a6b95f..8dd1b07 100644
--- a/x11-drivers/xf86-video-chips/pkg-plist
+++ b/x11-drivers/xf86-video-chips/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/chips_drv.so
 man/man4/chips.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
index c96c2e1..ac2b50e 100644
--- a/x11-drivers/xf86-video-cirrus/Makefile
+++ b/x11-drivers/xf86-video-cirrus/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-cirrus
 PORTVERSION=	1.5.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cirrus/pkg-plist b/x11-drivers/xf86-video-cirrus/pkg-plist
index 386a9bb..b14d284 100644
--- a/x11-drivers/xf86-video-cirrus/pkg-plist
+++ b/x11-drivers/xf86-video-cirrus/pkg-plist
@@ -2,6 +2,3 @@ lib/xorg/modules/drivers/cirrus_alpine.so
 lib/xorg/modules/drivers/cirrus_drv.so
 lib/xorg/modules/drivers/cirrus_laguna.so
 man/man4/cirrus.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
index 6d34089..d0f9426 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=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-dummy/pkg-plist b/x11-drivers/xf86-video-dummy/pkg-plist
index 120c414..344b589 100644
--- a/x11-drivers/xf86-video-dummy/pkg-plist
+++ b/x11-drivers/xf86-video-dummy/pkg-plist
@@ -1,4 +1 @@
 lib/xorg/modules/drivers/dummy_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
index b844ee5..5b3ae50 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=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-fbdev/pkg-plist b/x11-drivers/xf86-video-fbdev/pkg-plist
index 3ea8aa7..a9ab144 100644
--- a/x11-drivers/xf86-video-fbdev/pkg-plist
+++ b/x11-drivers/xf86-video-fbdev/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/fbdev_drv.so
 man/man4/fbdev.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
index 175ce6a..89e7c3a 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=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c b/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c
new file mode 100644
index 0000000..057c037
--- /dev/null
+++ b/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c
@@ -0,0 +1,19 @@
+--- src/glint_driver.c.orig	2012-07-16 02:50:47 UTC
++++ src/glint_driver.c
+@@ -52,8 +52,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ 
+-#include "mibstore.h"
+-
+ #include "pm3_regs.h"
+ #include "glint_regs.h"
+ #include "IBM.h"
+@@ -2904,7 +2902,6 @@ GLINTScreenInit(SCREEN_INIT_ARGS_DECL)
+         }
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
diff --git a/x11-drivers/xf86-video-glint/pkg-plist b/x11-drivers/xf86-video-glint/pkg-plist
index 06e0ad9..2c29551 100644
--- a/x11-drivers/xf86-video-glint/pkg-plist
+++ b/x11-drivers/xf86-video-glint/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/glint_drv.so
 man/man4/glint.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
index 42e52ae..e4d8538 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=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c b/x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c
new file mode 100644
index 0000000..6ac7248
--- /dev/null
+++ b/x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c
@@ -0,0 +1,19 @@
+--- src/i128_driver.c.orig	2012-07-17 05:21:15 UTC
++++ src/i128_driver.c
+@@ -50,8 +50,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+@@ -1557,7 +1555,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL)
+         return FALSE;
+     }
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
diff --git a/x11-drivers/xf86-video-i128/pkg-plist b/x11-drivers/xf86-video-i128/pkg-plist
index bf6f0d1..382d136 100644
--- a/x11-drivers/xf86-video-i128/pkg-plist
+++ b/x11-drivers/xf86-video-i128/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/i128_drv.so
 man/man4/i128.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
index 4e403e6..1fa29f8 100644
--- a/x11-drivers/xf86-video-i740/Makefile
+++ b/x11-drivers/xf86-video-i740/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-i740
 PORTVERSION=	1.3.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i740/files/patch-src_i740__driver.c b/x11-drivers/xf86-video-i740/files/patch-src_i740__driver.c
new file mode 100644
index 0000000..b35e670
--- /dev/null
+++ b/x11-drivers/xf86-video-i740/files/patch-src_i740__driver.c
@@ -0,0 +1,21 @@
+--- src/i740_driver.c.orig	2012-07-17 04:52:30 UTC
++++ src/i740_driver.c
+@@ -63,10 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ 
+ #include "compiler.h"
+ 
+-/* Drivers using the mi implementation of backing store need: */
+-
+-#include "mibstore.h"
+-
+ /* All drivers using the vgahw module need this */
+ /* This driver needs to be modified to not use vgaHW for multihead operation */
+ #include "vgaHW.h"
+@@ -1558,7 +1554,6 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) {
+     }
+   }
+ 
+-  miInitializeBackingStore(pScreen);
+   xf86SetBackingStore(pScreen);
+   xf86SetSilkenMouse(pScreen);
+ 
diff --git a/x11-drivers/xf86-video-i740/pkg-plist b/x11-drivers/xf86-video-i740/pkg-plist
index 34ff62b..2c0a0b49 100644
--- a/x11-drivers/xf86-video-i740/pkg-plist
+++ b/x11-drivers/xf86-video-i740/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/i740_drv.so
 man/man4/i740.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index 9cf13db..1a52f37 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=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile
index e1d5859..18e0fd5 100644
--- a/x11-drivers/xf86-video-mach64/Makefile
+++ b/x11-drivers/xf86-video-mach64/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-mach64
 PORTVERSION=	6.9.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-mach64/pkg-plist b/x11-drivers/xf86-video-mach64/pkg-plist
index 8e47d69..2ad9f0a 100644
--- a/x11-drivers/xf86-video-mach64/pkg-plist
+++ b/x11-drivers/xf86-video-mach64/pkg-plist
@@ -1,4 +1 @@
 lib/xorg/modules/drivers/mach64_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index 9a64653..ded2e09 100644
--- a/x11-drivers/xf86-video-mga/Makefile
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-mga
 PORTVERSION=	1.6.3
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	3
 CATEGORIES=	x11-drivers
 
diff --git a/x11-drivers/xf86-video-mga/pkg-plist b/x11-drivers/xf86-video-mga/pkg-plist
index 341b183..ab18d15 100644
--- a/x11-drivers/xf86-video-mga/pkg-plist
+++ b/x11-drivers/xf86-video-mga/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/mga_drv.so
 man/man4/mga.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
index 318aa01..a095adc 100644
--- a/x11-drivers/xf86-video-neomagic/Makefile
+++ b/x11-drivers/xf86-video-neomagic/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-neomagic
 PORTVERSION=	1.2.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-neomagic/pkg-plist b/x11-drivers/xf86-video-neomagic/pkg-plist
index b2949bc..c4f3ad6 100644
--- a/x11-drivers/xf86-video-neomagic/pkg-plist
+++ b/x11-drivers/xf86-video-neomagic/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/neomagic_drv.so
 man/man4/neomagic.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile
deleted file mode 100644
index 40b1603..0000000
--- a/x11-drivers/xf86-video-newport/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	xf86-video-newport
-PORTVERSION=	0.2.4
-PORTREVISION=	4
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org newport display driver
-
-XORG_CAT=	driver
-
-post-patch:
-		${REINPLACE_CMD} -e 's|values.h|sys/limits.h|' \
-				 -e 's|MAXSHORT|SHRT_MAX|g' \
-				 ${WRKSRC}/src/newport_accel.c
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-newport/distinfo b/x11-drivers/xf86-video-newport/distinfo
deleted file mode 100644
index bd6af4a..0000000
--- a/x11-drivers/xf86-video-newport/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 91cc41c6b17b068ed865c5d00b7662faaa1f7523ca449200abcd6539c4ad4ef9
-SIZE (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 308541
diff --git a/x11-drivers/xf86-video-newport/pkg-descr b/x11-drivers/xf86-video-newport/pkg-descr
deleted file mode 100644
index b85c38a..0000000
--- a/x11-drivers/xf86-video-newport/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-video-newport driver.
diff --git a/x11-drivers/xf86-video-newport/pkg-plist b/x11-drivers/xf86-video-newport/pkg-plist
deleted file mode 100644
index 4686d58..0000000
--- a/x11-drivers/xf86-video-newport/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/newport_drv.so
-man/man4/newport.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile
index 6c3468b..4a0cad9 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=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c b/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c
index 26e3d4a..84eae06 100644
--- a/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c
+++ b/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c
@@ -1,6 +1,6 @@
---- src/nv_driver.c.orig	2014-01-19 15:24:45.000000000 -0600
-+++ src/nv_driver.c	2014-01-19 15:24:07.000000000 -0600
-@@ -1543,7 +1543,11 @@
+--- src/nv_driver.c.orig	2012-07-17 06:47:02 UTC
++++ src/nv_driver.c
+@@ -1543,7 +1543,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
  	xf86FreeInt10(pNv->pInt);
  	return FALSE;
      }
@@ -12,3 +12,11 @@
      
      /* We use a programmable clock */
      pScrn->progClock = TRUE;
+@@ -2550,7 +2554,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
+     if (!pNv->NoAccel)
+ 	NVAccelInit(pScreen);
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
diff --git a/x11-drivers/xf86-video-nv/files/patch-src_g80__driver.c b/x11-drivers/xf86-video-nv/files/patch-src_g80__driver.c
new file mode 100644
index 0000000..53efac4
--- /dev/null
+++ b/x11-drivers/xf86-video-nv/files/patch-src_g80__driver.c
@@ -0,0 +1,18 @@
+--- src/g80_driver.c.orig	2012-07-17 06:47:02 UTC
++++ src/g80_driver.c
+@@ -34,7 +34,6 @@
+ #include <xf86Resources.h>
+ #endif
+ #include <mipointer.h>
+-#include <mibstore.h>
+ #include <micmap.h>
+ #include <xf86cmap.h>
+ #include <fb.h>
+@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
+         }
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
diff --git a/x11-drivers/xf86-video-nv/files/patch-src_nv__include.h b/x11-drivers/xf86-video-nv/files/patch-src_nv__include.h
new file mode 100644
index 0000000..4390175
--- /dev/null
+++ b/x11-drivers/xf86-video-nv/files/patch-src_nv__include.h
@@ -0,0 +1,12 @@
+--- src/nv_include.h.orig	2012-07-17 06:48:19 UTC
++++ src/nv_include.h
+@@ -24,9 +24,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
diff --git a/x11-drivers/xf86-video-nv/files/patch-src_riva__driver.c b/x11-drivers/xf86-video-nv/files/patch-src_riva__driver.c
new file mode 100644
index 0000000..74e1ee5
--- /dev/null
+++ b/x11-drivers/xf86-video-nv/files/patch-src_riva__driver.c
@@ -0,0 +1,10 @@
+--- src/riva_driver.c.orig	2012-07-17 06:47:02 UTC
++++ src/riva_driver.c
+@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
+     if (!pRiva->NoAccel)
+ 	RivaAccelInit(pScreen);
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
diff --git a/x11-drivers/xf86-video-nv/files/patch-src_riva__include.h b/x11-drivers/xf86-video-nv/files/patch-src_riva__include.h
new file mode 100644
index 0000000..e7c8e27
--- /dev/null
+++ b/x11-drivers/xf86-video-nv/files/patch-src_riva__include.h
@@ -0,0 +1,12 @@
+--- src/riva_include.h.orig	2012-07-17 06:48:45 UTC
++++ src/riva_include.h
+@@ -22,9 +22,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
diff --git a/x11-drivers/xf86-video-nv/pkg-plist b/x11-drivers/xf86-video-nv/pkg-plist
index 780e083..23953a9 100644
--- a/x11-drivers/xf86-video-nv/pkg-plist
+++ b/x11-drivers/xf86-video-nv/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/nv_drv.so
 man/man4/nv.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile
index 308ddcf..e153139 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=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-openchrome/pkg-plist b/x11-drivers/xf86-video-openchrome/pkg-plist
index 03b7069..4e137dc 100644
--- a/x11-drivers/xf86-video-openchrome/pkg-plist
+++ b/x11-drivers/xf86-video-openchrome/pkg-plist
@@ -6,6 +6,3 @@ lib/libchromeXvMCPro.so.1
 lib/libchromeXvMCPro.so.1.0.0
 lib/xorg/modules/drivers/openchrome_drv.so
 man/man4/openchrome.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile
index 9f373a8..95d3364 100644
--- a/x11-drivers/xf86-video-r128/Makefile
+++ b/x11-drivers/xf86-video-r128/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-r128
 PORTVERSION=	6.9.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-r128/pkg-plist b/x11-drivers/xf86-video-r128/pkg-plist
index a931d1f..93302a7 100644
--- a/x11-drivers/xf86-video-r128/pkg-plist
+++ b/x11-drivers/xf86-video-r128/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/r128_drv.so
 man/man4/r128.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
index 20c5307..9888f66 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=	5
+PORTREVISION=	6
 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
new file mode 100644
index 0000000..ab99424
--- /dev/null
+++ b/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c
@@ -0,0 +1,10 @@
+--- src/rendition.c.orig	2012-07-17 05:32:12 UTC
++++ src/rendition.c
+@@ -1173,7 +1173,6 @@ renditionScreenInit(SCREEN_INIT_ARGS_DEC
+     fbPictureInit (pScreen, 0, 0);
+ 
+     xf86SetBlackWhitePixels(pScreen);
+-    miInitializeBackingStore(pScreen);
+    
+     /*********************************************************/
+     /* The actual setup of the driver-specific code          */
diff --git a/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h b/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h
new file mode 100644
index 0000000..81b528a
--- /dev/null
+++ b/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h
@@ -0,0 +1,12 @@
+--- src/rendition.h.orig	2012-07-16 02:42:28 UTC
++++ src/rendition.h
+@@ -28,9 +28,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 colormap manipulation need this */
+ #include "micmap.h"
+ 
diff --git a/x11-drivers/xf86-video-rendition/pkg-plist b/x11-drivers/xf86-video-rendition/pkg-plist
index 04e6d8a..5f875b2 100644
--- a/x11-drivers/xf86-video-rendition/pkg-plist
+++ b/x11-drivers/xf86-video-rendition/pkg-plist
@@ -2,6 +2,3 @@ lib/xorg/modules/drivers/rendition_drv.so
 lib/xorg/modules/v10002d.uc
 lib/xorg/modules/v20002d.uc
 man/man4/rendition.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
index 0bddf65..8ccba04 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=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3/files/patch-src_s3__driver.c b/x11-drivers/xf86-video-s3/files/patch-src_s3__driver.c
new file mode 100644
index 0000000..92de843
--- /dev/null
+++ b/x11-drivers/xf86-video-s3/files/patch-src_s3__driver.c
@@ -0,0 +1,18 @@
+--- src/s3_driver.c.orig	2012-07-17 04:50:05 UTC
++++ src/s3_driver.c
+@@ -52,7 +52,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+-#include "mibstore.h"
+ #include "fb.h"
+ #include "inputstr.h"
+ #include "shadowfb.h"
+@@ -822,7 +821,6 @@ static Bool S3ScreenInit(SCREEN_INIT_ARG
+ 	fbPictureInit (pScreen, 0, 0);
+ 	S3DGAInit(pScreen);
+ 
+-        miInitializeBackingStore(pScreen);
+         xf86SetBackingStore(pScreen);
+ 
+ 	/* framebuffer manager setup */
diff --git a/x11-drivers/xf86-video-s3/pkg-plist b/x11-drivers/xf86-video-s3/pkg-plist
index a6aa703..05f8563 100644
--- a/x11-drivers/xf86-video-s3/pkg-plist
+++ b/x11-drivers/xf86-video-s3/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/s3_drv.so
 man/man4/s3.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
index 463ad6e..40c6715 100644
--- a/x11-drivers/xf86-video-s3virge/Makefile
+++ b/x11-drivers/xf86-video-s3virge/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-s3virge
 PORTVERSION=	1.10.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3virge/pkg-plist b/x11-drivers/xf86-video-s3virge/pkg-plist
index b9b28e4..27a08d0 100644
--- a/x11-drivers/xf86-video-s3virge/pkg-plist
+++ b/x11-drivers/xf86-video-s3virge/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/s3virge_drv.so
 man/man4/s3virge.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index 06f9946..968d308 100644
--- a/x11-drivers/xf86-video-savage/Makefile
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-savage
 PORTVERSION=	2.3.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-savage/pkg-plist b/x11-drivers/xf86-video-savage/pkg-plist
index 23de1c3..02df398 100644
--- a/x11-drivers/xf86-video-savage/pkg-plist
+++ b/x11-drivers/xf86-video-savage/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/savage_drv.so
 man/man4/savage.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-scfb/Makefile b/x11-drivers/xf86-video-scfb/Makefile
index 9515dda..dc2788c 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	ray@FreeBSD.org
@@ -15,8 +15,14 @@ GH_PROJECT=     ${PORTNAME}
 GH_TAGNAME=     bdeb3bf
 GH_COMMIT=      bdeb3bf
 
-GNU_CONFIGURE=  yes
 USES=		libtool pkgconfig
-USE_XORG=	xorg-server xproto inputproto randrproto renderproto videoproto
+GNU_CONFIGURE= 	yes
+DIST_SUBDIR=	xorg/driver
+USE_XORG=	xorg-server xproto randrproto xi renderproto xextproto \
+		inputproto kbproto fontsproto videoproto dri2proto \
+		xf86driproto glproto xineramaproto resourceproto \
+		scrnsaverproto
+CONFIGURE_ENV=	DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-scfb/distinfo b/x11-drivers/xf86-video-scfb/distinfo
index e15d59f..fa8257f 100644
--- a/x11-drivers/xf86-video-scfb/distinfo
+++ b/x11-drivers/xf86-video-scfb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xf86-video-scfb-0.0.4.tar.gz) = baccb6f2fd0b79198705497c6550e8f2130d2ae359b1288beec9eae50df16616
-SIZE (xf86-video-scfb-0.0.4.tar.gz) = 345302
+SHA256 (xorg/driver/xf86-video-scfb-0.0.4.tar.gz) = baccb6f2fd0b79198705497c6550e8f2130d2ae359b1288beec9eae50df16616
+SIZE (xorg/driver/xf86-video-scfb-0.0.4.tar.gz) = 345302
diff --git a/x11-drivers/xf86-video-scfb/files/patch-src_compat-api.h b/x11-drivers/xf86-video-scfb/files/patch-src_compat-api.h
new file mode 100644
index 0000000..a4e9815
--- /dev/null
+++ b/x11-drivers/xf86-video-scfb/files/patch-src_compat-api.h
@@ -0,0 +1,102 @@
+--- src/compat-api.h.orig	2014-11-23 09:47:32 UTC
++++ src/compat-api.h
+@@ -0,0 +1,99 @@
++/*
++ * Copyright 2012 Red Hat, Inc.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the next
++ * paragraph) shall be included in all copies or substantial portions of the
++ * Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ * DEALINGS IN THE SOFTWARE.
++ *
++ * Author: Dave Airlie <airlied@redhat.com>
++ */
++
++/* this file provides API compat between server post 1.13 and pre it,
++   it should be reused inside as many drivers as possible */
++#ifndef COMPAT_API_H
++#define COMPAT_API_H
++
++#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
++#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
++#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
++#endif
++
++#ifndef XF86_HAS_SCRN_CONV
++#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
++#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
++#endif
++
++#ifndef XF86_SCRN_INTERFACE
++
++#define SCRN_ARG_TYPE int
++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
++
++#define SCREEN_ARG_TYPE int
++#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
++
++#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
++
++#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
++#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
++
++#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
++#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
++
++#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
++#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
++
++#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
++#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
++
++#define FREE_SCREEN_ARGS_DECL int arg, int flags
++
++#define VT_FUNC_ARGS_DECL int arg, int flags
++#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags)
++
++#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex)
++#else
++#define SCRN_ARG_TYPE ScrnInfoPtr
++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
++
++#define SCREEN_ARG_TYPE ScreenPtr
++#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
++
++#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
++
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
++#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++
++#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
++#define CLOSE_SCREEN_ARGS pScreen
++
++#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
++#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
++
++#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
++#define SWITCH_MODE_ARGS(arg, m) arg, m
++
++#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
++
++#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
++#define VT_FUNC_ARGS(flags) pScrn
++
++#define XF86_ENABLEDISABLEFB_ARG(x) (x)
++
++#endif
++
++#endif
diff --git a/x11-drivers/xf86-video-scfb/files/patch-src_scfb__driver.c b/x11-drivers/xf86-video-scfb/files/patch-src_scfb__driver.c
new file mode 100644
index 0000000..eee6e58
--- /dev/null
+++ b/x11-drivers/xf86-video-scfb/files/patch-src_scfb__driver.c
@@ -0,0 +1,222 @@
+--- src/scfb_driver.c.orig	2014-07-19 22:22:29 UTC
++++ src/scfb_driver.c
+@@ -55,7 +55,6 @@
+ #include "xf86Priv.h"
+ 
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "micmap.h"
+ #include "colormapst.h"
+ #include "xf86cmap.h"
+@@ -80,6 +79,8 @@
+ #include "xf86xv.h"
+ #endif
+ 
++#include "compat-api.h"
++
+ #undef	DEBUG
+ #define	DEBUG	1
+ 
+@@ -101,15 +102,15 @@ static const OptionInfoRec * ScfbAvailab
+ static void ScfbIdentify(int);
+ static Bool ScfbProbe(DriverPtr, int);
+ static Bool ScfbPreInit(ScrnInfoPtr, int);
+-static Bool ScfbScreenInit(int, ScreenPtr, int, char **);
+-static Bool ScfbCloseScreen(int, ScreenPtr);
++static Bool ScfbScreenInit(SCREEN_INIT_ARGS_DECL);
++static Bool ScfbCloseScreen(CLOSE_SCREEN_ARGS_DECL);
+ static void *ScfbWindowLinear(ScreenPtr, CARD32, CARD32, int, CARD32 *,
+ 			      void *);
+-static void ScfbPointerMoved(int, int, int);
+-static Bool ScfbEnterVT(int, int);
+-static void ScfbLeaveVT(int, int);
+-static Bool ScfbSwitchMode(int, DisplayModePtr, int);
+-static int ScfbValidMode(int, DisplayModePtr, Bool, int);
++static void ScfbPointerMoved(SCRN_ARG_TYPE, int, int);
++static Bool ScfbEnterVT(VT_FUNC_ARGS_DECL);
++static void ScfbLeaveVT(VT_FUNC_ARGS_DECL);
++static Bool ScfbSwitchMode(SWITCH_MODE_ARGS_DECL);
++static int ScfbValidMode(SCRN_ARG_TYPE, DisplayModePtr, Bool, int);
+ static void ScfbLoadPalette(ScrnInfoPtr, int, int *, LOCO *, VisualPtr);
+ static Bool ScfbSaveScreen(ScreenPtr, int);
+ static void ScfbSave(ScrnInfoPtr);
+@@ -231,7 +232,7 @@ typedef struct {
+ 	void *			shadow;
+ 	CloseScreenProcPtr	CloseScreen;
+ 	CreateScreenResourcesProcPtr CreateScreenResources;
+-	void			(*PointerMoved)(int, int, int);
++	void			(*PointerMoved)(SCRN_ARG_TYPE, int, int);
+ 	EntityInfoPtr		pEnt;
+ 
+ #ifdef XFreeXDGA
+@@ -302,7 +303,7 @@ scfb_mmap(size_t len, off_t off, int fd)
+ 		mapaddr = NULL;
+ 	}
+ #if DEBUG
+-	ErrorF("mmap returns: addr %p len 0x%x, fd %d, off %x\n", mapaddr, mapsize, fd, off);
++	ErrorF("mmap returns: addr %p len 0x%x, fd %d, off %lx\n", mapaddr, mapsize, fd, off);
+ #endif
+ 	return mapaddr;
+ }
+@@ -633,9 +634,9 @@ ScfbShadowInit(ScreenPtr pScreen)
+ }
+ 
+ static Bool
+-ScfbScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
++ScfbScreenInit(SCREEN_INIT_ARGS_DECL)
+ {
+-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
++	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ 	ScfbPtr fPtr = SCFBPTR(pScrn);
+ 	VisualPtr visual;
+ 	int ret, flags, ncolors;
+@@ -792,7 +793,7 @@ ScfbScreenInit(int scrnIndex, ScreenPtr 
+ 				   "RENDER extension initialisation failed.");
+ 	}
+ 	if (fPtr->shadowFB && !ScfbShadowInit(pScreen)) {
+-		xf86DrvMsg(scrnIndex, X_ERROR,
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 		    "shadow framebuffer initialization failed\n");
+ 		return FALSE;
+ 	}
+@@ -801,20 +802,19 @@ ScfbScreenInit(int scrnIndex, ScreenPtr 
+ 	if (!fPtr->rotate)
+ 		ScfbDGAInit(pScrn, pScreen);
+ 	else
+-		xf86DrvMsg(scrnIndex, X_INFO, "Rotated display, "
++		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Rotated display, "
+ 		    "disabling DGA\n");
+ #endif
+ 	if (fPtr->rotate) {
+-		xf86DrvMsg(scrnIndex, X_INFO, "Enabling Driver Rotation, "
++		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Enabling Driver Rotation, "
+ 		    "disabling RandR\n");
+ 		xf86DisableRandR();
+ 		if (pScrn->bitsPerPixel == 24)
+-			xf86DrvMsg(scrnIndex, X_WARNING,
++			xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ 			    "Rotation might be broken in 24 bpp\n");
+ 	}
+ 
+ 	xf86SetBlackWhitePixels(pScreen);
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ 
+ 	/* Software cursor. */
+@@ -858,9 +858,9 @@ ScfbScreenInit(int scrnIndex, ScreenPtr 
+ }
+ 
+ static Bool
+-ScfbCloseScreen(int scrnIndex, ScreenPtr pScreen)
++ScfbCloseScreen(CLOSE_SCREEN_ARGS_DECL)
+ {
+-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ 	PixmapPtr pPixmap;
+ 	ScfbPtr fPtr = SCFBPTR(pScrn);
+ 
+@@ -892,7 +892,7 @@ ScfbCloseScreen(int scrnIndex, ScreenPtr
+ 	/* Unwrap CloseScreen. */
+ 	pScreen->CloseScreen = fPtr->CloseScreen;
+ 	TRACE_EXIT("ScfbCloseScreen");
+-	return (*pScreen->CloseScreen)(scrnIndex, pScreen);
++	return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
+ }
+ 
+ static void *
+@@ -907,9 +907,9 @@ ScfbWindowLinear(ScreenPtr pScreen, CARD
+ }
+ 
+ static void
+-ScfbPointerMoved(int index, int x, int y)
++ScfbPointerMoved(SCRN_ARG_TYPE arg, int x, int y)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[index];
++    SCRN_INFO_PTR(arg);
+     ScfbPtr fPtr = SCFBPTR(pScrn);
+     int newX, newY;
+ 
+@@ -941,13 +941,13 @@ ScfbPointerMoved(int index, int x, int y
+     }
+ 
+     /* Pass adjusted pointer coordinates to wrapped PointerMoved function. */
+-    (*fPtr->PointerMoved)(index, newX, newY);
++    (*fPtr->PointerMoved)(arg, newX, newY);
+ }
+ 
+ static Bool
+-ScfbEnterVT(int scrnIndex, int flags)
++ScfbEnterVT(VT_FUNC_ARGS_DECL)
+ {
+-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++	SCRN_INFO_PTR(arg);
+ 
+ 	TRACE_ENTER("EnterVT");
+ 	pScrn->vtSema = TRUE;
+@@ -956,20 +956,20 @@ ScfbEnterVT(int scrnIndex, int flags)
+ }
+ 
+ static void
+-ScfbLeaveVT(int scrnIndex, int flags)
++ScfbLeaveVT(VT_FUNC_ARGS_DECL)
+ {
+ #if DEBUG
+-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++	SCRN_INFO_PTR(arg);
+ #endif
+ 
+ 	TRACE_ENTER("LeaveVT");
+ }
+ 
+ static Bool
+-ScfbSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
++ScfbSwitchMode(SWITCH_MODE_ARGS_DECL)
+ {
+ #if DEBUG
+-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++	SCRN_INFO_PTR(arg);
+ #endif
+ 
+ 	TRACE_ENTER("SwitchMode");
+@@ -978,10 +978,10 @@ ScfbSwitchMode(int scrnIndex, DisplayMod
+ }
+ 
+ static int
+-ScfbValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
++ScfbValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
+ {
+ #if DEBUG
+-	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++	SCRN_INFO_PTR(arg);
+ #endif
+ 
+ 	TRACE_ENTER("ValidMode");
+@@ -1067,7 +1067,6 @@ static Bool
+ ScfbDGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode)
+ {
+ 	DisplayModePtr pMode;
+-	int scrnIdx = pScrn->pScreen->myNum;
+ 	int frameX0, frameY0;
+ 
+ 	if (pDGAMode) {
+@@ -1081,9 +1080,9 @@ ScfbDGASetMode(ScrnInfoPtr pScrn, DGAMod
+ 		frameY0 = pScrn->frameY0;
+ 	}
+ 
+-	if (!(*pScrn->SwitchMode)(scrnIdx, pMode, 0))
++	if (!(*pScrn->SwitchMode)(SWITCH_MODE_ARGS(pScrn, pMode)))
+ 		return FALSE;
+-	(*pScrn->AdjustFrame)(scrnIdx, frameX0, frameY0, 0);
++	(*pScrn->AdjustFrame)(ADJUST_FRAME_ARGS(pScrn, frameX0, frameY0));
+ 
+ 	return TRUE;
+ }
+@@ -1091,7 +1090,7 @@ ScfbDGASetMode(ScrnInfoPtr pScrn, DGAMod
+ static void
+ ScfbDGASetViewport(ScrnInfoPtr pScrn, int x, int y, int flags)
+ {
+-	(*pScrn->AdjustFrame)(pScrn->pScreen->myNum, x, y, flags);
++	(*pScrn->AdjustFrame)(ADJUST_FRAME_ARGS(pScrn, x, y));
+ }
+ 
+ static int
diff --git a/x11-drivers/xf86-video-scfb/pkg-plist b/x11-drivers/xf86-video-scfb/pkg-plist
index 5e68def..c68e96b 100644
--- a/x11-drivers/xf86-video-scfb/pkg-plist
+++ b/x11-drivers/xf86-video-scfb/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/scfb_drv.so
-man/man4/scfb.4.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
+man/man4/scfb.4x.gz
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
index ab8f59b..c67858b 100644
--- a/x11-drivers/xf86-video-siliconmotion/Makefile
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-siliconmotion
 PORTVERSION=	1.7.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
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
new file mode 100644
index 0000000..d74ae96
--- /dev/null
+++ b/x11-drivers/xf86-video-siliconmotion/files/patch-src_smi__driver.c
@@ -0,0 +1,11 @@
+--- 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-siliconmotion/pkg-plist b/x11-drivers/xf86-video-siliconmotion/pkg-plist
index 8471fb6..2f67b61 100644
--- a/x11-drivers/xf86-video-siliconmotion/pkg-plist
+++ b/x11-drivers/xf86-video-siliconmotion/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/siliconmotion_drv.so
 man/man4/siliconmotion.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index 03eff34..caf1336 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-sis
 PORTVERSION=	0.10.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
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
new file mode 100644
index 0000000..a42b69b
--- /dev/null
+++ b/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c
@@ -0,0 +1,40 @@
+--- 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();
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
+         {
+             double dx = x, dy = y;
+-            miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy);
++            miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy, NULL, NULL);
+             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-sis/pkg-plist b/x11-drivers/xf86-video-sis/pkg-plist
index 4563cbf..5520aef 100644
--- a/x11-drivers/xf86-video-sis/pkg-plist
+++ b/x11-drivers/xf86-video-sis/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/sis_drv.so
 man/man4/sis.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile
index 6bc106c..ba1abd9 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=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sunffb/pkg-plist b/x11-drivers/xf86-video-sunffb/pkg-plist
index 8aa3369..7904580 100644
--- a/x11-drivers/xf86-video-sunffb/pkg-plist
+++ b/x11-drivers/xf86-video-sunffb/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/sunffb_drv.so
 man/man4/sunffb.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
index e840216..372e4b9 100644
--- a/x11-drivers/xf86-video-tdfx/Makefile
+++ b/x11-drivers/xf86-video-tdfx/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-tdfx
 PORTVERSION=	1.4.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__driver.c b/x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__driver.c
new file mode 100644
index 0000000..b8f9003
--- /dev/null
+++ b/x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__driver.c
@@ -0,0 +1,21 @@
+--- src/tdfx_driver.c.orig	2012-07-17 05:21:16 UTC
++++ src/tdfx_driver.c
+@@ -62,10 +62,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ 
+ #include "compiler.h"
+ 
+-/* Drivers using the mi implementation of backing store need: */
+-
+-#include "mibstore.h"
+-
+ /* All drivers using the vgahw module need this */
+ /* This driver needs to be modified to not use vgaHW for multihead operation */
+ #include "vgaHW.h"
+@@ -2373,7 +2369,6 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
+     }
+   }
+ 
+-  miInitializeBackingStore(pScreen);
+   xf86SetBackingStore(pScreen);
+   xf86SetSilkenMouse(pScreen);
+ 
diff --git a/x11-drivers/xf86-video-tdfx/pkg-plist b/x11-drivers/xf86-video-tdfx/pkg-plist
index d104d44..6209309 100644
--- a/x11-drivers/xf86-video-tdfx/pkg-plist
+++ b/x11-drivers/xf86-video-tdfx/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/tdfx_drv.so
 man/man4/tdfx.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile
deleted file mode 100644
index 5402c8d..0000000
--- a/x11-drivers/xf86-video-tga/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	xf86-video-tga
-PORTVERSION=	1.2.2
-PORTREVISION=	5
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org tga display driver
-
-XORG_CAT=	driver
-USE_XORG=	xf86dgaproto
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-tga/distinfo b/x11-drivers/xf86-video-tga/distinfo
deleted file mode 100644
index d0af787..0000000
--- a/x11-drivers/xf86-video-tga/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131
-SIZE (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 318943
diff --git a/x11-drivers/xf86-video-tga/pkg-descr b/x11-drivers/xf86-video-tga/pkg-descr
deleted file mode 100644
index 4b6648a..0000000
--- a/x11-drivers/xf86-video-tga/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-tga driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-tga/pkg-plist b/x11-drivers/xf86-video-tga/pkg-plist
deleted file mode 100644
index 41eacf6..0000000
--- a/x11-drivers/xf86-video-tga/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/xorg/modules/drivers/tga_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
index ca2c805..3a8c405 100644
--- a/x11-drivers/xf86-video-trident/Makefile
+++ b/x11-drivers/xf86-video-trident/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-trident
 PORTVERSION=	1.3.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
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
new file mode 100644
index 0000000..22bdff2
--- /dev/null
+++ b/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c
@@ -0,0 +1,18 @@
+--- 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-trident/pkg-plist b/x11-drivers/xf86-video-trident/pkg-plist
index 4f60a8f..a2455c3 100644
--- a/x11-drivers/xf86-video-trident/pkg-plist
+++ b/x11-drivers/xf86-video-trident/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/trident_drv.so
 man/man4/trident.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile
index 961e910..ef4a214 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=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tseng/files/patch-src_tseng__driver.c b/x11-drivers/xf86-video-tseng/files/patch-src_tseng__driver.c
new file mode 100644
index 0000000..26bdfb3
--- /dev/null
+++ b/x11-drivers/xf86-video-tseng/files/patch-src_tseng__driver.c
@@ -0,0 +1,20 @@
+--- src/tseng_driver.c.orig	2012-07-17 05:21:17 UTC
++++ src/tseng_driver.c
+@@ -39,9 +39,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "fb.h"
+ 
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+@@ -1453,7 +1450,6 @@ TsengScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	}
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+     /* Initialise cursor functions */
+     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
diff --git a/x11-drivers/xf86-video-tseng/pkg-plist b/x11-drivers/xf86-video-tseng/pkg-plist
index 803640d..54c64fe 100644
--- a/x11-drivers/xf86-video-tseng/pkg-plist
+++ b/x11-drivers/xf86-video-tseng/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/tseng_drv.so
 man/man4/tseng.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
index 49d2031..ac29d9e 100644
--- a/x11-drivers/xf86-video-vesa/Makefile
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-vesa
 PORTVERSION=	2.3.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vesa/pkg-plist b/x11-drivers/xf86-video-vesa/pkg-plist
index 641d28f..39e1a03 100644
--- a/x11-drivers/xf86-video-vesa/pkg-plist
+++ b/x11-drivers/xf86-video-vesa/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/vesa_drv.so
 man/man4/vesa.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
index 6a7a7a2b..1fb5928 100644
--- a/x11-drivers/xf86-video-vmware/Makefile
+++ b/x11-drivers/xf86-video-vmware/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-vmware
 PORTVERSION=	13.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vmware/pkg-plist b/x11-drivers/xf86-video-vmware/pkg-plist
index 727f3ba..56d7543 100644
--- a/x11-drivers/xf86-video-vmware/pkg-plist
+++ b/x11-drivers/xf86-video-vmware/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/vmware_drv.so
 man/man4/vmware.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
index dcdea62..2442ed2 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=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-voodoo/pkg-plist b/x11-drivers/xf86-video-voodoo/pkg-plist
index 12fa28b..120d5a2 100644
--- a/x11-drivers/xf86-video-voodoo/pkg-plist
+++ b/x11-drivers/xf86-video-voodoo/pkg-plist
@@ -1,5 +1,2 @@
 lib/xorg/modules/drivers/voodoo_drv.so
 man/man4/voodoo.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index e47ea7f..6f64610 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -46,7 +46,6 @@ VIDEO_DRIVERS=		ati \
 			i740 \
 			mga \
 			neomagic \
-			newport \
 			rendition \
 			s3 \
 			s3virge \
@@ -54,7 +53,6 @@ VIDEO_DRIVERS=		ati \
 			siliconmotion \
 			sis \
 			tdfx \
-			tga \
 			trident \
 			tseng \
 			vmware \
diff --git a/x11-drivers/xorg-drivers/pkg-plist b/x11-drivers/xorg-drivers/pkg-plist
index d5bf804..04bdcc5 100644
--- a/x11-drivers/xorg-drivers/pkg-plist
+++ b/x11-drivers/xorg-drivers/pkg-plist
@@ -1,2 +1 @@
 libdata/xorg/drivers
-@dirrmtry libdata/xorg
diff --git a/x11-servers/xorg-dmx/pkg-plist b/x11-servers/xorg-dmx/pkg-plist
index 2fb0ebe..0ec9bfa 100644
--- a/x11-servers/xorg-dmx/pkg-plist
+++ b/x11-servers/xorg-dmx/pkg-plist
@@ -1,8 +1,7 @@
 bin/Xdmx
-%%OLD%%bin/xdmx
 bin/dmxaddinput
 bin/dmxaddscreen
-%%NEW%%bin/dmxinfo
+bin/dmxinfo
 bin/dmxreconfig
 bin/dmxresize
 bin/dmxrminput
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 183136d..f54cd43 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	xorg-server
-PORTVERSION=	${XORG_VERSION}
-PORTREVISION?=	${XORG_REVISION}
+PORTVERSION=	1.14.7
+PORTREVISION?=	0
 PORTEPOCH?=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG
@@ -13,6 +13,8 @@ DISTNAME=	xorg-server-${PORTVERSION}
 MAINTAINER=	x11@FreeBSD.org
 COMMENT?=	X.Org X server and related programs
 
+LICENSE=	MIT
+
 LIB_DEPENDS=	libdrm.so:${PORTSDIR}/graphics/libdrm
 RUN_DEPENDS=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
 		xkbcomp:${PORTSDIR}/x11/xkbcomp
@@ -20,42 +22,20 @@ RUN_DEPENDS=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
 XORG_CAT=	xserver
 SLAVE_PORT?=	no
 
-OPTIONS_DEFINE=	AIGLX SUID
+OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	SUID
 OPTIONS_RADIO=	CONF
 OPTIONS_RADIO_CONF= HAL DEVD
-AIGLX_DESC=	Compile with Accelerated Indirect GLX support
 SUID_DESC=	Install the Xorg server with setuid bit set
 HAL_DESC=	Compile with HAL config support
-DEVD_DESC=	Use devd for autoconfiguration of input devices (experimental)
-OPTIONS_DEFAULT=AIGLX SUID HAL
+DEVD_DESC=	Use devd for autoconfiguration of input devices
+OPTIONS_DEFAULT=SUID DEVD
 
 OPTIONS_EXCLUDE_sparc64=	HAL
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_NEW_XORG)
-XORG_VERSION=	1.12.4
-XORG_REVISION=	10
-PLIST_SUB+=	OLD="@comment " NEW=""
-EXTRA_PATCHES+=	${FILESDIR}/extra-clang \
-		${FILESDIR}/extra-configure \
-		${FILESDIR}/extra-new-bad-impl \
-		${FILESDIR}/extra-new-dix_dixfonts.c
-.else
-FORBIDDEN=		unfixed security issues
-XORG_VERSION=	1.7.7
-XORG_REVISION=	14
-PLIST_SUB+=	OLD="" NEW="@comment "
-EXTRA_PATCHES+=	${FILESDIR}/extra-Xext-xace.c \
-		${FILESDIR}/extra-Xserver-os-xprintf.c \
-		${FILESDIR}/extra-include_eventstr.h \
-		${FILESDIR}/extra-os-utils.c \
-		${FILESDIR}/extra-dix_events.c \
-		${FILESDIR}/extra-Xserver-hw-xfree86-common-xf86Config.c \
-		${FILESDIR}/extra-old-dix_dixfonts.c
-.endif
-
-USES=		gmake libtool:keepla perl5 tar:bzip2
+USES=		gmake libtool perl5 tar:bzip2
 USE_PERL5=	build
 USE_GL=		gl
 USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
@@ -97,74 +77,31 @@ CONFIGURE_ARGS+=	--enable-config-hal=yes
 CONFIGURE_ARGS+=	--enable-config-hal=no
 .endif
 
-.if ${PORT_OPTIONS:MDEVD}
-EXTRA_PATCHES+=		${FILESDIR}/extra-config_devd.c
-.endif
-
-.if ${PORT_OPTIONS:MAIGLX}
-CONFIGURE_ARGS+=	--enable-aiglx=yes
-.else
-CONFIGURE_ARGS+=	--enable-aiglx=no
-.endif
-
-# We handle Xorg setuid in the plist. This allows to build xorg-server as a user
-CONFIGURE_ARGS+=--enable-install-setuid=no
-.if ${PORT_OPTIONS:MSUID}
-PLIST_SUB+=	SUID=""
-.else
-PLIST_SUB+=	SUID="@comment "
-.endif
+# We handle Xorg setuid in the plist. This allows to build xorg-server as a user.
+CONFIGURE_ARGS+=--disable-install-setuid
 
 .if ${ARCH} == armv6
-.if defined(WITH_NEW_XORG)
 EXTRA_PATCHES+=	${FILESDIR}/extra-arm-patch-hw__xfree86__os-support__bsd__Makefile.in
 EXTRA_PATCHES+=	${FILESDIR}/extra-arm-patch-include__servermd.h
 .endif
-.endif
 
 .if ${ARCH} == i386
-.if defined(WITH_NEW_XORG)
-EXTRA_PATCHES+=	${FILESDIR}/extra-new-arch-i386
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extra-old-arch-i386
-.endif
+EXTRA_PATCHES+=	${FILESDIR}/extra-arch-i386
 .endif
 
 .if ${ARCH} == ia64
-PLIST_SUB+=	IA64_NA="@comment "
-EXTRA_PATCHES+=	${.CURDIR}/files/extra-arch-ia64
-.else
-PLIST_SUB+=	IA64_NA=""
+EXTRA_PATCHES+=	${FILESDIR}/extra-arch-ia64
 .endif
 
 .if ${ARCH} == powerpc || ${ARCH} == powerpc64
-PLIST_SUB+=	PPC_NA="@comment "
-.if defined(WITH_NEW_XORG)
-EXTRA_PATCHES+=	${.CURDIR}/files/extra-new-arch-powerpc
-.else
-EXTRA_PATCHES+=	${.CURDIR}/files/extra-old-arch-powerpc
-.endif
-.else
-PLIST_SUB+=	PPC_NA=""
+EXTRA_PATCHES+=	${FILESDIR}/extra-arch-powerpc
 .endif
 
 .if ${ARCH} == sparc64
 PLIST_SUB+=	SPARC64=""
-PLIST_SUB+=	SPARC64_NA="@comment "
-.if defined(WITH_NEW_XORG)
-EXTRA_PATCHES+=	${FILESDIR}/extra-new-arch-sparc64
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extra-old-arch-sparc64
-.endif
+EXTRA_PATCHES+=	${FILESDIR}/extra-arch-sparc64
 .else
 PLIST_SUB+=	SPARC64="@comment "
-PLIST_SUB+=	SPARC64_NA=""
-.endif
-
-.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == sparc64
-PLIST_SUB+=	AMD64_I386_SPARC64=""
-.else
-PLIST_SUB+=	AMD64_I386_SPARC64="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSUID}
@@ -184,29 +121,24 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|@GLX_TRUE@GLXMODS =|@GLX_BOGUS@GLXMODS =|g' \
 		-e 's|^LTLIBRARIES = |LTLIBRARIES = libglx.la |g' \
 		${WRKSRC}/hw/xfree86/dixmods/Makefile.in
-.if ${PORT_OPTIONS:MDEVD}
-	@${ECHO_CMD} -e "\nint config_devd_init(void);\nvoid config_devd_fini(void);" \
-		>> ${WRKSRC}/config/config-backends.h
-.endif
- 
+
 post-configure:
 .if ${PORT_OPTIONS:MDEVD}
 	@${REINPLACE_CMD} -e 's|config\.c|config.c devd.c|g' \
 		-e 's|config\.lo|config.lo devd.lo|g' \
 		${WRKSRC}/config/Makefile
+	@${REINPLACE_CMD} -e 's|^/\* #undef CONFIG_UDEV \*/|#define CONFIG_DEVD 1|' \
+		${WRKSRC}/include/dix-config.h
 .endif
 
 .if ${SLAVE_PORT} == "no"
 post-install:
-# The .xorg dir because else the xorg-server might not load the correct 
+# The .xorg dir because else the xorg-server might not load the correct
 # libglx module.
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg
 	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
 		${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/
-
-.if defined(WITH_NEW_XORG)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d
-.endif
 .endif # ! SLAVE_PORT
 
 .include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 7f1ac51..7574aaa 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,4 +1,2 @@
-SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
-SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
-SHA256 (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
-SIZE (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 5444761
+SHA256 (xorg/xserver/xorg-server-1.14.7.tar.bz2) = fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f
+SIZE (xorg/xserver/xorg-server-1.14.7.tar.bz2) = 5520884
diff --git a/x11-servers/xorg-server/files/extra-Xext-xace.c b/x11-servers/xorg-server/files/extra-Xext-xace.c
deleted file mode 100644
index 25bd425..0000000
--- a/x11-servers/xorg-server/files/extra-Xext-xace.c
+++ /dev/null
@@ -1,229 +0,0 @@
-From 6dae7f3792611aace1df0cca63bf50c50d93de43 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Tue, 10 Aug 2010 18:30:20 +0000
-Subject: xace: Invalid reference to out-of-scope data.
-
-The callback data passed by reference to the hook was allocated on stack
-within the scope of the case statement. The compiler is free to reuse
-any of that stack space whilst making the function call so we may end up
-passing garbage into the callback.
-
-References:
-
-  Bug 18451 - Xorg server 1.5.2 SEGV during XFixesGetCursorImage()
-  https://bugs.freedesktop.org/show_bug.cgi?id=18451
-
-v2: Drop the unrelated hunk that snuck in when ammending the commit
-message.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Signed-off-by: Keith Packard <keithp@keithp.com>
----
-diff --git a/Xext/xace.c b/Xext/xace.c
-index e10d837..c757cad 100644
---- Xext/xace.c
-+++ Xext/xace.c
-@@ -87,7 +87,18 @@ void XaceHookAuditEnd(ClientPtr ptr, int result)
-  */
- int XaceHook(int hook, ...)
- {
--    pointer calldata;	/* data passed to callback */
-+    union {
-+	XaceResourceAccessRec res;
-+	XaceDeviceAccessRec dev;
-+	XaceSendAccessRec send;
-+	XaceReceiveAccessRec recv;
-+	XaceClientAccessRec client;
-+	XaceExtAccessRec ext;
-+	XaceServerAccessRec server;
-+	XaceScreenAccessRec screen;
-+	XaceAuthAvailRec auth;
-+	XaceKeyAvailRec key;
-+    } u;
-     int *prv = NULL;	/* points to return value from callback */
-     va_list ap;		/* argument list */
-     va_start(ap, hook);
-@@ -99,117 +110,86 @@ int XaceHook(int hook, ...)
-      */
-     switch (hook)
-     {
--	case XACE_RESOURCE_ACCESS: {
--	    XaceResourceAccessRec rec;
--	    rec.client = va_arg(ap, ClientPtr);
--	    rec.id = va_arg(ap, XID);
--	    rec.rtype = va_arg(ap, RESTYPE);
--	    rec.res = va_arg(ap, pointer);
--	    rec.ptype = va_arg(ap, RESTYPE);
--	    rec.parent = va_arg(ap, pointer);
--	    rec.access_mode = va_arg(ap, Mask);
--	    rec.status = Success; /* default allow */
--	    calldata = &rec;
--	    prv = &rec.status;
-+	case XACE_RESOURCE_ACCESS:
-+	    u.res.client = va_arg(ap, ClientPtr);
-+	    u.res.id = va_arg(ap, XID);
-+	    u.res.rtype = va_arg(ap, RESTYPE);
-+	    u.res.res = va_arg(ap, pointer);
-+	    u.res.ptype = va_arg(ap, RESTYPE);
-+	    u.res.parent = va_arg(ap, pointer);
-+	    u.res.access_mode = va_arg(ap, Mask);
-+	    u.res.status = Success; /* default allow */
-+	    prv = &u.res.status;
- 	    break;
--	}
--	case XACE_DEVICE_ACCESS: {
--	    XaceDeviceAccessRec rec;
--	    rec.client = va_arg(ap, ClientPtr);
--	    rec.dev = va_arg(ap, DeviceIntPtr);
--	    rec.access_mode = va_arg(ap, Mask);
--	    rec.status = Success; /* default allow */
--	    calldata = &rec;
--	    prv = &rec.status;
-+	case XACE_DEVICE_ACCESS:
-+	    u.dev.client = va_arg(ap, ClientPtr);
-+	    u.dev.dev = va_arg(ap, DeviceIntPtr);
-+	    u.dev.access_mode = va_arg(ap, Mask);
-+	    u.dev.status = Success; /* default allow */
-+	    prv = &u.dev.status;
- 	    break;
--	}
--	case XACE_SEND_ACCESS: {
--	    XaceSendAccessRec rec;
--	    rec.client = va_arg(ap, ClientPtr);
--	    rec.dev = va_arg(ap, DeviceIntPtr);
--	    rec.pWin = va_arg(ap, WindowPtr);
--	    rec.events = va_arg(ap, xEventPtr);
--	    rec.count = va_arg(ap, int);
--	    rec.status = Success; /* default allow */
--	    calldata = &rec;
--	    prv = &rec.status;
-+	case XACE_SEND_ACCESS:
-+	    u.send.client = va_arg(ap, ClientPtr);
-+	    u.send.dev = va_arg(ap, DeviceIntPtr);
-+	    u.send.pWin = va_arg(ap, WindowPtr);
-+	    u.send.events = va_arg(ap, xEventPtr);
-+	    u.send.count = va_arg(ap, int);
-+	    u.send.status = Success; /* default allow */
-+	    prv = &u.send.status;
- 	    break;
--	}
--	case XACE_RECEIVE_ACCESS: {
--	    XaceReceiveAccessRec rec;
--	    rec.client = va_arg(ap, ClientPtr);
--	    rec.pWin = va_arg(ap, WindowPtr);
--	    rec.events = va_arg(ap, xEventPtr);
--	    rec.count = va_arg(ap, int);
--	    rec.status = Success; /* default allow */
--	    calldata = &rec;
--	    prv = &rec.status;
-+	case XACE_RECEIVE_ACCESS:
-+	    u.recv.client = va_arg(ap, ClientPtr);
-+	    u.recv.pWin = va_arg(ap, WindowPtr);
-+	    u.recv.events = va_arg(ap, xEventPtr);
-+	    u.recv.count = va_arg(ap, int);
-+	    u.recv.status = Success; /* default allow */
-+	    prv = &u.recv.status;
- 	    break;
--	}
--	case XACE_CLIENT_ACCESS: {
--	    XaceClientAccessRec rec;
--	    rec.client = va_arg(ap, ClientPtr);
--	    rec.target = va_arg(ap, ClientPtr);
--	    rec.access_mode = va_arg(ap, Mask);
--	    rec.status = Success; /* default allow */
--	    calldata = &rec;
--	    prv = &rec.status;
-+	case XACE_CLIENT_ACCESS:
-+	    u.client.client = va_arg(ap, ClientPtr);
-+	    u.client.target = va_arg(ap, ClientPtr);
-+	    u.client.access_mode = va_arg(ap, Mask);
-+	    u.client.status = Success; /* default allow */
-+	    prv = &u.client.status;
- 	    break;
--	}
--	case XACE_EXT_ACCESS: {
--	    XaceExtAccessRec rec;
--	    rec.client = va_arg(ap, ClientPtr);
--	    rec.ext = va_arg(ap, ExtensionEntry*);
--	    rec.access_mode = DixGetAttrAccess;
--	    rec.status = Success; /* default allow */
--	    calldata = &rec;
--	    prv = &rec.status;
-+	case XACE_EXT_ACCESS:
-+	    u.ext.client = va_arg(ap, ClientPtr);
-+	    u.ext.ext = va_arg(ap, ExtensionEntry*);
-+	    u.ext.access_mode = DixGetAttrAccess;
-+	    u.ext.status = Success; /* default allow */
-+	    prv = &u.ext.status;
- 	    break;
--	}
--	case XACE_SERVER_ACCESS: {
--	    XaceServerAccessRec rec;
--	    rec.client = va_arg(ap, ClientPtr);
--	    rec.access_mode = va_arg(ap, Mask);
--	    rec.status = Success; /* default allow */
--	    calldata = &rec;
--	    prv = &rec.status;
-+	case XACE_SERVER_ACCESS:
-+	    u.server.client = va_arg(ap, ClientPtr);
-+	    u.server.access_mode = va_arg(ap, Mask);
-+	    u.server.status = Success; /* default allow */
-+	    prv = &u.server.status;
- 	    break;
--	}
- 	case XACE_SCREEN_ACCESS:
--	case XACE_SCREENSAVER_ACCESS: {
--	    XaceScreenAccessRec rec;
--	    rec.client = va_arg(ap, ClientPtr);
--	    rec.screen = va_arg(ap, ScreenPtr);
--	    rec.access_mode = va_arg(ap, Mask);
--	    rec.status = Success; /* default allow */
--	    calldata = &rec;
--	    prv = &rec.status;
-+	case XACE_SCREENSAVER_ACCESS:
-+	    u.screen.client = va_arg(ap, ClientPtr);
-+	    u.screen.screen = va_arg(ap, ScreenPtr);
-+	    u.screen.access_mode = va_arg(ap, Mask);
-+	    u.screen.status = Success; /* default allow */
-+	    prv = &u.screen.status;
- 	    break;
--	}
--	case XACE_AUTH_AVAIL: {
--	    XaceAuthAvailRec rec;
--	    rec.client = va_arg(ap, ClientPtr);
--	    rec.authId = va_arg(ap, XID);
--	    calldata = &rec;
-+	case XACE_AUTH_AVAIL:
-+	    u.auth.client = va_arg(ap, ClientPtr);
-+	    u.auth.authId = va_arg(ap, XID);
- 	    break;
--	}
--	case XACE_KEY_AVAIL: {
--	    XaceKeyAvailRec rec;
--	    rec.event = va_arg(ap, xEventPtr);
--	    rec.keybd = va_arg(ap, DeviceIntPtr);
--	    rec.count = va_arg(ap, int);
--	    calldata = &rec;
-+	case XACE_KEY_AVAIL:
-+	    u.key.event = va_arg(ap, xEventPtr);
-+	    u.key.keybd = va_arg(ap, DeviceIntPtr);
-+	    u.key.count = va_arg(ap, int);
- 	    break;
--	}
--	default: {
-+	default:
- 	    va_end(ap);
- 	    return 0;	/* unimplemented hook number */
--	}
-     }
-     va_end(ap);
-  
-     /* call callbacks and return result, if any. */
--    CallCallbacks(&XaceHooks[hook], calldata);
-+    CallCallbacks(&XaceHooks[hook], &u);
-     return prv ? *prv : Success;
- }
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-common-xf86Config.c b/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-common-xf86Config.c
deleted file mode 100644
index 59aad37..0000000
--- a/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-common-xf86Config.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- hw/xfree86/common/xf86Config.c.orig	Fri Jun 23 12:32:32 2006
-+++ hw/xfree86/common/xf86Config.c	Fri Jun 23 12:32:46 2006
-@@ -1042,7 +1042,7 @@
-     else
- 	xf86Info.estimateSizesAggressively = 0;
- 
--    xf86Info.aiglx = TRUE;
-+    xf86Info.aiglx = FALSE;
-     xf86Info.aiglxFrom = X_DEFAULT;
-     if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) {
- 	xf86Info.aiglx = value;
diff --git a/x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c b/x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
deleted file mode 100644
index e9fb876..0000000
--- a/x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
---- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
-+++ os/xprintf.c	Thu Jan 26 12:47:37 2006
-@@ -39,7 +39,7 @@
- # ifdef __va_copy
- #  define va_copy __va_copy
- # else
--#  error "no working va_copy was found"
-+#  define va_copy(dest, src) ((dest) = (src))
- # endif
- #endif
-     
diff --git a/x11-servers/xorg-server/files/extra-arch-i386 b/x11-servers/xorg-server/files/extra-arch-i386
new file mode 100644
index 0000000..1a0bdee
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-arch-i386
@@ -0,0 +1,11 @@
+--- hw/xfree86/common/compiler.h.orig	2012-05-17 19:09:03.000000000 +0200
++++ hw/xfree86/common/compiler.h	2013-01-18 13:59:18.366436857 +0100
+@@ -1335,7 +1335,7 @@
+ 
+ #if !defined(__SUNPRO_C)
+ #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
+-#ifdef GCCUSESGAS
++#if defined(GCCUSESGAS) || defined(__clang__)
+ 
+ /*
+  * If gcc uses gas rather than the native assembler, the syntax of these
diff --git a/x11-servers/xorg-server/files/extra-arch-powerpc b/x11-servers/xorg-server/files/extra-arch-powerpc
new file mode 100644
index 0000000..389fc87
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-arch-powerpc
@@ -0,0 +1,70 @@
+--- hw/xfree86/os-support/bsd/ppc_video.c.orig	2014-07-22 07:52:58.000000000 -0700
++++ hw/xfree86/os-support/bsd/ppc_video.c	2014-07-22 08:00:21.000000000 -0700
+@@ -44,6 +44,8 @@
+ #define DEV_MEM "/dev/xf86"
+ #endif
+ 
++static int kmem = -1;
++
+ static pointer ppcMapVidMem(int, unsigned long, unsigned long, int flags);
+ static void ppcUnmapVidMem(int, pointer, unsigned long);
+ 
+@@ -68,6 +70,17 @@
+     int fd = xf86Info.consoleFd;
+     pointer base;
+ 
++#ifdef __FreeBSD__
++    if (kmem == -1) {
++        kmem = open(DEV_MEM, 2);
++        if (kmem == -1) {
++            FatalError("mapVidMem: open %s", DEV_MEM);
++        }
++    }
++
++    fd = kmem;
++#endif
++
+ #ifdef DEBUG
+     xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d", Base, Size, fd);
+ #endif
+@@ -93,7 +106,6 @@
+              int Len)
+ {
+     int rv;
+-    static int kmem = -1;
+ 
+     if (kmem == -1) {
+         kmem = open(DEV_MEM, 2);
+@@ -118,6 +130,8 @@
+     int fd = xf86Info.consoleFd;
+ 
+     xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
++
++#ifndef __FreeBSD__
+     if (ioBase == MAP_FAILED) {
+         ioBase = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd,
+                       0xf2000000);
+@@ -127,6 +141,12 @@
+             return FALSE;
+         }
+     }
++#endif
++   /*
++    * Note that outl() etc. check for ioBase == MAP_FAILED, so leaving it that
++    * way (e.g. on FreeBSD) is non-fatal.
++    */
++
+     return TRUE;
+ }
+ 
+@@ -134,8 +154,10 @@
+ xf86DisableIO()
+ {
+ 
++#ifndef __FreeBSD__
+     if (ioBase != MAP_FAILED) {
+         munmap(__UNVOLATILE(ioBase), 0x10000);
+         ioBase = MAP_FAILED;
+     }
++#endif
+ }
diff --git a/x11-servers/xorg-server/files/extra-arch-sparc64 b/x11-servers/xorg-server/files/extra-arch-sparc64
new file mode 100644
index 0000000..45d4005
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-arch-sparc64
@@ -0,0 +1,12 @@
+--- hw/xfree86/os-support/bsd/bsd_init.c.orig	2012-05-17 19:09:03.000000000 +0200
++++ hw/xfree86/os-support/bsd/bsd_init.c	2013-09-01 20:45:36.000000000 +0200
+@@ -230,6 +230,9 @@
+              * Add cases for other *BSD that behave the same.
+              */
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#if defined(__sparc64__)
++	    pci_system_init_dev_mem(fd);
++#endif
+             uname(&uts);
+             i = atof(uts.release) * 100;
+             if (i >= 310)
diff --git a/x11-servers/xorg-server/files/extra-clang b/x11-servers/xorg-server/files/extra-clang
deleted file mode 100644
index 7f22a52..0000000
--- a/x11-servers/xorg-server/files/extra-clang
+++ /dev/null
@@ -1,98 +0,0 @@
---- dix/events.c.orig	2012-07-09 02:32:59.000000000 +0200
-+++ dix/events.c	2012-07-22 14:34:46.000000000 +0200
-@@ -5189,7 +5189,8 @@
- InitEvents(void)
- {
-     int i;
--    QdEventPtr qe, tmp;
-+    QdEventPtr qe = NULL;
-+    QdEventPtr tmp;
- 
-     inputInfo.numDevices = 0;
-     inputInfo.devices = (DeviceIntPtr) NULL;
---- hw/xfree86/common/xf86Xinput.c.orig	2012-06-26 08:24:18.000000000 +0200
-+++ hw/xfree86/common/xf86Xinput.c	2012-07-22 14:34:46.000000000 +0200
-@@ -524,7 +524,7 @@
- MatchAttrToken(const char *attr, struct xorg_list *patterns,
-                int (*compare) (const char *attr, const char *pattern))
- {
--    const xf86MatchGroup *group;
-+    const xf86MatchGroup *group = NULL;
- 
-     /* If there are no patterns, accept the match */
-     if (xorg_list_is_empty(patterns))
---- hw/xfree86/dri2/dri2.c.orig	2012-07-09 02:32:59.000000000 +0200
-+++ hw/xfree86/dri2/dri2.c	2012-07-22 14:38:42.000000000 +0200
-@@ -239,7 +239,7 @@
- static DRI2DrawableRefPtr
- DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
- {
--    DRI2DrawableRefPtr ref;
-+    DRI2DrawableRefPtr ref = NULL;
- 
-     xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
-         if (ref->id == id)
-@@ -306,7 +306,8 @@
- {
-     DRI2DrawablePtr pPriv = p;
-     DRI2ScreenPtr ds = pPriv->dri2_screen;
--    DRI2DrawableRefPtr ref, next;
-+    DRI2DrawableRefPtr ref = NULL;
-+    DRI2DrawableRefPtr next;
-     WindowPtr pWin;
-     PixmapPtr pPixmap;
-     DrawablePtr pDraw;
-@@ -587,7 +588,7 @@
- DRI2InvalidateDrawable(DrawablePtr pDraw)
- {
-     DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
--    DRI2DrawableRefPtr ref;
-+    DRI2DrawableRefPtr ref = NULL;
- 
-     if (!pPriv || !pPriv->needInvalidate)
-         return;
---- test/list.c.orig	2012-06-26 06:12:51.000000000 +0200
-+++ test/list.c	2012-07-22 14:34:46.000000000 +0200
-@@ -187,7 +187,7 @@
- {
-     struct parent parent = { 0 };
-     struct child child[3];
--    struct child *c;
-+    struct child *c = NULL;
-     int i = 0;
- 
-     xorg_list_init(&parent.children);
---- xfixes/cursor.c.orig	2012-07-06 07:17:19.000000000 +0200
-+++ xfixes/cursor.c	2012-07-22 14:34:46.000000000 +0200
-@@ -1143,7 +1143,7 @@
- barrier_find_nearest(CursorScreenPtr cs, int dir,
-                      int x1, int y1, int x2, int y2)
- {
--    struct PointerBarrierClient *c;
-+    struct PointerBarrierClient *c = NULL;
-     struct PointerBarrier *nearest = NULL;
-     double min_distance = INT_MAX;      /* can't get higher than that in X anyway */
- 
---- hw/xfree86/parser/InputClass.c.orig	2013-07-04 11:45:42.139818164 +0200
-+++ hw/xfree86/parser/InputClass.c	2013-07-04 11:46:29.034806839 +0200
-@@ -362,7 +362,8 @@
-     XF86ConfInputClassPtr prev;
- 
-     while (ptr) {
--        xf86MatchGroup *group, *next;
-+        xf86MatchGroup *group = NULL;
-+        xf86MatchGroup *next;
-         char **list;
- 
-         TestFree(ptr->identifier);
---- hw/xfree86/loader/loadmod.c.orig	2013-07-04 11:48:11.160800614 +0200
-+++ hw/xfree86/loader/loadmod.c	2013-07-04 11:48:32.000800157 +0200
-@@ -472,7 +472,7 @@
-     char **elem;
-     const char **subdirs;
-     const char **s;
--    PatternPtr patterns;
-+    PatternPtr patterns = NULL;
-     PatternPtr p;
-     DIR *d;
-     struct dirent *dp;
diff --git a/x11-servers/xorg-server/files/extra-config_devd.c b/x11-servers/xorg-server/files/extra-config_devd.c
deleted file mode 100644
index f6d66a3..0000000
--- a/x11-servers/xorg-server/files/extra-config_devd.c
+++ /dev/null
@@ -1,481 +0,0 @@
---- /dev/null	2013-08-03 00:44:23.000000000 +0200
-+++ config/devd.c	2013-08-03 00:45:15.162836806 +0200
-@@ -0,0 +1,478 @@
-+/*
-+ * Copyright © 2012 Baptiste Daroussin
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ *
-+ * Author: Baptiste Daroussin <bapt@FreeBSD.org>
-+ */
-+
-+#ifdef HAVE_DIX_CONFIG_H
-+#include <dix-config.h>
-+#endif
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <sys/sysctl.h>
-+#include <sys/un.h>
-+
-+#include <ctype.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <stdarg.h>
-+#include <stdbool.h>
-+#include <unistd.h>
-+
-+#include "input.h"
-+#include "inputstr.h"
-+#include "hotplug.h"
-+#include "config-backends.h"
-+#include "os.h"
-+
-+#define DEVD_SOCK_PATH "/var/run/devd.pipe"
-+
-+#define DEVD_EVENT_ADD		'+'
-+#define DEVD_EVENT_REMOVE	'-'
-+
-+static int sock_devd = -1;
-+
-+#if XORG_VERSION_CURRENT < 10800000
-+enum {
-+	ATTR_KEYBOARD,
-+	ATTR_POINTER,
-+	ATTR_JOYSTICK,
-+	ATTR_TOUCHPAD,
-+	ATTR_TOUCHSCREEN,
-+};
-+#endif
-+
-+struct hw_type {
-+	const char *driver;
-+	int flag;
-+	const char *xdriver;
-+};
-+
-+static struct hw_type hw_types[] = {
-+	{ "ukbd", ATTR_KEYBOARD, "kdb" },
-+	{ "atkbd", ATTR_KEYBOARD, "kdb" },
-+	{ "ums", ATTR_POINTER, "mouse" },
-+	{ "psm", ATTR_POINTER, "mouse" },
-+	{ "uhid", ATTR_POINTER, "mouse" },
-+	{ "joy", ATTR_JOYSTICK, NULL },
-+	{ "atp", ATTR_TOUCHPAD, NULL },
-+	{ "uep", ATTR_TOUCHSCREEN, NULL },
-+	{ NULL, -1, NULL },
-+};
-+
-+#if XORG_VERSION_CURRENT < 10800000
-+static void
-+add_option(InputOption **options, const char *key, const char *value)
-+{
-+    if (!value || *value == '\0')
-+        return;
-+
-+    for (; *options; options = &(*options)->next)
-+        ;
-+    *options = calloc(sizeof(**options), 1);
-+    if (!*options) /* Yeesh. */
-+        return;
-+    (*options)->key = xstrdup(key);
-+    (*options)->value = xstrdup(value);
-+    (*options)->next = NULL;
-+}
-+
-+static void
-+remove_device(DeviceIntPtr dev)
-+{
-+    /* this only gets called for devices that have already been added */
-+    LogMessage(X_INFO, "config/devd: removing device %s\n", dev->name);
-+
-+    /* Call PIE here so we don't try to dereference a device that's
-+     * already been removed. */
-+    OsBlockSignals();
-+    ProcessInputEvents();
-+    DeleteInputDeviceRequest(dev);
-+    OsReleaseSignals();
-+}
-+
-+static bool
-+device_is_duplicate(char *config_info)
-+{
-+    DeviceIntPtr dev;
-+
-+    for (dev = inputInfo.devices; dev; dev = dev->next)
-+        if (dev->config_info && (strcmp(dev->config_info, config_info) == 0))
-+            return true;
-+
-+    for (dev = inputInfo.off_devices; dev; dev = dev->next)
-+        if (dev->config_info && (strcmp(dev->config_info, config_info) == 0))
-+            return true;
-+
-+    return false;
-+}
-+
-+#endif
-+
-+static bool
-+sysctl_exists(const char *format, ...)
-+{
-+	va_list args;
-+	char *name = NULL;
-+	size_t len;
-+	int ret;
-+
-+	if (format == NULL)
-+		return false;
-+
-+	va_start(args, format);
-+	vasprintf(&name, format, args);
-+	va_end(args);
-+
-+	ret = sysctlbyname(name, NULL, &len, NULL, 0);
-+
-+	if (ret == -1)
-+		len = 0;
-+
-+	free(name);
-+	return (len > 0);
-+}
-+
-+static char *
-+sysctl_get_str(const char *format, ...)
-+{
-+	va_list args;
-+	char *name = NULL;
-+	char *dest = NULL;
-+	size_t len;
-+
-+	if (format == NULL)
-+		return NULL;
-+
-+	va_start(args, format);
-+	vasprintf(&name, format, args);
-+	va_end(args);
-+
-+	if (sysctlbyname(name, NULL, &len, NULL, 0) == 0) {
-+		dest = malloc(len + 1);
-+		if (sysctlbyname(name, dest, &len, NULL, 0) == 0)
-+			dest[len] = '\0';
-+		else {
-+			free(dest);
-+			dest = NULL;
-+		}
-+	}
-+
-+	free(name);
-+	return dest;
-+}
-+
-+static void
-+device_added(char *line)
-+{
-+    char *walk;
-+    char *path;
-+    char *vendor;
-+    char *product = NULL;
-+    char *config_info = NULL;
-+    InputOption *options = NULL;
-+#if XORG_VERSION_CURRENT > 10800000
-+    InputAttributes attrs = {};
-+#else
-+    InputOption *tmpo;
-+#endif
-+    DeviceIntPtr dev = NULL;
-+    int i, rc;
-+
-+    walk = strchr(line, ' ');
-+    if (walk != NULL)
-+        walk[0] = '\0';
-+
-+    for (i = 0; hw_types[i].driver != NULL; i++) {
-+        if (strncmp(line, hw_types[i].driver,
-+                    strlen(hw_types[i].driver)) == 0 &&
-+            isnumber(*(line + strlen(hw_types[i].driver)))) {
-+#if XORG_VERSION_CURRENT > 10800000
-+            attrs.flags |= hw_types[i].flag;
-+#endif
-+            break;
-+        }
-+    }
-+    if (hw_types[i].driver == NULL) {
-+        LogMessageVerb(X_INFO, 10, "config/devd: ignoring device %s\n", line);
-+        return;
-+    }
-+
-+#if XORG_VERSION_CURRENT < 10800000
-+    if (hw_types[i].xdriver == NULL) {
-+        LogMessageVerb(X_INFO, 10, "config/devd: ignoring device %s\n", line);
-+        return;
-+    }
-+#endif
-+    if (asprintf(&path, "/dev/%s", line) == -1)
-+        return;
-+
-+#if XORG_VERSION_CURRENT < 10800000
-+    options = calloc(sizeof(*options), 1);
-+    if (!options)
-+        return;
-+
-+    add_option(&options, "_source", "server/devd");
-+#else
-+    options =  input_option_new(NULL, "_source", "server/devd");
-+    if (!options)
-+        return;
-+#endif
-+
-+    vendor = sysctl_get_str("dev.%s.%s.%%desc", hw_types[i].driver, line + strlen(hw_types[i].driver));
-+    if (vendor == NULL) {
-+#if XORG_VERSION_CURRENT > 10800000
-+        attrs.vendor = strdup("(unnamed)");
-+#endif
-+    } else {
-+        if ((product = strchr(vendor, ' ')) != NULL) {
-+            product[0] = '\0';
-+            product++;
-+        }
-+#if XORG_VERSION_CURRENT > 10800000
-+        attrs.vendor = strdup(vendor);
-+#endif
-+        if (product != NULL && (walk = strchr(product, ',')) != NULL)
-+            walk[0] = '\0';
-+#if XORG_VERSION_CURRENT > 10800000
-+        attrs.product = strdup(product != NULL ? product : "(unnamed)");
-+	options = input_option_new(options, "name", product != NULL ? product : "(unnamed)");
-+#else
-+        add_option(&options, "name", product != NULL ? product : "(unnamed)");
-+#endif
-+    }
-+#if XORG_VERSION_CURRENT > 10800000
-+    attrs.usb_id = NULL;
-+    options = input_option_new(options, "path", path);
-+    options = input_option_new(options, "device", path);
-+#else
-+    add_option(&options, "path", path);
-+    add_option(&options, "device", path);
-+#endif
-+
-+#if XORG_VERSION_CURRENT < 10800000
-+    add_option(&options, "driver", hw_types[i].xdriver);
-+#endif
-+
-+    if (asprintf(&config_info, "devd:%s", line) == -1) {
-+        config_info = NULL;
-+        goto unwind;
-+    }
-+
-+    if (device_is_duplicate(config_info)) {
-+        LogMessage(X_WARNING, "config/devd: device %s already added. "
-+                              "Ignoring.\n", product != NULL ? product : "(unnamed)");
-+        goto unwind;
-+    }
-+
-+#if XORG_VERSION_CURRENT < 10800000
-+    add_option(&options, "config_info", config_info);
-+#else
-+    options = input_option_new(options, "config_info", config_info);
-+#endif
-+    LogMessage(X_INFO, "config/devd: Adding input device %s (%s)\n",
-+               product != NULL ? product : "(unnamed)", path);
-+
-+#if XORG_VERSION_CURRENT > 10800000
-+    rc = NewInputDeviceRequest(options, &attrs, &dev);
-+#else
-+    rc = NewInputDeviceRequest(options, &dev);
-+#endif
-+
-+    if (rc != Success)
-+        goto unwind;
-+
-+ unwind:
-+    free(config_info);
-+#if XORG_VERSION_CURRENT < 10800000
-+    while ((tmpo = options)) {
-+        options = tmpo->next;
-+        free(tmpo->key);        /* NULL if dev != NULL */
-+        free(tmpo->value);      /* NULL if dev != NULL */
-+        free(tmpo);
-+    }
-+#else
-+    input_option_free_list(&options);
-+#endif
-+
-+#if XORG_VERSION_CURRENT > 10800000
-+    free(attrs.usb_id);
-+    free(attrs.product);
-+    free(attrs.device);
-+    free(attrs.vendor);
-+#endif
-+
-+    return;
-+}
-+
-+static void
-+device_removed(char *line)
-+{
-+    char *walk;
-+    char *value;
-+#if XORG_VERSION_CURRENT < 10800000
-+    DeviceIntPtr dev, next;
-+#endif
-+
-+    walk = strchr(line, ' ');
-+    if (walk != NULL)
-+        walk[0] = '\0';
-+
-+    if (asprintf(&value, "devd:%s", line) == -1)
-+        return;
-+
-+#if XORG_VERSION_CURRENT > 10800000
-+    remove_devices("dev", value);
-+#else
-+    for (dev = inputInfo.devices; dev; dev = next) {
-+        next = dev->next;
-+        if (dev->config_info && strcmp(dev->config_info, value) == 0)
-+            remove_device(dev);
-+    }
-+    for (dev = inputInfo.off_devices; dev; dev = next) {
-+	next = dev->next;
-+        if (dev->config_info && strcmp(dev->config_info, value) == 0)
-+            remove_device(dev);
-+    }
-+#endif
-+
-+    free(value);
-+}
-+
-+static ssize_t
-+socket_getline(int fd, char **out)
-+{
-+	char *buf;
-+	ssize_t ret, cap, sz = 0;
-+	char c;
-+
-+	cap = 1024;
-+	buf = malloc(cap * sizeof(char));
-+	if (!buf)
-+		return -1;
-+
-+	for (;;) {
-+		ret = read(sock_devd, &c, 1);
-+		if (ret < 1) {
-+			free(buf);
-+			return -1;
-+		}
-+
-+		if (c == '\n')
-+			break;
-+
-+		if (sz + 1 >= cap) {
-+			cap *= 2;
-+			buf = realloc(buf, cap *sizeof(char));
-+		}
-+		buf[sz] = c;
-+		sz++;
-+	}
-+
-+	buf[sz] = '\0';
-+	if (sz > 0)
-+		*out = buf;
-+	else
-+		free(buf);
-+
-+	return sz; /* number of bytes in the line, not counting the line break*/
-+}
-+
-+static void
-+wakeup_handler(pointer data, int err, pointer read_mask)
-+{
-+    char *line = NULL;
-+
-+    if (err < 0)
-+        return;
-+
-+    if (FD_ISSET(sock_devd, (fd_set *)read_mask)) {
-+        if (socket_getline(sock_devd, &line) < 0)
-+            return;
-+
-+        switch(*line) {
-+		case DEVD_EVENT_ADD:
-+			device_added(line++);
-+			break;
-+		case DEVD_EVENT_REMOVE:
-+			device_removed(line++);
-+			break;
-+		default:
-+			break;
-+	}
-+	free(line);
-+    }
-+}
-+
-+static void
-+block_handler(pointer data, struct timeval **tv, pointer read_mask)
-+{
-+}
-+
-+int
-+config_devd_init(void)
-+{
-+    struct sockaddr_un devd;
-+    char devicename[1024];
-+    int i, j;
-+
-+    /* first scan the sysctl to determine the hardware if needed */
-+
-+    for (i = 0; hw_types[i].driver != NULL; i++) {
-+        for (j = 0; sysctl_exists("dev.%s.%i.%%desc", hw_types[i].driver, j); j++) {
-+            snprintf(devicename, 1024, "%s%i", hw_types[i].driver, j);
-+            device_added(devicename);
-+        }
-+
-+    }
-+    sock_devd = socket(AF_UNIX, SOCK_STREAM, 0);
-+    if (sock_devd < 0) {
-+        ErrorF("config/devd: Fail opening stream socket");
-+        return 0;
-+    }
-+
-+    devd.sun_family = AF_UNIX;
-+    strlcpy(devd.sun_path, DEVD_SOCK_PATH, sizeof(devd.sun_path));
-+
-+    if (connect(sock_devd, (struct sockaddr *) &devd, sizeof(struct sockaddr_un)) < 0) {
-+        close(sock_devd);
-+        ErrorF("config/devd: Fail to connect to devd");
-+        return 0;
-+    }
-+
-+    RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL);
-+    AddGeneralSocket(sock_devd);
-+
-+    return 1;
-+}
-+
-+void
-+config_devd_fini(void)
-+{
-+    if (sock_devd < 0)
-+        return;
-+
-+    RemoveGeneralSocket(sock_devd);
-+    RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL);
-+    close(sock_devd);
-+}
diff --git a/x11-servers/xorg-server/files/extra-configure b/x11-servers/xorg-server/files/extra-configure
deleted file mode 100644
index cede35b..0000000
--- a/x11-servers/xorg-server/files/extra-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2013-09-07 22:11:27.210621324 +0200
-+++ configure	2013-09-07 22:11:52.912624338 +0200
-@@ -22839,7 +22839,7 @@
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
--  ac_cv_tls=$kw
-+  ac_cv_tls=$kw; break ;
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-         done
diff --git a/x11-servers/xorg-server/files/extra-dix_events.c b/x11-servers/xorg-server/files/extra-dix_events.c
deleted file mode 100644
index caa7a99..0000000
--- a/x11-servers/xorg-server/files/extra-dix_events.c
+++ /dev/null
@@ -1,89 +0,0 @@
---- dix/events.c.orig	2010-05-04 02:47:57.000000000 +0200
-+++ dix/events.c	2012-04-24 12:59:22.000000000 +0200
-@@ -3440,7 +3440,6 @@ CheckPassiveGrabsOnWindow(
-     {
- 	DeviceIntPtr	gdev;
- 	XkbSrvInfoPtr	xkbi = NULL;
--	Mask		mask = 0;
- 
- 	gdev= grab->modifierDevice;
-         if (grab->grabtype == GRABTYPE_CORE)
-@@ -3555,9 +3554,6 @@ CheckPassiveGrabsOnWindow(
-                 }
-                 xE = &core;
-                 count = 1;
--                mask = grab->eventMask;
--                if (grab->ownerEvents)
--                    mask |= pWin->eventMask;
-             } else if (match & XI2_MATCH)
-             {
-                 rc = EventToXI2((InternalEvent*)event, &xE);
-@@ -3569,34 +3565,6 @@ CheckPassiveGrabsOnWindow(
-                     continue;
-                 }
-                 count = 1;
--
--                /* FIXME: EventToXI2 returns NULL for enter events, so
--                 * dereferencing the event is bad. Internal event types are
--                 * aligned with core events, so the else clause is valid.
--                 * long-term we should use internal events for enter/focus
--                 * as well */
--                if (xE)
--                    mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
--                else if (event->type == XI_Enter || event->type == XI_FocusIn)
--                    mask = grab->xi2mask[device->id][event->type/8];
--
--                if (grab->ownerEvents && wOtherInputMasks(grab->window))
--                {
--                    InputClientsPtr icp =
--                        wOtherInputMasks(grab->window)->inputClients;
--
--                    while(icp)
--                    {
--                        if (rClient(icp) == rClient(grab))
--                        {
--                            int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
--                            mask |= icp->xi2mask[device->id][evtype/8];
--                            break;
--                        }
--
--                        icp = icp->next;
--                    }
--                }
-             } else
-             {
-                 rc = EventToXI((InternalEvent*)event, &xE, &count);
-@@ -3607,23 +3575,6 @@ CheckPassiveGrabsOnWindow(
-                                 "(%d, %d).\n", device->name, event->type, rc);
-                     continue;
-                 }
--                mask = grab->eventMask;
--                if (grab->ownerEvents && wOtherInputMasks(grab->window))
--                {
--                    InputClientsPtr icp =
--                        wOtherInputMasks(grab->window)->inputClients;
--
--                    while(icp)
--                    {
--                        if (rClient(icp) == rClient(grab))
--                        {
--                            mask |= icp->mask[device->id];
--                            break;
--                        }
--
--                        icp = icp->next;
--                    }
--                }
-             }
- 
- 	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
-@@ -3632,7 +3583,8 @@ CheckPassiveGrabsOnWindow(
-             {
-                 FixUpEventFromWindow(device, xE, grab->window, None, TRUE);
- 
--                TryClientEvents(rClient(grab), device, xE, count, mask,
-+                TryClientEvents(rClient(grab), device, xE, count,
-+                                       GetEventFilter(device, xE),
-                                        GetEventFilter(device, xE), grab);
-             }
- 
diff --git a/x11-servers/xorg-server/files/extra-include_eventstr.h b/x11-servers/xorg-server/files/extra-include_eventstr.h
deleted file mode 100644
index e39aadd..0000000
--- a/x11-servers/xorg-server/files/extra-include_eventstr.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/eventstr.h.orig	2012-02-05 19:23:06.000000000 +0100
-+++ include/eventstr.h	2012-02-05 19:23:35.000000000 +0100
-@@ -91,9 +91,9 @@
-         uint32_t button;  /**< Button number */
-         uint32_t key;     /**< Key code */
-     } detail;
--    uint16_t root_x;      /**< Pos relative to root window in integral data */
-+    int16_t root_x;      /**< Pos relative to root window in integral data */
-     float root_x_frac;    /**< Pos relative to root window in frac part */
--    uint16_t root_y;      /**< Pos relative to root window in integral part */
-+    int16_t root_y;      /**< Pos relative to root window in integral part */
-     float root_y_frac;    /**< Pos relative to root window in frac part */
-     uint8_t    buttons[(MAX_BUTTONS + 7)/8]; /**< Button mask */
-     struct {
diff --git a/x11-servers/xorg-server/files/extra-new-arch-i386 b/x11-servers/xorg-server/files/extra-new-arch-i386
deleted file mode 100644
index 1a0bdee..0000000
--- a/x11-servers/xorg-server/files/extra-new-arch-i386
+++ /dev/null
@@ -1,11 +0,0 @@
---- hw/xfree86/common/compiler.h.orig	2012-05-17 19:09:03.000000000 +0200
-+++ hw/xfree86/common/compiler.h	2013-01-18 13:59:18.366436857 +0100
-@@ -1335,7 +1335,7 @@
- 
- #if !defined(__SUNPRO_C)
- #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
--#ifdef GCCUSESGAS
-+#if defined(GCCUSESGAS) || defined(__clang__)
- 
- /*
-  * If gcc uses gas rather than the native assembler, the syntax of these
diff --git a/x11-servers/xorg-server/files/extra-new-arch-powerpc b/x11-servers/xorg-server/files/extra-new-arch-powerpc
deleted file mode 100644
index 389fc87..0000000
--- a/x11-servers/xorg-server/files/extra-new-arch-powerpc
+++ /dev/null
@@ -1,70 +0,0 @@
---- hw/xfree86/os-support/bsd/ppc_video.c.orig	2014-07-22 07:52:58.000000000 -0700
-+++ hw/xfree86/os-support/bsd/ppc_video.c	2014-07-22 08:00:21.000000000 -0700
-@@ -44,6 +44,8 @@
- #define DEV_MEM "/dev/xf86"
- #endif
- 
-+static int kmem = -1;
-+
- static pointer ppcMapVidMem(int, unsigned long, unsigned long, int flags);
- static void ppcUnmapVidMem(int, pointer, unsigned long);
- 
-@@ -68,6 +70,17 @@
-     int fd = xf86Info.consoleFd;
-     pointer base;
- 
-+#ifdef __FreeBSD__
-+    if (kmem == -1) {
-+        kmem = open(DEV_MEM, 2);
-+        if (kmem == -1) {
-+            FatalError("mapVidMem: open %s", DEV_MEM);
-+        }
-+    }
-+
-+    fd = kmem;
-+#endif
-+
- #ifdef DEBUG
-     xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d", Base, Size, fd);
- #endif
-@@ -93,7 +106,6 @@
-              int Len)
- {
-     int rv;
--    static int kmem = -1;
- 
-     if (kmem == -1) {
-         kmem = open(DEV_MEM, 2);
-@@ -118,6 +130,8 @@
-     int fd = xf86Info.consoleFd;
- 
-     xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
-+
-+#ifndef __FreeBSD__
-     if (ioBase == MAP_FAILED) {
-         ioBase = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd,
-                       0xf2000000);
-@@ -127,6 +141,12 @@
-             return FALSE;
-         }
-     }
-+#endif
-+   /*
-+    * Note that outl() etc. check for ioBase == MAP_FAILED, so leaving it that
-+    * way (e.g. on FreeBSD) is non-fatal.
-+    */
-+
-     return TRUE;
- }
- 
-@@ -134,8 +154,10 @@
- xf86DisableIO()
- {
- 
-+#ifndef __FreeBSD__
-     if (ioBase != MAP_FAILED) {
-         munmap(__UNVOLATILE(ioBase), 0x10000);
-         ioBase = MAP_FAILED;
-     }
-+#endif
- }
diff --git a/x11-servers/xorg-server/files/extra-new-arch-sparc64 b/x11-servers/xorg-server/files/extra-new-arch-sparc64
deleted file mode 100644
index 45d4005..0000000
--- a/x11-servers/xorg-server/files/extra-new-arch-sparc64
+++ /dev/null
@@ -1,12 +0,0 @@
---- hw/xfree86/os-support/bsd/bsd_init.c.orig	2012-05-17 19:09:03.000000000 +0200
-+++ hw/xfree86/os-support/bsd/bsd_init.c	2013-09-01 20:45:36.000000000 +0200
-@@ -230,6 +230,9 @@
-              * Add cases for other *BSD that behave the same.
-              */
- #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__sparc64__)
-+	    pci_system_init_dev_mem(fd);
-+#endif
-             uname(&uts);
-             i = atof(uts.release) * 100;
-             if (i >= 310)
diff --git a/x11-servers/xorg-server/files/extra-new-bad-impl b/x11-servers/xorg-server/files/extra-new-bad-impl
deleted file mode 100644
index d15ee84..0000000
--- a/x11-servers/xorg-server/files/extra-new-bad-impl
+++ /dev/null
@@ -1,38 +0,0 @@
-Fix BadImplemented triggered in GDK 3
-
-Lead:
-https://bbs.archlinux.org/viewtopic.php?id=162012
-Debian bug:
-http://lists.debian.org/debian-x/2012/12/msg00133.html
-
---- Xi/xiselectev.c.orig	2012-05-17 19:09:01.000000000 +0200
-+++ Xi/xiselectev.c	2012-12-18 10:29:38.804469850 +0100
-@@ -175,17 +175,24 @@
-                 if (inputMasks)
-                     iclient = inputMasks->inputClients;
-                 for (; iclient; iclient = iclient->next) {
--                    DeviceIntPtr dummy;
-+                    DeviceIntPtr devTest;
-+                    DeviceIntRec dummyTest;
- 
-                     if (CLIENT_ID(iclient->resource) == client->index)
-                         continue;
- 
--                    dixLookupDevice(&dummy, evmask->deviceid, serverClient,
-+                    if (evmask->deviceid == XIAllDevices ||
-+                        evmask->deviceid == XIAllMasterDevices) {
-+                        dummyTest.id = evmask->deviceid;
-+                        devTest = &dummyTest;
-+                    }
-+                    else
-+                        dixLookupDevice(&devTest, evmask->deviceid, serverClient,
-                                     DixReadAccess);
--                    if (!dummy)
-+                    if (!devTest)
-                         return BadImplementation;       /* this shouldn't happen */
- 
--                    if (xi2mask_isset(iclient->xi2mask, dummy, XI_TouchBegin))
-+                    if (xi2mask_isset(iclient->xi2mask, devTest, XI_TouchBegin))
-                         return BadAccess;
-                 }
-             }
diff --git a/x11-servers/xorg-server/files/extra-new-dix_dixfonts.c b/x11-servers/xorg-server/files/extra-new-dix_dixfonts.c
deleted file mode 100644
index d1f5674..0000000
--- a/x11-servers/xorg-server/files/extra-new-dix_dixfonts.c
+++ /dev/null
@@ -1,41 +0,0 @@
---- dix/dixfonts.c.orig	2012-05-17 19:09:01.000000000 +0200
-+++ dix/dixfonts.c	2013-10-09 10:49:38.158284440 +0200
-@@ -1414,6 +1414,7 @@
-             GC *pGC;
-             unsigned char *data;
-             ITclosurePtr new_closure;
-+            ITclosurePtr old_closure;
- 
-             /* We're putting the client to sleep.  We need to
-                save some state.  Similar problem to that handled
-@@ -1425,12 +1426,14 @@
-                 err = BadAlloc;
-                 goto bail;
-             }
-+            old_closure = c;
-             *new_closure = *c;
-             c = new_closure;
- 
-             data = malloc(c->nChars * itemSize);
-             if (!data) {
-                 free(c);
-+                c = old_closure;
-                 err = BadAlloc;
-                 goto bail;
-             }
-@@ -1441,6 +1444,7 @@
-             if (!pGC) {
-                 free(c->data);
-                 free(c);
-+                c = old_closure;
-                 err = BadAlloc;
-                 goto bail;
-             }
-@@ -1453,6 +1457,7 @@
-                 FreeScratchGC(pGC);
-                 free(c->data);
-                 free(c);
-+                c = old_closure;
-                 err = BadAlloc;
-                 goto bail;
-             }
diff --git a/x11-servers/xorg-server/files/extra-old-arch-i386 b/x11-servers/xorg-server/files/extra-old-arch-i386
deleted file mode 100644
index c5e558c..0000000
--- a/x11-servers/xorg-server/files/extra-old-arch-i386
+++ /dev/null
@@ -1,11 +0,0 @@
---- hw/xfree86/common/compiler.h.orig	2010-05-04 02:47:58.000000000 +0200
-+++ hw/xfree86/common/compiler.h	2013-01-18 13:07:35.785442739 +0100
-@@ -1021,7 +1021,7 @@
- 
- #    if !defined(__SUNPRO_C)
- #    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
--#     ifdef GCCUSESGAS
-+#     if defined(GCCUSESGAS) || defined(__clang__)
- 
- /*
-  * If gcc uses gas rather than the native assembler, the syntax of these
diff --git a/x11-servers/xorg-server/files/extra-old-arch-powerpc b/x11-servers/xorg-server/files/extra-old-arch-powerpc
deleted file mode 100644
index 6fa9178..0000000
--- a/x11-servers/xorg-server/files/extra-old-arch-powerpc
+++ /dev/null
@@ -1,14 +0,0 @@
---- hw/xfree86/os-support/bsd/ppc_video.c.orig	2008-01-02 12:29:21.000000000 +0000
-+++ hw/xfree86/os-support/bsd/ppc_video.c	2008-01-02 12:29:00.000000000 +0000
-@@ -164,7 +164,11 @@
- 
-         if (ioBase != MAP_FAILED)
-         {
-+#if defined(__FreeBSD__)
-+		munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000);
-+#else
-                 munmap(__UNVOLATILE(ioBase), 0x10000);
-+#endif
-                 ioBase = MAP_FAILED;
-         }
- }
diff --git a/x11-servers/xorg-server/files/extra-old-arch-sparc64 b/x11-servers/xorg-server/files/extra-old-arch-sparc64
deleted file mode 100644
index 651be80..0000000
--- a/x11-servers/xorg-server/files/extra-old-arch-sparc64
+++ /dev/null
@@ -1,13 +0,0 @@
---- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
-+++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
-@@ -52,6 +52,10 @@
- 	pVidMem->mapMem = sparc64MapVidMem;
- 	pVidMem->unmapMem = sparc64UnmapVidMem;
- 	pVidMem->initialised = TRUE;
-+
-+#if defined(__FreeBSD__)
-+	pci_system_init_dev_mem(xf86Info.screenFd);
-+#endif
- }
- 
- static pointer
diff --git a/x11-servers/xorg-server/files/extra-old-dix_dixfonts.c b/x11-servers/xorg-server/files/extra-old-dix_dixfonts.c
deleted file mode 100644
index 163a4ef..0000000
--- a/x11-servers/xorg-server/files/extra-old-dix_dixfonts.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- dix/dixfonts.c.orig	2010-05-04 02:47:57.000000000 +0200
-+++ dix/dixfonts.c	2013-10-09 10:54:40.488267646 +0200
-@@ -1508,6 +1508,7 @@
- 	    GC *pGC;
- 	    unsigned char *data;
- 	    ITclosurePtr new_closure;
-+	    ITclosurePtr old_closure;
- 
- 	    /* We're putting the client to sleep.  We need to
- 	       save some state.  Similar problem to that handled
-@@ -1520,6 +1521,7 @@
- 		err = BadAlloc;
- 		goto bail;
- 	    }
-+	    old_closure = c;
- 	    *new_closure = *c;
- 	    c = new_closure;
- 
-@@ -1527,6 +1529,7 @@
- 	    if (!data)
- 	    {
- 		xfree(c);
-+		c = old_closure;
- 		err = BadAlloc;
- 		goto bail;
- 	    }
-@@ -1538,6 +1541,7 @@
- 	    {
- 		xfree(c->data);
- 		xfree(c);
-+		c = old_closure;
- 		err = BadAlloc;
- 		goto bail;
- 	    }
-@@ -1551,6 +1555,7 @@
- 		FreeScratchGC(pGC);
- 		xfree(c->data);
- 		xfree(c);
-+		c = old_closure;
- 		err = BadAlloc;
- 		goto bail;
- 	    }
diff --git a/x11-servers/xorg-server/files/extra-os-utils.c b/x11-servers/xorg-server/files/extra-os-utils.c
deleted file mode 100644
index 2980ded..0000000
--- a/x11-servers/xorg-server/files/extra-os-utils.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
-+++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
-@@ -315,7 +315,7 @@
-     FatalError("Could not create lock file in %s\n", tmp);
-   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
-   (void) write(lfd, pid_str, 11);
--  (void) chmod(tmp, 0444);
-+  (void) fchmod(tmp, 0444);
-   (void) close(lfd);
- 
-   /*
-@@ -336,7 +336,7 @@
-       /*
-        * Read the pid from the existing file
-        */
--      lfd = open(LockFile, O_RDONLY);
-+      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
-       if (lfd < 0) {
-         unlink(tmp);
-         FatalError("Can't read lock file %s\n", LockFile); 
diff --git a/x11-servers/xorg-server/files/patch-CVE-2014-8092-3-4 b/x11-servers/xorg-server/files/patch-CVE-2014-8092-3-4
index e05101b..1d40d04 100644
--- a/x11-servers/xorg-server/files/patch-CVE-2014-8092-3-4
+++ b/x11-servers/xorg-server/files/patch-CVE-2014-8092-3-4
@@ -119,7 +119,7 @@ index 515e93f..079375d 100644
 -        if (((_size) > 1) && ((_pReg)->data =
 -                              (RegDataPtr) malloc(RegionSizeof(_size)))) {
 +        if (((_size) > 1) && ((rgnSize = RegionSizeof(_size)) > 0) &&
-+            (((_pReg)->data = malloc(rgnSize)) != NULL)) {
++            (((_pReg)->data = (RegDataPtr) malloc(rgnSize)) != NULL)) {
              (_pReg)->data->size = (_size);
              (_pReg)->data->numRects = 0;
          }
diff --git a/x11-servers/xorg-server/files/patch-CVE-2014-8095 b/x11-servers/xorg-server/files/patch-CVE-2014-8095
index 8c8a3f0..8fddc45 100644
--- a/x11-servers/xorg-server/files/patch-CVE-2014-8095
+++ b/x11-servers/xorg-server/files/patch-CVE-2014-8095
@@ -281,38 +281,28 @@ index 63d95bc..e2a2ae3 100644
  
      ret = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess);
      if (ret != Success)
---- Xi/xipassivegrab.c.orig	2012-05-17 19:09:01.000000000 +0200
-+++ Xi/xipassivegrab.c	2014-12-10 10:32:35.379412598 +0100
-@@ -50,9 +50,10 @@
- SProcXIPassiveGrabDevice(ClientPtr client)
- {
-     int i;
--    xXIModifierInfo *mods;
-+    uint32_t *mods;
+--- Xi/xipassivegrab.c.orig	2014-04-15 03:01:56.000000000 +0200
++++ Xi/xipassivegrab.c	2014-12-11 09:00:53.965074134 +0100
+@@ -53,6 +53,7 @@
+     uint32_t *mods;
  
      REQUEST(xXIPassiveGrabDeviceReq);
 +    REQUEST_AT_LEAST_SIZE(xXIPassiveGrabDeviceReq);
  
      swaps(&stuff->length);
      swaps(&stuff->deviceid);
-@@ -63,12 +64,12 @@
+@@ -63,7 +64,9 @@
      swaps(&stuff->mask_len);
      swaps(&stuff->num_modifiers);
  
--    mods = (xXIModifierInfo *) &stuff[1];
+-    mods = (uint32_t *) &stuff[1];
 +    REQUEST_FIXED_SIZE(xXIPassiveGrabDeviceReq,
 +        ((uint32_t) stuff->mask_len + stuff->num_modifiers) *4);
 +    mods = (uint32_t *) &stuff[1] + stuff->mask_len;
  
      for (i = 0; i < stuff->num_modifiers; i++, mods++) {
--        swapl(&mods->base_mods);
--        swapl(&mods->latched_mods);
--        swapl(&mods->locked_mods);
-+        swapl(mods);
-     }
- 
-     return ProcXIPassiveGrabDevice(client);
-@@ -88,7 +89,8 @@
+         swapl(mods);
+@@ -92,7 +95,8 @@
      int mask_len;
  
      REQUEST(xXIPassiveGrabDeviceReq);
@@ -322,7 +312,7 @@ index 63d95bc..e2a2ae3 100644
  
      if (stuff->deviceid == XIAllDevices)
          dev = inputInfo.all_devices;
-@@ -250,6 +252,7 @@
+@@ -248,6 +252,7 @@
      uint32_t *modifiers;
  
      REQUEST(xXIPassiveUngrabDeviceReq);
@@ -330,7 +320,7 @@ index 63d95bc..e2a2ae3 100644
  
      swaps(&stuff->length);
      swapl(&stuff->grab_window);
-@@ -257,6 +260,8 @@
+@@ -255,6 +260,8 @@
      swapl(&stuff->detail);
      swaps(&stuff->num_modifiers);
  
@@ -339,7 +329,7 @@ index 63d95bc..e2a2ae3 100644
      modifiers = (uint32_t *) &stuff[1];
  
      for (i = 0; i < stuff->num_modifiers; i++, modifiers++)
-@@ -275,7 +280,8 @@
+@@ -273,7 +280,8 @@
      int i, rc;
  
      REQUEST(xXIPassiveUngrabDeviceReq);
diff --git a/x11-servers/xorg-server/files/patch-CVE-2014-8098-7-8 b/x11-servers/xorg-server/files/patch-CVE-2014-8098-7-8
index 518b71d..76fa0e0 100644
--- a/x11-servers/xorg-server/files/patch-CVE-2014-8098-7-8
+++ b/x11-servers/xorg-server/files/patch-CVE-2014-8098-7-8
@@ -47,8 +47,8 @@ index cda7656..1ebf7f3 100644
      pc += __GLX_SINGLE_HDR_SIZE;
      if (cx != NULL) {
          const GLenum target = (GLenum) bswap_32(*(int *) (pc + 0));
---- glx/single2.c.orig	2012-05-17 19:09:02.000000000 +0200
-+++ glx/single2.c	2014-12-10 14:44:06.961670320 +0100
+--- glx/single2.c.orig	2014-04-15 03:01:57.000000000 +0200
++++ glx/single2.c	2014-12-11 09:08:22.788060618 +0100
 @@ -49,11 +49,14 @@
  int
  __glXDisp_FeedbackBuffer(__GLXclientState * cl, GLbyte * pc)
@@ -101,10 +101,10 @@ index cda7656..1ebf7f3 100644
       */
   noChangeAllowed:;
 -    client = cl->client;
-     reply.length = nitems;
-     reply.type = X_Reply;
-     reply.sequenceNumber = client->sequence;
-@@ -209,9 +216,12 @@
+     reply = (xGLXRenderModeReply) {
+         .type = X_Reply,
+         .sequenceNumber = client->sequence,
+@@ -211,9 +218,12 @@
  int
  __glXDisp_Flush(__GLXclientState * cl, GLbyte * pc)
  {
@@ -117,7 +117,7 @@ index cda7656..1ebf7f3 100644
      cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
      if (!cx) {
          return error;
-@@ -225,10 +235,12 @@
+@@ -227,10 +237,12 @@
  int
  __glXDisp_Finish(__GLXclientState * cl, GLbyte * pc)
  {
@@ -131,7 +131,7 @@ index cda7656..1ebf7f3 100644
      cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
      if (!cx) {
          return error;
-@@ -319,7 +331,7 @@
+@@ -321,7 +332,7 @@
  int
  DoGetString(__GLXclientState * cl, GLbyte * pc, GLboolean need_swap)
  {
@@ -140,7 +140,7 @@ index cda7656..1ebf7f3 100644
      __GLXcontext *cx;
      GLenum name;
      const char *string;
-@@ -329,6 +341,8 @@
+@@ -331,6 +342,8 @@
      char *buf = NULL, *buf1 = NULL;
      GLint length = 0;
  
@@ -149,7 +149,7 @@ index cda7656..1ebf7f3 100644
      /* If the client has the opposite byte order, swap the contextTag and
       * the name.
       */
-@@ -345,7 +359,6 @@
+@@ -347,7 +360,6 @@
      pc += __GLX_SINGLE_HDR_SIZE;
      name = *(GLenum *) (pc + 0);
      string = (const char *) CALL_GetString(GET_DISPATCH(), (name));
@@ -157,8 +157,8 @@ index cda7656..1ebf7f3 100644
  
      if (string == NULL)
          string = "";
---- glx/single2swap.c.orig	2012-05-17 19:09:02.000000000 +0200
-+++ glx/single2swap.c	2014-12-10 14:46:06.475406737 +0100
+--- glx/single2swap.c.orig	2014-04-15 03:01:57.000000000 +0200
++++ glx/single2swap.c	2014-12-11 09:05:12.670056539 +0100
 @@ -45,6 +45,7 @@
  int
  __glXDispSwap_FeedbackBuffer(__GLXclientState * cl, GLbyte * pc)
@@ -215,10 +215,10 @@ index cda7656..1ebf7f3 100644
       */
   noChangeAllowed:;
 -    client = cl->client;
-     reply.length = nitems;
-     reply.type = X_Reply;
-     reply.sequenceNumber = client->sequence;
-@@ -226,11 +233,14 @@
+     reply = (xGLXRenderModeReply) {
+         .type = X_Reply,
+         .sequenceNumber = client->sequence,
+@@ -228,11 +235,14 @@
  int
  __glXDispSwap_Flush(__GLXclientState * cl, GLbyte * pc)
  {
@@ -233,7 +233,7 @@ index cda7656..1ebf7f3 100644
      __GLX_SWAP_INT(&((xGLXSingleReq *) pc)->contextTag);
      cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
      if (!cx) {
-@@ -245,12 +255,14 @@
+@@ -247,12 +257,14 @@
  int
  __glXDispSwap_Finish(__GLXclientState * cl, GLbyte * pc)
  {
@@ -249,7 +249,7 @@ index cda7656..1ebf7f3 100644
      __GLX_SWAP_INT(&((xGLXSingleReq *) pc)->contextTag);
      cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
      if (!cx) {
-@@ -262,7 +274,6 @@
+@@ -264,7 +276,6 @@
      cx->hasUnflushedCommands = GL_FALSE;
  
      /* Send empty reply packet to indicate finish is finished */
@@ -257,8 +257,8 @@ index cda7656..1ebf7f3 100644
      __GLX_BEGIN_REPLY(0);
      __GLX_PUT_RETVAL(0);
      __GLX_SWAP_REPLY_HEADER();
---- glx/singlepix.c.orig	2014-12-10 15:49:35.025115139 +0100
-+++ glx/singlepix.c	2014-12-10 15:53:21.967098978 +0100
+--- glx/singlepix.c.orig	2014-12-11 09:04:51.072058678 +0100
++++ glx/singlepix.c	2014-12-11 09:10:51.484033826 +0100
 @@ -55,6 +55,8 @@
      int error;
      char *answer, answerBuffer[200];
@@ -404,8 +404,8 @@ index cda7656..1ebf7f3 100644
 +    REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 16);
      return GetColorTable(cl, pc + __GLX_VENDPRIV_HDR_SIZE, tag);
  }
---- glx/singlepixswap.c.orig	2014-12-10 15:49:35.025115139 +0100
-+++ glx/singlepixswap.c	2014-12-10 15:55:47.558406617 +0100
+--- glx/singlepixswap.c.orig	2014-12-11 09:04:51.073058638 +0100
++++ glx/singlepixswap.c	2014-12-11 09:12:14.151301716 +0100
 @@ -57,6 +57,8 @@
      int error;
      char *answer, answerBuffer[200];
@@ -438,7 +438,7 @@ index cda7656..1ebf7f3 100644
      compsize2 = __glGetTexImage_size(target, 1, format, type, height, 1, 1);
  
 -    if (compsize < 0)
-+    if ((compsize = safe_pad(compsize)) < 0)
++    if ((compsize =safe_pad(compsize)) < 0)
          return BadLength;
 -    if (compsize2 < 0)
 +    if ((compsize2 = safe_pad(compsize2)) < 0)
diff --git a/x11-servers/xorg-server/files/patch-CVE-2014-8100-1-2 b/x11-servers/xorg-server/files/patch-CVE-2014-8100-1-2
index a2ae054..cfb0c4c 100644
--- a/x11-servers/xorg-server/files/patch-CVE-2014-8100-1-2
+++ b/x11-servers/xorg-server/files/patch-CVE-2014-8100-1-2
@@ -13,9 +13,11 @@ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  render/render.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- render/render.c.orig	2014-12-10 16:06:01.737046585 +0100
-+++ render/render.c	2014-12-10 16:07:49.285040265 +0100
-@@ -271,10 +271,11 @@
+diff --git a/render/render.c b/render/render.c
+index e3031da..200e0c8 100644
+--- render/render.c
++++ render/render.c
+@@ -276,11 +276,11 @@ ProcRenderQueryVersion(ClientPtr client)
  
      REQUEST(xRenderQueryVersionReq);
  
@@ -25,6 +27,10 @@ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
      pRenderClient->minor_version = stuff->minorVersion;
  
 -    REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
-     memset(&rep, 0, sizeof(xRenderQueryVersionReply));
-     rep.type = X_Reply;
-     rep.length = 0;
+-
+     if ((stuff->majorVersion * 1000 + stuff->minorVersion) <
+         (SERVER_RENDER_MAJOR_VERSION * 1000 + SERVER_RENDER_MINOR_VERSION)) {
+         rep.majorVersion = stuff->majorVersion;
+-- 
+2.1.2
+
diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
index 933742b..d0bbe3d 100644
--- a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
+++ b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
@@ -1,8 +1,5 @@
-Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
-diff -u -p programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
---- hw/xfree86/os-support/bsd/i386_video.c.orig	Tue Oct  4 01:46:14 2005
-+++ hw/xfree86/os-support/bsd/i386_video.c	Thu Jan 26 14:57:56 2006
-@@ -35,6 +35,7 @@
+Index: hw/xfree86/os-support/bsd/i386_video.c
+@@ -32,6 +32,7 @@
  #include "xf86Priv.h"
  
  #include <errno.h>
diff --git a/x11-servers/xorg-server/files/patch-config_config-backends.h b/x11-servers/xorg-server/files/patch-config_config-backends.h
new file mode 100644
index 0000000..89d3c65
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-config_config-backends.h
@@ -0,0 +1,11 @@
+--- config/config-backends.h.orig	2014-04-12 15:29:14 UTC
++++ config/config-backends.h
+@@ -75,3 +75,8 @@ void config_hal_fini(void);
+ int config_wscons_init(void);
+ void config_wscons_fini(void);
+ #endif
++
++#ifdef CONFIG_DEVD
++int config_devd_init(void);
++void config_devd_fini(void);
++#endif
diff --git a/x11-servers/xorg-server/files/patch-config_config.c b/x11-servers/xorg-server/files/patch-config_config.c
new file mode 100644
index 0000000..570d0de
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-config_config.c
@@ -0,0 +1,21 @@
+--- config/config.c.orig	2014-04-12 15:29:14 UTC
++++ config/config.c
+@@ -64,6 +64,9 @@ config_init(void)
+ #elif defined(CONFIG_WSCONS)
+     if (!config_wscons_init())
+         ErrorF("[config] failed to initialise wscons\n");
++#elif defined(CONFIG_DEVD)
++     if (!config_devd_init())
++         ErrorF("[config] failed to initialise devd\n");
+ #endif
+ }
+ 
+@@ -82,6 +85,8 @@ config_fini(void)
+     config_dbus_core_fini();
+ #elif defined(CONFIG_WSCONS)
+     config_wscons_fini();
++#elif defined(CONFIG_DEVD)
++     config_devd_fini();
+ #endif
+ }
+ 
diff --git a/x11-servers/xorg-server/files/patch-config_devd.c b/x11-servers/xorg-server/files/patch-config_devd.c
new file mode 100644
index 0000000..039205d
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-config_devd.c
@@ -0,0 +1,533 @@
+--- config/devd.c.orig	2014-12-16 23:03:10 UTC
++++ config/devd.c
+@@ -0,0 +1,530 @@
++/*
++ * Copyright (c) 2012 Baptiste Daroussin
++ * Copyright (c) 2013, 2014 Alex Kozlov
++ * Copyright (c) 2014 Robert Millan
++ * Copyright (c) 2014 Jean-Sebastien Pedron
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the next
++ * paragraph) shall be included in all copies or substantial portions of the
++ * Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ * DEALINGS IN THE SOFTWARE.
++ *
++ * Author: Baptiste Daroussin <bapt@FreeBSD.org>
++ */
++
++#ifdef HAVE_DIX_CONFIG_H
++#include <dix-config.h>
++#endif
++
++#include <sys/types.h>
++#include <sys/kbio.h>
++#include <sys/socket.h>
++#include <sys/stat.h>
++#include <sys/sysctl.h>
++#include <sys/un.h>
++
++#include <ctype.h>
++#include <errno.h>
++#include <fcntl.h>
++#include <stdlib.h>
++#include <stdio.h>
++#include <stdbool.h>
++#include <unistd.h>
++
++#include "input.h"
++#include "inputstr.h"
++#include "hotplug.h"
++#include "config-backends.h"
++#include "os.h"
++
++#define DEVD_SOCK_PATH "/var/run/devd.pipe"
++
++#define DEVD_EVENT_ADD		'+'
++#define DEVD_EVENT_REMOVE	'-'
++
++#define RECONNECT_DELAY		5 * 1000
++
++static int sock_devd;
++static bool is_console_kbd = false;
++static bool is_kbdmux = false;
++OsTimerPtr rtimer;
++
++struct hw_type {
++	const char *driver;
++	int flag;
++	const char *xdriver;
++};
++
++static struct hw_type hw_types[] = {
++	{ "ukbd", ATTR_KEYBOARD, "kbd" },
++	{ "atkbd", ATTR_KEYBOARD, "kbd" },
++	{ "kbdmux", ATTR_KEYBOARD, "kbd" },
++	{ "sysmouse", ATTR_POINTER, "mouse" },
++	{ "ums", ATTR_POINTER, "mouse" },
++	{ "psm", ATTR_POINTER, "mouse" },
++	{ "joy", ATTR_JOYSTICK, NULL },
++	{ "atp", ATTR_TOUCHPAD, NULL },
++	{ "uep", ATTR_TOUCHSCREEN, NULL },
++	{ NULL, -1, NULL },
++};
++
++static bool
++sysctl_exists(const struct hw_type *device, int unit,
++	char *devname, size_t devname_len)
++{
++	char sysctlname[PATH_MAX];
++	size_t len;
++	int ret;
++
++	if (device == NULL || device->driver == NULL)
++		return false;
++
++	/* Check if a sysctl exists. */
++	snprintf(sysctlname, sizeof(sysctlname), "dev.%s.%i.%%desc",
++	    device->driver, unit);
++	ret = sysctlbyname(sysctlname, NULL, &len, NULL, 0);
++
++	if (ret == 0 && len > 0) {
++		snprintf(devname, devname_len, "%s%i", device->driver, unit);
++		return true;
++	}
++
++	return false;
++}
++
++static bool
++devpath_exists(const struct hw_type *device,
++	char *devname, size_t devname_len)
++{
++	char *devpath;
++	struct stat st;
++	int ret;
++
++	if (device == NULL || device->driver == NULL)
++		return false;
++
++	/* Check if /dev/$driver exists. */
++	asprintf(&devpath, "/dev/%s", device->driver);
++	if (devpath == NULL)
++		return false;
++
++	ret = stat(devpath, &st);
++	free(devpath);
++
++	if (ret == 0) {
++		strncpy(devname, device->driver, devname_len);
++		return true;
++	}
++
++	return false;
++}
++
++static char *
++sysctl_get_str(const char *sysctlname)
++{
++	char *dest = NULL;
++	size_t len;
++
++	if (sysctlname == NULL)
++		return NULL;
++
++	if (sysctlbyname(sysctlname, NULL, &len, NULL, 0) == 0) {
++		dest = malloc(len + 1);
++		if (dest) {
++			if (sysctlbyname(sysctlname, dest, &len, NULL, 0) == 0)
++				dest[len] = '\0';
++			else {
++				free(dest);
++				dest = NULL;
++			}
++		}
++	}
++
++	return dest;
++}
++
++static void
++device_added(const char *devname)
++{
++	char path[PATH_MAX];
++	char sysctlname[PATH_MAX];
++	char *vendor;
++	char *product = NULL;
++	char *config_info = NULL;
++	char *walk;
++	InputOption *options = NULL;
++	InputAttributes attrs = { };
++	DeviceIntPtr dev = NULL;
++	int i;
++	int fd;
++
++	for (i = 0; hw_types[i].driver != NULL; i++) {
++		size_t len;
++
++		len = strlen(hw_types[i].driver);
++		if (strcmp(devname, hw_types[i].driver) == 0 ||
++			(strncmp(devname, hw_types[i].driver, len) == 0 &&
++				isnumber(*(devname + len)))) {
++			attrs.flags |= hw_types[i].flag;
++			break;
++		}
++	}
++
++	if (hw_types[i].driver == NULL || hw_types[i].xdriver == NULL) {
++		LogMessage(X_INFO, "config/devd: ignoring device %s\n",
++				devname);
++		return;
++	}
++
++	/* Skip keyboard devices if kbdmux is enabled */
++	if (is_kbdmux && is_console_kbd && hw_types[i].flag & ATTR_KEYBOARD) {
++		LogMessage(X_INFO, "config/devd: kbdmux is enabled, ignoring device %s\n",
++				devname);
++		return;
++	}
++
++	snprintf(path, sizeof(path), "/dev/%s", devname);
++
++	options = input_option_new(NULL, "_source", "server/devd");
++	if (!options)
++		return;
++
++	snprintf(sysctlname, sizeof(sysctlname), "dev.%s.%s.%%desc",
++	    hw_types[i].driver, devname + strlen(hw_types[i].driver));
++	vendor = sysctl_get_str(sysctlname);
++	if (vendor == NULL) {
++		options = input_option_new(options, "name", devname);
++	}
++	else {
++		if ((walk = strchr(vendor, ' ')) != NULL) {
++			walk[0] = '\0';
++			walk++;
++			product = walk;
++			if ((walk = strchr(product, ',')) != NULL)
++				walk[0] = '\0';
++		}
++
++		attrs.vendor = strdup(vendor);
++		if (product) {
++			attrs.product = strdup(product);
++			options = input_option_new(options, "name", product);
++		}
++		else
++			options = input_option_new(options, "name", "(unnamed)");
++
++		free(vendor);
++	}
++
++	/* XXX implement usb_id */
++	attrs.usb_id = NULL;
++	attrs.device = strdup(path);
++	options = input_option_new(options, "driver", hw_types[i].xdriver);
++
++	fd = open(path, O_RDONLY);
++	if (fd > 0) {
++		close(fd);
++		options = input_option_new(options, "device", path);
++	}
++	else {
++		if (attrs.flags & ~ATTR_KEYBOARD) {
++			LogMessage(X_INFO, "config/devd: device %s already opened\n",
++					 path);
++
++			/*
++			 * Fail if cannot open device, it breaks AllowMouseOpenFail,
++			 * but it should not matter when config/devd enabled
++			 */
++			goto unwind;
++		}
++
++		if (is_console_kbd) {
++			/*
++			 * There can be only one keyboard attached to console and
++			 * it is already added.
++			 */
++			LogMessage(X_WARNING, "config/devd: console keyboard is "
++					"already added, ignoring %s (%s)\n",
++					attrs.product, path);
++			goto unwind;
++		}
++		else
++			/*
++			 * Don't pass "device" option if the keyboard is already
++			 * attached to the console (ie. open() fails).
++			 * This would activate a special logic in xf86-input-keyboard.
++			 * Prevent any other attached to console keyboards being
++			 * processed. There can be only one such device.
++			 */
++			is_console_kbd = true;
++	}
++
++	if (asprintf(&config_info, "devd:%s", devname) == -1) {
++		config_info = NULL;
++		goto unwind;
++	}
++
++	if (device_is_duplicate(config_info)) {
++		LogMessage(X_WARNING, "config/devd: device %s (%s) already added. "
++				"ignoring\n", attrs.product, path);
++		goto unwind;
++	}
++
++	options = input_option_new(options, "config_info", config_info);
++	LogMessage(X_INFO, "config/devd: adding input device %s (%s)\n",
++			attrs.product, path);
++
++	NewInputDeviceRequest(options, &attrs, &dev);
++
++unwind:
++	free(config_info);
++	input_option_free_list(&options);
++	free(attrs.usb_id);
++	free(attrs.product);
++	free(attrs.device);
++	free(attrs.vendor);
++}
++
++static void
++device_removed(char *devname)
++{
++	char *config_info;
++
++	if (asprintf(&config_info, "devd:%s", devname) == -1)
++		return;
++
++	remove_devices("devd", config_info);
++
++	free(config_info);
++}
++
++static bool is_kbdmux_enabled(void)
++{
++	/* Xorg uses /dev/ttyv0 as a console device */
++	/* const char device[]="/dev/console"; */
++	const char device[]="/dev/ttyv0";
++	keyboard_info_t info;
++	int fd;
++
++	fd = open(device, O_RDONLY);
++
++	if (fd < 0)
++		return false;
++
++	if (ioctl(fd, KDGKBINFO, &info) == -1) {
++		close(fd);
++		return false;
++	}
++
++	close(fd);
++
++	if (!strncmp(info.kb_name, "kbdmux", 6))
++		return true;
++
++	return false;
++}
++
++static void
++disconnect_devd(int sock)
++{
++	if (sock >= 0) {
++		RemoveGeneralSocket(sock);
++		close(sock);
++	}
++}
++
++static int
++connect_devd(void)
++{
++	struct sockaddr_un devd;
++	int sock;
++
++	sock = socket(AF_UNIX, SOCK_STREAM, 0);
++	if (sock < 0) {
++		LogMessage(X_ERROR, "config/devd: fail opening stream socket\n");
++		return -1;
++	}
++
++	devd.sun_family = AF_UNIX;
++	strlcpy(devd.sun_path, DEVD_SOCK_PATH, sizeof(devd.sun_path));
++
++	if (connect(sock, (struct sockaddr *) &devd, sizeof(devd)) < 0) {
++		close(sock);
++		LogMessage(X_ERROR, "config/devd: fail to connect to devd\n");
++		return -1;
++	}
++
++	AddGeneralSocket(sock);
++
++	return	sock;
++}
++
++static CARD32
++reconnect_handler(OsTimerPtr timer, CARD32 time, pointer arg)
++{
++	int newsock;
++
++	if ((newsock = connect_devd()) > 0) {
++		sock_devd = newsock;
++		TimerFree(rtimer);
++		rtimer = NULL;
++		LogMessage(X_INFO, "config/devd: reopening devd socket\n");
++		return 0;
++	}
++
++	/* Try again after RECONNECT_DELAY */
++	return RECONNECT_DELAY;
++}
++
++static ssize_t
++socket_getline(int fd, char **out)
++{
++	char *buf, *newbuf;
++	ssize_t ret, cap, sz = 0;
++	char c;
++
++	cap = 1024;
++	buf = malloc(cap * sizeof(char));
++	if (!buf)
++		return -1;
++
++	for (;;) {
++		ret = read(sock_devd, &c, 1);
++		if (ret < 0) {
++			if (errno == EINTR)
++				continue;
++			free(buf);
++			return -1;
++		/* EOF - devd socket is lost */
++		} else if (ret == 0) {
++			disconnect_devd(sock_devd);
++			rtimer = TimerSet(NULL, 0, 1, reconnect_handler, NULL);
++			LogMessage(X_WARNING, "config/devd: devd socket is lost\n");
++			return -1;
++		}
++		if (c == '\n')
++			break;
++
++		if (sz + 1 >= cap) {
++			cap *= 2;
++			newbuf = realloc(buf, cap * sizeof(char));
++			if (!newbuf) {
++				free(buf);
++				return -1;
++			}
++			buf = newbuf;
++		}
++		buf[sz] = c;
++		sz++;
++	}
++
++	buf[sz] = '\0';
++	if (sz >= 0)
++		*out = buf;
++	else
++		free(buf);
++
++	/* Number of bytes in the line, not counting the line break */
++	return sz;
++}
++
++static void
++wakeup_handler(void *data, int err, void *read_mask)
++{
++	char *line = NULL;
++	char *walk;
++
++	if (err < 0)
++		return;
++
++	if (FD_ISSET(sock_devd, (fd_set *) read_mask)) {
++		if (socket_getline(sock_devd, &line) < 0)
++			return;
++
++		walk = strchr(line + 1, ' ');
++		if (walk != NULL)
++			walk[0] = '\0';
++
++		switch (*line) {
++		case DEVD_EVENT_ADD:
++			device_added(line + 1);
++			break;
++		case DEVD_EVENT_REMOVE:
++			device_removed(line + 1);
++			break;
++		default:
++			break;
++		}
++		free(line);
++	}
++}
++
++static void
++block_handler(void *data, struct timeval **tv, void *read_mask)
++{
++}
++
++int
++config_devd_init(void)
++{
++	char devicename[1024];
++	int i, j;
++
++	LogMessage(X_INFO, "config/devd: probing input devices...\n");
++
++	/*
++	 * Add fake keyboard and give up on keyboards management
++	 * if kbdmux is enabled
++	 */
++	if ((is_kbdmux = is_kbdmux_enabled()) == true)
++		device_added("kbdmux");
++
++	for (i = 0; hw_types[i].driver != NULL; i++) {
++		/* First scan the sysctl to determine the hardware */
++		for (j = 0; j < 16; j++) {
++			if (sysctl_exists(&hw_types[i], j,
++					devicename, sizeof(devicename)) != 0)
++				device_added(devicename);
++		}
++
++		if (devpath_exists(&hw_types[i], devicename, sizeof(devicename)) != 0)
++			device_added(devicename);
++	}
++
++	if ((sock_devd = connect_devd()) < 0)
++		return 0;
++
++	RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL);
++
++	return 1;
++}
++
++void
++config_devd_fini(void)
++{
++	LogMessage(X_INFO, "config/devd: terminating backend...\n");
++
++	if (rtimer) {
++		TimerFree(rtimer);
++		rtimer = NULL;
++	}
++
++	disconnect_devd(sock_devd);
++
++	RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL);
++
++	is_console_kbd = false;
++}
diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Config.c b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Config.c
new file mode 100644
index 0000000..7d9edf6
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Config.c
@@ -0,0 +1,20 @@
+--- hw/xfree86/common/xf86Config.c.orig	2014-04-15 01:01:57 UTC
++++ hw/xfree86/common/xf86Config.c
+@@ -1376,13 +1376,16 @@ checkCoreInputDevices(serverLayoutPtr se
+     }
+ 
+     if (!xf86Info.forceInputDevices && !(foundPointer && foundKeyboard)) {
+-#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS)
++#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS) || \
++		defined(CONFIG_DEVD)
+         const char *config_backend;
+ 
+ #if defined(CONFIG_HAL)
+         config_backend = "HAL";
+ #elif defined(CONFIG_UDEV)
+         config_backend = "udev";
++#elif defined(CONFIG_DEVD)
++        config_backend = "devd";
+ #else
+         config_backend = "wscons";
+ #endif
diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Globals.c b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Globals.c
new file mode 100644
index 0000000..bae0675
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Globals.c
@@ -0,0 +1,12 @@
+--- hw/xfree86/common/xf86Globals.c.orig	2014-04-12 15:29:14 UTC
++++ hw/xfree86/common/xf86Globals.c
+@@ -123,7 +123,8 @@ xf86InfoRec xf86Info = {
+     .log = LogNone,
+     .disableRandR = FALSE,
+     .randRFrom = X_DEFAULT,
+-#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS)
++#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS) || \
++	defined(CONFIG_DEVD)
+     .forceInputDevices = FALSE,
+     .autoAddDevices = TRUE,
+     .autoEnableDevices = TRUE,
diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_loader_loadmod.c b/x11-servers/xorg-server/files/patch-hw_xfree86_loader_loadmod.c
new file mode 100644
index 0000000..3af4e16
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-hw_xfree86_loader_loadmod.c
@@ -0,0 +1,11 @@
+--- hw/xfree86/loader/loadmod.c.orig	2014-04-12 15:29:14 UTC
++++ hw/xfree86/loader/loadmod.c
+@@ -490,7 +490,7 @@ LoaderListDirs(const char **subdirlist, 
+     char **elem;
+     const char **subdirs;
+     const char **s;
+-    PatternPtr patterns;
++    PatternPtr patterns = NULL;
+     PatternPtr p;
+     DIR *d;
+     struct dirent *dp;
diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_modes_xf86Crtc.c b/x11-servers/xorg-server/files/patch-hw_xfree86_modes_xf86Crtc.c
new file mode 100644
index 0000000..8e89fbc
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-hw_xfree86_modes_xf86Crtc.c
@@ -0,0 +1,12 @@
+--- hw/xfree86/modes/xf86Crtc.c.orig	2014-04-15 01:01:57 UTC
++++ hw/xfree86/modes/xf86Crtc.c
+@@ -1774,6 +1774,9 @@ SetCompatOutput(xf86CrtcConfigPtr config
+     DisplayModePtr maxmode = NULL, testmode, mode;
+     int o, compat = -1, count, mincount = 0;
+ 
++    if (config->num_output == 0)
++        return NULL;
++
+     /* Look for one that's definitely connected */
+     for (o = 0; o < config->num_output; o++) {
+         test = config->output[o];
diff --git a/x11-servers/xorg-server/files/patch-xkb_Makefile.in b/x11-servers/xorg-server/files/patch-xkb_Makefile.in
index 934bef0..48f821c 100644
--- a/x11-servers/xorg-server/files/patch-xkb_Makefile.in
+++ b/x11-servers/xorg-server/files/patch-xkb_Makefile.in
@@ -1,6 +1,6 @@
---- xkb/Makefile.in.orig	2013-06-16 11:16:48.000000000 +0000
-+++ xkb/Makefile.in	2013-06-16 11:17:08.000000000 +0000
-@@ -816,7 +816,7 @@
+--- xkb/Makefile.in.orig	2014-12-12 22:12:45 UTC
++++ xkb/Makefile.in
+@@ -790,7 +790,7 @@ info: info-am
  
  info-am:
  
diff --git a/x11-servers/xorg-server/files/patch-xorgconf.cpp b/x11-servers/xorg-server/files/patch-xorgconf.cpp
deleted file mode 100644
index 04e217b..0000000
--- a/x11-servers/xorg-server/files/patch-xorgconf.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- hw/xfree86/xorgconf.cpp.orig	Fri Dec 31 14:40:27 2004
-+++ hw/xfree86/xorgconf.cpp	Fri Dec 31 14:40:28 2004
-@@ -624,3 +624,11 @@
-     InputDevice "Keyboard1" "CoreKeyboard"
- EndSection
- 
-+ 
-+XCOMM  Two experimental extensions are available -- Composite and XEVIE.  Uncomment
-+XCOMM  the section below to enable Composite.  Many extensions can also be disabled
-+XCOMM  in this manner.
-+
-+XCOMM Section "Extensions"
-+XCOMM 	Option "Composite" "Enable"
-+XCOMM EndSection
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index b893360..62612ed 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -12,13 +12,10 @@ include/xorg/BT.h
 include/xorg/IBM.h
 include/xorg/TI.h
 include/xorg/XIstubs.h
-%%NEW%%include/xorg/Xprintf.h
+include/xorg/Xprintf.h
 include/xorg/bt829.h
-%%OLD%%include/xorg/bstore.h
-%%OLD%%include/xorg/bstorestr.h
-%%NEW%%include/xorg/callback.h
-%%OLD%%include/xorg/cfb8_16.h
-%%NEW%%include/xorg/client.h
+include/xorg/callback.h
+include/xorg/client.h
 include/xorg/closestr.h
 include/xorg/closure.h
 include/xorg/colormap.h
@@ -61,14 +58,13 @@ include/xorg/geext.h
 include/xorg/geint.h
 include/xorg/globals.h
 include/xorg/glyphstr.h
+include/xorg/glx_extinit.h
 include/xorg/hotplug.h
 include/xorg/i2c_def.h
 include/xorg/input.h
 include/xorg/inputstr.h
-%%NEW%%include/xorg/list.h
+include/xorg/list.h
 include/xorg/mi.h
-%%OLD%%include/xorg/mibank.h
-include/xorg/mibstore.h
 include/xorg/micmap.h
 include/xorg/micoord.h
 include/xorg/mifillarc.h
@@ -82,15 +78,15 @@ include/xorg/misc.h
 include/xorg/miscstruct.h
 include/xorg/mispans.h
 include/xorg/mistruct.h
-%%NEW%%include/xorg/misync.h
-%%NEW%%include/xorg/misyncstr.h
+include/xorg/misync.h
+include/xorg/misyncstr.h
 include/xorg/miwideline.h
 include/xorg/mizerarc.h
 include/xorg/mioverlay.h
 include/xorg/msp3430.h
 include/xorg/opaque.h
 include/xorg/os.h
-%%NEW%%include/xorg/optionstr.h
+include/xorg/optionstr.h
 include/xorg/panoramiXsrv.h
 include/xorg/panoramiX.h
 include/xorg/picture.h
@@ -102,7 +98,6 @@ include/xorg/property.h
 include/xorg/propertyst.h
 include/xorg/ptrveloc.h
 include/xorg/randrstr.h
-%%OLD%%include/xorg/renderedge.h
 include/xorg/region.h
 include/xorg/regionstr.h
 include/xorg/registry.h
@@ -120,7 +115,7 @@ include/xorg/shmint.h
 include/xorg/site.h
 include/xorg/swaprep.h
 include/xorg/swapreq.h
-%%NEW%%include/xorg/syncsdk.h
+include/xorg/syncsdk.h
 include/xorg/tda8425.h
 include/xorg/tda9850.h
 include/xorg/tda9885.h
@@ -133,9 +128,6 @@ include/xorg/vidmodeproc.h
 include/xorg/wfbrename.h
 include/xorg/window.h
 include/xorg/windowstr.h
-include/xorg/xaa.h
-%%OLD%%include/xorg/xaaWrapper.h
-include/xorg/xaalocal.h
 include/xorg/xaarop.h
 include/xorg/xace.h
 include/xorg/xacestr.h
@@ -146,7 +138,7 @@ include/xorg/xf86DDC.h
 include/xorg/xf86Modes.h
 include/xorg/xf86Module.h
 include/xorg/xf86Opt.h
-%%NEW%%include/xorg/xf86Optionstr.h
+include/xorg/xf86Optionstr.h
 include/xorg/xf86Optrec.h
 include/xorg/xf86Parser.h
 include/xorg/xf86Pci.h
@@ -165,6 +157,7 @@ include/xorg/xf86cmap.h
 include/xorg/xf86fbman.h
 include/xorg/xf86i2c.h
 include/xorg/xf86int10.h
+include/xorg/xf86platformBus.h
 include/xorg/xf86sbusBus.h
 include/xorg/xf86str.h
 include/xorg/xf86xv.h
@@ -181,54 +174,22 @@ include/xorg/xorgVersion.h
 include/xorg/xserver-properties.h
 include/xorg/xvdix.h
 include/xorg/xvmcext.h
-lib/xorg/modules/extensions/libdbe.la
-lib/xorg/modules/extensions/libdbe.so
-lib/xorg/modules/extensions/libdri.la
-lib/xorg/modules/extensions/libdri.so
-lib/xorg/modules/extensions/libdri2.la
-lib/xorg/modules/extensions/libdri2.so
-lib/xorg/modules/extensions/libextmod.la
-lib/xorg/modules/extensions/libextmod.so
-lib/xorg/modules/extensions/librecord.la
-lib/xorg/modules/extensions/librecord.so
 lib/xorg/modules/extensions/.xorg/libglx.so
-lib/xorg/modules/libexa.la
 lib/xorg/modules/libexa.so
-lib/xorg/modules/libfb.la
 lib/xorg/modules/libfb.so
-%%NEW%%lib/xorg/modules/libfbdevhw.so
-%%NEW%%lib/xorg/modules/libfbdevhw.la
-lib/xorg/modules/libint10.la
+lib/xorg/modules/libfbdevhw.so
 lib/xorg/modules/libint10.so
-lib/xorg/modules/libshadow.la
 lib/xorg/modules/libshadow.so
-lib/xorg/modules/libshadowfb.la
 lib/xorg/modules/libshadowfb.so
-lib/xorg/modules/libvbe.la
 lib/xorg/modules/libvbe.so
-lib/xorg/modules/libvgahw.la
 lib/xorg/modules/libvgahw.so
-lib/xorg/modules/libwfb.la
 lib/xorg/modules/libwfb.so
-lib/xorg/modules/libxaa.la
-lib/xorg/modules/libxaa.so
-%%OLD%%lib/xorg/modules/libxf8_16bpp.la
-%%OLD%%lib/xorg/modules/libxf8_16bpp.so
-%%OLD%%lib/xorg/modules/linux/libfbdevhw.la
-%%OLD%%lib/xorg/modules/linux/libfbdevhw.so
-lib/xorg/modules/multimedia/bt829_drv.la
 lib/xorg/modules/multimedia/bt829_drv.so
-lib/xorg/modules/multimedia/fi1236_drv.la
 lib/xorg/modules/multimedia/fi1236_drv.so
-lib/xorg/modules/multimedia/msp3430_drv.la
 lib/xorg/modules/multimedia/msp3430_drv.so
-lib/xorg/modules/multimedia/tda8425_drv.la
 lib/xorg/modules/multimedia/tda8425_drv.so
-lib/xorg/modules/multimedia/tda9850_drv.la
 lib/xorg/modules/multimedia/tda9850_drv.so
-lib/xorg/modules/multimedia/tda9885_drv.la
 lib/xorg/modules/multimedia/tda9885_drv.so
-lib/xorg/modules/multimedia/uda1380_drv.la
 lib/xorg/modules/multimedia/uda1380_drv.so
 lib/xorg/protocol.txt
 libdata/pkgconfig/xorg-server.pc
@@ -239,15 +200,6 @@ man/man1/gtf.1.gz
 man/man4/exa.4.gz
 man/man4/fbdevhw.4.gz
 man/man5/xorg.conf.5.gz
-%%NEW%%man/man5/xorg.conf.d.5.gz
+man/man5/xorg.conf.d.5.gz
 share/aclocal/xorg-server.m4
-@comment %%NEW%%@dirrm share/doc/xorg-server
-@dirrm include/xorg
-@dirrm lib/xorg/modules/extensions/.xorg
-@dirrm lib/xorg/modules/extensions
-@dirrm lib/xorg/modules/multimedia
-%%OLD%%@dirrm lib/xorg/modules/linux
-@dirrm lib/xorg/modules
-@dirrm lib/xorg
-%%NEW%%@dirrmtry etc/X11/xorg.conf.d
-%%NEW%%@dirrmtry etc/X11
+@dir etc/X11/xorg.conf.d
diff --git a/x11/Makefile b/x11/Makefile
index a4ee78c..22bdefd 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -210,8 +210,6 @@
     SUBDIR += nvidia-driver
     SUBDIR += nvidia-driver-173
     SUBDIR += nvidia-driver-304
-    SUBDIR += nvidia-driver-71
-    SUBDIR += nvidia-driver-96
     SUBDIR += nvidia-settings
     SUBDIR += nvidia-xconfig
     SUBDIR += nxcomp
diff --git a/x11/nvidia-driver-173/Makefile b/x11/nvidia-driver-173/Makefile
index e66621c..fcc9199 100644
--- a/x11/nvidia-driver-173/Makefile
+++ b/x11/nvidia-driver-173/Makefile
@@ -1,9 +1,9 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION=	173.14.35
+DISTVERSION=	173.14.39
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	3
+PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-173
diff --git a/x11/nvidia-driver-71/Makefile b/x11/nvidia-driver-71/Makefile
deleted file mode 100644
index 4ac7707..0000000
--- a/x11/nvidia-driver-71/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
-# $FreeBSD$
-
-DISTVERSION=	71.86.15
-# Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	4
-
-MASTERDIR=	${.CURDIR}/../nvidia-driver
-PKGNAMESUFFIX=	-71
-
-FORBIDDEN=	vulnerable to denial of service or arbitrary code execution (CVE-2014-8298)
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11/nvidia-driver-96/Makefile b/x11/nvidia-driver-96/Makefile
deleted file mode 100644
index d4348cd..0000000
--- a/x11/nvidia-driver-96/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
-# $FreeBSD$
-
-DISTVERSION=	96.43.23
-# Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	2
-
-MASTERDIR=	${.CURDIR}/../nvidia-driver
-PKGNAMESUFFIX=	-96
-
-FORBIDDEN=	vulnerable to denial of service or arbitrary code execution (CVE-2014-8298)
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index d351844..8820f11 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -6,9 +6,5 @@ SHA256 (NVIDIA-FreeBSD-x86_64-304.125.tar.gz) = 46b14b8c5ee1c02ff5e30afc9c99f4dd
 SIZE (NVIDIA-FreeBSD-x86_64-304.125.tar.gz) = 35498616
 SHA256 (NVIDIA-FreeBSD-x86-304.125.tar.gz) = 806d0bff9d394390b3a257472bc342857f150e9dba6673e6b930f47a93ec0269
 SIZE (NVIDIA-FreeBSD-x86-304.125.tar.gz) = 34494889
-SHA256 (NVIDIA-FreeBSD-x86-173.14.35.tar.gz) = 51e82a12db81b5af4ae5ee59612875c0dbef52cb641d61a44c72f2e1cd7f4c78
-SIZE (NVIDIA-FreeBSD-x86-173.14.35.tar.gz) = 18748428
-SHA256 (NVIDIA-FreeBSD-x86-96.43.23.tar.gz) = 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78
-SIZE (NVIDIA-FreeBSD-x86-96.43.23.tar.gz) = 15463464
-SHA256 (NVIDIA-FreeBSD-x86-71.86.15.tar.gz) = 7be5ba641eabaa96a068e147a1dd5d75aadc10575bb1d2c6e8529cd423438168
-SIZE (NVIDIA-FreeBSD-x86-71.86.15.tar.gz) = 8067916
+SHA256 (NVIDIA-FreeBSD-x86-173.14.39.tar.gz) = 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b
+SIZE (NVIDIA-FreeBSD-x86-173.14.39.tar.gz) = 20038266