51 files changed, 184 insertions, 111 deletions

diff --git a/x11-drivers/synaptics/Makefile b/x11-drivers/synaptics/Makefile
index 7a39ce27f533..857b3ed766a6 100644
--- a/x11-drivers/synaptics/Makefile
+++ b/x11-drivers/synaptics/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	synaptics
 PORTVERSION=	0.14.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://web.telia.com/~u89404340/touchpad/files/:synaptics
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \
@@ -36,9 +36,10 @@ MASTER_SITES+=	ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/:x11 \
 DIST_SUBDIR=	xorg/xserver
 X_DISTFILES=	xorg-server-${X11VERSION}.tar.bz2
 PLIST_SUB+=	XORG="" XFREE86="@comment "
+EXTRA_PATCHES=	${FILESDIR}/extra-xorg-server-1.4
 
 post-patch:
-	@${REINPLACE_CMD} 's|\(ALLINCLUDES = -I.\)|\1 -I${X11BASE}/include|' \
+	@${REINPLACE_CMD} 's|\(ALLINCLUDES = -I.\)|\1 -I${LOCALBASE}/include -I${LOCALBASE}/include/pixman-1|' \
 		${WRKSRC}/Makefile
 
 .elif	${X_WINDOW_SYSTEM:L} == xfree86-4
diff --git a/x11-drivers/synaptics/distinfo b/x11-drivers/synaptics/distinfo
index a4b8415f3a1e..2028c8c16605 100644
--- a/x11-drivers/synaptics/distinfo
+++ b/x11-drivers/synaptics/distinfo
@@ -1,9 +1,9 @@
 MD5 (xorg/xserver/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af
 SHA256 (xorg/xserver/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
 SIZE (xorg/xserver/synaptics-0.14.6.tar.bz2) = 126833
-MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6
-SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
-SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596
+MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220
+SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
+SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392
 MD5 (xc/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af
 SHA256 (xc/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
 SIZE (xc/synaptics-0.14.6.tar.bz2) = 126833
diff --git a/x11-drivers/synaptics/files/extra-xorg-server-1.4 b/x11-drivers/synaptics/files/extra-xorg-server-1.4
new file mode 100644
index 000000000000..d6f2ab11f0a7
--- /dev/null
+++ b/x11-drivers/synaptics/files/extra-xorg-server-1.4
@@ -0,0 +1,63 @@
+diff -u Makefile.orig Makefile
+--- Makefile.orig	2006-07-15 17:58:26.000000000 +0200
++++ Makefile	2007-09-07 15:03:17.386179198 +0200
+@@ -34,10 +34,9 @@
+   LDCOMBINEFLAGS = -shared -lc
+   PICFLAG = $(call check_gcc,-fPIC,)
+   X_INCLUDES_ROOT = $(INSTALLED_X)
+-  SDKDIR = $(shell pkg-config xorg-server --variable=sdkdir)
+   ALLINCLUDES = -I. -I$(INSTALLED_X)/include/X11 \
+ 		-I$(INSTALLED_X)/include/X11/extensions \
+-		-I$(SDKDIR)
++		`pkg-config xorg-server --cflags`
+ else
+   INSTALLED_X = /usr/X11R6
+   INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input
+diff -u synaptics.c.orig synaptics.c
+--- synaptics.c.orig	2006-07-15 17:54:29.000000000 +0200
++++ synaptics.c	2007-09-07 15:10:24.910542275 +0200
+@@ -321,7 +321,9 @@
+     local->private_flags           = 0;
+     local->flags                   = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
+     local->conf_idev               = dev;
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+     local->motion_history_proc     = xf86GetMotionEvents;
++#endif
+     local->history_size            = 0;
+     local->always_core_feedback    = 0;
+ 
+@@ -613,8 +615,17 @@
+ 
+     InitPointerDeviceStruct((DevicePtr)dev, map,
+ 			    SYN_MAX_BUTTONS,
+-			    miPointerGetMotionEvents, SynapticsCtrl,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
++			    miPointerGetMotionEvents,
++#else
++			    GetMotionHistory,
++#endif
++			    SynapticsCtrl,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+ 			    miPointerGetMotionBufferSize());
++#else
++			    GetMotionHistorySize(), 2);
++#endif
+ 
+     /* X valuator */
+     xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1);
+diff -u synaptics.h.orig synaptics.h
+--- synaptics.h.orig	2006-07-15 17:54:29.000000000 +0200
++++ synaptics.h	2007-09-07 15:10:12.409829887 +0200
+@@ -226,5 +226,11 @@
+ 
+ #endif /* SYNAPTICS_PRIVATE */
+ 
++/* Previously found in xf86Xinput.h */
++#ifdef DBG
++#undef DBG
++#endif
++
++#define DBG(lvl, f) {if ((lvl) <= xf86GetVerbosity()) f;}
+ 
+ #endif /* _SYNAPTICS_H_ */
+
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
index 42a7b7a477a8..3cb2bb126f2f 100644
--- a/x11-drivers/xf86-input-acecad/Makefile
+++ b/x11-drivers/xf86-input-acecad/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-input-acecad
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-acecad/distinfo b/x11-drivers/xf86-input-acecad/distinfo
index 16af938dad3d..b76810fe5bcd 100644
--- a/x11-drivers/xf86-input-acecad/distinfo
+++ b/x11-drivers/xf86-input-acecad/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-acecad-1.1.0.tar.bz2) = ce0b7bec500273ad935cbfa212b8ac8a
-SHA256 (xorg/driver/xf86-input-acecad-1.1.0.tar.bz2) = 3e5feea79f1d48cd46a2a40661140042ac586f90311669f79d65fea6cfc112ad
-SIZE (xorg/driver/xf86-input-acecad-1.1.0.tar.bz2) = 230176
+MD5 (xorg/driver/xf86-input-acecad-1.2.1.tar.bz2) = 2c371317f2aae34c04db63c19759a44e
+SHA256 (xorg/driver/xf86-input-acecad-1.2.1.tar.bz2) = 07d2f8a1153d34a6516b8f1129fc32a18f2862bbb58c9bad4637fb282d60385a
+SIZE (xorg/driver/xf86-input-acecad-1.2.1.tar.bz2) = 230394
diff --git a/x11-drivers/xf86-input-calcomp/Makefile b/x11-drivers/xf86-input-calcomp/Makefile
index d9a335967cf0..99fca604b2a6 100644
--- a/x11-drivers/xf86-input-calcomp/Makefile
+++ b/x11-drivers/xf86-input-calcomp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-input-calcomp
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-calcomp/distinfo b/x11-drivers/xf86-input-calcomp/distinfo
index 3c739f96fbd2..c41442399067 100644
--- a/x11-drivers/xf86-input-calcomp/distinfo
+++ b/x11-drivers/xf86-input-calcomp/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-calcomp-1.1.0.tar.bz2) = af13f9de2af4e1d03b2da0c037fd718a
-SHA256 (xorg/driver/xf86-input-calcomp-1.1.0.tar.bz2) = ebc446e74eea72d391104b1ce3b2a5376bced098154ec089a944f4311d240904
-SIZE (xorg/driver/xf86-input-calcomp-1.1.0.tar.bz2) = 231496
+MD5 (xorg/driver/xf86-input-calcomp-1.1.1.tar.bz2) = 689099e2ade8a8c9f68f82fdf569b3ad
+SHA256 (xorg/driver/xf86-input-calcomp-1.1.1.tar.bz2) = 8117b37da2e031eb983e1e98034710a1511299496fcf235f936caff252fa8957
+SIZE (xorg/driver/xf86-input-calcomp-1.1.1.tar.bz2) = 225927
diff --git a/x11-drivers/xf86-input-citron/Makefile b/x11-drivers/xf86-input-citron/Makefile
index 4c21d32b3b16..7fc6e506750e 100644
--- a/x11-drivers/xf86-input-citron/Makefile
+++ b/x11-drivers/xf86-input-citron/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-input-citron
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-citron/distinfo b/x11-drivers/xf86-input-citron/distinfo
index 067361f9aa45..38eef6049d01 100644
--- a/x11-drivers/xf86-input-citron/distinfo
+++ b/x11-drivers/xf86-input-citron/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-citron-2.2.0.tar.bz2) = 1fe53cd055a69650f3c2e02377ec728c
-SHA256 (xorg/driver/xf86-input-citron-2.2.0.tar.bz2) = 26cfa755d3a383f80039fcd286c44ba5f7b353feb8c674f386bb08d741d2c3fe
-SIZE (xorg/driver/xf86-input-citron-2.2.0.tar.bz2) = 257145
+MD5 (xorg/driver/xf86-input-citron-2.2.1.tar.bz2) = 4e254fcefb3bea55772e63c12570f6d9
+SHA256 (xorg/driver/xf86-input-citron-2.2.1.tar.bz2) = 1480ba63b342c00a53292d513bd79a69e1ea7c01a0c77d1a368ffb22e37c1a83
+SIZE (xorg/driver/xf86-input-citron-2.2.1.tar.bz2) = 251964
diff --git a/x11-drivers/xf86-input-dmc/Makefile b/x11-drivers/xf86-input-dmc/Makefile
index 6b7d69b88eb2..3f1c9bc407d0 100644
--- a/x11-drivers/xf86-input-dmc/Makefile
+++ b/x11-drivers/xf86-input-dmc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-input-dmc
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-dmc/distinfo b/x11-drivers/xf86-input-dmc/distinfo
index 5b548b06c199..cc33e98bfbf4 100644
--- a/x11-drivers/xf86-input-dmc/distinfo
+++ b/x11-drivers/xf86-input-dmc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-dmc-1.1.0.tar.bz2) = e1bcbdefcb839173de79aeb3cd038b77
-SHA256 (xorg/driver/xf86-input-dmc-1.1.0.tar.bz2) = c5ca8fb2dfe0130767b2c10bd0661277a67e7d5b9171a7f5f6264ec48790473f
-SIZE (xorg/driver/xf86-input-dmc-1.1.0.tar.bz2) = 228592
+MD5 (xorg/driver/xf86-input-dmc-1.1.1.tar.bz2) = f21f008220bc7687ce1c34ab557ec32f
+SHA256 (xorg/driver/xf86-input-dmc-1.1.1.tar.bz2) = f98c5a7010fa71cee88b4c2470e5cd804e42dfbc5292cf1c20eb75e9b1814002
+SIZE (xorg/driver/xf86-input-dmc-1.1.1.tar.bz2) = 223565
diff --git a/x11-drivers/xf86-input-dynapro/Makefile b/x11-drivers/xf86-input-dynapro/Makefile
index 9772be78c52e..37207e61d2f5 100644
--- a/x11-drivers/xf86-input-dynapro/Makefile
+++ b/x11-drivers/xf86-input-dynapro/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-input-dynapro
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-dynapro/distinfo b/x11-drivers/xf86-input-dynapro/distinfo
index 12e972f2610d..4bf7cc30a455 100644
--- a/x11-drivers/xf86-input-dynapro/distinfo
+++ b/x11-drivers/xf86-input-dynapro/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-dynapro-1.1.0.tar.bz2) = 1683178d09dfc604dde9ea2aab950a28
-SHA256 (xorg/driver/xf86-input-dynapro-1.1.0.tar.bz2) = fc2ad50b1aa027fe57da53cbb73db0b4b9d0de9032f00dd42e7cc0aae7c50d6a
-SIZE (xorg/driver/xf86-input-dynapro-1.1.0.tar.bz2) = 227960
+MD5 (xorg/driver/xf86-input-dynapro-1.1.1.tar.bz2) = d47be12a230c44a05d56d6b79ebcfc38
+SHA256 (xorg/driver/xf86-input-dynapro-1.1.1.tar.bz2) = ed0f1ba81febf8e7a20cfaf32b021fcaa102af37f3070d67d6a101eeb6964992
+SIZE (xorg/driver/xf86-input-dynapro-1.1.1.tar.bz2) = 222619
diff --git a/x11-drivers/xf86-input-elo2300/Makefile b/x11-drivers/xf86-input-elo2300/Makefile
index 5ddc621a95e2..3e52a481cefc 100644
--- a/x11-drivers/xf86-input-elo2300/Makefile
+++ b/x11-drivers/xf86-input-elo2300/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-input-elo2300
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-elo2300/distinfo b/x11-drivers/xf86-input-elo2300/distinfo
index 485614280ed6..3dc0e127131c 100644
--- a/x11-drivers/xf86-input-elo2300/distinfo
+++ b/x11-drivers/xf86-input-elo2300/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-elo2300-1.1.0.tar.bz2) = 43885769d6f741272dda162e82902b0d
-SHA256 (xorg/driver/xf86-input-elo2300-1.1.0.tar.bz2) = 9551f67e24c4573867a64d032d1ff6b63654caab8a85d3c6b2af7748daaa2134
-SIZE (xorg/driver/xf86-input-elo2300-1.1.0.tar.bz2) = 230654
+MD5 (xorg/driver/xf86-input-elo2300-1.1.1.tar.bz2) = 4eef20f44954d49571a10b9134fdb663
+SHA256 (xorg/driver/xf86-input-elo2300-1.1.1.tar.bz2) = cc2cd97f49cce1795ea74034b1416ff7cd5107e1a69258b09a741d55a98ba005
+SIZE (xorg/driver/xf86-input-elo2300-1.1.1.tar.bz2) = 225191
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
index bb746ad58726..dabed65caa53 100644
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-input-joystick
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,4 +14,6 @@ COMMENT=	X.Org joystick input driver
 
 XORG_CAT=	driver
 
+MAN4=		joystick.4x
+
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-joystick/distinfo b/x11-drivers/xf86-input-joystick/distinfo
index c4b7d151af72..b15366ed7b32 100644
--- a/x11-drivers/xf86-input-joystick/distinfo
+++ b/x11-drivers/xf86-input-joystick/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-joystick-1.1.0.tar.bz2) = e0025215542c7a11c5a7f9548631dbd7
-SHA256 (xorg/driver/xf86-input-joystick-1.1.0.tar.bz2) = 11c3e8056e8f44b9a6f348b5366c7e725155563374770b82e339e913b9a60d16
-SIZE (xorg/driver/xf86-input-joystick-1.1.0.tar.bz2) = 228374
+MD5 (xorg/driver/xf86-input-joystick-1.2.3.tar.bz2) = 41f33b1a18c576433222d8b6ca22c738
+SHA256 (xorg/driver/xf86-input-joystick-1.2.3.tar.bz2) = 708e01ca0f0e12a94f20566c18edc8ca71063dbc4c00e2cd78300236ee5954f7
+SIZE (xorg/driver/xf86-input-joystick-1.2.3.tar.bz2) = 239917
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 7c2f223e4759..c4f014b0c3be 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-input-keyboard
-PORTVERSION=	1.1.1
+PORTVERSION=	1.2.2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,6 +14,6 @@ COMMENT=	X.Org keyboard input driver
 
 XORG_CAT=	driver
 USE_XORG=	kbproto
-MAN4=		kbd.4x keyboard.4x
+MAN4=		kbd.4x
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo
index 87ec2cfc238b..616768134029 100644
--- a/x11-drivers/xf86-input-keyboard/distinfo
+++ b/x11-drivers/xf86-input-keyboard/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-keyboard-1.1.1.tar.bz2) = babf094e37bdfc08076d4adb4c69c1d9
-SHA256 (xorg/driver/xf86-input-keyboard-1.1.1.tar.bz2) = b7e7377d75f3a10cceb5df18019b8e4498fbed0100478edd4af75bf8cd45d6fd
-SIZE (xorg/driver/xf86-input-keyboard-1.1.1.tar.bz2) = 235022
+MD5 (xorg/driver/xf86-input-keyboard-1.2.2.tar.bz2) = ab3122921f6359c54e250879288ffd47
+SHA256 (xorg/driver/xf86-input-keyboard-1.2.2.tar.bz2) = c25b35524eaf00928d97bd0d8bf9e489d92993b133461b5f4d8d9655d37ec072
+SIZE (xorg/driver/xf86-input-keyboard-1.2.2.tar.bz2) = 245665
diff --git a/x11-drivers/xf86-input-keyboard/pkg-plist b/x11-drivers/xf86-input-keyboard/pkg-plist
index 32d077162789..7e9f47e9ffe1 100644
--- a/x11-drivers/xf86-input-keyboard/pkg-plist
+++ b/x11-drivers/xf86-input-keyboard/pkg-plist
@@ -1,7 +1,5 @@
 lib/xorg/modules/input/kbd_drv.la
 lib/xorg/modules/input/kbd_drv.so
-lib/xorg/modules/input/keyboard_drv.la
-lib/xorg/modules/input/keyboard_drv.so
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-magellan/Makefile b/x11-drivers/xf86-input-magellan/Makefile
index bf936bae3d7e..36a4f2fa548e 100644
--- a/x11-drivers/xf86-input-magellan/Makefile
+++ b/x11-drivers/xf86-input-magellan/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-input-magellan
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-magellan/distinfo b/x11-drivers/xf86-input-magellan/distinfo
index 59784431ba6c..736cfcd6f7f1 100644
--- a/x11-drivers/xf86-input-magellan/distinfo
+++ b/x11-drivers/xf86-input-magellan/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-magellan-1.1.0.tar.bz2) = 0d6a81aa864ac790d9a8b517ca7016ad
-SHA256 (xorg/driver/xf86-input-magellan-1.1.0.tar.bz2) = 8eef54b50c428513a330ed7183ce37f269050252a4d1199d3b00ad6bf0a7833d
-SIZE (xorg/driver/xf86-input-magellan-1.1.0.tar.bz2) = 228401
+MD5 (xorg/driver/xf86-input-magellan-1.1.1.tar.bz2) = 8a966d3b74dc2a801ff09b895037090c
+SHA256 (xorg/driver/xf86-input-magellan-1.1.1.tar.bz2) = 06da7d1b222ba47ba0c7fd561965d78f2c8e46f44c998cb768e98bdc3c0e1741
+SIZE (xorg/driver/xf86-input-magellan-1.1.1.tar.bz2) = 223055
diff --git a/x11-drivers/xf86-input-microtouch/Makefile b/x11-drivers/xf86-input-microtouch/Makefile
index 137c05d886f5..81cb2ff0aeee 100644
--- a/x11-drivers/xf86-input-microtouch/Makefile
+++ b/x11-drivers/xf86-input-microtouch/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-input-microtouch
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-microtouch/distinfo b/x11-drivers/xf86-input-microtouch/distinfo
index dce1b3e71abc..149e9286096d 100644
--- a/x11-drivers/xf86-input-microtouch/distinfo
+++ b/x11-drivers/xf86-input-microtouch/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-microtouch-1.1.0.tar.bz2) = 7b3cc0330d70e7e4e07914fcb325b331
-SHA256 (xorg/driver/xf86-input-microtouch-1.1.0.tar.bz2) = 7f92f5531495ecfbfd00744198fd4b2aa3b8f5c188b115e55e865e961bca2039
-SIZE (xorg/driver/xf86-input-microtouch-1.1.0.tar.bz2) = 231483
+MD5 (xorg/driver/xf86-input-microtouch-1.1.1.tar.bz2) = 9843fbea6cc0c4129e96ce9a6c893cf6
+SHA256 (xorg/driver/xf86-input-microtouch-1.1.1.tar.bz2) = 5f2f0b16705c6226081a452f9f876508c388b384fca69106d377cd134cfddfd3
+SIZE (xorg/driver/xf86-input-microtouch-1.1.1.tar.bz2) = 226034
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index df7cf282513f..5550791b4bd3 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-input-mouse
-PORTVERSION=	1.1.2
+PORTVERSION=	1.2.2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo
index eebc5df3524b..eb8def43ba43 100644
--- a/x11-drivers/xf86-input-mouse/distinfo
+++ b/x11-drivers/xf86-input-mouse/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-mouse-1.1.2.tar.bz2) = d8bcd9fb1b4efb02acd251495f9a30c1
-SHA256 (xorg/driver/xf86-input-mouse-1.1.2.tar.bz2) = 7d4c2ecbe8f9327f7c8093c05401ab68b22f3343bcf04e4838cc40c21b7f8e0a
-SIZE (xorg/driver/xf86-input-mouse-1.1.2.tar.bz2) = 279229
+MD5 (xorg/driver/xf86-input-mouse-1.2.2.tar.bz2) = c47c598e55e7080b8ea30f70781f7ca3
+SHA256 (xorg/driver/xf86-input-mouse-1.2.2.tar.bz2) = 80e9cb52b2036b71289b2140bcd3ac202cf46fd42830761c53120ddac38e7edf
+SIZE (xorg/driver/xf86-input-mouse-1.2.2.tar.bz2) = 274401
diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile
index 26d6e860f58b..01740eca6ee1 100644
--- a/x11-drivers/xf86-input-penmount/Makefile
+++ b/x11-drivers/xf86-input-penmount/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-input-penmount
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-penmount/distinfo b/x11-drivers/xf86-input-penmount/distinfo
index d099b3757f0a..af64b1649286 100644
--- a/x11-drivers/xf86-input-penmount/distinfo
+++ b/x11-drivers/xf86-input-penmount/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-penmount-1.2.0.tar.bz2) = 0589f2eaa84afb9bd49b226ce7dacdda
-SHA256 (xorg/driver/xf86-input-penmount-1.2.0.tar.bz2) = dea18a07cf8f59e7bc981cfa1f6ef476dd14f7d9bee3bb1a55a6cc49f766150e
-SIZE (xorg/driver/xf86-input-penmount-1.2.0.tar.bz2) = 210083
+MD5 (xorg/driver/xf86-input-penmount-1.2.1.tar.bz2) = 268af4dceda544d8c815b9b7e87d4536
+SHA256 (xorg/driver/xf86-input-penmount-1.2.1.tar.bz2) = fab08de727da6f56b82d8ecee451a52e7129ff80522e711c5322f1bd2fa9970a
+SIZE (xorg/driver/xf86-input-penmount-1.2.1.tar.bz2) = 224350
diff --git a/x11-drivers/xf86-input-spaceorb/Makefile b/x11-drivers/xf86-input-spaceorb/Makefile
index 81bbdab1b33a..59174fc7c606 100644
--- a/x11-drivers/xf86-input-spaceorb/Makefile
+++ b/x11-drivers/xf86-input-spaceorb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-input-spaceorb
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-spaceorb/distinfo b/x11-drivers/xf86-input-spaceorb/distinfo
index 1fb4db5f22f1..537d703d42b4 100644
--- a/x11-drivers/xf86-input-spaceorb/distinfo
+++ b/x11-drivers/xf86-input-spaceorb/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-spaceorb-1.1.0.tar.bz2) = 294810ca9e93c4096458c6a0f2fb5679
-SHA256 (xorg/driver/xf86-input-spaceorb-1.1.0.tar.bz2) = 9cd53cb719bf401ff3f72233d3a88c59539b94eaf11e586e307c807a325f0815
-SIZE (xorg/driver/xf86-input-spaceorb-1.1.0.tar.bz2) = 227457
+MD5 (xorg/driver/xf86-input-spaceorb-1.1.1.tar.bz2) = c7fb96281874733480ba86a5a0a3b5af
+SHA256 (xorg/driver/xf86-input-spaceorb-1.1.1.tar.bz2) = be8f052e7132d39094f42a08c0b7171a9e280e9fa1b162a62343d1dc0d2449cf
+SIZE (xorg/driver/xf86-input-spaceorb-1.1.1.tar.bz2) = 222050
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
index d2253dcc174a..82757c57365b 100644
--- a/x11-drivers/xf86-input-void/Makefile
+++ b/x11-drivers/xf86-input-void/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-input-void
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-void/distinfo b/x11-drivers/xf86-input-void/distinfo
index 01b44a382693..14642cefafa6 100644
--- a/x11-drivers/xf86-input-void/distinfo
+++ b/x11-drivers/xf86-input-void/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-void-1.1.0.tar.bz2) = ea72a92d43b95f413347df96d6a73933
-SHA256 (xorg/driver/xf86-input-void-1.1.0.tar.bz2) = b43c5d920821bd06b6a1a131dd071ab838bf024c3cb092c6d1f10d57b648b0e4
-SIZE (xorg/driver/xf86-input-void-1.1.0.tar.bz2) = 226456
+MD5 (xorg/driver/xf86-input-void-1.1.1.tar.bz2) = 862c230f5f6e0c545f232b4c0fa9537a
+SHA256 (xorg/driver/xf86-input-void-1.1.1.tar.bz2) = dde062d6267a3fd9d51b0daee88fd84fceea52a6019de51dece46e92012dbc4f
+SIZE (xorg/driver/xf86-input-void-1.1.1.tar.bz2) = 219328
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index a529247c3365..b770360be9b9 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-ati
-PORTVERSION=	6.6.3
-PORTREVISION=	2
+PORTVERSION=	6.7.192
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo
index b618867a33c5..cb9e6bf6773e 100644
--- a/x11-drivers/xf86-video-ati/distinfo
+++ b/x11-drivers/xf86-video-ati/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = f6d559f9d20f61567d381916b376590f
-SHA256 (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780
-SIZE (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = 723083
+MD5 (xorg/driver/xf86-video-ati-6.7.192.tar.bz2) = b3207c1df5f6f8cf344efe4842bb2db7
+SHA256 (xorg/driver/xf86-video-ati-6.7.192.tar.bz2) = ea282de08e20a04df49e76970ec9944d95f5e8f1a40abe31e30eca11a7aa8263
+SIZE (xorg/driver/xf86-video-ati-6.7.192.tar.bz2) = 730601
diff --git a/x11-drivers/xf86-video-ati613/Makefile b/x11-drivers/xf86-video-ati613/Makefile
index a529247c3365..b770360be9b9 100644
--- a/x11-drivers/xf86-video-ati613/Makefile
+++ b/x11-drivers/xf86-video-ati613/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-ati
-PORTVERSION=	6.6.3
-PORTREVISION=	2
+PORTVERSION=	6.7.192
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati613/distinfo b/x11-drivers/xf86-video-ati613/distinfo
index b618867a33c5..cb9e6bf6773e 100644
--- a/x11-drivers/xf86-video-ati613/distinfo
+++ b/x11-drivers/xf86-video-ati613/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = f6d559f9d20f61567d381916b376590f
-SHA256 (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780
-SIZE (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = 723083
+MD5 (xorg/driver/xf86-video-ati-6.7.192.tar.bz2) = b3207c1df5f6f8cf344efe4842bb2db7
+SHA256 (xorg/driver/xf86-video-ati-6.7.192.tar.bz2) = ea282de08e20a04df49e76970ec9944d95f5e8f1a40abe31e30eca11a7aa8263
+SIZE (xorg/driver/xf86-video-ati-6.7.192.tar.bz2) = 730601
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index d4e60adc2b8f..66ce8d1d528a 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-intel
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-intel/distinfo b/x11-drivers/xf86-video-intel/distinfo
index b102e21621cd..f8459338fd93 100644
--- a/x11-drivers/xf86-video-intel/distinfo
+++ b/x11-drivers/xf86-video-intel/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-intel-2.1.0.tar.bz2) = a564a1fbb7ed9fcbcf81e15aedc92578
-SHA256 (xorg/driver/xf86-video-intel-2.1.0.tar.bz2) = a407c355c9d333853e1a7afb9eb380595b407860c5873ef0418e726107c99fcb
-SIZE (xorg/driver/xf86-video-intel-2.1.0.tar.bz2) = 544558
+MD5 (xorg/driver/xf86-video-intel-2.1.1.tar.bz2) = a645aa1a8e1e6031e1f817d2cda9db1d
+SHA256 (xorg/driver/xf86-video-intel-2.1.1.tar.bz2) = 4f7215b2cc9ab4b35be56fd26fb858d64665ffd241c59a2c2c81eb39f0d5c51c
+SIZE (xorg/driver/xf86-video-intel-2.1.1.tar.bz2) = 584729
diff --git a/x11-drivers/xf86-video-intel29/Makefile b/x11-drivers/xf86-video-intel29/Makefile
index d4e60adc2b8f..66ce8d1d528a 100644
--- a/x11-drivers/xf86-video-intel29/Makefile
+++ b/x11-drivers/xf86-video-intel29/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-intel
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-intel29/distinfo b/x11-drivers/xf86-video-intel29/distinfo
index b102e21621cd..f8459338fd93 100644
--- a/x11-drivers/xf86-video-intel29/distinfo
+++ b/x11-drivers/xf86-video-intel29/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-intel-2.1.0.tar.bz2) = a564a1fbb7ed9fcbcf81e15aedc92578
-SHA256 (xorg/driver/xf86-video-intel-2.1.0.tar.bz2) = a407c355c9d333853e1a7afb9eb380595b407860c5873ef0418e726107c99fcb
-SIZE (xorg/driver/xf86-video-intel-2.1.0.tar.bz2) = 544558
+MD5 (xorg/driver/xf86-video-intel-2.1.1.tar.bz2) = a645aa1a8e1e6031e1f817d2cda9db1d
+SHA256 (xorg/driver/xf86-video-intel-2.1.1.tar.bz2) = 4f7215b2cc9ab4b35be56fd26fb858d64665ffd241c59a2c2c81eb39f0d5c51c
+SIZE (xorg/driver/xf86-video-intel-2.1.1.tar.bz2) = 584729
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index e4ec426b464e..15079f535661 100644
--- a/x11-drivers/xf86-video-mga/Makefile
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-mga
-PORTVERSION=	1.4.6.1
-PORTREVISION=	1
+PORTVERSION=	1.4.7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-mga/distinfo b/x11-drivers/xf86-video-mga/distinfo
index 84a79c17200e..76b33640feaa 100644
--- a/x11-drivers/xf86-video-mga/distinfo
+++ b/x11-drivers/xf86-video-mga/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-mga-1.4.6.1.tar.bz2) = a678b429a35648f96d3ebf328300de46
-SHA256 (xorg/driver/xf86-video-mga-1.4.6.1.tar.bz2) = a7ace8c088cc214122c5f9d85f5566b0790207c8f15b960a4fc673d1bdaffdfc
-SIZE (xorg/driver/xf86-video-mga-1.4.6.1.tar.bz2) = 376624
+MD5 (xorg/driver/xf86-video-mga-1.4.7.tar.bz2) = a7f0857a1d7fa0f615bd18515775d2af
+SHA256 (xorg/driver/xf86-video-mga-1.4.7.tar.bz2) = a1c3a91f3d5f17ffc21fdb5ed3c1bcc953ab6602fbfaae2954ae7bd5e9ee5952
+SIZE (xorg/driver/xf86-video-mga-1.4.7.tar.bz2) = 389212
diff --git a/x11-drivers/xf86-video-nsc/Makefile b/x11-drivers/xf86-video-nsc/Makefile
index 43a40a233d6c..8e8664831d72 100644
--- a/x11-drivers/xf86-video-nsc/Makefile
+++ b/x11-drivers/xf86-video-nsc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-nsc
-PORTVERSION=	2.8.2
+PORTVERSION=	2.8.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-nsc/distinfo b/x11-drivers/xf86-video-nsc/distinfo
index ca2fd1878d41..6b5601152db8 100644
--- a/x11-drivers/xf86-video-nsc/distinfo
+++ b/x11-drivers/xf86-video-nsc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-nsc-2.8.2.tar.bz2) = 1fbdd5e9b5508b032c0102f72d1e555c
-SHA256 (xorg/driver/xf86-video-nsc-2.8.2.tar.bz2) = 060493a9dcad81e8912381d2a8d14a3e32a34414296a089756868f3442103c8c
-SIZE (xorg/driver/xf86-video-nsc-2.8.2.tar.bz2) = 479445
+MD5 (xorg/driver/xf86-video-nsc-2.8.3.tar.bz2) = f3ffacdc9f19e00b66bdff71b6df9b4e
+SHA256 (xorg/driver/xf86-video-nsc-2.8.3.tar.bz2) = e5c5a2021877b8975bee39c06096316324e04f1eac5261bc882b96353a8b1839
+SIZE (xorg/driver/xf86-video-nsc-2.8.3.tar.bz2) = 465597
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index 5c74c2e52a83..68e37d905899 100644
--- a/x11-drivers/xf86-video-savage/Makefile
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-savage
-PORTVERSION=	2.1.2
-PORTREVISION=	2
+PORTVERSION=	2.1.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo
index 6d16a63d6167..39e16869811c 100644
--- a/x11-drivers/xf86-video-savage/distinfo
+++ b/x11-drivers/xf86-video-savage/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-savage-2.1.2.tar.bz2) = 6367e921a98f6a7fec9d0a9bc5ff0a47
-SHA256 (xorg/driver/xf86-video-savage-2.1.2.tar.bz2) = 1a9aa442152c139e3c54bc6c323bd13edf0bfff70a81c03969bcb1159317edb2
-SIZE (xorg/driver/xf86-video-savage-2.1.2.tar.bz2) = 303497
+MD5 (xorg/driver/xf86-video-savage-2.1.3.tar.bz2) = 9c5e541613b07de6e7b2b2df3a2e35b1
+SHA256 (xorg/driver/xf86-video-savage-2.1.3.tar.bz2) = f5f154df377cb445935d1453d6b7095d63912d5776dcb44f8d3c2f10ab1a3cc5
+SIZE (xorg/driver/xf86-video-savage-2.1.3.tar.bz2) = 310709
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
index cda2eb02c3ab..bc33772fcbf7 100644
--- a/x11-drivers/xf86-video-siliconmotion/Makefile
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-siliconmotion
-PORTVERSION=	1.4.2
+PORTVERSION=	1.5.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo
index 2a735f8620d3..a8822e45239b 100644
--- a/x11-drivers/xf86-video-siliconmotion/distinfo
+++ b/x11-drivers/xf86-video-siliconmotion/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-siliconmotion-1.4.2.tar.bz2) = 31fa07bfc6f06e07216bf34a35091af0
-SHA256 (xorg/driver/xf86-video-siliconmotion-1.4.2.tar.bz2) = a47a60920c454342a212260b5ec74c93f7889a6df4942bd2d6c0c0672aa25fdd
-SIZE (xorg/driver/xf86-video-siliconmotion-1.4.2.tar.bz2) = 279048
+MD5 (xorg/driver/xf86-video-siliconmotion-1.5.1.tar.bz2) = ee35d7714ce44a2b5ac7ad7b7b7dd75a
+SHA256 (xorg/driver/xf86-video-siliconmotion-1.5.1.tar.bz2) = 54cf791695a53d4836d32f899b7d34b969edf5415f02e36956b6e72993e21cd7
+SIZE (xorg/driver/xf86-video-siliconmotion-1.5.1.tar.bz2) = 265829
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
index ca50e650a30c..fb40cbb219de 100644
--- a/x11-drivers/xf86-video-vmware/Makefile
+++ b/x11-drivers/xf86-video-vmware/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-vmware
-PORTVERSION=	10.14.1
+PORTVERSION=	10.15.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vmware/distinfo b/x11-drivers/xf86-video-vmware/distinfo
index 68bb42406ba3..e73e8b9511c9 100644
--- a/x11-drivers/xf86-video-vmware/distinfo
+++ b/x11-drivers/xf86-video-vmware/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-vmware-10.14.1.tar.bz2) = eaf1ce9fa23363799140602afaa10f37
-SHA256 (xorg/driver/xf86-video-vmware-10.14.1.tar.bz2) = 1971fd356ba54204c3611edb9144c43c25c21167a5fa5ee725d3f2e3f9864fa9
-SIZE (xorg/driver/xf86-video-vmware-10.14.1.tar.bz2) = 265946
+MD5 (xorg/driver/xf86-video-vmware-10.15.0.tar.bz2) = 9ad83ec872917a9c35bf3254ef455399
+SHA256 (xorg/driver/xf86-video-vmware-10.15.0.tar.bz2) = b5a3a7f9e5d7aef3ad294c1a10271cef3d0fe0ff90fba1dc0afbf95009e45d51
+SIZE (xorg/driver/xf86-video-vmware-10.15.0.tar.bz2) = 261255
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index 17418fe27406..6b6478b9f0d8 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xorg-drivers
-PORTVERSION=	7.2
-PORTREVISION=	2
+PORTVERSION=	7.3
 CATEGORIES=	x11-drivers
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -29,8 +28,8 @@ VIDEO_ON=	ati \
 		i810 \
 		nv \
 		vesa vga via
-VIDEO_OFF=	apm ark				\
-		chips cirrus cyrix		\
+VIDEO_OFF=	apm ark \
+		chips cirrus cyrix \
 		dummy \
 		fbdev \
 		glint \
@@ -61,7 +60,17 @@ INPUT_OFF=	acecad \
 		palmax penmount \
 		spaceorb summa \
 		tek4957 \
-		void
+		vmmouse void
+
+QUIRKS=		keyboard:kbd jamstudio:js_x
+
+.if defined(XORG_COMPLETE)
+. for type in input video
+${type:U}_ON:=	${${type:U}_ON} ${${type:U}_OFF}
+${type:U}_OFF=	# nil
+. endfor
+.endif
+
 
 .for default in on off
 . for type in input video
@@ -81,8 +90,12 @@ IGNORE=		You can't choose both i810 and intel drivers as they are conflicting
 . for type in input video
 .  for i in ${${type:U}_${default:U}}
 DEFAULT=${default}
-.   if (${DEFAULT} == "on" && !defined(WITHOUT_${i:U})) || (${DEFAULT} == "off" &&  defined(WITH_${i:U}))
-RUN_DEPENDS+=	${${type:U}DIR}/${i:C/jamstudio/js_x/}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i}
+.   if (${DEFAULT} == "on" && !defined(WITHOUT_${i:U})) || (${DEFAULT} == "off" && defined(WITH_${i:U}))
+.    if ${QUIRKS:M${i}\:*:C/.*://} != ""
+RUN_DEPENDS+=	${${type:U}DIR}/${QUIRKS:M${i}\:*:C/.*://}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i}
+.    else
+RUN_DEPENDS+=	${${type:U}DIR}/${i}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i}
+.    endif
 .   endif
 .  endfor
 . endfor