50 files changed, 89 insertions, 56 deletions

diff --git a/x11-drivers/input-wacom/Makefile b/x11-drivers/input-wacom/Makefile
index d909e434df8e..de3e72efb844 100644
--- a/x11-drivers/input-wacom/Makefile
+++ b/x11-drivers/input-wacom/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	input-wacom
 PORTVERSION=	${KLD_VERSION}.${WACOM_VERSION:C/-/./g}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers kld
 MASTER_SITES=	http://www.chillt.de/bsdwacom/:bsdwacom \
 		SF/linuxwacom/xf86-input-wacom/:linuxwacom
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
index 36840f9987f1..bda9d5b8c815 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile
index b2c03ed78b04..3857aa01074c 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-fpit/pkg-plist b/x11-drivers/xf86-input-fpit/pkg-plist
index fdc01d021e1c..9a8ba176754b 100644
--- a/x11-drivers/xf86-input-fpit/pkg-plist
+++ b/x11-drivers/xf86-input-fpit/pkg-plist
@@ -2,6 +2,7 @@ lib/xorg/modules/input/fpit_drv.la
 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-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 841bd4cdbd5e..3518e1752747 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-input-keyboard
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile
index 469e03c0c961..4ef2b129dad3 100644
--- a/x11-drivers/xf86-input-magictouch/Makefile
+++ b/x11-drivers/xf86-input-magictouch/Makefile
@@ -2,13 +2,15 @@
 
 PORTNAME=	xf86-input-magictouch
 PORTVERSION=	1.0.0.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org magictouch input driver
 
 BROKEN=		Does not compile
+DEPRECATED=	Does not compile
+EXPIRATION_DATE=2014-05-01
 
 .include <bsd.port.options.mk>
 
@@ -17,6 +19,6 @@ IGNORE=		needs xf86_ansic.h which doesn't exist with recent xserver
 .endif
 
 XORG_CAT=	driver
-USE_AUTOTOOLS=	libtool
+USES=		libtool
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index c5fe1623806d..4c28509c2c6b 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index d0e1183787ea..5874922b4f8a 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -14,8 +14,10 @@ USES=		pathfix
 USE_XORG=	x11 xtst
 XORG_CAT=	driver
 
+.include <bsd.port.options.mk>
+
 .if defined(WITH_NEW_XORG)
-SYNAPTICS_VERSION=	1.7.2
+SYNAPTICS_VERSION=	1.7.4
 SYNAPTICS_REVISION=	0
 PLIST_SUB+=	NEW="" OLD="@comment "
 .else
diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo
index a82a418573c0..a7440fb036c0 100644
--- a/x11-drivers/xf86-input-synaptics/distinfo
+++ b/x11-drivers/xf86-input-synaptics/distinfo
@@ -1,4 +1,4 @@
 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.2.tar.bz2) = 63957fa55f0d8662ef8c57f6325155c9884a854554d33921f0738e097f2a7dcd
-SIZE (xorg/driver/xf86-input-synaptics-1.7.2.tar.bz2) = 448170
+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-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
index 0bb4ac9847b1..d84420ad8379 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-vmmouse/pkg-plist b/x11-drivers/xf86-input-vmmouse/pkg-plist
index 35717b9231d7..6d3a44183402 100644
--- a/x11-drivers/xf86-input-vmmouse/pkg-plist
+++ b/x11-drivers/xf86-input-vmmouse/pkg-plist
@@ -6,6 +6,7 @@ man/man1/vmmouse_detect.1.gz
 man/man4/vmmouse.4x.gz
 %%NEW%%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-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile
index 49f83a350775..e4a5bc41873e 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
index df031c8d07c7..1e9a526f6c30 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index e0efe72d4834..be942d399d45 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -14,16 +14,16 @@ USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 1000051 || !defined(WITH_NEW_XORG) || \
-	(${ARCH} != i386 && ${ARCH} != amd64)
+.if ${OSVERSION} < 1000051 || !defined(WITH_NEW_XORG)
 ATI_VERSION=	6.14.6
-ATI_REVISION=	1
+ATI_REVISION=	2
 CONFIGURE_ARGS+=--disable-kms
 PLIST_SUB+=	OLD=""
 .else
 ATI_VERSION=	7.2.0
-ATI_REVISION=	1
+ATI_REVISION=	2
 CONFIGURE_ARGS+=--disable-udev
+CONFIGURE_ARGS+=--disable-glamor
 EXTRA_PATCHES+=	${FILESDIR}/extra-src__radeon_kms.c
 PLIST_SUB+=	OLD="@comment "
 .endif
diff --git a/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c b/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c
index c8ed5680a9ef..9de83f0dfac5 100644
--- a/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c
+++ b/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c
@@ -1,6 +1,15 @@
 --- src/radeon_kms.c.orig	2013-08-07 10:44:09.000000000 +0200
-+++ src/radeon_kms.c	2013-08-31 01:20:44.370468797 +0200
-@@ -270,7 +270,7 @@
++++ 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;
@@ -9,12 +18,20 @@
  
  	if (xorg_list_is_empty(&screen->pixmap_dirty_list))
  		return;
-@@ -606,7 +606,7 @@
+@@ -606,6 +608,16 @@
  		      dev->domain, dev->bus, dev->dev, dev->func);
  #endif
  
--    info->dri2.drm_fd = drmOpen("radeon", busid);
-+    info->dri2.drm_fd = drmOpen("radeonkms", busid);
++    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) {
  
- 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
index cefa98a2b766..4874a28863bf 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
index a6dd1a257dc3..854ab4718a20 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile
index ccce8e78cc51..9ac0270fef4f 100644
--- a/x11-drivers/xf86-video-cyrix/Makefile
+++ b/x11-drivers/xf86-video-cyrix/Makefile
@@ -2,13 +2,15 @@
 
 PORTNAME=	xf86-video-cyrix
 PORTVERSION=	1.1.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org cyrix display driver
 
 IGNORE=		requires pciVideoPtr typedef
+DEPRECATED=	requires pciVideoPtr typedef
+EXPIRATION_DATE=2014-05-01
 
 XORG_CAT=	driver
 USE_XORG=	xextproto xf86dgaproto
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
index 59937958e703..7028fafe5e38 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
index dea21f99d36c..6110bb766780 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=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
index 0a787d88265f..a4e70b1eff56 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
index a7b205367041..fdfcf2114ae9 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
index bb0ab79dddb3..f80256232791 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index 708df7ff0999..5b343e12265b 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -27,10 +27,10 @@ USE_XORG=	glproto \
 
 .if defined(WITH_NEW_XORG)
 INTEL_VERSION=	2.21.15
-INTEL_REVISION=	1
+INTEL_REVISION=	2
 CONFIGURE_ENV+=	xorg_cv_cc_flag__Wno_maybe_uninitialized=no
 CONFIGURE_ARGS+=	--enable-sna
-MAKE_JOBS_UNSAFE=yes
+CONFIGURE_ARGS+=	--disable-glamor
 PLIST_SUB+=	OLD="@comment "
 EXTRA_PATCHES+=	${PATCHDIR}/extra-src__sna__sna_threads.c \
 		${PATCHDIR}/extra-src_sna_kgem.c \
@@ -39,7 +39,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-src__sna__sna_threads.c \
 LIB_DEPENDS+=	libxcb-util.so:${PORTSDIR}/x11/xcb-util
 .else
 INTEL_VERSION=	2.7.1
-INTEL_REVISION=	6
+INTEL_REVISION=	7
 PLIST_SUB+=	OLD=""
 
 EXTRA_PATCHES+=	${PATCHDIR}/extra-src_ch7017_ch7017.c \
diff --git a/x11-drivers/xf86-video-intel/pkg-plist b/x11-drivers/xf86-video-intel/pkg-plist
index 2d3ca12deb10..948876757621 100644
--- a/x11-drivers/xf86-video-intel/pkg-plist
+++ b/x11-drivers/xf86-video-intel/pkg-plist
@@ -1,9 +1,11 @@
 lib/libI810XvMC.la
 lib/libI810XvMC.so
 lib/libI810XvMC.so.1
+lib/libI810XvMC.so.1.0.0
 lib/libIntelXvMC.la
 lib/libIntelXvMC.so.1
 lib/libIntelXvMC.so
+lib/libIntelXvMC.so.1.0.0
 %%OLD%%lib/xorg/modules/drivers/ch7017.la
 %%OLD%%lib/xorg/modules/drivers/ch7017.so
 %%OLD%%lib/xorg/modules/drivers/ch7xxx.la
diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile
index 3c1cf88e242f..327c98796b87 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index 036b5a9df829..48c872b7e7c4 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=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	x11-drivers
 
diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
index a9503712e748..2a86d787c41a 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=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile
index e03da55a9166..60197b5a582d 100644
--- a/x11-drivers/xf86-video-newport/Makefile
+++ b/x11-drivers/xf86-video-newport/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-newport
 PORTVERSION=	0.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile
index 28cf7fc8496e..1bec3944ca77 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=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile
index 3e404a4bb4a3..0cb95f2ed4ed 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=	1
+PORTREVISION=	2
 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 e936c4ef4609..8cfd05855e10 100644
--- a/x11-drivers/xf86-video-openchrome/pkg-plist
+++ b/x11-drivers/xf86-video-openchrome/pkg-plist
@@ -1,9 +1,11 @@
 lib/libchromeXvMC.la
 lib/libchromeXvMC.so
 lib/libchromeXvMC.so.1
+lib/libchromeXvMC.so.1.0.0
 lib/libchromeXvMCPro.la
 lib/libchromeXvMCPro.so
 lib/libchromeXvMCPro.so.1
+lib/libchromeXvMCPro.so.1.0.0
 lib/xorg/modules/drivers/openchrome_drv.la
 lib/xorg/modules/drivers/openchrome_drv.so
 man/man4/openchrome.4x.gz
diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile
index 2f976e966744..53ad516a7f35 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-rdc/Makefile b/x11-drivers/xf86-video-rdc/Makefile
index 136511e8b6db..eb4a887a5f5b 100644
--- a/x11-drivers/xf86-video-rdc/Makefile
+++ b/x11-drivers/xf86-video-rdc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xf86-video-rdc
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 MASTER_SITES=	http://www.SpringDaemons.com/stas/
 
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
index 6f16dcbb7cc0..18de975902e2 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=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
index fb0dd1c4bc57..40867810c832 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
index 0da4a4c95d2a..1f5e1136fbbf 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index 414be7e07de5..7faa59529cbe 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-scfb/Makefile b/x11-drivers/xf86-video-scfb/Makefile
index f5327d6db780..65ef88a888c2 100644
--- a/x11-drivers/xf86-video-scfb/Makefile
+++ b/x11-drivers/xf86-video-scfb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xf86-video-scfb
 PORTVERSION=	0.0.3
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/ \
 		LOCAL/rene 
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
index 117af602b55f..66665ea8b072 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sis-intel/Makefile b/x11-drivers/xf86-video-sis-intel/Makefile
index 40e4b47cc459..4f07b9e425fd 100644
--- a/x11-drivers/xf86-video-sis-intel/Makefile
+++ b/x11-drivers/xf86-video-sis-intel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xf86-video-sis-intel
 PORTVERSION=	300407
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-drivers
 MASTER_SITES=	http://downloadmirror.intel.com/15443/eng/
 DISTNAME=	sis_drv_src_300407
@@ -12,6 +12,8 @@ MAINTAINER=	littlesavage@orionet.ru
 COMMENT=	X.Org sis display driver provided by Intel
 
 IGNORE=		requires pciVideoPtr typedef
+DEPRECATED=	requires pciVideoPtr typedef
+EXPIRATION_DATE=2014-05-01
 
 CONFLICTS=	xf86-video-sis-[0-9]*
 WRKSRC=		${WRKDIR}/2d-driver
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index 63d58c856b1d..27adeeb6fa94 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile
index 5ecb9e27dc1b..0504641a9ae7 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
index 5e17cc359bdc..7ac894d0ee45 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=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile
index 827dc8b06a94..2a33d01aa08a 100644
--- a/x11-drivers/xf86-video-tga/Makefile
+++ b/x11-drivers/xf86-video-tga/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-tga
 PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
index 56c9fc522a6d..a6db3d6c9d8c 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=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile
index 71baafaf94a6..c6afdadc9e36 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=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
index 6b2ed137f5e1..b9785b8a7865 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
index de0c5dcf8cf0..31dbda7d42c7 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=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
index 0e23246f93ec..81ad6d1a4e2c 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=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org