aboutsummaryrefslogtreecommitdiff
path: root/x11-drivers
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2013-05-25 14:37:02 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2013-05-25 14:37:02 +0000
commit92ea0d614b10bd99ce43a611721c7c4003cd79a5 (patch)
treecf13f962932aab3646f0af684b2923c4e0f0825b /x11-drivers
parentffbb85145227efbc987e5d09cab804f896bf37f5 (diff)
downloadports-92ea0d614b10bd99ce43a611721c7c4003cd79a5.tar.gz
ports-92ea0d614b10bd99ce43a611721c7c4003cd79a5.zip
Notes
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/xf86-input-acecad/Makefile6
-rw-r--r--x11-drivers/xf86-input-egalax/Makefile2
-rw-r--r--x11-drivers/xf86-input-elographics/Makefile6
-rw-r--r--x11-drivers/xf86-input-fpit/Makefile19
-rw-r--r--x11-drivers/xf86-input-fpit/distinfo2
-rw-r--r--x11-drivers/xf86-input-fpit/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-fpit/pkg-plist6
-rw-r--r--x11-drivers/xf86-input-hyperpen/Makefile8
-rw-r--r--x11-drivers/xf86-input-joystick/Makefile8
-rw-r--r--x11-drivers/xf86-input-joystick/distinfo4
-rw-r--r--x11-drivers/xf86-input-keyboard/Makefile9
-rw-r--r--x11-drivers/xf86-input-keyboard/distinfo4
-rw-r--r--x11-drivers/xf86-input-magictouch/Makefile5
-rw-r--r--x11-drivers/xf86-input-mouse/Makefile8
-rw-r--r--x11-drivers/xf86-input-mouse/distinfo4
-rw-r--r--x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c271
-rw-r--r--x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in11
-rw-r--r--x11-drivers/xf86-input-mouse/files/patch-src_mouse.c189
-rw-r--r--x11-drivers/xf86-input-mouse/files/patch-src_mouse.h25
-rw-r--r--x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h11
-rw-r--r--x11-drivers/xf86-input-mouse/pkg-plist3
-rw-r--r--x11-drivers/xf86-input-mutouch/Makefile6
-rw-r--r--x11-drivers/xf86-input-penmount/Makefile6
-rw-r--r--x11-drivers/xf86-input-synaptics/Makefile46
-rw-r--r--x11-drivers/xf86-input-synaptics/distinfo6
-rw-r--r--x11-drivers/xf86-input-synaptics/files/extra-Makefile.in11
-rw-r--r--x11-drivers/xf86-input-synaptics/pkg-plist14
-rw-r--r--x11-drivers/xf86-input-vmmouse/Makefile17
-rw-r--r--x11-drivers/xf86-input-vmmouse/distinfo4
-rw-r--r--x11-drivers/xf86-input-vmmouse/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-void/Makefile6
-rw-r--r--x11-drivers/xf86-video-apm/Makefile9
-rw-r--r--x11-drivers/xf86-video-apm/distinfo4
-rw-r--r--x11-drivers/xf86-video-ark/Makefile9
-rw-r--r--x11-drivers/xf86-video-ark/distinfo4
-rw-r--r--x11-drivers/xf86-video-ati/Makefile10
-rw-r--r--x11-drivers/xf86-video-ati/distinfo4
-rw-r--r--x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c12
-rw-r--r--x11-drivers/xf86-video-chips/Makefile8
-rw-r--r--x11-drivers/xf86-video-chips/distinfo4
-rw-r--r--x11-drivers/xf86-video-chips/files/patch-util_Makefile.am13
-rw-r--r--x11-drivers/xf86-video-chips/files/patch-util_Makefile.in15
-rw-r--r--x11-drivers/xf86-video-chips/files/patch-util_iopl.h63
-rw-r--r--x11-drivers/xf86-video-cirrus/Makefile9
-rw-r--r--x11-drivers/xf86-video-cirrus/distinfo4
-rw-r--r--x11-drivers/xf86-video-cyrix/Makefile5
-rw-r--r--x11-drivers/xf86-video-dummy/Makefile9
-rw-r--r--x11-drivers/xf86-video-dummy/distinfo4
-rw-r--r--x11-drivers/xf86-video-fbdev/Makefile8
-rw-r--r--x11-drivers/xf86-video-fbdev/distinfo4
-rw-r--r--x11-drivers/xf86-video-glint/Makefile9
-rw-r--r--x11-drivers/xf86-video-glint/distinfo4
-rw-r--r--x11-drivers/xf86-video-i128/Makefile9
-rw-r--r--x11-drivers/xf86-video-i128/distinfo4
-rw-r--r--x11-drivers/xf86-video-i740/Makefile9
-rw-r--r--x11-drivers/xf86-video-i740/distinfo4
-rw-r--r--x11-drivers/xf86-video-imstt/Makefile5
-rw-r--r--x11-drivers/xf86-video-intel/Makefile28
-rw-r--r--x11-drivers/xf86-video-intel/distinfo4
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-clang53
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-i915kms20
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c14
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h18
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c91
-rw-r--r--x11-drivers/xf86-video-mach64/Makefile9
-rw-r--r--x11-drivers/xf86-video-mach64/distinfo4
-rw-r--r--x11-drivers/xf86-video-mga/Makefile11
-rw-r--r--x11-drivers/xf86-video-mga/distinfo4
-rw-r--r--x11-drivers/xf86-video-neomagic/Makefile9
-rw-r--r--x11-drivers/xf86-video-neomagic/distinfo4
-rw-r--r--x11-drivers/xf86-video-newport/Makefile9
-rw-r--r--x11-drivers/xf86-video-newport/distinfo4
-rw-r--r--x11-drivers/xf86-video-nouveau/Makefile8
-rw-r--r--x11-drivers/xf86-video-nv/Makefile8
-rw-r--r--x11-drivers/xf86-video-nv/distinfo4
-rw-r--r--x11-drivers/xf86-video-openchrome/Makefile11
-rw-r--r--x11-drivers/xf86-video-openchrome/distinfo4
-rw-r--r--x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c32
-rw-r--r--x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c83
-rw-r--r--x11-drivers/xf86-video-r128/Makefile9
-rw-r--r--x11-drivers/xf86-video-r128/distinfo4
-rw-r--r--x11-drivers/xf86-video-rdc/Makefile10
-rw-r--r--x11-drivers/xf86-video-rendition/Makefile8
-rw-r--r--x11-drivers/xf86-video-rendition/distinfo4
-rw-r--r--x11-drivers/xf86-video-s3/Makefile9
-rw-r--r--x11-drivers/xf86-video-s3/distinfo4
-rw-r--r--x11-drivers/xf86-video-s3virge/Makefile9
-rw-r--r--x11-drivers/xf86-video-s3virge/distinfo4
-rw-r--r--x11-drivers/xf86-video-savage/Makefile10
-rw-r--r--x11-drivers/xf86-video-savage/distinfo4
-rw-r--r--x11-drivers/xf86-video-siliconmotion/Makefile8
-rw-r--r--x11-drivers/xf86-video-siliconmotion/distinfo4
-rw-r--r--x11-drivers/xf86-video-sis/Makefile13
-rw-r--r--x11-drivers/xf86-video-sis/distinfo4
-rw-r--r--x11-drivers/xf86-video-sunffb/Makefile5
-rw-r--r--x11-drivers/xf86-video-tdfx/Makefile9
-rw-r--r--x11-drivers/xf86-video-tdfx/distinfo4
-rw-r--r--x11-drivers/xf86-video-tga/Makefile9
-rw-r--r--x11-drivers/xf86-video-tga/distinfo4
-rw-r--r--x11-drivers/xf86-video-trident/Makefile9
-rw-r--r--x11-drivers/xf86-video-trident/distinfo4
-rw-r--r--x11-drivers/xf86-video-tseng/Makefile8
-rw-r--r--x11-drivers/xf86-video-tseng/distinfo4
-rw-r--r--x11-drivers/xf86-video-vesa/Makefile9
-rw-r--r--x11-drivers/xf86-video-vesa/distinfo4
-rw-r--r--x11-drivers/xf86-video-via/Makefile5
-rw-r--r--x11-drivers/xf86-video-vmware/Makefile8
-rw-r--r--x11-drivers/xf86-video-vmware/distinfo4
-rw-r--r--x11-drivers/xf86-video-voodoo/Makefile9
-rw-r--r--x11-drivers/xf86-video-voodoo/distinfo4
-rw-r--r--x11-drivers/xorg-drivers/Makefile5
111 files changed, 887 insertions, 716 deletions
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
index e73f065440a9..add20a8fddec 100644
--- a/x11-drivers/xf86-input-acecad/Makefile
+++ b/x11-drivers/xf86-input-acecad/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xf86-input-acecad
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-input-acecad
PORTVERSION= 1.5.0
@@ -13,7 +8,6 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org acecad input driver
XORG_CAT= driver
-USE_XORG= xextproto videoproto
MAN4= acecad.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-egalax/Makefile b/x11-drivers/xf86-input-egalax/Makefile
index b0198f84acf3..88c6e1a943a1 100644
--- a/x11-drivers/xf86-input-egalax/Makefile
+++ b/x11-drivers/xf86-input-egalax/Makefile
@@ -25,7 +25,7 @@ IGNORE= is useless without uep(4) kernel driver
.endif
.if defined(WITH_NEW_XORG)
-IGNORE= does not build with X server 1.10
+IGNORE= does not build with X server 1.12
.endif
.include <bsd.port.post.mk>
diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile
index fe1cdddfaf12..46de1f68e714 100644
--- a/x11-drivers/xf86-input-elographics/Makefile
+++ b/x11-drivers/xf86-input-elographics/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xf86-input-elographics
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-input-elographics
PORTVERSION= ${ELO_VERSION}
@@ -14,7 +9,6 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org elographics input driver
XORG_CAT= driver
-USE_XORG= xextproto videoproto
MAN4= elographics.4x
.if defined(WITH_NEW_XORG)
diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile
new file mode 100644
index 000000000000..ae3b53b12a5d
--- /dev/null
+++ b/x11-drivers/xf86-input-fpit/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME= xf86-input-fpit
+PORTVERSION= 1.4.0
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org fpit input driver
+
+XORG_CAT= driver
+USE_XORG= xrandr
+
+MAN4= fpit.4x
+
+.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/distinfo b/x11-drivers/xf86-input-fpit/distinfo
new file mode 100644
index 000000000000..1e97d5e0d0a2
--- /dev/null
+++ b/x11-drivers/xf86-input-fpit/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-input-fpit-1.4.0.tar.bz2) = 38a80ad6e9b367e068390b2ef92e0bbb9c21c09ea835a5190ae14c2271e68f9a
+SIZE (xorg/driver/xf86-input-fpit-1.4.0.tar.bz2) = 277843
diff --git a/x11-drivers/xf86-input-fpit/pkg-descr b/x11-drivers/xf86-input-fpit/pkg-descr
new file mode 100644
index 000000000000..28985efe820a
--- /dev/null
+++ b/x11-drivers/xf86-input-fpit/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-input-fpit driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-fpit/pkg-plist b/x11-drivers/xf86-input-fpit/pkg-plist
new file mode 100644
index 000000000000..724fb9560c6e
--- /dev/null
+++ b/x11-drivers/xf86-input-fpit/pkg-plist
@@ -0,0 +1,6 @@
+lib/xorg/modules/input/fpit_drv.la
+lib/xorg/modules/input/fpit_drv.so
+share/X11/xorg.conf.d/50-fpit.conf
+@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 2f7b5c74d867..4c6ffaf98ce0 100644
--- a/x11-drivers/xf86-input-hyperpen/Makefile
+++ b/x11-drivers/xf86-input-hyperpen/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xf86-input-hyperpen
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-input-hyperpen
PORTVERSION= ${HYPERVER}
@@ -14,13 +9,10 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org hyperpen input driver
XORG_CAT= driver
-USE_XORG= xextproto videoproto
.if defined(WITH_NEW_XORG)
HYPERVER= 1.4.1
HYPERREVISION= 0
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_xf86HyperPen.c
-
.else
HYPERVER= 1.3.0
HYPERREVISION= 6
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
index 94f2872da90b..f2e9e1e46bb5 100644
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xf86-input-joystick
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-input-joystick
PORTVERSION= ${JOYVER}
@@ -14,11 +9,10 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org joystick input driver
XORG_CAT= driver
-USE_XORG= xextproto videoproto
MAN4= joystick.4x
.if defined(WITH_NEW_XORG)
-JOYVER= 1.6.0
+JOYVER= 1.6.2
JOYREVISION= 0
.else
JOYVER= 1.5.0
diff --git a/x11-drivers/xf86-input-joystick/distinfo b/x11-drivers/xf86-input-joystick/distinfo
index db447f9e87de..821ce73a6c85 100644
--- a/x11-drivers/xf86-input-joystick/distinfo
+++ b/x11-drivers/xf86-input-joystick/distinfo
@@ -1,4 +1,4 @@
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.0.tar.bz2) = 4f1c15ec7372dd340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1
-SIZE (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 310552
+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-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 86be55c73da4..c4d4ae61bfc5 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -1,19 +1,14 @@
-# New ports collection makefile for: xf86-input-keyboard
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-input-keyboard
-PORTVERSION= 1.6.1
+PORTVERSION= 1.7.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org keyboard input driver
XORG_CAT= driver
-USE_XORG= kbproto xextproto videoproto
+USE_XORG= kbproto
MAN4= kbd.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo
index f093391f0b88..35dda24723c9 100644
--- a/x11-drivers/xf86-input-keyboard/distinfo
+++ b/x11-drivers/xf86-input-keyboard/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
-SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = 304166
+SHA256 (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c
+SIZE (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 319043
diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile
index 38eb7613b939..9b48bf0fe9a1 100644
--- a/x11-drivers/xf86-input-magictouch/Makefile
+++ b/x11-drivers/xf86-input-magictouch/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xf86-input-magictouch
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-input-magictouch
PORTVERSION= 1.0.0.5
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index 42ee890b0afe..cabe85a8eb0b 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -1,18 +1,14 @@
-# Created by: Florent Thoumie <flz@FreeBSD.org>
# $FreeBSD$
PORTNAME= xf86-input-mouse
-PORTVERSION= 1.7.1
-PORTREVISION= 1
+PORTVERSION= 1.9.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org mouse input driver
-CONFIGURE_ARGS+=--disable-silent-rules
-
XORG_CAT= driver
-USE_XORG= xextproto videoproto
+USES= pathfix
MAN4= mousedrv.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo
index 890cfcb50773..00bb525f0db8 100644
--- a/x11-drivers/xf86-input-mouse/distinfo
+++ b/x11-drivers/xf86-input-mouse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
-SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 319429
+SHA256 (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488
+SIZE (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 353339
diff --git a/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c b/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
index b1da04c548d7..078d52a28128 100644
--- a/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
+++ b/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
@@ -1,64 +1,57 @@
---- src/bsd_mouse.c.orig 2008-11-26 23:11:36.000000000 -0500
-+++ src/bsd_mouse.c 2009-04-07 17:10:17.000000000 -0400
-@@ -1,4 +1,3 @@
--
- /*
- * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
- *
-@@ -71,15 +70,20 @@
+--- src/bsd_mouse.c.orig 2012-07-27 08:10:56.000000000 +0200
++++ src/bsd_mouse.c 2012-07-30 00:49:09.000000000 +0200
+@@ -71,15 +71,20 @@
static const char *FindDevice(InputInfoPtr, const char *, int);
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-+#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106)
++#if !defined(XPS2_SUPPORT)
+#define XPS2_SUPPORT
+#endif
/* These are for FreeBSD and DragonFly */
- #define DEFAULT_MOUSE_DEV "/dev/mouse"
- #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse"
- #define DEFAULT_PS2_DEV "/dev/psm0"
-+#define DEFAULT_USB_DEV "/dev/ums0"
+ #define DEFAULT_MOUSE_DEV "/dev/mouse"
+ #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse"
+ #define DEFAULT_PS2_DEV "/dev/psm0"
++#define DEFAULT_USB_DEV "/dev/ums0"
static const char *mouseDevs[] = {
- DEFAULT_MOUSE_DEV,
- DEFAULT_SYSMOUSE_DEV,
- DEFAULT_PS2_DEV,
-+ DEFAULT_USB_DEV,
- NULL
+ DEFAULT_MOUSE_DEV,
+ DEFAULT_SYSMOUSE_DEV,
+ DEFAULT_PS2_DEV,
++ DEFAULT_USB_DEV,
+ NULL
};
#elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
-@@ -100,7 +104,11 @@
+@@ -100,7 +105,11 @@
#if defined(__NetBSD__)
return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
+ return MSE_SERIAL | MSE_BUS | MSE_PS2 |
+#ifdef XPS2_SUPPORT
-+ MSE_XPS2 |
++ MSE_XPS2 |
+#endif
-+ MSE_AUTO | MSE_MISC;
++ MSE_AUTO | MSE_MISC;
#else
- return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
+ return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
#endif
-@@ -179,10 +187,31 @@
- { MOUSE_PROTO_THINK, "ThinkingMouse" },
- { MOUSE_PROTO_SYSMOUSE, "SysMouse" }
+@@ -180,9 +189,30 @@
+ { MOUSE_PROTO_SYSMOUSE, "SysMouse" }
};
--
-+
+
+#ifdef XPS2_SUPPORT
+static struct {
-+ int dmodel;
-+ char *name;
++ int dmodel;
++ char *name;
+} ps2proto[] = {
-+ { MOUSE_MODEL_NETSCROLL, "NetScrollPS/2" },
-+ { MOUSE_MODEL_NET, "NetMousePS/2" },
-+ { MOUSE_MODEL_GLIDEPOINT, "GlidePointPS/2" },
-+ { MOUSE_MODEL_THINK, "ThinkingMousePS/2" },
-+ { MOUSE_MODEL_INTELLI, "IMPS/2" },
-+ { MOUSE_MODEL_MOUSEMANPLUS, "MouseManPlusPS/2" },
-+ { MOUSE_MODEL_EXPLORER, "ExplorerPS/2" },
-+ { MOUSE_MODEL_4D, "IMPS/2" },
-+ { MOUSE_MODEL_4DPLUS, "IMPS/2" },
++ { MOUSE_MODEL_NETSCROLL, "NetScrollPS/2" },
++ { MOUSE_MODEL_NET, "NetMousePS/2" },
++ { MOUSE_MODEL_GLIDEPOINT, "GlidePointPS/2" },
++ { MOUSE_MODEL_THINK, "ThinkingMousePS/2" },
++ { MOUSE_MODEL_INTELLI, "IMPS/2" },
++ { MOUSE_MODEL_MOUSEMANPLUS, "MouseManPlusPS/2" },
++ { MOUSE_MODEL_EXPLORER, "ExplorerPS/2" },
++ { MOUSE_MODEL_4D, "IMPS/2" },
++ { MOUSE_MODEL_4DPLUS, "IMPS/2" },
+};
+#endif
+
@@ -72,56 +65,52 @@
int i;
mousehw_t hw;
mousemode_t mode;
-@@ -190,10 +219,16 @@
+@@ -190,7 +220,13 @@
if (pInfo->fd == -1)
- return NULL;
+ return NULL;
+#ifdef XPS2_SUPPORT
/* set the driver operation level, if applicable */
+ dev = xf86FindOptionValue(pInfo->options, "Device");
+ if (dev != NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8))
-+ i = 2;
++ i = 2;
+ else
+#endif
i = 1;
ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
--
-+
- /* interrogate the driver and get some intelligence on the device. */
- hw.iftype = MOUSE_IF_UNKNOWN;
- hw.model = MOUSE_MODEL_GENERIC;
-@@ -209,9 +244,18 @@
- protoPara[0] = mode.syncmask[0];
- protoPara[1] = mode.syncmask[1];
- }
-+ proto = devproto[i].name;
+
+@@ -209,9 +245,18 @@
+ protoPara[0] = mode.syncmask[0];
+ protoPara[1] = mode.syncmask[1];
+ }
++ proto = devproto[i].name;
+#ifdef XPS2_SUPPORT
-+ if (mode.protocol == MOUSE_PROTO_PS2)
-+ for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
-+ if (hw.model == ps2proto[i].dmodel) {
-+ proto = ps2proto[i].name;
-+ break;
-+ }
++ if (mode.protocol == MOUSE_PROTO_PS2)
++ for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
++ if (hw.model == ps2proto[i].dmodel) {
++ proto = ps2proto[i].name;
++ break;
++ }
+#endif
- xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
-- pInfo->name, devproto[i].name);
-- return devproto[i].name;
-+ pInfo->name, proto);
-+ return proto;
- }
- }
+ xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
+- pInfo->name, devproto[i].name);
+- return devproto[i].name;
++ pInfo->name, proto);
++ return proto;
+ }
+ }
}
-@@ -234,41 +278,41 @@
- (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
- /*
- * As the FreeBSD sysmouse driver defaults to protocol level 0
-- * everytime it is opened we enforce protocol level 1 again at
-+ * everytime it is closed we enforce protocol level 1 again at
- * this point.
- */
- mode.level = 1;
+@@ -234,41 +279,41 @@
+ (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
+ /*
+ * As the FreeBSD sysmouse driver defaults to protocol level 0
+- * everytime it is opened we enforce protocol level 1 again at
++ * everytime it is closed we enforce protocol level 1 again at
+ * this point.
+ */
+ mode.level = 1;
} else
-- mode.level = -1;
+- mode.level = -1;
-#else
- mode.level = -1;
#endif
@@ -151,26 +140,26 @@
+ unsigned int i;
- if ((f = fopen(MOUSED_PID_FILE, "r")) != NULL) {
-- if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
-- if (kill(pid, 0) == 0) {
-- fclose(f);
-- return TRUE;
-- }
+- if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
+- if (kill(pid, 0) == 0) {
+- fclose(f);
+- return TRUE;
+- }
+ if (dev)
-+ sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
++ sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
+ else
-+ sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
++ sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
+ if ((f = popen(cmd, "r")) != NULL) {
-+ if (fscanf(f, "%u", &i) == 1 && i > 0) {
-+ pclose(f);
-+ return TRUE;
- }
-- fclose(f);
-+ pclose(f);
++ if (fscanf(f, "%u", &i) == 1 && i > 0) {
++ pclose(f);
++ return TRUE;
+ }
+- fclose(f);
++ pclose(f);
}
return FALSE;
}
-@@ -276,17 +320,17 @@
+@@ -276,17 +321,17 @@
static const char *
FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
{
@@ -182,63 +171,63 @@
struct stat sb;
for (pdev = mouseDevs; *pdev; pdev++) {
-- SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
-- if (fd == -1) {
-+ SYSCALL (ret = stat(*pdev, &sb));
-+ if (ret == -1) {
+- SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
+- if (fd == -1) {
++ SYSCALL (ret = stat(*pdev, &sb));
++ if (ret == -1) {
#ifdef DEBUG
-- ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
-+ ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
+- ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
++ ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
#endif
- } else {
- /*
-@@ -295,28 +339,32 @@
- * the test for whether /dev/sysmouse is usable can be made.
- */
- if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
-- if (fstat(fd, &devMouseStat) == 0)
-- devMouse = TRUE;
-- close(fd);
-+ memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
-+ devMouse = TRUE;
- continue;
- } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
- /* Check if /dev/mouse is the same as /dev/sysmouse. */
-- if (devMouse && fstat(fd, &sb) == 0 &&
-- devMouseStat.st_dev == sb.st_dev &&
-+ if (devMouse && devMouseStat.st_dev == sb.st_dev &&
- devMouseStat.st_ino == sb.st_ino) {
- /* If the same, use /dev/sysmouse. */
- devMouse = FALSE;
- }
-- close(fd);
-- if (MousedRunning())
-+ if (MousedRunning(NULL))
- break;
-- else {
+ } else {
+ /*
+@@ -295,28 +340,32 @@
+ * the test for whether /dev/sysmouse is usable can be made.
+ */
+ if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
+- if (fstat(fd, &devMouseStat) == 0)
+- devMouse = TRUE;
+- close(fd);
++ memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
++ devMouse = TRUE;
+ continue;
+ } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
+ /* Check if /dev/mouse is the same as /dev/sysmouse. */
+- if (devMouse && fstat(fd, &sb) == 0 &&
+- devMouseStat.st_dev == sb.st_dev &&
++ if (devMouse && devMouseStat.st_dev == sb.st_dev &&
+ devMouseStat.st_ino == sb.st_ino) {
+ /* If the same, use /dev/sysmouse. */
+ devMouse = FALSE;
+ }
+- close(fd);
+- if (MousedRunning())
++ if (MousedRunning(NULL))
+ break;
+- else {
-#ifdef DEBUG
-- ErrorF("moused isn't running\n");
+- ErrorF("moused isn't running\n");
-#endif
-- }
- } else {
-- close(fd);
-+ /* Check if /dev/mouse is the same as this device. */
-+ if (devMouse && devMouseStat.st_dev == sb.st_dev &&
-+ devMouseStat.st_ino == sb.st_ino) {
-+ /* If the same, use this device. */
-+ devMouse = FALSE;
-+ }
-+ if (MousedRunning(*pdev))
-+ continue;
-+ /* ums(4) does not support anything but SysMouse protocol. */
-+ if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
-+ xf86NameCmp(protocol, "auto") != 0 &&
-+ xf86NameCmp(protocol, "sysmouse") != 0)
-+ continue;
- break;
- }
- }
-@@ -782,7 +830,9 @@
+- }
+ } else {
+- close(fd);
++ /* Check if /dev/mouse is the same as this device. */
++ if (devMouse && devMouseStat.st_dev == sb.st_dev &&
++ devMouseStat.st_ino == sb.st_ino) {
++ /* If the same, use this device. */
++ devMouse = FALSE;
++ }
++ if (MousedRunning(*pdev))
++ continue;
++ /* ums(4) does not support anything but SysMouse protocol. */
++ if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
++ xf86NameCmp(protocol, "auto") != 0 &&
++ xf86NameCmp(protocol, "sysmouse") != 0)
++ continue;
+ break;
+ }
+ }
+@@ -764,7 +813,9 @@
p->CheckProtocol = CheckProtocol;
#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
p->SetupAuto = SetupAuto;
diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in b/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..5b1c89921ea5
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
@@ -0,0 +1,11 @@
+--- ./src/Makefile.in.orig 2011-07-05 18:09:54.000000000 +0200
++++ ./src/Makefile.in 2012-03-02 14:02:43.000000000 +0100
+@@ -279,7 +279,7 @@
+ # _ladir passes a dummy rpath to libtool so the thing will actually link
+ # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+ @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
+-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
++@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -lusbhid
+ @DRIVER_NAME@_drv_ladir = @inputdir@
+
+ # We have to list all the mouse drivers here, even if we don't build them, so
diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
index 8255608025a1..2d363d50c7b2 100644
--- a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
+++ b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
@@ -1,11 +1,182 @@
---- src/mouse.c.orig 2012-10-18 11:06:28.000000000 +0400
-+++ src/mouse.c 2012-10-18 11:06:57.000000000 +0400
-@@ -872,6 +872,8 @@ MousePreInit(InputDriverPtr drv, IDevPtr
- pInfo->private_flags = 0;
- pInfo->always_core_feedback = NULL;
+--- src/mouse.c.orig 2012-07-27 08:10:56.000000000 +0200
++++ src/mouse.c 2012-07-30 00:31:48.000000000 +0200
+@@ -280,13 +280,39 @@
-+ COLLECT_INPUT_OPTIONS(pInfo, NULL);
+ pMse = pInfo->private;
+
+- pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
++ i = xf86SetIntOption(pInfo->options, "Buttons", 0);
++ if (i != 0)
++ pMse->buttons = i;
+ if (!pMse->buttons) {
+ pMse->buttons = MSE_DFLTBUTTONS;
+ buttons_from = X_DEFAULT;
+ }
+ origButtons = pMse->buttons;
+
++ s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
++ if (s) {
++ int b, n = 0;
++ char *s1 = s;
++ /* keep getting numbers which are buttons */
++ while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
++ /* check sanity for a button */
++ if (b < 0 || b > MSE_MAXBUTTONS) {
++ xf86Msg(X_WARNING,
++ "ButtonMapping: Invalid button number = %d\n", b);
++ break;
++ };
++ pMse->buttonMap[n++] = 1 << (b-1);
++ if (b > pMse->buttons) pMse->buttons = b;
++ }
++ free(s);
++ }
++ /* get maximum of mapped buttons */
++ for (i = pMse->buttons-1; i >= 0; i--) {
++ int f = ffs (pMse->buttonMap[i]);
++ if (f > pMse->buttons)
++ pMse->buttons = f;
++ }
+
- if (NewMousePreInit(drv, pInfo, flags) == Success)
- {
- /* Check if SendDragEvents has been disabled. */
+ pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
+ "Emulate3Buttons", FALSE);
+ if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
+@@ -298,6 +324,8 @@
+ "Emulate3Timeout", 50);
+ if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
+ MessageType from = X_CONFIG;
++ if (pMse->buttons < 3)
++ pMse->buttons = 3;
+ if (pMse->emulate3ButtonsSoft)
+ from = X_DEFAULT;
+ xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
+@@ -305,6 +333,8 @@
+ }
+
+ pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE);
++ if (pMse->chordMiddle && pMse->buttons < 3)
++ pMse->buttons = 3;
+ pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE);
+ if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) {
+ pMse->invX = -1;
+@@ -315,7 +345,7 @@
+ } else
+ pMse->invY = 1;
+ pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0);
+-
++ pMse->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
+
+ if (pMse->pDragLock)
+ free(pMse->pDragLock);
+@@ -425,14 +455,17 @@
+ free(s);
+ }
+
+- s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
++ s = xf86SetStrOption(pInfo->options, "ZAxisMapping",
++ pMse->hasZ ? ( pMse->hasW ? "4 5 6 7" : "4 5" ) : "off");
+ if (s) {
+ int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
+ char *msg = NULL;
+
+ pMse->negativeZ = pMse->positiveZ = MSE_NOAXISMAP;
+ pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP;
+- if (!xf86NameCmp(s, "x")) {
++ if (!xf86NameCmp(s, "off")) {
++ msg = xstrdup("off");
++ } else if (!xf86NameCmp(s, "x")) {
+ pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
+ msg = xstrdup("X axis");
+ } else if (!xf86NameCmp(s, "y")) {
+@@ -568,29 +601,6 @@
+ pInfo->name, wheelButton, pMse->wheelInertia,
+ pMse->wheelButtonTimeout);
+ }
+- s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
+- if (s) {
+- int b, n = 0;
+- char *s1 = s;
+- /* keep getting numbers which are buttons */
+- while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
+- /* check sanity for a button */
+- if (b < 0 || b > MSE_MAXBUTTONS) {
+- xf86Msg(X_WARNING,
+- "ButtonMapping: Invalid button number = %d\n", b);
+- break;
+- };
+- pMse->buttonMap[n++] = 1 << (b-1);
+- if (b > pMse->buttons) pMse->buttons = b;
+- }
+- free(s);
+- }
+- /* get maximum of mapped buttons */
+- for (i = pMse->buttons-1; i >= 0; i--) {
+- int f = ffs (pMse->buttonMap[i]);
+- if (f > pMse->buttons)
+- pMse->buttons = f;
+- }
+ if (origButtons != pMse->buttons)
+ buttons_from = X_CONFIG;
+ xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
+@@ -668,7 +678,6 @@
+ }
+ pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0);
+ pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0);
+- mPriv->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
+ }
+
+ static void
+@@ -959,6 +968,8 @@
+ /* Default Mapping: 1 2 3 8 9 10 11 ... */
+ for (i = 0; i < MSE_MAXBUTTONS; i++)
+ pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
++ pMse->hasZ = 1;
++ pMse->hasW = 0;
+
+ protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
+
+@@ -2137,7 +2148,7 @@
+
+ if (pMse->emulateWheel) {
+ /* Emulate wheel button handling */
+- if(pMse->wheelButton == 0)
++ if (pMse->wheelButton == 0)
+ wheelButtonMask = 0;
+ else
+ wheelButtonMask = 1 << (pMse->wheelButton - 1);
+@@ -2221,6 +2232,9 @@
+ }
+ }
+ }
++ } else {
++ pMse->wheelXDistance = 0;
++ pMse->wheelYDistance = 0;
+ }
+
+ /* Absorb the mouse movement while the wheel button is pressed. */
+@@ -2238,7 +2252,7 @@
+ if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
+ buttonTimer(pInfo);
+
+- if (dx || dy)
++ if ((dx || dy) && !pMse->disableXY)
+ xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
+
+ if (change) {
+@@ -2448,11 +2462,11 @@
+
+ /* Accumulate the scaled dx, dy in the private variables
+ fracdx,fracdy and return the integer number part */
+- if (mousepriv) {
+- mousepriv->fracdx += mousepriv->sensitivity*dx;
+- mousepriv->fracdy += mousepriv->sensitivity*dy;
+- mousepriv->fracdx -= ( dx=(int)(mousepriv->fracdx) );
+- mousepriv->fracdy -= ( dy=(int)(mousepriv->fracdy) );
++ if (pMse->sensitivity != 0) {
++ pMse->fracdx += pMse->sensitivity*dx;
++ pMse->fracdy += pMse->sensitivity*dy;
++ pMse->fracdx -= ( dx=(int)(pMse->fracdx) );
++ pMse->fracdy -= ( dy=(int)(pMse->fracdy) );
+ }
+
+ /* If mouse wheel movement has to be mapped on a button, we need to
diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
new file mode 100644
index 000000000000..abb2ac9565b2
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
@@ -0,0 +1,25 @@
+--- src/mouse.h.orig 2012-07-27 08:10:56.000000000 +0200
++++ src/mouse.h 2012-07-30 00:41:02.000000000 +0200
+@@ -217,10 +217,13 @@
+ Bool emulate3ButtonsSoft;
+ int emulate3Timeout;/* Timeout for 3 button emulation */
+ Bool chordMiddle;
++ Bool disableXY;
+ Bool flipXY;
+ int invX;
+ int invY;
+ int resolution;
++ Bool hasW;
++ Bool hasZ;
+ int negativeZ; /* button mask */
+ int positiveZ; /* button mask */
+ int negativeW; /* button mask */
+@@ -259,6 +262,8 @@
+ int doubleClickOldSourceState;
+ int lastMappedButtons;
+ int buttonMap[MSE_MAXBUTTONS];
++ float fracdx,fracdy;
++ float sensitivity;
+ } MouseDevRec, *MouseDevPtr;
+
+ #endif /* _XF86OSMOUSE_H_ */
diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h b/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
new file mode 100644
index 000000000000..8abb8c3e83fc
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
@@ -0,0 +1,11 @@
+--- src/mousePriv.h.orig 2012-07-27 08:10:56.000000000 +0200
++++ src/mousePriv.h 2012-07-30 00:39:00.000000000 +0200
+@@ -63,8 +63,6 @@
+ int acc;
+ CARD32 pnpLast;
+ Bool disablePnPauto;
+- float fracdx,fracdy;
+- float sensitivity;
+ } mousePrivRec, *mousePrivPtr;
+
+ /* mouse proto flags */
diff --git a/x11-drivers/xf86-input-mouse/pkg-plist b/x11-drivers/xf86-input-mouse/pkg-plist
index dd465f17a16a..3e9b203c360f 100644
--- a/x11-drivers/xf86-input-mouse/pkg-plist
+++ b/x11-drivers/xf86-input-mouse/pkg-plist
@@ -1,5 +1,8 @@
+include/xorg/xf86-mouse-properties.h
lib/xorg/modules/input/mouse_drv.la
lib/xorg/modules/input/mouse_drv.so
+libdata/pkgconfig/xorg-mouse.pc
@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 adb94e60aaf8..7e5d23c89439 100644
--- a/x11-drivers/xf86-input-mutouch/Makefile
+++ b/x11-drivers/xf86-input-mutouch/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xf86-input-mutouch
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-input-mutouch
PORTVERSION= 1.3.0
@@ -13,7 +8,6 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org mutouch input driver
XORG_CAT= driver
-USE_XORG= xextproto videoproto
MAN4= mutouch.4x
.if !defined(WITH_NEW_XORG)
diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile
index 5fdd36055de5..9f29f545af2c 100644
--- a/x11-drivers/xf86-input-penmount/Makefile
+++ b/x11-drivers/xf86-input-penmount/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xf86-input-penmount
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-input-penmount
PORTVERSION= ${PEN_VERSION}
@@ -14,7 +9,6 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org penmount input driver
XORG_CAT= driver
-USE_XORG= xextproto videoproto
MAN4= penmount.4x
.if defined(WITH_NEW_XORG)
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index 8a5e57cfb4c4..aec3f7dfc78f 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: xf86-input-synaptics
-# Date Created: 25 Sep 2008
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-input-synaptics
-PORTVERSION= 1.5.0
+PORTVERSION= ${SYNAPTICS_VERSION}
+PORTREVISION= ${SYNAPTICS_REVISION}
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -14,25 +10,47 @@ COMMENT= X.Org synaptics input driver
CONFLICTS= synaptics-[0-9]*
-LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
+OPTIONS_DEFINE= HAL
+OPTIONS_DEFAULT=HAL
+
+.include <bsd.port.options.mk>
-USES= pathfix
-USE_XORG= x11 xextproto videoproto
+USES= pathfix
+USE_XORG= x11
XORG_CAT= driver
+.if ${PORT_OPTIONS:MHAL}
+PLIST_SUB+= HAL=""
+LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
+.else
+PLIST_SUB+= HAL="@comment "
+.endif
+
MAN1= syndaemon.1 \
synclient.1
MAN4= synaptics.4x
-post-install:
- ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
- ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
- ${PREFIX}/share/hal/fdi/policy/10osvendor/
-
.if defined(WITH_NEW_XORG)
+SYNAPTICS_VERSION= 1.7.1
+SYNAPTICS_REVISION= 0
PLIST_SUB+= NEW="" OLD="@comment "
.else
+SYNAPTICS_VERSION= 1.6.4
+SYNAPTICS_REVISION= 0
PLIST_SUB+= NEW="@comment " OLD=""
+EXTRA_PATCHES+= ${PATCHDIR}/extra-Makefile.in
+.endif
+
+post-install:
+.if ${PORT_OPTIONS:MHAL}
+ ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
+ ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
+ ${PREFIX}/share/hal/fdi/policy/10osvendor/
+.if !defined(WITH_NEW_XORG)
+ ${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty
+ ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
+ ${PREFIX}/share/hal/fdi/policy/20thirdparty/
+.endif
.endif
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo
index 21ece95f394e..bad1c22f40ed 100644
--- a/x11-drivers/xf86-input-synaptics/distinfo
+++ b/x11-drivers/xf86-input-synaptics/distinfo
@@ -1,2 +1,4 @@
-SHA256 (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 95cc5399fc49c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e
-SIZE (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 431123
+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.1.tar.bz2) = db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e
+SIZE (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = 441407
diff --git a/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in b/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
new file mode 100644
index 000000000000..957f9fcdbc51
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
@@ -0,0 +1,11 @@
+--- 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 4d1aec8680a1..3f9ad117dbf2 100644
--- a/x11-drivers/xf86-input-synaptics/pkg-plist
+++ b/x11-drivers/xf86-input-synaptics/pkg-plist
@@ -1,18 +1,18 @@
bin/synclient
bin/syndaemon
include/xorg/synaptics-properties.h
-include/xorg/synaptics.h
+%%OLD%%include/xorg/synaptics.h
lib/xorg/modules/input/synaptics_drv.la
lib/xorg/modules/input/synaptics_drv.so
libdata/pkgconfig/xorg-synaptics.pc
%%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
-share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
-%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
+%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
+%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
@dirrmtry include/xorg
-@dirrmtry share/hal/fdi/policy/10osvendor
-@dirrmtry share/hal/fdi/policy
-@dirrmtry share/hal/fdi
-@dirrmtry share/hal
+%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor
+%%HAL%%@dirrmtry share/hal/fdi/policy
+%%HAL%%@dirrmtry share/hal/fdi
+%%HAL%%@dirrmtry share/hal
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
index 7bfac60c4a10..ca879b51efc8 100644
--- a/x11-drivers/xf86-input-vmmouse/Makefile
+++ b/x11-drivers/xf86-input-vmmouse/Makefile
@@ -1,18 +1,15 @@
-# New ports collection makefile for: xf86-input-vmmouse
-# Date Created: 17 Feb 2006
-# Whom: NIIMI Satoshi <sa2c@sa2c.net>
-#
+# Created by: NIIMI Satoshi <sa2c@sa2c.net>
# $FreeBSD$
-#
PORTNAME= xf86-input-vmmouse
-PORTVERSION= 12.6.9
-PORTREVISION= 2
+PORTVERSION= 13.0.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org vmmouse input driver
+LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
+
XORG_CAT= driver
CONFIGURE_ARGS= --with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
USE_GMAKE= yes
@@ -23,4 +20,10 @@ MAN4= vmmouse.4x
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= The vmmouse protocol is only supported on x86-compatible architectures.
+.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/distinfo b/x11-drivers/xf86-input-vmmouse/distinfo
index d3fd665c934e..0445b6b023c3 100644
--- a/x11-drivers/xf86-input-vmmouse/distinfo
+++ b/x11-drivers/xf86-input-vmmouse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f
-SIZE (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = 273002
+SHA256 (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c
+SIZE (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 314269
diff --git a/x11-drivers/xf86-input-vmmouse/pkg-plist b/x11-drivers/xf86-input-vmmouse/pkg-plist
index d5ba6a3115a6..0af5d7981aff 100644
--- a/x11-drivers/xf86-input-vmmouse/pkg-plist
+++ b/x11-drivers/xf86-input-vmmouse/pkg-plist
@@ -2,6 +2,7 @@ bin/vmmouse_detect
libexec/hal/scripts/hal-probe-vmmouse
lib/xorg/modules/input/vmmouse_drv.la
lib/xorg/modules/input/vmmouse_drv.so
+%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
index deea0dfbea7d..d768b9dbfac6 100644
--- a/x11-drivers/xf86-input-void/Makefile
+++ b/x11-drivers/xf86-input-void/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xf86-input-void
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-input-void
PORTVERSION= ${VOID_VERSION}
@@ -14,7 +9,6 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org void input driver
XORG_CAT= driver
-USE_XORG= xextproto videoproto
MAN4= void.4x
.if defined(WITH_NEW_XORG)
diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile
index 96546c4eae21..65e37a3e3ca6 100644
--- a/x11-drivers/xf86-video-apm/Makefile
+++ b/x11-drivers/xf86-video-apm/Makefile
@@ -1,20 +1,13 @@
-# New ports collection makefile for: xf86-video-apm
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-apm
-PORTVERSION= 1.2.3
-PORTREVISION= 1
+PORTVERSION= 1.2.5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org apm display driver
XORG_CAT= driver
-USE_XORG= videoproto xextproto
MAN4= apm.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-apm/distinfo b/x11-drivers/xf86-video-apm/distinfo
index 230f03ee84b4..cd9591f9e068 100644
--- a/x11-drivers/xf86-video-apm/distinfo
+++ b/x11-drivers/xf86-video-apm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da
-SIZE (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 295470
+SHA256 (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f
+SIZE (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 325277
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
index de559d88acf2..c3e844391f83 100644
--- a/x11-drivers/xf86-video-ark/Makefile
+++ b/x11-drivers/xf86-video-ark/Makefile
@@ -1,19 +1,12 @@
-# New ports collection makefile for: xf86-video-ark
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-ark
-PORTVERSION= 0.7.3
-PORTREVISION= 1
+PORTVERSION= 0.7.5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org ark display driver
XORG_CAT= driver
-USE_XORG= xextproto videoproto
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ark/distinfo b/x11-drivers/xf86-video-ark/distinfo
index d7e2a50fee90..bbd43c721722 100644
--- a/x11-drivers/xf86-video-ark/distinfo
+++ b/x11-drivers/xf86-video-ark/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
-SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 238946
+SHA256 (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e
+SIZE (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = 290423
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index 0f173cd9a0eb..369e3d2cf62a 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: xf86-video-ati
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-ati
-PORTVERSION= 6.14.3
-PORTREVISION= 1
+PORTVERSION= 6.14.6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -15,7 +9,7 @@ COMMENT= X.Org ati display driver
USE_GL= gl
XORG_CAT= driver
-USE_XORG= xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
+USE_XORG= xf86driproto xineramaproto xf86miscproto glproto
MAN4= ati.4x radeon.4x
CONFIGURE_ARGS+=--disable-kms
diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo
index 8308036858f8..baa6ed57a8e1 100644
--- a/x11-drivers/xf86-video-ati/distinfo
+++ b/x11-drivers/xf86-video-ati/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
-SIZE (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 1113119
+SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36
+SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495
diff --git a/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c b/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
index 84a992a3bfd9..73d311a98c82 100644
--- a/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
+++ b/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
@@ -1,17 +1,15 @@
---- src/radeon_accel.c.orig 2012-04-15 19:36:08.000000000 +0200
-+++ src/radeon_accel.c 2012-04-15 19:36:15.000000000 +0200
-@@ -982,10 +982,9 @@
+--- src/radeon_accel.c.orig 2012-06-25 10:19:41.000000000 +0200
++++ src/radeon_accel.c 2012-07-30 02:11:51.000000000 +0200
+@@ -967,10 +967,9 @@
for (; nwords > 0; --nwords, ++d, ++s)
#ifdef __powerpc__
- asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
+ asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
#else
-- *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
+- *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
- | ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
+ *d = (*s >> 8) | (*s << 8);
#endif
return;
- }
-
-
+ }
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
index 15e327e912fb..0187092b4d2f 100644
--- a/x11-drivers/xf86-video-chips/Makefile
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -1,19 +1,13 @@
-# New ports collection makefile for: xf86-video-chips
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-chips
-PORTVERSION= 1.2.4
+PORTVERSION= 1.2.5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org chips display driver
XORG_CAT= driver
-USE_XORG= videoproto xextproto
MAN4= chips.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo
index f03b7195566c..a6eb707f460c 100644
--- a/x11-drivers/xf86-video-chips/distinfo
+++ b/x11-drivers/xf86-video-chips/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
-SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618
+SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2
+SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 398804
diff --git a/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
new file mode 100644
index 000000000000..2ec5982b0be0
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
@@ -0,0 +1,13 @@
+--- util/Makefile.am.orig 2013-03-25 20:49:28.885754151 +0100
++++ util/Makefile.am 2013-03-25 20:50:10.467748226 +0100
+@@ -3,7 +3,7 @@
+ noinst_PROGRAMS = dRegs mRegs modClock memClock
+ endif
+
+-dRegs_SOURCES = dRegs.c AsmMacros.h
+-mRegs_SOURCES = mRegs.c AsmMacros.h
+-modClock_SOURCES = modClock.c AsmMacros.h
++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
+ memClock_SOURCES = modClock.c AsmMacros.h
diff --git a/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
new file mode 100644
index 000000000000..b8d96245a190
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
@@ -0,0 +1,15 @@
+--- util/Makefile.in.orig 2013-03-25 20:50:53.827746698 +0100
++++ util/Makefile.in 2013-03-25 20:50:55.499747558 +0100
+@@ -238,9 +238,9 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-dRegs_SOURCES = dRegs.c AsmMacros.h
+-mRegs_SOURCES = mRegs.c AsmMacros.h
+-modClock_SOURCES = modClock.c AsmMacros.h
++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
+ memClock_SOURCES = modClock.c AsmMacros.h
+ all: all-am
+
diff --git a/x11-drivers/xf86-video-chips/files/patch-util_iopl.h b/x11-drivers/xf86-video-chips/files/patch-util_iopl.h
new file mode 100644
index 000000000000..50db4d1a3700
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/files/patch-util_iopl.h
@@ -0,0 +1,63 @@
+--- util/iopl.h.orig 2013-03-25 20:48:15.486758154 +0100
++++ util/iopl.h 2013-03-25 20:47:56.000000000 +0100
+@@ -0,0 +1,60 @@
++#ifdef __NetBSD__
++# include <sys/types.h>
++# include <machine/pio.h>
++# include <machine/sysarch.h>
++#else
++# if defined(__linux__)
++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
++ * # include <sys/io.h>
++ */
++int iopl(int level);
++# endif
++# if defined(SVR4) && defined(i386)
++# include <sys/types.h>
++# ifdef NCR
++ /* broken NCR <sys/sysi86.h> */
++# define __STDC
++# include <sys/sysi86.h>
++# undef __STDC
++# else
++# include <sys/sysi86.h>
++# endif
++# ifdef SVR4
++# if !defined(sun)
++# include <sys/seg.h>
++# endif
++# endif
++# include <sys/v86.h>
++# if defined(sun)
++# include <sys/psw.h>
++# endif
++# endif
++# include "AsmMacros.h"
++#endif /* NetBSD */
++
++#include <unistd.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++#ifdef __NetBSD__
++# define SET_IOPL() i386_iopl(3)
++# define RESET_IOPL() i386_iopl(0)
++#else
++# if defined(SVR4) && defined(i386)
++# ifndef SI86IOPL
++# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
++# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
++# else
++# define SET_IOPL() sysi86(SI86IOPL,3)
++# define RESET_IOPL() sysi86(SI86IOPL,0)
++# endif
++# else
++# ifdef linux
++# define SET_IOPL() iopl(3)
++# define RESET_IOPL() iopl(0)
++# else
++# define SET_IOPL() (void)0
++# define RESET_IOPL() (void)0
++# endif
++# endif
++#endif
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
index 0df0cf1aa519..01a93fa42ddc 100644
--- a/x11-drivers/xf86-video-cirrus/Makefile
+++ b/x11-drivers/xf86-video-cirrus/Makefile
@@ -1,20 +1,13 @@
-# New ports collection makefile for: xf86-video-cirrus
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-cirrus
-PORTVERSION= 1.3.2
-PORTREVISION= 2
+PORTVERSION= 1.5.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org cirrus display driver
XORG_CAT= driver
-USE_XORG= videoproto xextproto
MAN4= cirrus.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-cirrus/distinfo b/x11-drivers/xf86-video-cirrus/distinfo
index 936b7ca7c9d5..cd297e476047 100644
--- a/x11-drivers/xf86-video-cirrus/distinfo
+++ b/x11-drivers/xf86-video-cirrus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
-SIZE (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 286949
+SHA256 (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
+SIZE (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 327547
diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile
index fd32fe39cf6f..e46a3116a20f 100644
--- a/x11-drivers/xf86-video-cyrix/Makefile
+++ b/x11-drivers/xf86-video-cyrix/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xf86-video-cyrix
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-cyrix
PORTVERSION= 1.1.0
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
index 2154b3a4e2a0..e4ab998c623d 100644
--- a/x11-drivers/xf86-video-dummy/Makefile
+++ b/x11-drivers/xf86-video-dummy/Makefile
@@ -1,18 +1,13 @@
-# New ports collection makefile for: xf86-video-dummy
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-dummy
-PORTVERSION= 0.3.5
+PORTVERSION= 0.3.6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org dummy display driver
XORG_CAT= driver
-USE_XORG= videoproto xf86dgaproto
+USE_XORG= xf86dgaproto
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-dummy/distinfo b/x11-drivers/xf86-video-dummy/distinfo
index 899bec938884..bb0e34d02659 100644
--- a/x11-drivers/xf86-video-dummy/distinfo
+++ b/x11-drivers/xf86-video-dummy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
-SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = 274761
+SHA256 (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798
+SIZE (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 285892
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
index 09b6a6a53f7c..7f30b8d665b4 100644
--- a/x11-drivers/xf86-video-fbdev/Makefile
+++ b/x11-drivers/xf86-video-fbdev/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: xf86-video-fbdev
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-fbdev
-PORTVERSION= 0.4.2
+PORTVERSION= 0.4.3
PORTREVISION= 1
CATEGORIES= x11-drivers
@@ -14,7 +9,6 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org fbdev display driver
XORG_CAT= driver
-USE_XORG= videoproto
MAN4= fbdev.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-fbdev/distinfo b/x11-drivers/xf86-video-fbdev/distinfo
index 9f19d13ecd7c..603c5cede855 100644
--- a/x11-drivers/xf86-video-fbdev/distinfo
+++ b/x11-drivers/xf86-video-fbdev/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5
-SIZE (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 263094
+SHA256 (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831
+SIZE (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = 289056
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
index 320b6b13e677..e3175b17712b 100644
--- a/x11-drivers/xf86-video-glint/Makefile
+++ b/x11-drivers/xf86-video-glint/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: xf86-video-glint
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-glint
-PORTVERSION= 1.2.6
+PORTVERSION= 1.2.8
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -15,7 +10,7 @@ COMMENT= X.Org glint display driver
USE_GL= gl
XORG_CAT= driver
-USE_XORG= xf86driproto videoproto xextproto xf86dgaproto glproto
+USE_XORG= xf86driproto xf86dgaproto glproto
MAN4= glint.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-glint/distinfo b/x11-drivers/xf86-video-glint/distinfo
index 1e7a988615d2..8d55f3705992 100644
--- a/x11-drivers/xf86-video-glint/distinfo
+++ b/x11-drivers/xf86-video-glint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7
-SIZE (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = 393872
+SHA256 (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221
+SIZE (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 395371
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
index 8a570b8db161..9c6c57ebccc4 100644
--- a/x11-drivers/xf86-video-i128/Makefile
+++ b/x11-drivers/xf86-video-i128/Makefile
@@ -1,20 +1,13 @@
-# New ports collection makefile for: xf86-video-i128
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-i128
-PORTVERSION= 1.3.4
-PORTREVISION= 1
+PORTVERSION= 1.3.6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org i128 display driver
XORG_CAT= driver
-USE_XORG= videoproto xextproto
MAN4= i128.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-i128/distinfo b/x11-drivers/xf86-video-i128/distinfo
index 1b2a870d5476..2c29d2bd22d7 100644
--- a/x11-drivers/xf86-video-i128/distinfo
+++ b/x11-drivers/xf86-video-i128/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
-SIZE (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = 292046
+SHA256 (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c
+SIZE (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = 324894
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
index b9f11c574d69..50f4c1119d81 100644
--- a/x11-drivers/xf86-video-i740/Makefile
+++ b/x11-drivers/xf86-video-i740/Makefile
@@ -1,20 +1,13 @@
-# New ports collection makefile for: xf86-video-i740
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-i740
-PORTVERSION= 1.3.2
-PORTREVISION= 2
+PORTVERSION= 1.3.4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org i740 display driver
XORG_CAT= driver
-USE_XORG= videoproto xextproto
MAN4= i740.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-i740/distinfo b/x11-drivers/xf86-video-i740/distinfo
index 2b108cd73434..1907b7d40e0a 100644
--- a/x11-drivers/xf86-video-i740/distinfo
+++ b/x11-drivers/xf86-video-i740/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
-SIZE (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 273853
+SHA256 (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78
+SIZE (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 316654
diff --git a/x11-drivers/xf86-video-imstt/Makefile b/x11-drivers/xf86-video-imstt/Makefile
index cf048f3abe43..d86879311183 100644
--- a/x11-drivers/xf86-video-imstt/Makefile
+++ b/x11-drivers/xf86-video-imstt/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xf86-video-imstt
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-imstt
PORTVERSION= 1.1.0
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index 5d6d0a628a18..e256158c7a7e 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xf86-video-intel
-# Date Created: 28 May 2007
-# Whom: lesi@FreeBSD.org
-#
+# Created by: lesi@FreeBSD.org
# $FreeBSD$
-#
PORTNAME= xf86-video-intel
PORTVERSION= ${INTEL_VERSION}
@@ -18,15 +14,29 @@ USE_GL= gl
USE_LDCONFIG= yes
XORG_CAT= driver
-USE_XORG= xvmc xineramaproto xextproto x11 xf86driproto glproto
+USE_XORG= glproto \
+ pixman \
+ x11 \
+ xext \
+ xf86driproto \
+ xineramaproto \
+ xrender \
+ xvmc
+
MAN4= intel.4x
.if defined(WITH_NEW_XORG)
-INTEL_VERSION= 2.17.0
-INTEL_REVISION= 1
+INTEL_VERSION= 2.21.6
+INTEL_REVISION= 0
+CONFIGURE_ARGS+= --enable-sna
MAKE_JOBS_UNSAFE=yes
PLIST_SUB+= OLD="@comment "
-EXTRA_PATCHES+= ${PATCHDIR}/extra-i915kms
+EXTRA_PATCHES+= ${PATCHDIR}/extra-clang \
+ ${PATCHDIR}/extra-src_sna_compiler.h \
+ ${PATCHDIR}/extra-src_sna_kgem.c \
+ ${PATCHDIR}/extra-src__sna__sna_threads.c \
+ ${PATCHDIR}/extra-i915kms
+LIB_DEPENDS+= xcb-util:${PORTSDIR}/x11/xcb-util
.else
INTEL_VERSION= 2.7.1
INTEL_REVISION= 4
diff --git a/x11-drivers/xf86-video-intel/distinfo b/x11-drivers/xf86-video-intel/distinfo
index fa854ebe1516..9044ccc9121a 100644
--- a/x11-drivers/xf86-video-intel/distinfo
+++ b/x11-drivers/xf86-video-intel/distinfo
@@ -1,4 +1,4 @@
SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
-SHA256 (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387
-SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 1339717
+SHA256 (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9
+SIZE (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = 1721176
diff --git a/x11-drivers/xf86-video-intel/files/extra-clang b/x11-drivers/xf86-video-intel/files/extra-clang
new file mode 100644
index 000000000000..bb499458d41e
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-clang
@@ -0,0 +1,53 @@
+--- src/intel_display.c.orig 2012-12-11 20:33:06.000000000 +0100
++++ src/intel_display.c 2012-12-11 20:33:45.000000000 +0100
+@@ -1691,7 +1691,7 @@
+ static drmModeEncoderPtr
+ intel_get_kencoder(struct intel_mode *mode, int num)
+ {
+- struct intel_output *iterator;
++ struct intel_output *iterator = NULL;
+ int id = mode->mode_res->encoders[num];
+
+ list_for_each_entry(iterator, &mode->outputs, link)
+--- src/intel_batchbuffer.c.orig 2012-12-11 20:34:55.000000000 +0100
++++ src/intel_batchbuffer.c 2012-12-11 20:35:19.000000000 +0100
+@@ -119,7 +119,7 @@
+ static void intel_batch_do_flush(ScrnInfoPtr scrn)
+ {
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+- struct intel_pixmap *priv;
++ struct intel_pixmap *priv = NULL;
+
+ list_for_each_entry(priv, &intel->batch_pixmaps, batch)
+ priv->dirty = 0;
+--- src/sna/sna_damage.c.orig 2012-12-11 20:41:38.000000000 +0100
++++ src/sna/sna_damage.c 2012-12-11 20:42:23.000000000 +0100
+@@ -410,7 +410,7 @@
+ int n, nboxes;
+ BoxPtr boxes, free_boxes = NULL;
+ pixman_region16_t *region = &damage->region;
+- struct sna_damage_box *iter;
++ struct sna_damage_box *iter = NULL;
+
+ assert(damage->mode != DAMAGE_ALL);
+ assert(damage->dirty);
+@@ -1671,7 +1671,7 @@
+ {
+ int n, nboxes;
+ BoxPtr boxes;
+- struct sna_damage_box *iter;
++ struct sna_damage_box *iter = NULL;
+
+ RegionCopy(r, &damage->region);
+ if (!damage->dirty)
+--- uxa/uxa-accel.c.orig 2012-12-11 20:50:56.000000000 +0100
++++ uxa/uxa-accel.c 2012-12-11 20:51:14.000000000 +0100
+@@ -944,7 +944,7 @@
+
+ if (uxa_screen->info->flags & UXA_USE_GLAMOR) {
+ int ok = 0;
+- RegionPtr region;
++ RegionPtr region = NULL;
+
+ if (uxa_prepare_access(pDst, UXA_GLAMOR_ACCESS_RW)) {
+ if (uxa_prepare_access(pSrc, UXA_GLAMOR_ACCESS_RO)) {
diff --git a/x11-drivers/xf86-video-intel/files/extra-i915kms b/x11-drivers/xf86-video-intel/files/extra-i915kms
index ed5018116f64..c900909f7747 100644
--- a/x11-drivers/xf86-video-intel/files/extra-i915kms
+++ b/x11-drivers/xf86-video-intel/files/extra-i915kms
@@ -1,11 +1,13 @@
---- src/intel_driver.c.orig 2012-05-17 16:13:46.000000000 +0200
-+++ src/intel_driver.c 2012-05-17 16:14:46.000000000 +0200
-@@ -334,7 +334,7 @@
- snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d",
+--- src/intel_module.c.orig 2012-09-27 23:31:20.000000000 +0300
++++ src/intel_module.c 2012-11-02 17:32:00.819723398 +0200
+@@ -393,8 +393,8 @@
dev->domain, dev->bus, dev->dev, dev->func);
-- intel->drmSubFD = drmOpen("i915", busid);
-+ intel->drmSubFD = drmOpen("i915kms", busid);
- if (intel->drmSubFD == -1) {
- xf86DrvMsg(scrn->scrnIndex, X_ERROR,
- "[drm] Failed to open DRM device for %s: %s\n",
+ ret = drmCheckModesettingSupported(id);
+- if (ret) {
+- if (xf86LoadKernelModule("i915"))
++ if (ret || 1) {
++ if (xf86LoadKernelModule("i915kms"))
+ ret = drmCheckModesettingSupported(id);
+ if (ret)
+ return FALSE;
diff --git a/x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c b/x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
new file mode 100644
index 000000000000..57361b9413e5
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
@@ -0,0 +1,14 @@
+--- src/sna/sna_threads.c.orig 2013-02-02 00:03:44.000000000 +0000
++++ src/sna/sna_threads.c 2013-02-02 00:04:39.000000000 +0000
+@@ -94,7 +94,11 @@
+ size_t len = 0;
+ char *line = NULL;
+ uint32_t processors = 0, cores = 0;
++#ifdef __GLIBC__
+ while (getline(&line, &len, file) != -1) {
++#else
++ while ((line = fgetln(file, &len)) != (char *) NULL) {
++#endif
+ int id;
+ if (sscanf(line, "physical id : %d", &id) == 1) {
+ if (id >= 32)
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h b/x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
new file mode 100644
index 000000000000..47131740bc6c
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h
@@ -0,0 +1,18 @@
+--- src/sna/compiler.h.orig 2013-03-12 12:48:29.745101779 +0100
++++ src/sna/compiler.h 2013-03-12 12:48:52.857102997 +0100
+@@ -37,7 +37,6 @@
+ #define must_check __attribute__((warn_unused_result))
+ #define constant __attribute__((const))
+ #define pure __attribute__((pure))
+-#define __packed__ __attribute__((__packed__))
+ #define flatten __attribute__((flatten))
+ #else
+ #define likely(expr) (expr)
+@@ -48,7 +47,6 @@
+ #define must_check
+ #define constant
+ #define pure
+-#define __packed__
+ #define flatten
+ #endif
+
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c b/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
new file mode 100644
index 000000000000..9771d08562b3
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
@@ -0,0 +1,91 @@
+--- src/sna/kgem.c.orig 2013-03-11 11:19:02.000000000 +0100
++++ src/sna/kgem.c 2013-03-12 12:56:49.452065668 +0100
+@@ -658,7 +658,11 @@
+ if (file) {
+ size_t len = 0;
+ char *line = NULL;
++#ifdef __GLIBC__
+ while (getline(&line, &len, file) != -1) {
++#else
++ while ((line = fgetln(file, &len)) != (char *) NULL) {
++#endif
+ int mb;
+ if (sscanf(line, "cache size : %d KB", &mb) == 1) {
+ /* Paranoid check against gargantuan caches */
+@@ -1666,7 +1670,8 @@
+ static struct kgem_bo *
+ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
+ {
+- struct kgem_bo *bo, *first = NULL;
++ struct kgem_bo *bo = NULL;
++ struct kgem_bo *first = NULL;
+
+ DBG(("%s: num_pages=%d, flags=%x\n", __FUNCTION__, num_pages, flags));
+
+@@ -1868,7 +1873,8 @@
+
+ static bool kgem_retire__flushing(struct kgem *kgem)
+ {
+- struct kgem_bo *bo, *next;
++ struct kgem_bo *bo = NULL;
++ struct kgem_bo *next;
+ bool retired = false;
+
+ list_for_each_entry_safe(bo, next, &kgem->flushing, request) {
+@@ -2073,7 +2079,8 @@
+ static void kgem_commit(struct kgem *kgem)
+ {
+ struct kgem_request *rq = kgem->next_request;
+- struct kgem_bo *bo, *next;
++ struct kgem_bo *bo = NULL;
++ struct kgem_bo *next;
+
+ list_for_each_entry_safe(bo, next, &rq->buffers, request) {
+ assert(next->request.prev == &bo->request);
+@@ -2154,7 +2161,8 @@
+
+ static void kgem_finish_buffers(struct kgem *kgem)
+ {
+- struct kgem_buffer *bo, *next;
++ struct kgem_buffer *bo = NULL;
++ struct kgem_buffer *next;
+
+ list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) {
+ DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%d\n",
+@@ -2963,7 +2971,8 @@
+ static struct kgem_bo *
+ search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
+ {
+- struct kgem_bo *bo, *first = NULL;
++ struct kgem_bo *bo = NULL;
++ struct kgem_bo *first = NULL;
+ bool use_active = (flags & CREATE_INACTIVE) == 0;
+ struct list *cache;
+
+@@ -3521,7 +3530,7 @@
+ uint32_t flags)
+ {
+ struct list *cache;
+- struct kgem_bo *bo;
++ struct kgem_bo *bo = NULL;
+ uint32_t pitch, tiled_height, size;
+ uint32_t handle;
+ int i, bucket, retry;
+@@ -4834,7 +4843,7 @@
+ void kgem_clear_dirty(struct kgem *kgem)
+ {
+ struct list * const buffers = &kgem->next_request->buffers;
+- struct kgem_bo *bo;
++ struct kgem_bo *bo = NULL;
+
+ list_for_each_entry(bo, buffers, request) {
+ if (!bo->dirty)
+@@ -5072,7 +5081,7 @@
+ uint32_t size, uint32_t flags,
+ void **ret)
+ {
+- struct kgem_buffer *bo;
++ struct kgem_buffer *bo = NULL;
+ unsigned offset, alloc;
+ struct kgem_bo *old;
+
diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile
index fbd0fdd276c4..22644205908c 100644
--- a/x11-drivers/xf86-video-mach64/Makefile
+++ b/x11-drivers/xf86-video-mach64/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: xf86-video-mach64
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-mach64
-PORTVERSION= 6.9.0
+PORTVERSION= 6.9.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -15,6 +10,6 @@ COMMENT= X.Org mach64 display driver
USE_GL= gl
XORG_CAT= driver
-USE_XORG= glproto videoproto xextproto xf86driproto xf86miscproto
+USE_XORG= glproto xf86driproto xf86miscproto
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-mach64/distinfo b/x11-drivers/xf86-video-mach64/distinfo
index 356c86900bf3..d4739a0bbb3e 100644
--- a/x11-drivers/xf86-video-mach64/distinfo
+++ b/x11-drivers/xf86-video-mach64/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = a214f066c1cc997cb2d4db8474b51f731b51f8486c023c62a0e2c69f283bcd1a
-SIZE (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = 505200
+SHA256 (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218
+SIZE (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 525988
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index b343fb26f9f1..f9a5959ed87e 100644
--- a/x11-drivers/xf86-video-mga/Makefile
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: xf86-video-mga
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-mga
-PORTVERSION= 1.4.13
-PORTEPOCH= 2
+PORTVERSION= 1.6.1
+PORTEPOCH= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,7 +11,7 @@ COMMENT= X.Org mga display driver
USE_GL= gl
XORG_CAT= driver
-USE_XORG= xf86driproto videoproto xextproto glproto
+USE_XORG= xf86driproto glproto
MAN4= mga.4x
pre-patch:
diff --git a/x11-drivers/xf86-video-mga/distinfo b/x11-drivers/xf86-video-mga/distinfo
index 7a6ef1a5a4f6..f24b15aa8cb4 100644
--- a/x11-drivers/xf86-video-mga/distinfo
+++ b/x11-drivers/xf86-video-mga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6
-SIZE (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = 423134
+SHA256 (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4
+SIZE (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 446495
diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
index 533e26b8cec1..4748da1aa9e8 100644
--- a/x11-drivers/xf86-video-neomagic/Makefile
+++ b/x11-drivers/xf86-video-neomagic/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: xf86-video-neomagic
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-neomagic
-PORTVERSION= 1.2.5
+PORTVERSION= 1.2.7
PORTREVISION= 1
CATEGORIES= x11-drivers
@@ -14,7 +9,7 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org neomagic display driver
XORG_CAT= driver
-USE_XORG= videoproto xextproto xf86dgaproto
+USE_XORG= xf86dgaproto
MAN4= neomagic.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-neomagic/distinfo b/x11-drivers/xf86-video-neomagic/distinfo
index 67022a742eae..e740d009f581 100644
--- a/x11-drivers/xf86-video-neomagic/distinfo
+++ b/x11-drivers/xf86-video-neomagic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = c0b69e83a4bd6c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b
-SIZE (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = 294723
+SHA256 (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76
+SIZE (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 328716
diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile
index 14f6c9645814..962ee7484160 100644
--- a/x11-drivers/xf86-video-newport/Makefile
+++ b/x11-drivers/xf86-video-newport/Makefile
@@ -1,20 +1,13 @@
-# New ports collection makefile for: xf86-video-newport
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-newport
-PORTVERSION= 0.2.3
-PORTREVISION= 2
+PORTVERSION= 0.2.4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org newport display driver
XORG_CAT= driver
-USE_XORG= videoproto
MAN4= newport.4x
post-patch:
diff --git a/x11-drivers/xf86-video-newport/distinfo b/x11-drivers/xf86-video-newport/distinfo
index 7d0ce5c786d3..bd6af4abcf17 100644
--- a/x11-drivers/xf86-video-newport/distinfo
+++ b/x11-drivers/xf86-video-newport/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
-SIZE (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 266377
+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-nouveau/Makefile b/x11-drivers/xf86-video-nouveau/Makefile
index 64afb7ac6bb7..3f80904f61f1 100644
--- a/x11-drivers/xf86-video-nouveau/Makefile
+++ b/x11-drivers/xf86-video-nouveau/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xf86-video-nouveau
-# Date Created: 29 Jan 2009
-# Whom: Anonymous <swell.k@gmail.com>
-#
+# Created by: Anonymous <swell.k@gmail.com>
# $FreeBSD$
-#
PORTNAME= xf86-video-nouveau
PORTVERSION= 0.0.10.${SNAPDATE}
@@ -16,7 +12,7 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= Free nouveau display driver for nvidia-based cards
XORG_CAT= driver
-USE_XORG= videoproto xextproto xf86driproto glproto
+USE_XORG= xf86driproto glproto
MAN4= nouveau.4x
MAKE_JOBS_SAFE= yes
diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile
index db48fb65ee64..2e8a95d18979 100644
--- a/x11-drivers/xf86-video-nv/Makefile
+++ b/x11-drivers/xf86-video-nv/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: xf86-video-nv
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-nv
-PORTVERSION= 2.1.18
+PORTVERSION= 2.1.20
PORTREVISION= 1
CATEGORIES= x11-drivers
@@ -14,7 +9,6 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org nv display driver
XORG_CAT= driver
-USE_XORG= videoproto xextproto
MAN4= nv.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-nv/distinfo b/x11-drivers/xf86-video-nv/distinfo
index efc4d2e0dcbd..54a09c6c57d3 100644
--- a/x11-drivers/xf86-video-nv/distinfo
+++ b/x11-drivers/xf86-video-nv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 6cf726cc8377cd823ea6038938ea8a88e883fea01b13a749b5491e26535cf415
-SIZE (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 354719
+SHA256 (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf
+SIZE (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 396982
diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile
index b3e4d076eeb5..fad0cb90ffd0 100644
--- a/x11-drivers/xf86-video-openchrome/Makefile
+++ b/x11-drivers/xf86-video-openchrome/Makefile
@@ -1,15 +1,8 @@
-# New ports collection makefile for: xf86-video-openchrome
-# Date Created: 17 Sep 2007
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-openchrome
-PORTVERSION= 0.2.904
-PORTREVISION= 3
+PORTVERSION= 0.3.3
CATEGORIES= x11-drivers
-MASTER_SITES= http://www.openchrome.org/releases/
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org openChrome display driver
@@ -17,7 +10,7 @@ COMMENT= X.Org openChrome display driver
USE_GL= gl
XORG_CAT= driver
-USE_XORG= videoproto xf86driproto xextproto xvmc glproto
+USE_XORG= xf86driproto xvmc glproto
MAN4= openchrome.4x
MAKE_ARGS+= drivermandir=${LOCALBASE}/man/man4
diff --git a/x11-drivers/xf86-video-openchrome/distinfo b/x11-drivers/xf86-video-openchrome/distinfo
index 98e690767da4..59ce0a19a7b5 100644
--- a/x11-drivers/xf86-video-openchrome/distinfo
+++ b/x11-drivers/xf86-video-openchrome/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
-SIZE (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = 460051
+SHA256 (xorg/driver/xf86-video-openchrome-0.3.3.tar.bz2) = e49e2f1e5dac86408e5a74b87038cc4082d2c3fba4e0579823161991432412ed
+SIZE (xorg/driver/xf86-video-openchrome-0.3.3.tar.bz2) = 518705
diff --git a/x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c b/x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c
deleted file mode 100644
index ad794cba31fd..000000000000
--- a/x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/via_vgahw.c.orig 2009-10-03 22:48:55.000000000 +0200
-+++ src/via_vgahw.c 2012-02-08 10:43:08.000000000 +0100
-@@ -36,6 +36,11 @@
- #include "via_driver.h" /* for HAVE_DEBUG */
- #include "via_vgahw.h"
-
-+#if ABI_VIDEODRV_VERSION < 12
-+#define PIOOFFSET hwp->PIOOffset
-+#else
-+#define PIOOFFSET 0
-+#endif
-
- static CARD8
- ViaVgahwIn(vgaHWPtr hwp, int address)
-@@ -43,7 +48,7 @@
- if (hwp->MMIOBase)
- return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address);
- else
-- return inb(hwp->PIOOffset + address);
-+ return inb(PIOOFFSET + address);
- }
-
- static void
-@@ -52,7 +57,7 @@
- if (hwp->MMIOBase)
- MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value);
- else
-- outb(hwp->PIOOffset + address, value);
-+ outb(PIOOFFSET + address, value);
- }
-
- /*
diff --git a/x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c b/x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c
deleted file mode 100644
index 6eb3f18c11f2..000000000000
--- a/x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c
+++ /dev/null
@@ -1,83 +0,0 @@
-Fix Xvideo crash in X.org server 1.10
-
-http://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=cd753845e02466b81f426793e4f5619afab05d82
-
---- src/via_video.c.orig 2012-02-08 10:13:54.000000000 +0100
-+++ src/via_video.c 2012-02-08 10:14:33.000000000 +0100
-@@ -763,67 +763,6 @@
- return 0;
- }
-
--
--/*
-- * This one gets called, for example, on panning.
-- */
--
--static int
--viaReputImage(ScrnInfoPtr pScrn,
-- short drw_x, short drw_y, RegionPtr clipBoxes, pointer data,
-- DrawablePtr pDraw)
--{
--
-- DDUPDATEOVERLAY UpdateOverlay_Video;
-- LPDDUPDATEOVERLAY lpUpdateOverlay = &UpdateOverlay_Video;
-- viaPortPrivPtr pPriv = (viaPortPrivPtr) data;
-- VIAPtr pVia = VIAPTR(pScrn);
--
-- if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
-- REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
-- if (pPriv->autoPaint) {
-- if (pDraw->type == DRAWABLE_WINDOW) {
-- viaPaintColorkey(pScrn, pPriv, clipBoxes, pDraw);
-- } else {
-- xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey,
-- clipBoxes);
-- }
-- }
-- }
--
-- if (drw_x == pPriv->old_drw_x &&
-- drw_y == pPriv->old_drw_y &&
-- pVia->swov.oldPanningX == pVia->swov.panning_x &&
-- pVia->swov.oldPanningY == pVia->swov.panning_y) {
-- viaXvError(pScrn, pPriv, xve_none);
-- return Success;
-- }
--
-- lpUpdateOverlay->SrcLeft = pPriv->old_src_x;
-- lpUpdateOverlay->SrcTop = pPriv->old_src_y;
-- lpUpdateOverlay->SrcRight = pPriv->old_src_x + pPriv->old_src_w;
-- lpUpdateOverlay->SrcBottom = pPriv->old_src_y + pPriv->old_src_h;
--
-- lpUpdateOverlay->DstLeft = drw_x;
-- lpUpdateOverlay->DstTop = drw_y;
-- lpUpdateOverlay->DstRight = drw_x + pPriv->old_drw_w;
-- lpUpdateOverlay->DstBottom = drw_y + pPriv->old_drw_h;
-- pPriv->old_drw_x = drw_x;
-- pPriv->old_drw_y = drw_y;
--
-- lpUpdateOverlay->dwFlags = DDOVER_KEYDEST;
--
-- if (pScrn->bitsPerPixel == 8)
-- lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey & 0xff;
-- else
-- lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey;
--
-- VIAVidUpdateOverlay(pScrn, lpUpdateOverlay);
--
-- viaXvError(pScrn, pPriv, xve_none);
-- return Success;
--}
--
- static unsigned
- viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
- {
-@@ -884,7 +823,7 @@
- viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute;
- viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute;
- viaAdaptPtr[i]->PutImage = viaPutImage;
-- viaAdaptPtr[i]->ReputImage = viaReputImage;
-+ viaAdaptPtr[i]->ReputImage = NULL;
- viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes;
- for (j = 0; j < numPorts; ++j) {
- viaPortPriv[j].dmaBounceBuffer = NULL;
diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile
index 14a78b324e82..8878a88258aa 100644
--- a/x11-drivers/xf86-video-r128/Makefile
+++ b/x11-drivers/xf86-video-r128/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: xf86-video-r128
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-r128
-PORTVERSION= 6.8.1
+PORTVERSION= 6.8.4
PORTREVISION= 3
CATEGORIES= x11-drivers
@@ -15,7 +10,7 @@ COMMENT= X.Org r128 display driver
USE_GL= gl
XORG_CAT= driver
-USE_XORG= glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
+USE_XORG= glproto xf86driproto xf86miscproto xineramaproto
MAN4= r128.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-r128/distinfo b/x11-drivers/xf86-video-r128/distinfo
index 913172362cb3..541af7bbbd9d 100644
--- a/x11-drivers/xf86-video-r128/distinfo
+++ b/x11-drivers/xf86-video-r128/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
-SIZE (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 418251
+SHA256 (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7
+SIZE (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 459364
diff --git a/x11-drivers/xf86-video-rdc/Makefile b/x11-drivers/xf86-video-rdc/Makefile
index 3d9cf6405365..40e19bc04cb9 100644
--- a/x11-drivers/xf86-video-rdc/Makefile
+++ b/x11-drivers/xf86-video-rdc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xf86-video-rdc
-# Date created: 14 April 2010
-# Whom: stas
-#
+# Created by: stas
# $FreeBSD$
-#
PORTNAME= xf86-video-rdc
PORTVERSION= 0.9
@@ -17,6 +13,10 @@ COMMENT= X.Org RDC display driver
XORG_CAT= driver
USE_XORG= xvmc xf86driproto xextproto x11 glproto
+.if defined(WITH_NEW_XORG)
+IGNORE= does not build with X server 1.12
+.endif
+
do-install:
${MKDIR} ${PREFIX}/lib/xorg/modules/drivers
${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/rdc_drv.so \
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
index 72fdd37a67d3..0b4d2a6a11c9 100644
--- a/x11-drivers/xf86-video-rendition/Makefile
+++ b/x11-drivers/xf86-video-rendition/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: xf86-video-rendition
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-rendition
-PORTVERSION= 4.2.4
+PORTVERSION= 4.2.5
PORTREVISION= 1
CATEGORIES= x11-drivers
@@ -14,7 +9,6 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org rendition display driver
XORG_CAT= driver
-USE_XORG= xextproto videoproto
MAN4= rendition.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-rendition/distinfo b/x11-drivers/xf86-video-rendition/distinfo
index 2b683b7b5539..86861706d499 100644
--- a/x11-drivers/xf86-video-rendition/distinfo
+++ b/x11-drivers/xf86-video-rendition/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
-SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573
+SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb
+SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 356351
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
index e8cd85092e85..c6fd38ad7a77 100644
--- a/x11-drivers/xf86-video-s3/Makefile
+++ b/x11-drivers/xf86-video-s3/Makefile
@@ -1,20 +1,13 @@
-# New ports collection makefile for: xf86-video-s3
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-s3
-PORTVERSION= 0.6.3
-PORTREVISION= 3
+PORTVERSION= 0.6.5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org s3 display driver
XORG_CAT= driver
-USE_XORG= videoproto xextproto
MAN4= s3.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-s3/distinfo b/x11-drivers/xf86-video-s3/distinfo
index 5b0ccdf3a295..1dd127d18fe9 100644
--- a/x11-drivers/xf86-video-s3/distinfo
+++ b/x11-drivers/xf86-video-s3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
-SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148
+SHA256 (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39
+SIZE (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 325582
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
index 22581ca02e63..5d947f0d6916 100644
--- a/x11-drivers/xf86-video-s3virge/Makefile
+++ b/x11-drivers/xf86-video-s3virge/Makefile
@@ -1,20 +1,13 @@
-# New ports collection makefile for: xf86-video-s3virge
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-s3virge
-PORTVERSION= 1.10.4
-PORTREVISION= 2
+PORTVERSION= 1.10.6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org s3virge display driver
XORG_CAT= driver
-USE_XORG= videoproto xextproto
MAN4= s3virge.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-s3virge/distinfo b/x11-drivers/xf86-video-s3virge/distinfo
index 2788f392c962..8eabf45be469 100644
--- a/x11-drivers/xf86-video-s3virge/distinfo
+++ b/x11-drivers/xf86-video-s3virge/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
-SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 300224
+SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e
+SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index 75102292a37e..36abb6d15725 100644
--- a/x11-drivers/xf86-video-savage/Makefile
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: xf86-video-savage
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-savage
-PORTVERSION= 2.3.3
+PORTVERSION= 2.3.6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -14,9 +9,8 @@ COMMENT= X.Org savage display driver
USE_GL= gl
-WITH_FBSD10_FIX=yes
XORG_CAT= driver
-USE_XORG= xf86driproto videoproto xextproto glproto
+USE_XORG= xf86driproto glproto
MAN4= savage.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo
index 6b5437235cc2..17328465370e 100644
--- a/x11-drivers/xf86-video-savage/distinfo
+++ b/x11-drivers/xf86-video-savage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2
-SIZE (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = 371252
+SHA256 (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6
+SIZE (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 403495
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
index 681fdd40640e..dd044dce86cc 100644
--- a/x11-drivers/xf86-video-siliconmotion/Makefile
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -1,19 +1,13 @@
-# New ports collection makefile for: xf86-video-siliconmotion
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-siliconmotion
-PORTVERSION= 1.7.5
+PORTVERSION= 1.7.7
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org siliconmotion display driver
XORG_CAT= driver
-USE_XORG= videoproto xextproto
MAN4= siliconmotion.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo
index 5707cf9c7d92..536d2c25ccf7 100644
--- a/x11-drivers/xf86-video-siliconmotion/distinfo
+++ b/x11-drivers/xf86-video-siliconmotion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913
-SIZE (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 351610
+SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa
+SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index 16f7899e94cb..056882880cff 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: xf86-video-sis
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-sis
-PORTVERSION= 0.10.3
+PORTVERSION= 0.10.7
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -17,11 +12,7 @@ CONFLICTS= xf86-video-sis-intel-[0-9]*
USE_GL= gl
XORG_CAT= driver
-USE_XORG= xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
+USE_XORG= xf86dgaproto xf86driproto xineramaproto xf86miscproto glproto
MAN4= sis.4x
-post-patch:
- @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
- ${WRKSRC}/configure
-
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-sis/distinfo b/x11-drivers/xf86-video-sis/distinfo
index 0b66a0d4d700..7a8c42ed1fea 100644
--- a/x11-drivers/xf86-video-sis/distinfo
+++ b/x11-drivers/xf86-video-sis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737
-SIZE (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 649750
+SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0
+SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = 699499
diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile
index 0f5db118c02c..630a968200ee 100644
--- a/x11-drivers/xf86-video-sunffb/Makefile
+++ b/x11-drivers/xf86-video-sunffb/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xf86-video-sunffb
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-sunffb
PORTVERSION= 1.2.1
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
index b8fd2e108784..9a8e70c279e0 100644
--- a/x11-drivers/xf86-video-tdfx/Makefile
+++ b/x11-drivers/xf86-video-tdfx/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: xf86-video-tdfx
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-tdfx
-PORTVERSION= 1.4.3
+PORTVERSION= 1.4.5
PORTREVISION= 2
CATEGORIES= x11-drivers
@@ -16,7 +11,7 @@ COMMENT= X.Org tdfx display driver
USE_GL= gl
XORG_CAT= driver
-USE_XORG= xf86driproto videoproto xextproto glproto
+USE_XORG= xf86driproto glproto
MAN4= tdfx.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-tdfx/distinfo b/x11-drivers/xf86-video-tdfx/distinfo
index 88ae8fb191a2..c726ba67740a 100644
--- a/x11-drivers/xf86-video-tdfx/distinfo
+++ b/x11-drivers/xf86-video-tdfx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
-SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 290172
+SHA256 (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859
+SIZE (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 339623
diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile
index a78f578af9f3..827dc8b06a94 100644
--- a/x11-drivers/xf86-video-tga/Makefile
+++ b/x11-drivers/xf86-video-tga/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: xf86-video-tga
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-tga
-PORTVERSION= 1.2.1
+PORTVERSION= 1.2.2
PORTREVISION= 2
CATEGORIES= x11-drivers
@@ -14,6 +9,6 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org tga display driver
XORG_CAT= driver
-USE_XORG= videoproto xextproto xf86dgaproto
+USE_XORG= xf86dgaproto
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-tga/distinfo b/x11-drivers/xf86-video-tga/distinfo
index abe79c962703..d0af7877d185 100644
--- a/x11-drivers/xf86-video-tga/distinfo
+++ b/x11-drivers/xf86-video-tga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
-SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 273334
+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-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
index 76b0570e00c3..ca4491cb9334 100644
--- a/x11-drivers/xf86-video-trident/Makefile
+++ b/x11-drivers/xf86-video-trident/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: xf86-video-trident
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-trident
-PORTVERSION= 1.3.4
+PORTVERSION= 1.3.6
PORTREVISION= 1
CATEGORIES= x11-drivers
@@ -14,7 +9,7 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org trident display driver
XORG_CAT= driver
-USE_XORG= videoproto xextproto xf86dgaproto
+USE_XORG= xf86dgaproto
MAN4= trident.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-trident/distinfo b/x11-drivers/xf86-video-trident/distinfo
index 80d0901a5deb..db131b880e21 100644
--- a/x11-drivers/xf86-video-trident/distinfo
+++ b/x11-drivers/xf86-video-trident/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8
-SIZE (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 310898
+SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104
+SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 356092
diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile
index 521fc6f9406e..4134fa9b13ef 100644
--- a/x11-drivers/xf86-video-tseng/Makefile
+++ b/x11-drivers/xf86-video-tseng/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: xf86-video-tseng
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-tseng
-PORTVERSION= 1.2.4
+PORTVERSION= 1.2.5
PORTREVISION= 1
CATEGORIES= x11-drivers
@@ -14,7 +9,6 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org tseng display driver
XORG_CAT= driver
-USE_XORG= videoproto xextproto
MAN4= tseng.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-tseng/distinfo b/x11-drivers/xf86-video-tseng/distinfo
index 475278a285da..c0ad1ad46b97 100644
--- a/x11-drivers/xf86-video-tseng/distinfo
+++ b/x11-drivers/xf86-video-tseng/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = d0dd5dfb4c6a8d0e0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d
-SIZE (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = 296314
+SHA256 (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819
+SIZE (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = 330575
diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
index 5fdfb038d857..04588d135a2b 100644
--- a/x11-drivers/xf86-video-vesa/Makefile
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -1,20 +1,13 @@
-# New ports collection makefile for: xf86-video-vesa
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-vesa
-PORTVERSION= 2.3.0
-PORTREVISION= 2
+PORTVERSION= 2.3.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org vesa display driver
XORG_CAT= driver
-USE_XORG= xextproto videoproto
MAN4= vesa.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-vesa/distinfo b/x11-drivers/xf86-video-vesa/distinfo
index 59364f5a9dab..f9dbf13a418e 100644
--- a/x11-drivers/xf86-video-vesa/distinfo
+++ b/x11-drivers/xf86-video-vesa/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
-SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539
+SHA256 (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3
+SIZE (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 298186
diff --git a/x11-drivers/xf86-video-via/Makefile b/x11-drivers/xf86-video-via/Makefile
index 8b6d3c97ceaa..eb05e608ebd3 100644
--- a/x11-drivers/xf86-video-via/Makefile
+++ b/x11-drivers/xf86-video-via/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: xf86-video-via
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-via
PORTVERSION= 0.2.2
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
index 92cd78d730c9..d8aa97d0ec6c 100644
--- a/x11-drivers/xf86-video-vmware/Makefile
+++ b/x11-drivers/xf86-video-vmware/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: xf86-video-vmware
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-vmware
-PORTVERSION= 12.0.2
-PORTREVISION= 1
+PORTVERSION= 13.0.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vmware/distinfo b/x11-drivers/xf86-video-vmware/distinfo
index 03af6aa5dcf8..1265b6e3b2e8 100644
--- a/x11-drivers/xf86-video-vmware/distinfo
+++ b/x11-drivers/xf86-video-vmware/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147
-SIZE (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = 432468
+SHA256 (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d
+SIZE (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 432401
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
index 5cc2a7d0d85d..a6df42353901 100644
--- a/x11-drivers/xf86-video-voodoo/Makefile
+++ b/x11-drivers/xf86-video-voodoo/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: xf86-video-voodoo
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= xf86-video-voodoo
-PORTVERSION= 1.2.4
+PORTVERSION= 1.2.5
PORTREVISION= 1
CATEGORIES= x11-drivers
@@ -14,7 +9,7 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org voodoo display driver
XORG_CAT= driver
-USE_XORG= xf86dgaproto xextproto videoproto
+USE_XORG= xf86dgaproto
MAN4= voodoo.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-voodoo/distinfo b/x11-drivers/xf86-video-voodoo/distinfo
index 20eff8e7f454..cd1d29cc0413 100644
--- a/x11-drivers/xf86-video-voodoo/distinfo
+++ b/x11-drivers/xf86-video-voodoo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
-SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = 274523
+SHA256 (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8
+SIZE (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 305489
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index 47c95f268000..2cb28b179721 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xorg-drivers
-PORTVERSION= 7.5.2
+PORTVERSION= 7.7
CATEGORIES= x11-drivers
MASTER_SITES= # none
DISTFILES= # none
@@ -92,10 +92,9 @@ INTEL_DESC= Install intel video driver
OPENCHROME_DESC= Install openchrome video driver
SUNFFB_DESC= Install sunffb video driver
-# these drivers module name are different then the plugin they install
+# these drivers have a different module name compared to the plugin they install
QUIRKS= keyboard:kbd
-
.include <bsd.port.options.mk>
# Manual add arch specific drivers so they be added to depend lines.