aboutsummaryrefslogtreecommitdiff
path: root/x11-drivers
diff options
context:
space:
mode:
authorFlorent Thoumie <flz@FreeBSD.org>2009-01-23 16:28:36 +0000
committerFlorent Thoumie <flz@FreeBSD.org>2009-01-23 16:28:36 +0000
commit340b57f8beb786be8990652b17d2e45f182346e6 (patch)
treec3e6d8718763fb6c4df9ddb40d2544e7ceccaccd /x11-drivers
parent66a81c62b92aa3373e54dc3b68238b43561f244f (diff)
downloadports-340b57f8beb786be8990652b17d2e45f182346e6.tar.gz
ports-340b57f8beb786be8990652b17d2e45f182346e6.zip
Notes
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/Makefile2
-rw-r--r--x11-drivers/synaptics/Makefile61
-rw-r--r--x11-drivers/synaptics/distinfo6
-rw-r--r--x11-drivers/synaptics/files/extra-xorg-server-1.463
-rw-r--r--x11-drivers/synaptics/files/patch-Makefile100
-rw-r--r--x11-drivers/synaptics/files/patch-eventcomm.c20
-rw-r--r--x11-drivers/synaptics/pkg-descr6
-rw-r--r--x11-drivers/synaptics/pkg-message92
-rw-r--r--x11-drivers/synaptics/pkg-plist6
-rw-r--r--x11-drivers/xf86-input-acecad/Makefile3
-rw-r--r--x11-drivers/xf86-input-acecad/distinfo6
-rw-r--r--x11-drivers/xf86-input-calcomp/Makefile3
-rw-r--r--x11-drivers/xf86-input-calcomp/distinfo6
-rw-r--r--x11-drivers/xf86-input-digitaledge/Makefile3
-rw-r--r--x11-drivers/xf86-input-digitaledge/distinfo6
-rw-r--r--x11-drivers/xf86-input-dmc/Makefile3
-rw-r--r--x11-drivers/xf86-input-dmc/distinfo6
-rw-r--r--x11-drivers/xf86-input-dynapro/Makefile3
-rw-r--r--x11-drivers/xf86-input-dynapro/distinfo6
-rw-r--r--x11-drivers/xf86-input-elo2300/Makefile3
-rw-r--r--x11-drivers/xf86-input-elo2300/distinfo6
-rw-r--r--x11-drivers/xf86-input-elographics/Makefile3
-rw-r--r--x11-drivers/xf86-input-elographics/distinfo6
-rw-r--r--x11-drivers/xf86-input-fpit/Makefile5
-rw-r--r--x11-drivers/xf86-input-fpit/distinfo6
-rw-r--r--x11-drivers/xf86-input-hyperpen/Makefile3
-rw-r--r--x11-drivers/xf86-input-hyperpen/distinfo6
-rw-r--r--x11-drivers/xf86-input-jamstudio/Makefile3
-rw-r--r--x11-drivers/xf86-input-jamstudio/distinfo6
-rw-r--r--x11-drivers/xf86-input-joystick/Makefile7
-rw-r--r--x11-drivers/xf86-input-joystick/distinfo6
-rw-r--r--x11-drivers/xf86-input-joystick/pkg-plist3
-rw-r--r--x11-drivers/xf86-input-keyboard/Makefile3
-rw-r--r--x11-drivers/xf86-input-keyboard/distinfo6
-rw-r--r--x11-drivers/xf86-input-magellan/Makefile3
-rw-r--r--x11-drivers/xf86-input-magellan/distinfo6
-rw-r--r--x11-drivers/xf86-input-magictouch/Makefile2
-rw-r--r--x11-drivers/xf86-input-microtouch/Makefile3
-rw-r--r--x11-drivers/xf86-input-microtouch/distinfo6
-rw-r--r--x11-drivers/xf86-input-mouse/Makefile3
-rw-r--r--x11-drivers/xf86-input-mouse/distinfo6
-rw-r--r--x11-drivers/xf86-input-mouse/files/patch-dont-flush-buttons-6a03e8bd38
-rw-r--r--x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c200
-rw-r--r--x11-drivers/xf86-input-mutouch/Makefile3
-rw-r--r--x11-drivers/xf86-input-mutouch/distinfo6
-rw-r--r--x11-drivers/xf86-input-palmax/Makefile3
-rw-r--r--x11-drivers/xf86-input-palmax/distinfo6
-rw-r--r--x11-drivers/xf86-input-penmount/Makefile3
-rw-r--r--x11-drivers/xf86-input-penmount/distinfo6
-rw-r--r--x11-drivers/xf86-input-summa/Makefile3
-rw-r--r--x11-drivers/xf86-input-summa/distinfo6
-rw-r--r--x11-drivers/xf86-input-synaptics/Makefile29
-rw-r--r--x11-drivers/xf86-input-synaptics/distinfo3
-rw-r--r--x11-drivers/xf86-input-synaptics/pkg-descr4
-rw-r--r--x11-drivers/xf86-input-synaptics/pkg-plist12
-rw-r--r--x11-drivers/xf86-input-tek4957/Makefile3
-rw-r--r--x11-drivers/xf86-input-tek4957/distinfo6
-rw-r--r--x11-drivers/xf86-input-vmmouse/Makefile6
-rw-r--r--x11-drivers/xf86-input-vmmouse/distinfo6
-rw-r--r--x11-drivers/xf86-input-vmmouse/files/patch-src_vmmouse.c28
-rw-r--r--x11-drivers/xf86-input-vmmouse/pkg-plist3
-rw-r--r--x11-drivers/xf86-video-apm/Makefile3
-rw-r--r--x11-drivers/xf86-video-apm/distinfo6
-rw-r--r--x11-drivers/xf86-video-ark/Makefile3
-rw-r--r--x11-drivers/xf86-video-ark/distinfo6
-rw-r--r--x11-drivers/xf86-video-ati/Makefile2
-rw-r--r--x11-drivers/xf86-video-ati/distinfo6
-rw-r--r--x11-drivers/xf86-video-ati613/Makefile2
-rw-r--r--x11-drivers/xf86-video-ati613/distinfo6
-rw-r--r--x11-drivers/xf86-video-chips/Makefile3
-rw-r--r--x11-drivers/xf86-video-chips/distinfo6
-rw-r--r--x11-drivers/xf86-video-cirrus/Makefile3
-rw-r--r--x11-drivers/xf86-video-cirrus/distinfo6
-rw-r--r--x11-drivers/xf86-video-cyrix/Makefile2
-rw-r--r--x11-drivers/xf86-video-dummy/Makefile3
-rw-r--r--x11-drivers/xf86-video-dummy/distinfo6
-rw-r--r--x11-drivers/xf86-video-fbdev/Makefile3
-rw-r--r--x11-drivers/xf86-video-fbdev/distinfo6
-rw-r--r--x11-drivers/xf86-video-glint/Makefile3
-rw-r--r--x11-drivers/xf86-video-glint/distinfo6
-rw-r--r--x11-drivers/xf86-video-i128/Makefile3
-rw-r--r--x11-drivers/xf86-video-i128/distinfo6
-rw-r--r--x11-drivers/xf86-video-i740/Makefile3
-rw-r--r--x11-drivers/xf86-video-i740/distinfo6
-rw-r--r--x11-drivers/xf86-video-imstt/Makefile2
-rw-r--r--x11-drivers/xf86-video-intel/Makefile2
-rw-r--r--x11-drivers/xf86-video-intel/distinfo6
-rw-r--r--x11-drivers/xf86-video-intel29/Makefile2
-rw-r--r--x11-drivers/xf86-video-intel29/distinfo6
-rw-r--r--x11-drivers/xf86-video-mga/Makefile3
-rw-r--r--x11-drivers/xf86-video-mga/distinfo6
-rw-r--r--x11-drivers/xf86-video-neomagic/Makefile3
-rw-r--r--x11-drivers/xf86-video-neomagic/distinfo6
-rw-r--r--x11-drivers/xf86-video-rendition/Makefile3
-rw-r--r--x11-drivers/xf86-video-rendition/distinfo6
-rw-r--r--x11-drivers/xf86-video-s3/Makefile3
-rw-r--r--x11-drivers/xf86-video-s3/distinfo6
-rw-r--r--x11-drivers/xf86-video-s3virge/Makefile3
-rw-r--r--x11-drivers/xf86-video-s3virge/distinfo6
-rw-r--r--x11-drivers/xf86-video-savage/Makefile3
-rw-r--r--x11-drivers/xf86-video-savage/distinfo6
-rw-r--r--x11-drivers/xf86-video-siliconmotion/Makefile3
-rw-r--r--x11-drivers/xf86-video-siliconmotion/distinfo6
-rw-r--r--x11-drivers/xf86-video-sis-intel/Makefile2
-rw-r--r--x11-drivers/xf86-video-sis/Makefile3
-rw-r--r--x11-drivers/xf86-video-sis/distinfo6
-rw-r--r--x11-drivers/xf86-video-sunffb/Makefile3
-rw-r--r--x11-drivers/xf86-video-sunffb/distinfo6
-rw-r--r--x11-drivers/xf86-video-tdfx/Makefile3
-rw-r--r--x11-drivers/xf86-video-tdfx/distinfo6
-rw-r--r--x11-drivers/xf86-video-tga/Makefile3
-rw-r--r--x11-drivers/xf86-video-tga/distinfo6
-rw-r--r--x11-drivers/xf86-video-trident/Makefile3
-rw-r--r--x11-drivers/xf86-video-trident/distinfo6
-rw-r--r--x11-drivers/xf86-video-tseng/Makefile3
-rw-r--r--x11-drivers/xf86-video-tseng/distinfo6
-rw-r--r--x11-drivers/xf86-video-vesa/Makefile3
-rw-r--r--x11-drivers/xf86-video-vesa/distinfo6
-rw-r--r--x11-drivers/xf86-video-via/Makefile4
-rw-r--r--x11-drivers/xf86-video-vmware/Makefile6
-rw-r--r--x11-drivers/xf86-video-vmware/distinfo6
-rw-r--r--x11-drivers/xf86-video-voodoo/Makefile3
-rw-r--r--x11-drivers/xf86-video-voodoo/distinfo6
-rw-r--r--x11-drivers/xorg-drivers/Makefile12
124 files changed, 482 insertions, 676 deletions
diff --git a/x11-drivers/Makefile b/x11-drivers/Makefile
index 1b0bc5670bfb..075f104b8316 100644
--- a/x11-drivers/Makefile
+++ b/x11-drivers/Makefile
@@ -4,7 +4,6 @@
COMMENT = X11 drivers
SUBDIR += input-wacom
- SUBDIR += synaptics
SUBDIR += xf86-input-acecad
SUBDIR += xf86-input-calcomp
SUBDIR += xf86-input-citron
@@ -27,6 +26,7 @@
SUBDIR += xf86-input-penmount
SUBDIR += xf86-input-spaceorb
SUBDIR += xf86-input-summa
+ SUBDIR += xf86-input-synaptics
SUBDIR += xf86-input-tek4957
SUBDIR += xf86-input-vmmouse
SUBDIR += xf86-input-void
diff --git a/x11-drivers/synaptics/Makefile b/x11-drivers/synaptics/Makefile
deleted file mode 100644
index a7c3ee4e49c4..000000000000
--- a/x11-drivers/synaptics/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# New ports collection makefile for: synaptics
-# Date created: 2004-01-02
-# Whom: nork@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME= synaptics
-PORTVERSION= 0.14.6
-PORTREVISION= 6
-CATEGORIES= x11-drivers
-MASTER_SITES= http://web.telia.com/~u89404340/touchpad/files/:synaptics
-DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \
- ${X_DISTFILES:C/$/:x11/}
-EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-
-MAINTAINER= nork@FreeBSD.org
-COMMENT= The Synaptics touchpad X driver
-
-USE_XORG= xorg-server xi xproto
-USE_BZIP2= yes
-USE_GMAKE= yes
-
-.include <bsd.port.pre.mk>
-
-MASTER_SITES+= ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/:x11 \
- http://xorg.freedesktop.org/releases/individual/xserver/:x11
-DIST_SUBDIR= xorg/xserver
-X_DISTFILES= xorg-server-1.4.2.tar.bz2
-EXTRA_PATCHES= ${FILESDIR}/extra-xorg-server-1.4
-
-post-patch:
- @${REINPLACE_CMD} 's|\(ALLINCLUDES = -I.\)|\1 -I${LOCALBASE}/include -I${LOCALBASE}/include/pixman-1|' \
- ${WRKSRC}/Makefile
-
-MAKE_ENV= TOP=${WRKDIR}/xc CFLAGSCLIENT="${CFLAGS}"
-
-MAN1= synclient.1 # syndaemon.1
-MAN5= synaptics.5
-PORTDOCS= COMPATIBILITY FILES INSTALL INSTALL.DE INSTALL.FR \
- README README.alps TODO
-
-post-extract:
-.for FILE in ${X_DISTFILES}
- @cd ${WRKDIR} && \
- ${GZIP_CMD} -dc ${_DISTDIR}/${FILE} | ${TAR} -xf -
-.endfor
-
-pre-install:
- ${MKDIR} ${LOCALBASE}/lib/xorg/modules/input/
-
-post-install:
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for FILE in ${PORTDOCS}
- @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-.endif
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/x11-drivers/synaptics/distinfo b/x11-drivers/synaptics/distinfo
deleted file mode 100644
index 1712be2a2998..000000000000
--- a/x11-drivers/synaptics/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-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.4.2.tar.bz2) = fa2915ae377f61c340a18ebef484b64b
-SHA256 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d
-SIZE (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 6216638
diff --git a/x11-drivers/synaptics/files/extra-xorg-server-1.4 b/x11-drivers/synaptics/files/extra-xorg-server-1.4
deleted file mode 100644
index d6f2ab11f0a7..000000000000
--- a/x11-drivers/synaptics/files/extra-xorg-server-1.4
+++ /dev/null
@@ -1,63 +0,0 @@
-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/synaptics/files/patch-Makefile b/x11-drivers/synaptics/files/patch-Makefile
deleted file mode 100644
index 58bc8c599b5d..000000000000
--- a/x11-drivers/synaptics/files/patch-Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
---- Makefile.orig Sun Jul 16 00:58:26 2006
-+++ Makefile Sun Aug 13 10:47:35 2006
-@@ -12,14 +12,14 @@
- MANDIR = $(DESTDIR)$(PREFIX)/man
-
- ifeq ($(ARCH),)
-- ARCH = $(shell /bin/arch)
-+ ARCH = $(shell uname -m)
- endif
- ifeq ($(ARCH),amd64)
-- ARCH = x86_64
-+ override ARCH = x86_64
- endif
- ifeq ($(ARCH),x86_64)
- ARCH_DEFINES = -D__x86_64__ -D_XSERVER64
-- LIBDIR = lib64
-+ LIBDIR = lib
- else
- ARCH_DEFINES = -D__i386__
- LIBDIR = lib
-@@ -39,7 +39,7 @@
- -I$(INSTALLED_X)/include/X11/extensions \
- -I$(SDKDIR)
- else
-- INSTALLED_X = /usr/X11R6
-+ INSTALLED_X = ${LOCALBASE}
- INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input
- SYNAPTICS_DRV = synaptics_drv.o
- LDCOMBINEFLAGS = -r
-@@ -62,12 +62,16 @@
- else
- SERVERSRC = $(TOP)/programs/Xserver
- ALLINCLUDES = -I. \
-+ -I${LOCALBASE}/include \
-+ -I${LOCALBASE}/include/X11 \
-+ -I$(SERVERSRC)/hw/xfree86 \
- -I$(SERVERSRC)/hw/xfree86/common \
- -I$(SERVERSRC)/hw/xfree86/os-support \
-+ -I$(SERVERSRC)/hw/xfree86/os-support/bus \
- -I$(SERVERSRC)/mi \
- -I$(SERVERSRC)/include \
- -I$(TOP)/include
-- X_INCLUDES_ROOT = $(TOP)
-+ X_INCLUDES_ROOT = $(LOCALBASE)
- endif
- endif
-
-@@ -81,11 +85,11 @@
-
- CCOPTIONS := -pedantic -Wall -Wpointer-arith
- CCOPTIONS += $(call check_gcc,-fno-merge-constants,)
--CDEBUGFLAGS = -O2
--CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(PICFLAG) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)"
--CFLAGSCLIENT = $(CDEBUGFLAGS) $(CCOPTIONS) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include
-+#CDEBUGFLAGS = -O2
-+CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(PICFLAG) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)"
-+CFLAGSCLIENT += $(CCOPTIONS) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include
-
--CC = gcc
-+#CC = gcc
-
- SRCS = synaptics.c ps2comm.c eventcomm.c psmcomm.c alpscomm.c
- OBJS = synaptics.o ps2comm.o eventcomm.o psmcomm.o alpscomm.o
-@@ -94,29 +98,29 @@
- $(RM) $@
- $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
-
--all:: $(SYNAPTICS_DRV) synclient syndaemon
-+all:: $(SYNAPTICS_DRV) synclient
-
--install: $(BINDIR)/synclient $(BINDIR)/syndaemon $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) install-man
-+install: $(BINDIR)/synclient $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) install-man
-
--install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man1/syndaemon.1 $(MANDIR)/man5/synaptics.5
-+install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man5/synaptics.5
-
- $(MANDIR)/man1/synclient.1: manpages/synclient.1
-- install --mode=0644 -D $< $@
-+ ${BSD_INSTALL_MAN} $< $@
-
- $(MANDIR)/man1/syndaemon.1: manpages/syndaemon.1
- install --mode=0644 -D $< $@
-
- $(MANDIR)/man5/synaptics.5: manpages/synaptics.5
-- install --mode=0644 -D $< $@
-+ ${BSD_INSTALL_MAN} $< $@
-
- $(BINDIR)/synclient : synclient
-- install -D $< $@
-+ ${BSD_INSTALL_PROGRAM} $< $@
-
- $(BINDIR)/syndaemon : syndaemon
- install -D $< $@
-
- $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) : $(SYNAPTICS_DRV)
-- install --mode=0644 -D $< $@
-+ ${BSD_INSTALL_DATA} $< $@
-
- $(SYNAPTICS_DRV): $(OBJS)
- $(RM) $@
diff --git a/x11-drivers/synaptics/files/patch-eventcomm.c b/x11-drivers/synaptics/files/patch-eventcomm.c
deleted file mode 100644
index 0fbcfefe6d27..000000000000
--- a/x11-drivers/synaptics/files/patch-eventcomm.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- eventcomm.c.orig Mon Aug 8 04:44:04 2005
-+++ eventcomm.c Sat Mar 18 18:54:22 2006
-@@ -55,6 +55,7 @@
- static Bool
- event_query_is_touchpad(int fd)
- {
-+#if 0
- int ret;
- unsigned long evbits[NBITS(KEY_MAX)];
-
-@@ -83,6 +84,9 @@
- return FALSE;
-
- return TRUE;
-+#else
-+ return FALSE;
-+#endif
- }
-
- static Bool
diff --git a/x11-drivers/synaptics/pkg-descr b/x11-drivers/synaptics/pkg-descr
deleted file mode 100644
index 009694de864a..000000000000
--- a/x11-drivers/synaptics/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a driver for the Synaptics TouchPad for XOrg/XFree86 4.x.
-A Synaptics touchpad by default operates in compatibility mode by
-emulating a standard mouse. However, by using a dedicated driver,
-more advanced features of the touchpad becomes available.
-
-WWW: http://web.telia.com/~u89404340/touchpad/
diff --git a/x11-drivers/synaptics/pkg-message b/x11-drivers/synaptics/pkg-message
deleted file mode 100644
index fb6808b99934..000000000000
--- a/x11-drivers/synaptics/pkg-message
+++ /dev/null
@@ -1,92 +0,0 @@
-===============================================================================
-
- * SETUP NOTE * SETUP NOTE *
-
-o Add boot time tunable to /boot/loader.conf.
- Set hw.psm.synaptics_support=1 and shutdown -r now!
-
-/boot/loader.conf ---------------------------------
-hw.psm.synaptics_support=1
----------------------------------------------------
-
-o Don't run moused(8) daemon.
- Dont' set moused_enable="YES" in /etc/rc.conf.
-
-/etc/rc.conf --------------------------------------
-moused_enable="NO"
----------------------------------------------------
-
-o Set your /etc/xorg.conf (or /etc/XF86Config)
- Adopt your environment. This is a sample configration, and
- following setting is mine. You may want to change the
- values of *Edge and *Delta.
-
- *NOTE*
- Please disable your existing "CorePointer" in "ServerLayout"
- section, only use "Synaptics_Touchpad" CorePointer.
-
- * IMPORTANT NOTICE *
- Please set *AllowEmptyInput* option at ServerFlags section.
-
-/etc/xorg.conf (or /etc/XF86Config) ---------------
- :
-Section "Module"
- :
- Load "synaptics"
-EndSection
-
-Section "ServerFlags"
- :
- Option "AllowEmptyInput"
-EndSection
-
-Section "ServerLayout"
- :
-# InputDevice "Standard_PS/2_Mouse" "CorePointer"
- InputDevice "Synaptics_Touchpad" "CorePointer"
-EndSection
-
-Section "InputDevice"
- Identifier "Synaptics_Touchpad"
- Driver "synaptics"
-
- Option "Device" "/dev/psm0"
- Option "Protocol" "psm"
-
- Option "LeftEdge" "1700"
- Option "RightEdge" "5300"
- Option "TopEdge" "1700"
- Option "BottomEdge" "4200"
-
- Option "FingerLow" "25"
- Option "FingerHigh" "30"
-
- Option "MaxTapTime" "180"
- Option "MaxTapMove" "220"
-
- Option "VertScrollDelta" "100"
- Option "HorizScrollDelta" "100"
-
- Option "MinSpeed" "0.06"
- Option "MaxSpeed" "0.06"
- Option "AccelFactor" "0.0010"
-
- Option "ScrollButtonRepeat" "100"
- Option "UpDownScrolling" "on"
- Option "UpDownRepeat" "on"
- Option "LeftRightScrolling" "on"
- Option "LeftRightRepeat" "on"
-
- # "SHMConfig on" seems good works with synclient(1). But this
- # options is insecure. I recommended "off" as default.
- Option "SHMConfig" "off"
-
- # If you use circular touchpad, uncomment them.
-# Option "CircularPad" "on"
-# Option "CircularScrolling" "on"
-# Option "CircScrollDelta" "0.5"
-EndSection
- :
-/etc/xorg.conf (or /etc/XF86Config) ---------------
-
-===============================================================================
diff --git a/x11-drivers/synaptics/pkg-plist b/x11-drivers/synaptics/pkg-plist
deleted file mode 100644
index 342a06bea1e8..000000000000
--- a/x11-drivers/synaptics/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/synclient
-@comment bin/syndaemon
-lib/xorg/modules/input/synaptics_drv.so
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
index e9050aa93506..85fd64117c6a 100644
--- a/x11-drivers/xf86-input-acecad/Makefile
+++ b/x11-drivers/xf86-input-acecad/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-acecad
-PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTVERSION= 1.2.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-acecad/distinfo b/x11-drivers/xf86-input-acecad/distinfo
index b76810fe5bcd..78a38abe0e7e 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.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
+MD5 (xorg/driver/xf86-input-acecad-1.2.2.tar.bz2) = 2d6596b2b0cfa527b5ed4df2014684bf
+SHA256 (xorg/driver/xf86-input-acecad-1.2.2.tar.bz2) = 953ebb7d7ed579ce648dd6f6a25307c37ad8230a0336ec6fc58247732835f26e
+SIZE (xorg/driver/xf86-input-acecad-1.2.2.tar.bz2) = 230781
diff --git a/x11-drivers/xf86-input-calcomp/Makefile b/x11-drivers/xf86-input-calcomp/Makefile
index ab057ab8adce..c574814367ca 100644
--- a/x11-drivers/xf86-input-calcomp/Makefile
+++ b/x11-drivers/xf86-input-calcomp/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-calcomp
-PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTVERSION= 1.1.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-calcomp/distinfo b/x11-drivers/xf86-input-calcomp/distinfo
index c41442399067..6d652532cf60 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.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
+MD5 (xorg/driver/xf86-input-calcomp-1.1.2.tar.bz2) = ebc9a64dc72ae3015c16011bbd2d3557
+SHA256 (xorg/driver/xf86-input-calcomp-1.1.2.tar.bz2) = bf6edb9d78c90952a16c8bab9e69aebb3e1361e4423ec90e47df57e8c873254b
+SIZE (xorg/driver/xf86-input-calcomp-1.1.2.tar.bz2) = 244642
diff --git a/x11-drivers/xf86-input-digitaledge/Makefile b/x11-drivers/xf86-input-digitaledge/Makefile
index 0fa62ba51d45..5d4282a92b3b 100644
--- a/x11-drivers/xf86-input-digitaledge/Makefile
+++ b/x11-drivers/xf86-input-digitaledge/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-digitaledge
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.1.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-digitaledge/distinfo b/x11-drivers/xf86-input-digitaledge/distinfo
index 8fe3d8ba77a6..ee055fffbcd2 100644
--- a/x11-drivers/xf86-input-digitaledge/distinfo
+++ b/x11-drivers/xf86-input-digitaledge/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-digitaledge-1.1.0.tar.bz2) = 53461c34cc0712aacab92b820b9fcb84
-SHA256 (xorg/driver/xf86-input-digitaledge-1.1.0.tar.bz2) = 24001f19b46b5bc2fcf8212f04863e4efa90175fac797350525e14848ab98a38
-SIZE (xorg/driver/xf86-input-digitaledge-1.1.0.tar.bz2) = 232925
+MD5 (xorg/driver/xf86-input-digitaledge-1.1.1.tar.bz2) = 4c27e0f3c6447e76df39a837fd46a00f
+SHA256 (xorg/driver/xf86-input-digitaledge-1.1.1.tar.bz2) = ded010f82b1dbb57b1ee0ad6707902b31540e0592c94d6bbf3b43a7a35220775
+SIZE (xorg/driver/xf86-input-digitaledge-1.1.1.tar.bz2) = 242609
diff --git a/x11-drivers/xf86-input-dmc/Makefile b/x11-drivers/xf86-input-dmc/Makefile
index 45c87e5012b4..da424c4c6d02 100644
--- a/x11-drivers/xf86-input-dmc/Makefile
+++ b/x11-drivers/xf86-input-dmc/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-dmc
-PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTVERSION= 1.1.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-dmc/distinfo b/x11-drivers/xf86-input-dmc/distinfo
index cc33e98bfbf4..401682bebc4c 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.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
+MD5 (xorg/driver/xf86-input-dmc-1.1.2.tar.bz2) = 91021ea8f3593221c0d9ee9cc14deb48
+SHA256 (xorg/driver/xf86-input-dmc-1.1.2.tar.bz2) = b6f4eb367ab1aa7da5ac5218953d7cdde409c9ddf59f6cb6b2e1aa2789b3f361
+SIZE (xorg/driver/xf86-input-dmc-1.1.2.tar.bz2) = 241971
diff --git a/x11-drivers/xf86-input-dynapro/Makefile b/x11-drivers/xf86-input-dynapro/Makefile
index 61950944fb99..5acfa4954158 100644
--- a/x11-drivers/xf86-input-dynapro/Makefile
+++ b/x11-drivers/xf86-input-dynapro/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-dynapro
-PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTVERSION= 1.1.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-dynapro/distinfo b/x11-drivers/xf86-input-dynapro/distinfo
index 4bf7cc30a455..0ae43f0a7e23 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.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
+MD5 (xorg/driver/xf86-input-dynapro-1.1.2.tar.bz2) = ceb5efbd3d62e24ab3a5f9f180777f7c
+SHA256 (xorg/driver/xf86-input-dynapro-1.1.2.tar.bz2) = 55b7b2e950331292ec05c81d566af6d1000ac3cf904068964c3b9d43cea4deec
+SIZE (xorg/driver/xf86-input-dynapro-1.1.2.tar.bz2) = 241219
diff --git a/x11-drivers/xf86-input-elo2300/Makefile b/x11-drivers/xf86-input-elo2300/Makefile
index 9e383316ca00..2282f38804b9 100644
--- a/x11-drivers/xf86-input-elo2300/Makefile
+++ b/x11-drivers/xf86-input-elo2300/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-elo2300
-PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTVERSION= 1.1.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-elo2300/distinfo b/x11-drivers/xf86-input-elo2300/distinfo
index 3dc0e127131c..1e47179274b0 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.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
+MD5 (xorg/driver/xf86-input-elo2300-1.1.2.tar.bz2) = 611d0a77a80286bc926dd3c414e59555
+SHA256 (xorg/driver/xf86-input-elo2300-1.1.2.tar.bz2) = ce575f79a5a93f4129a4e63572911d54cdc6640abc303afeb3c74741bb3c9627
+SIZE (xorg/driver/xf86-input-elo2300-1.1.2.tar.bz2) = 244443
diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile
index 326554f7b41f..b079eab95732 100644
--- a/x11-drivers/xf86-input-elographics/Makefile
+++ b/x11-drivers/xf86-input-elographics/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-elographics
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.2.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-elographics/distinfo b/x11-drivers/xf86-input-elographics/distinfo
index ad1f75673b19..9d554d838b7e 100644
--- a/x11-drivers/xf86-input-elographics/distinfo
+++ b/x11-drivers/xf86-input-elographics/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-elographics-1.1.0.tar.bz2) = ecb2bf1f800d4f5f4c295f2a0e6b1de7
-SHA256 (xorg/driver/xf86-input-elographics-1.1.0.tar.bz2) = 1583e1dae6e3ecd34ba55deae7dfc052efede0378f852de6224308d7e7d5b2d8
-SIZE (xorg/driver/xf86-input-elographics-1.1.0.tar.bz2) = 236648
+MD5 (xorg/driver/xf86-input-elographics-1.2.3.tar.bz2) = cc2923460c8eff9652b01889a063058d
+SHA256 (xorg/driver/xf86-input-elographics-1.2.3.tar.bz2) = 67550c8f4a85a8029f08880adf487e2efd4585e7adbe8da357fbd49750b08d8f
+SIZE (xorg/driver/xf86-input-elographics-1.2.3.tar.bz2) = 251743
diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile
index 292a8a0ce12f..92cb18099d4d 100644
--- a/x11-drivers/xf86-input-fpit/Makefile
+++ b/x11-drivers/xf86-input-fpit/Makefile
@@ -6,14 +6,15 @@
#
PORTNAME= xf86-input-fpit
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.2.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org fpit input driver
XORG_CAT= driver
+USE_XORG= xrandr
+
MAN4= fpit.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-fpit/distinfo b/x11-drivers/xf86-input-fpit/distinfo
index a4c1fbe0592f..86316bbd0151 100644
--- a/x11-drivers/xf86-input-fpit/distinfo
+++ b/x11-drivers/xf86-input-fpit/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-fpit-1.1.0.tar.bz2) = a31066a2076d18619ceaea67f6d89698
-SHA256 (xorg/driver/xf86-input-fpit-1.1.0.tar.bz2) = 8ee3b2df90516182460fbda025153aa7fb2c6ba343e4239d225963a287f694f8
-SIZE (xorg/driver/xf86-input-fpit-1.1.0.tar.bz2) = 232340
+MD5 (xorg/driver/xf86-input-fpit-1.2.0.tar.bz2) = 0f3e013d5ff58e0aba3d9e1d18830291
+SHA256 (xorg/driver/xf86-input-fpit-1.2.0.tar.bz2) = 87e3dd97d57ddb520cafa5e68fa7846cfc3d9d71cb054cdf0e1d650c7b1cff7e
+SIZE (xorg/driver/xf86-input-fpit-1.2.0.tar.bz2) = 242815
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile
index 8444423558f0..31e2fb3036c7 100644
--- a/x11-drivers/xf86-input-hyperpen/Makefile
+++ b/x11-drivers/xf86-input-hyperpen/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-hyperpen
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.2.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-hyperpen/distinfo b/x11-drivers/xf86-input-hyperpen/distinfo
index bdff1d50303b..c6af6e015c5b 100644
--- a/x11-drivers/xf86-input-hyperpen/distinfo
+++ b/x11-drivers/xf86-input-hyperpen/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-hyperpen-1.1.0.tar.bz2) = 1dfccb75069e61e0c6f990b47eb58c40
-SHA256 (xorg/driver/xf86-input-hyperpen-1.1.0.tar.bz2) = d1c20a3340e06c5634759832dcf2edc6acb41476a4f637eba6880730e607f493
-SIZE (xorg/driver/xf86-input-hyperpen-1.1.0.tar.bz2) = 235132
+MD5 (xorg/driver/xf86-input-hyperpen-1.2.0.tar.bz2) = 175c1e1ad668ebbbe212c1e975dd14f9
+SHA256 (xorg/driver/xf86-input-hyperpen-1.2.0.tar.bz2) = 689d1c5c1f21eed00ae03a01c57482f7bbef36d7e07156556c99febe28c7d413
+SIZE (xorg/driver/xf86-input-hyperpen-1.2.0.tar.bz2) = 244682
diff --git a/x11-drivers/xf86-input-jamstudio/Makefile b/x11-drivers/xf86-input-jamstudio/Makefile
index 2b770e12281a..83605d9684c6 100644
--- a/x11-drivers/xf86-input-jamstudio/Makefile
+++ b/x11-drivers/xf86-input-jamstudio/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-jamstudio
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.2.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-jamstudio/distinfo b/x11-drivers/xf86-input-jamstudio/distinfo
index 6bb120620b44..b6e86cc94a2d 100644
--- a/x11-drivers/xf86-input-jamstudio/distinfo
+++ b/x11-drivers/xf86-input-jamstudio/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-jamstudio-1.1.0.tar.bz2) = a32e36a24545791a3408cdc5563b6523
-SHA256 (xorg/driver/xf86-input-jamstudio-1.1.0.tar.bz2) = ce41b360bd08ea31036b79cfc25a32c854147522e4580f5ca1a203233e657e1a
-SIZE (xorg/driver/xf86-input-jamstudio-1.1.0.tar.bz2) = 226459
+MD5 (xorg/driver/xf86-input-jamstudio-1.2.0.tar.bz2) = 8011f90d7dd801d26e8c3dd058633978
+SHA256 (xorg/driver/xf86-input-jamstudio-1.2.0.tar.bz2) = c5bbade96f1849b45f665a54e08ac8f9d5a94d31a8a680edc4d3c9361d164ac0
+SIZE (xorg/driver/xf86-input-jamstudio-1.2.0.tar.bz2) = 236377
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
index 86062993af94..01c962317e95 100644
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-joystick
-PORTVERSION= 1.2.3
-PORTREVISION= 1
+PORTVERSION= 1.4.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -17,4 +16,8 @@ XORG_CAT= driver
MAN4= joystick.4x
+post-patch:
+ @${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+ ${WRKSRC}/Makefile.in
+
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-joystick/distinfo b/x11-drivers/xf86-input-joystick/distinfo
index b15366ed7b32..0c801d16cec8 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.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
+MD5 (xorg/driver/xf86-input-joystick-1.4.0.tar.bz2) = 600bca5bd96a0dee90e20b606aa1eb93
+SHA256 (xorg/driver/xf86-input-joystick-1.4.0.tar.bz2) = 789d9a3e1346ad24cc41c4f466de3eda08473772305c5e4bef2afa159e66c4c2
+SIZE (xorg/driver/xf86-input-joystick-1.4.0.tar.bz2) = 305610
diff --git a/x11-drivers/xf86-input-joystick/pkg-plist b/x11-drivers/xf86-input-joystick/pkg-plist
index 358a463f054f..2c94a5896b99 100644
--- a/x11-drivers/xf86-input-joystick/pkg-plist
+++ b/x11-drivers/xf86-input-joystick/pkg-plist
@@ -1,5 +1,8 @@
+include/xorg/joystick-properties.h
lib/xorg/modules/input/joystick_drv.la
lib/xorg/modules/input/joystick_drv.so
+libdata/pkgconfig/xorg-joystick.pc
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
+@dirrmtry include/xorg
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 46aad51de982..5b6e29dd7510 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-keyboard
-PORTVERSION= 1.2.2
-PORTREVISION= 2
+PORTVERSION= 1.3.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo
index 616768134029..87aab6634f0c 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.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
+MD5 (xorg/driver/xf86-input-keyboard-1.3.2.tar.bz2) = d6fe929c4f6085d6dd67f197ae9c42f6
+SHA256 (xorg/driver/xf86-input-keyboard-1.3.2.tar.bz2) = 33939ec65dbf56f49e1e7de854a1cf95446e40c533950431901567e67112aef2
+SIZE (xorg/driver/xf86-input-keyboard-1.3.2.tar.bz2) = 269634
diff --git a/x11-drivers/xf86-input-magellan/Makefile b/x11-drivers/xf86-input-magellan/Makefile
index 6cf2f290ac99..8dcbdc33cbcb 100644
--- a/x11-drivers/xf86-input-magellan/Makefile
+++ b/x11-drivers/xf86-input-magellan/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-magellan
-PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTVERSION= 1.2.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-magellan/distinfo b/x11-drivers/xf86-input-magellan/distinfo
index 736cfcd6f7f1..d2378448b995 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.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
+MD5 (xorg/driver/xf86-input-magellan-1.2.0.tar.bz2) = 9801ba10f15f8be2420dfb3f3b5d5d27
+SHA256 (xorg/driver/xf86-input-magellan-1.2.0.tar.bz2) = c5285147a4df0b5b0fd5dcb7c0e5953bc982d3d6f2a2ed2e7767ead909a510e4
+SIZE (xorg/driver/xf86-input-magellan-1.2.0.tar.bz2) = 241520
diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile
index 41fa07c14e1f..87df92e41e84 100644
--- a/x11-drivers/xf86-input-magictouch/Makefile
+++ b/x11-drivers/xf86-input-magictouch/Makefile
@@ -13,6 +13,8 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org magictouch input driver
+IGNORE= needs xf86_ansic.h which doesn't exist with recent xserver
+
XORG_CAT= driver
MAN4= magictouch.4x
USE_AUTOTOOLS= libtool:15
diff --git a/x11-drivers/xf86-input-microtouch/Makefile b/x11-drivers/xf86-input-microtouch/Makefile
index da27791fd7ae..c4a0aa3dbc85 100644
--- a/x11-drivers/xf86-input-microtouch/Makefile
+++ b/x11-drivers/xf86-input-microtouch/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-microtouch
-PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTVERSION= 1.2.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-microtouch/distinfo b/x11-drivers/xf86-input-microtouch/distinfo
index 149e9286096d..9b68bdae014f 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.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
+MD5 (xorg/driver/xf86-input-microtouch-1.2.0.tar.bz2) = 1ad1aee7d8df84b9ea832d1e75963257
+SHA256 (xorg/driver/xf86-input-microtouch-1.2.0.tar.bz2) = b3034e0a768c4f646ea954d59dd414d00df3238e845848081221af6efe864f3b
+SIZE (xorg/driver/xf86-input-microtouch-1.2.0.tar.bz2) = 244712
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index e271d315f120..b3cd5b4e4463 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-mouse
-PORTVERSION= 1.2.3
-PORTREVISION= 2
+PORTVERSION= 1.4.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo
index f34123fe51b5..9864f5a0bfcf 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.2.3.tar.bz2) = 47da1fa52584933d045528109f094eff
-SHA256 (xorg/driver/xf86-input-mouse-1.2.3.tar.bz2) = a07cb2169f43018c90b7889781c0db30cda0da03811edccb8c4db533166357ab
-SIZE (xorg/driver/xf86-input-mouse-1.2.3.tar.bz2) = 272961
+MD5 (xorg/driver/xf86-input-mouse-1.4.0.tar.bz2) = e7dc0759c14a9bfd373917a49e5f7c7d
+SHA256 (xorg/driver/xf86-input-mouse-1.4.0.tar.bz2) = e6e1dbd64d41c826619a5881c5aeed46095bfdcb87c3e27d65292fc12a5bb7c7
+SIZE (xorg/driver/xf86-input-mouse-1.4.0.tar.bz2) = 292626
diff --git a/x11-drivers/xf86-input-mouse/files/patch-dont-flush-buttons-6a03e8bd b/x11-drivers/xf86-input-mouse/files/patch-dont-flush-buttons-6a03e8bd
deleted file mode 100644
index d1a21ed5f306..000000000000
--- a/x11-drivers/xf86-input-mouse/files/patch-dont-flush-buttons-6a03e8bd
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6a03e8bd9699a33dabcdd2bbcf51a001ddfd5534 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter@cs.unisa.edu.au>
-Date: Fri, 16 Nov 2007 06:15:45 +0000
-Subject: Bug #13144: Don't flush buttons, release events can cause paste events.
-
----
-diff --git src/mouse.c src/mouse.c
-index ff52d2b..bd98a80 100644
---- src/mouse.c
-+++ src/mouse.c
-@@ -1853,26 +1853,17 @@ MouseConvert(InputInfoPtr pInfo, int first, int num, int v0, int v1, int v2,
-
- /**********************************************************************
- *
-- * FlushButtons -- send button up events for sanity.
-+ * FlushButtons -- reset button states.
- *
- **********************************************************************/
-
- static void
- FlushButtons(MouseDevPtr pMse)
- {
--
-- /* If no button down is pending xf86PostButtonEvent()
-- * will discard them. So we are on the safe side. */
--
- int i, blocked;
-
- pMse->lastButtons = 0;
- pMse->lastMappedButtons = 0;
--
-- blocked = xf86BlockSIGIO ();
-- for (i = 1; i <= 5; i++)
-- xf86PostButtonEvent(pMse->device,0,i,0,0,0);
-- xf86UnblockSIGIO (blocked);
- }
-
- /**********************************************************************
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
new file mode 100644
index 000000000000..b3258c653ad4
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
@@ -0,0 +1,200 @@
+--- src/bsd_mouse.c.orig 2008-12-13 18:24:06.000000000 -0500
++++ src/bsd_mouse.c 2008-12-14 22:50:40.000000000 -0500
+@@ -1,4 +1,3 @@
+-
+ /*
+ * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
+ *
+@@ -75,11 +74,15 @@
+ #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,
++#ifndef CONFIG_HAL
+ DEFAULT_PS2_DEV,
++ DEFAULT_USB_DEV,
++#endif
+ NULL
+ };
+ #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
+@@ -100,7 +103,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 |
++#endif
++ MSE_AUTO | MSE_MISC;
+ #else
+ return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
+ #endif
+@@ -179,10 +186,31 @@
+ { MOUSE_PROTO_THINK, "ThinkingMouse" },
+ { MOUSE_PROTO_SYSMOUSE, "SysMouse" }
+ };
+-
++
++#ifdef XPS2_SUPPORT
++static struct {
++ 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" },
++};
++#endif
++
+ static const char *
+ SetupAuto(InputInfoPtr pInfo, int *protoPara)
+ {
++#ifdef XPS2_SUPPORT
++ char *dev;
++#endif
++ const char *proto;
+ int i;
+ mousehw_t hw;
+ mousemode_t mode;
+@@ -190,10 +218,20 @@
+ if (pInfo->fd == -1)
+ return NULL;
+
++#ifdef XPS2_SUPPORT
+ /* set the driver operation level, if applicable */
++ if ((dev = xf86FindOptionValue(pInfo->options, "Device"))) {
++ if (!strncmp(dev, DEFAULT_PS2_DEV, 8))
++ i = 2;
++ else
++ i = 1;
++ ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
++ }
++#else
+ i = 1;
+ ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
+-
++#endif
++
+ /* interrogate the driver and get some intelligence on the device. */
+ hw.iftype = MOUSE_IF_UNKNOWN;
+ hw.model = MOUSE_MODEL_GENERIC;
+@@ -209,9 +247,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;
++ }
++#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;
+ }
+ }
+ }
+@@ -234,41 +281,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;
+-#else
+- mode.level = -1;
+ #endif
++ mode.level = -1;
+ ioctl(pInfo->fd, MOUSE_SETMODE, &mode);
+ }
+ #endif
+
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+-
+-#define MOUSED_PID_FILE "/var/run/moused.pid"
+-
+ /*
+ * Try to check if moused is running. DEFAULT_SYSMOUSE_DEV is useless without
+- * it. There doesn't seem to be a better way of checking.
++ * it. Also, try to check if the device is used by moused. If it is opened
++ * by moused, we do not want to use it directly. There doesn't seem to be
++ * a better way of checking.
+ */
+ static Bool
+-MousedRunning(void)
++MousedRunning(const char *dev)
+ {
++ char cmd[128];
+ FILE *f = NULL;
+- unsigned int pid;
++ 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 (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");
++ if ((f = popen(cmd, "r")) != NULL) {
++ if (fscanf(f, "%u", &i) == 1 && i > 0) {
++ pclose(f);
++ return TRUE;
+ }
+- fclose(f);
++ pclose(f);
+ }
+ return FALSE;
+ }
+@@ -308,15 +355,12 @@
+ devMouse = FALSE;
+ }
+ close(fd);
+- if (MousedRunning())
++ if (MousedRunning(NULL))
+ break;
+- else {
+-#ifdef DEBUG
+- ErrorF("moused isn't running\n");
+-#endif
+- }
+ } else {
+ close(fd);
++ if (MousedRunning(*pdev))
++ continue;
+ break;
+ }
+ }
+@@ -782,7 +826,9 @@
+ p->CheckProtocol = CheckProtocol;
+ #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
+ p->SetupAuto = SetupAuto;
++#ifndef XPS2_SUPPORT
+ p->SetPS2Res = SetSysMouseRes;
++#endif
+ p->SetBMRes = SetSysMouseRes;
+ p->SetMiscRes = SetSysMouseRes;
+ #endif
diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile
index bf3b5608f9e9..ddc8cd1d13d3 100644
--- a/x11-drivers/xf86-input-mutouch/Makefile
+++ b/x11-drivers/xf86-input-mutouch/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-mutouch
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.2.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mutouch/distinfo b/x11-drivers/xf86-input-mutouch/distinfo
index 591d113a6c22..f0c1f7a390b8 100644
--- a/x11-drivers/xf86-input-mutouch/distinfo
+++ b/x11-drivers/xf86-input-mutouch/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-mutouch-1.1.0.tar.bz2) = 98ae915c67cabf0e6d40a425dbdbe10b
-SHA256 (xorg/driver/xf86-input-mutouch-1.1.0.tar.bz2) = cc67e0dd4f4fcc8d798f0bfe42b975132c5739bdd80809580a74182e4d1b62ea
-SIZE (xorg/driver/xf86-input-mutouch-1.1.0.tar.bz2) = 236844
+MD5 (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = f28998cdfae2a4c41589299a4ee1f459
+SHA256 (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = 53bfe976042de69f87e28261ad581cf418c67b5cb69a09cfe1eea169021db35b
+SIZE (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = 246240
diff --git a/x11-drivers/xf86-input-palmax/Makefile b/x11-drivers/xf86-input-palmax/Makefile
index 93bf2ed288b8..6d58bb0999b8 100644
--- a/x11-drivers/xf86-input-palmax/Makefile
+++ b/x11-drivers/xf86-input-palmax/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-palmax
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.2.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-palmax/distinfo b/x11-drivers/xf86-input-palmax/distinfo
index 6becf1468b7f..a1c9a27814a9 100644
--- a/x11-drivers/xf86-input-palmax/distinfo
+++ b/x11-drivers/xf86-input-palmax/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-palmax-1.1.0.tar.bz2) = 0959dbf7972dfb95f56e4bd3f56447cf
-SHA256 (xorg/driver/xf86-input-palmax-1.1.0.tar.bz2) = 5c00c85eed2950a575362bee2f21c2fa68eb8af81e7f1d451273a1302eac4145
-SIZE (xorg/driver/xf86-input-palmax-1.1.0.tar.bz2) = 229673
+MD5 (xorg/driver/xf86-input-palmax-1.2.0.tar.bz2) = 9655d2235569c5a6ac321c6fb89a6f3b
+SHA256 (xorg/driver/xf86-input-palmax-1.2.0.tar.bz2) = 02177c339ba60fb6cc942d3bc93a322e94247f36a6fe90c7c1121694c929b05b
+SIZE (xorg/driver/xf86-input-palmax-1.2.0.tar.bz2) = 239602
diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile
index ebf79348e1ef..4bc49793d353 100644
--- a/x11-drivers/xf86-input-penmount/Makefile
+++ b/x11-drivers/xf86-input-penmount/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-penmount
-PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTVERSION= 1.3.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-penmount/distinfo b/x11-drivers/xf86-input-penmount/distinfo
index af64b1649286..df02c34efa7c 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.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
+MD5 (xorg/driver/xf86-input-penmount-1.3.0.tar.bz2) = 24594c0222e631fedccc7c540c420b03
+SHA256 (xorg/driver/xf86-input-penmount-1.3.0.tar.bz2) = 9cb4e0e83dcefe1ece814d638bd186785b6bc1debe1aa2101ce2a4ea0376805a
+SIZE (xorg/driver/xf86-input-penmount-1.3.0.tar.bz2) = 243048
diff --git a/x11-drivers/xf86-input-summa/Makefile b/x11-drivers/xf86-input-summa/Makefile
index 1be8dc58b240..ade2466a8f8a 100644
--- a/x11-drivers/xf86-input-summa/Makefile
+++ b/x11-drivers/xf86-input-summa/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-summa
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.2.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-summa/distinfo b/x11-drivers/xf86-input-summa/distinfo
index 1c67f94379c3..7f4890c3d07d 100644
--- a/x11-drivers/xf86-input-summa/distinfo
+++ b/x11-drivers/xf86-input-summa/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-summa-1.1.0.tar.bz2) = b37a432fd87bb9f46d011622d6fce6b3
-SHA256 (xorg/driver/xf86-input-summa-1.1.0.tar.bz2) = f10f2cadd4120b40b3658000c87f910e3005f4d787441c7dd83b48ebbf2a11f2
-SIZE (xorg/driver/xf86-input-summa-1.1.0.tar.bz2) = 235031
+MD5 (xorg/driver/xf86-input-summa-1.2.0.tar.bz2) = 7e17468c0d90dcbbb6202a8242efff4b
+SHA256 (xorg/driver/xf86-input-summa-1.2.0.tar.bz2) = 3e8bcd89b4b3f86677f338a4584f41acb2a3cca7fe492cbea32664aa6f4f8cd8
+SIZE (xorg/driver/xf86-input-summa-1.2.0.tar.bz2) = 244435
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
new file mode 100644
index 000000000000..fad50514a67b
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -0,0 +1,29 @@
+# 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= 0.99.3
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org synaptics input driver
+
+CONFLICTS= synaptics-[0-9]*
+
+USE_GNOME= gnomehack
+USE_XORG= x11
+XORG_CAT= driver
+
+MAN1= syndaemon.1 \
+ synclient.1
+MAN4= synaptics.4x
+
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/fdi/11-x11-synaptics.fdi \
+ ${PREFIX}/share/hal/fdi/policy/10osvendor/
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo
new file mode 100644
index 000000000000..b7ce9b8f78d8
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-synaptics-0.99.3.tar.bz2) = 735a798e0f68c65d98e3d6b092b56d29
+SHA256 (xorg/driver/xf86-input-synaptics-0.99.3.tar.bz2) = 1a31962e05ff8480e1d97e0cd33b071fdc9a128cf71c5ad05428e5761be4f4b2
+SIZE (xorg/driver/xf86-input-synaptics-0.99.3.tar.bz2) = 284946
diff --git a/x11-drivers/xf86-input-synaptics/pkg-descr b/x11-drivers/xf86-input-synaptics/pkg-descr
new file mode 100644
index 000000000000..2272145a738f
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-synaptics driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist
new file mode 100644
index 000000000000..b270639d245e
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/pkg-plist
@@ -0,0 +1,12 @@
+bin/synclient
+bin/syndaemon
+include/xorg/synaptics-properties.h
+include/xorg/synaptics.h
+lib/xorg/modules/input/synaptics_drv.la
+lib/xorg/modules/input/synaptics_drv.so
+libdata/pkgconfig/xorg-synaptics.pc
+share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
+@dirrmtry include/xorg
diff --git a/x11-drivers/xf86-input-tek4957/Makefile b/x11-drivers/xf86-input-tek4957/Makefile
index 5bc6b4d9a630..e4b59f2902ca 100644
--- a/x11-drivers/xf86-input-tek4957/Makefile
+++ b/x11-drivers/xf86-input-tek4957/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-tek4957
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.2.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-tek4957/distinfo b/x11-drivers/xf86-input-tek4957/distinfo
index 7defb616273d..adb7e92babc5 100644
--- a/x11-drivers/xf86-input-tek4957/distinfo
+++ b/x11-drivers/xf86-input-tek4957/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-tek4957-1.1.0.tar.bz2) = be8a4bd474ad6c85b93f66dd6fcfa6ee
-SHA256 (xorg/driver/xf86-input-tek4957-1.1.0.tar.bz2) = 09b9506d1bb1deaaf69872392bc56e1d75997bb8157e85a9121749bf5fe15727
-SIZE (xorg/driver/xf86-input-tek4957-1.1.0.tar.bz2) = 229426
+MD5 (xorg/driver/xf86-input-tek4957-1.2.0.tar.bz2) = 8103db1ca5c55726e0b58148e4b1fc06
+SHA256 (xorg/driver/xf86-input-tek4957-1.2.0.tar.bz2) = b097a5b1acbd732d9ca5d28c13003a1f1c8a3465f4fa77c1578d36330f3358a2
+SIZE (xorg/driver/xf86-input-tek4957-1.2.0.tar.bz2) = 239405
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
index 9889986d8eb2..6a02f58a174e 100644
--- a/x11-drivers/xf86-input-vmmouse/Makefile
+++ b/x11-drivers/xf86-input-vmmouse/Makefile
@@ -6,14 +6,16 @@
#
PORTNAME= xf86-input-vmmouse
-PORTVERSION= 12.4.3
-PORTREVISION= 2
+PORTVERSION= 12.6.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org vmmouse input driver
XORG_CAT= driver
+CONFIGURE_ARGS= --with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
+
+MAN1= vmmouse_detect.1
MAN4= vmmouse.4x
ONLY_FOR_ARCHS= i386 amd64
diff --git a/x11-drivers/xf86-input-vmmouse/distinfo b/x11-drivers/xf86-input-vmmouse/distinfo
index 64f21f5552ff..f7fa6a5e46aa 100644
--- a/x11-drivers/xf86-input-vmmouse/distinfo
+++ b/x11-drivers/xf86-input-vmmouse/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-vmmouse-12.4.3.tar.bz2) = 44730af795616ed4d4a0cd9a3a07935d
-SHA256 (xorg/driver/xf86-input-vmmouse-12.4.3.tar.bz2) = d668c4cacd4be6d56608fbdf7779d60120f38f3315e6385a7cc87339124e77ab
-SIZE (xorg/driver/xf86-input-vmmouse-12.4.3.tar.bz2) = 248239
+MD5 (xorg/driver/xf86-input-vmmouse-12.6.3.tar.bz2) = f5933143d7789557983ecb527092d14e
+SHA256 (xorg/driver/xf86-input-vmmouse-12.6.3.tar.bz2) = c39fe6f2a17c8c609421ed17447221209dd416ca142d6f3d0b1052808ef7d604
+SIZE (xorg/driver/xf86-input-vmmouse-12.6.3.tar.bz2) = 252631
diff --git a/x11-drivers/xf86-input-vmmouse/files/patch-src_vmmouse.c b/x11-drivers/xf86-input-vmmouse/files/patch-src_vmmouse.c
deleted file mode 100644
index 94d61e4e9c0d..000000000000
--- a/x11-drivers/xf86-input-vmmouse/files/patch-src_vmmouse.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/vmmouse.c.orig Wed Sep 26 08:11:47 2007
-+++ src/vmmouse.c Sun Jan 20 17:10:54 2008
-@@ -964,8 +964,11 @@
- VMMOUSE_INPUT_DATA vmmouseInput;
- int ps2Buttons = 0;
- int numPackets;
-+ VMMousePrivPtr mPriv;
-+ double factorX, factorY;
-
- pMse = pInfo->private;
-+ mPriv = pMse->mousePriv;
- while((numPackets = VMMouseClient_GetInput(&vmmouseInput))){
- if (numPackets == VMMOUSE_ERROR) {
- VMMouseClient_Disable();
-@@ -990,6 +993,13 @@
- dy = vmmouseInput.Y;
- dz = (char)vmmouseInput.Z;
- dw = 0;
-+
-+ /* X server 1.4.0 does not call VMMouseConvertProc() so we scale coordinates here */
-+ factorX = ((double) screenInfo.screens[mPriv->screenNum]->width) / (double) 65535;
-+ factorY = ((double) screenInfo.screens[mPriv->screenNum]->height) / (double) 65535;
-+ dx = dx * factorX + 0.5;
-+ dy = dy * factorY + 0.5;
-+
- /* post an event */
- pMse->PostEvent(pInfo, buttons, dx, dy, dz, dw);
- }
diff --git a/x11-drivers/xf86-input-vmmouse/pkg-plist b/x11-drivers/xf86-input-vmmouse/pkg-plist
index 2a9d937472a8..d5ba6a3115a6 100644
--- a/x11-drivers/xf86-input-vmmouse/pkg-plist
+++ b/x11-drivers/xf86-input-vmmouse/pkg-plist
@@ -1,5 +1,8 @@
+bin/vmmouse_detect
+libexec/hal/scripts/hal-probe-vmmouse
lib/xorg/modules/input/vmmouse_drv.la
lib/xorg/modules/input/vmmouse_drv.so
+share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile
index c9701dd2e2e4..01f95f216ca5 100644
--- a/x11-drivers/xf86-video-apm/Makefile
+++ b/x11-drivers/xf86-video-apm/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-apm
-PORTVERSION= 1.1.1
-PORTREVISION= 2
+PORTVERSION= 1.2.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-apm/distinfo b/x11-drivers/xf86-video-apm/distinfo
index 6255b59dc11d..9515277f34f0 100644
--- a/x11-drivers/xf86-video-apm/distinfo
+++ b/x11-drivers/xf86-video-apm/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-apm-1.1.1.tar.bz2) = ac7e05f0dfc7e02cac0bf17b9eb89b11
-SHA256 (xorg/driver/xf86-video-apm-1.1.1.tar.bz2) = 09d7e6cf30b94f141f8ebe2560b301a058f645e74108edc28c908e750865dcec
-SIZE (xorg/driver/xf86-video-apm-1.1.1.tar.bz2) = 268210
+MD5 (xorg/driver/xf86-video-apm-1.2.1.tar.bz2) = 673c93df004bb857dc89ae9c78ccf907
+SHA256 (xorg/driver/xf86-video-apm-1.2.1.tar.bz2) = f88e2550f970135b535febc180407b92f6cd0b3b0997fb6f0ce282e3a675c4fe
+SIZE (xorg/driver/xf86-video-apm-1.2.1.tar.bz2) = 282068
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
index e4a21423353c..fc40144a68c6 100644
--- a/x11-drivers/xf86-video-ark/Makefile
+++ b/x11-drivers/xf86-video-ark/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-ark
-PORTVERSION= 0.6.0
-PORTREVISION= 2
+PORTVERSION= 0.7.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ark/distinfo b/x11-drivers/xf86-video-ark/distinfo
index 2e32a0bbc272..e7f2a3b8b6ea 100644
--- a/x11-drivers/xf86-video-ark/distinfo
+++ b/x11-drivers/xf86-video-ark/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-ark-0.6.0.tar.bz2) = 6921479baca8f7b156029489fd335854
-SHA256 (xorg/driver/xf86-video-ark-0.6.0.tar.bz2) = e5abc4f4ae643ce56d5773f052515196f05786235e4afd155a3232e20dbc84d7
-SIZE (xorg/driver/xf86-video-ark-0.6.0.tar.bz2) = 231223
+MD5 (xorg/driver/xf86-video-ark-0.7.1.tar.bz2) = be91391f061863617018403cdbd2944f
+SHA256 (xorg/driver/xf86-video-ark-0.7.1.tar.bz2) = 14c34fb3fc894aad7ca24141cbc2283d955849eec920d058ba1aca2a1f5e3b86
+SIZE (xorg/driver/xf86-video-ark-0.7.1.tar.bz2) = 237009
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index 049af109c5fb..bcd873fe5458 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-ati
-PORTVERSION= 6.9.0
+PORTVERSION= 6.10.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo
index 2dba90ba75e3..a7665b42ae36 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.9.0.tar.bz2) = afa4873f58ae6fa31fedeb9ed31531db
-SHA256 (xorg/driver/xf86-video-ati-6.9.0.tar.bz2) = 682cd1916c386c192dd83d22d07529a247e72a1052c4a008c5466a155413d7c2
-SIZE (xorg/driver/xf86-video-ati-6.9.0.tar.bz2) = 777455
+MD5 (xorg/driver/xf86-video-ati-6.10.0.tar.bz2) = 6445815b12ffa4ccd1aafd43640f466d
+SHA256 (xorg/driver/xf86-video-ati-6.10.0.tar.bz2) = dd92bfff4e10d79f98844a9c2962ee9bb8d0cfd863e1e764941749aabe6d4ebd
+SIZE (xorg/driver/xf86-video-ati-6.10.0.tar.bz2) = 823540
diff --git a/x11-drivers/xf86-video-ati613/Makefile b/x11-drivers/xf86-video-ati613/Makefile
index 049af109c5fb..bcd873fe5458 100644
--- a/x11-drivers/xf86-video-ati613/Makefile
+++ b/x11-drivers/xf86-video-ati613/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-ati
-PORTVERSION= 6.9.0
+PORTVERSION= 6.10.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati613/distinfo b/x11-drivers/xf86-video-ati613/distinfo
index 2dba90ba75e3..a7665b42ae36 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.9.0.tar.bz2) = afa4873f58ae6fa31fedeb9ed31531db
-SHA256 (xorg/driver/xf86-video-ati-6.9.0.tar.bz2) = 682cd1916c386c192dd83d22d07529a247e72a1052c4a008c5466a155413d7c2
-SIZE (xorg/driver/xf86-video-ati-6.9.0.tar.bz2) = 777455
+MD5 (xorg/driver/xf86-video-ati-6.10.0.tar.bz2) = 6445815b12ffa4ccd1aafd43640f466d
+SHA256 (xorg/driver/xf86-video-ati-6.10.0.tar.bz2) = dd92bfff4e10d79f98844a9c2962ee9bb8d0cfd863e1e764941749aabe6d4ebd
+SIZE (xorg/driver/xf86-video-ati-6.10.0.tar.bz2) = 823540
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
index b6b27784630a..853acc905dd3 100644
--- a/x11-drivers/xf86-video-chips/Makefile
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-chips
-PORTVERSION= 1.1.1
-PORTREVISION= 2
+PORTVERSION= 1.2.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo
index cd1bd89ac0fd..b2d97d5f4784 100644
--- a/x11-drivers/xf86-video-chips/distinfo
+++ b/x11-drivers/xf86-video-chips/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-chips-1.1.1.tar.bz2) = 3182d43439ca4cbf08ff9aa76990bba3
-SHA256 (xorg/driver/xf86-video-chips-1.1.1.tar.bz2) = 16a81cdb6b311176936c3326d279c0d75530adbcf9a3489eea55992ac5bc7494
-SIZE (xorg/driver/xf86-video-chips-1.1.1.tar.bz2) = 324093
+MD5 (xorg/driver/xf86-video-chips-1.2.1.tar.bz2) = 2f2643fca6335f18024bffa6c4e0c12f
+SHA256 (xorg/driver/xf86-video-chips-1.2.1.tar.bz2) = ed3531c5b283b9b0df7e8fc4aa1b42df89c65a5b48889f786c1a9066190833f3
+SIZE (xorg/driver/xf86-video-chips-1.2.1.tar.bz2) = 340894
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
index cab61a7322fe..053095df6234 100644
--- a/x11-drivers/xf86-video-cirrus/Makefile
+++ b/x11-drivers/xf86-video-cirrus/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-cirrus
-PORTVERSION= 1.1.0
-PORTREVISION= 2
+PORTVERSION= 1.2.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cirrus/distinfo b/x11-drivers/xf86-video-cirrus/distinfo
index f6d5c31b4749..f831f1d7e3cb 100644
--- a/x11-drivers/xf86-video-cirrus/distinfo
+++ b/x11-drivers/xf86-video-cirrus/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-cirrus-1.1.0.tar.bz2) = 66344e315def275605dafb314ce59851
-SHA256 (xorg/driver/xf86-video-cirrus-1.1.0.tar.bz2) = 5988962199d5013274f6a6952939e4f405df658bb6616ebf9954c993b1179b1b
-SIZE (xorg/driver/xf86-video-cirrus-1.1.0.tar.bz2) = 264167
+MD5 (xorg/driver/xf86-video-cirrus-1.2.1.tar.bz2) = bc28fdedaee9059180e2534f9dbcd2f6
+SHA256 (xorg/driver/xf86-video-cirrus-1.2.1.tar.bz2) = e7c99ed66326df5fadf6e5d875859a430fec4369415a27cde72a91109f78bb9c
+SIZE (xorg/driver/xf86-video-cirrus-1.2.1.tar.bz2) = 274458
diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile
index 136ceeeaf50e..cf1796bb2a25 100644
--- a/x11-drivers/xf86-video-cyrix/Makefile
+++ b/x11-drivers/xf86-video-cyrix/Makefile
@@ -13,6 +13,8 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org cyrix display driver
+IGNORE= requires pciVideoPtr typedef
+
XORG_CAT= driver
USE_XORG= xextproto xf86dgaproto
MAN4= cyrix.4x
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
index 62d6bd64f6f2..6a6fc581d2b3 100644
--- a/x11-drivers/xf86-video-dummy/Makefile
+++ b/x11-drivers/xf86-video-dummy/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-dummy
-PORTVERSION= 0.2.0
-PORTREVISION= 2
+PORTVERSION= 0.3.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-dummy/distinfo b/x11-drivers/xf86-video-dummy/distinfo
index 180edab7c5b5..333cd7427b53 100644
--- a/x11-drivers/xf86-video-dummy/distinfo
+++ b/x11-drivers/xf86-video-dummy/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-dummy-0.2.0.tar.bz2) = 22b7cc20a33443cbd218bd2521850cfe
-SHA256 (xorg/driver/xf86-video-dummy-0.2.0.tar.bz2) = 46013885696f3c1a5e05c5d503abc69e691443319a97cf2c6a01ec031e06c910
-SIZE (xorg/driver/xf86-video-dummy-0.2.0.tar.bz2) = 229159
+MD5 (xorg/driver/xf86-video-dummy-0.3.0.tar.bz2) = 3d96297556846bee02a74166ffb5d052
+SHA256 (xorg/driver/xf86-video-dummy-0.3.0.tar.bz2) = 5a4bbde0b7f0334bb63b159e5ef6e164be3699e3424734c2bd9823f20a30a278
+SIZE (xorg/driver/xf86-video-dummy-0.3.0.tar.bz2) = 239002
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
index 66ad94f328a4..b861a3c339b4 100644
--- a/x11-drivers/xf86-video-fbdev/Makefile
+++ b/x11-drivers/xf86-video-fbdev/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-fbdev
-PORTVERSION= 0.3.1
-PORTREVISION= 2
+PORTVERSION= 0.4.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-fbdev/distinfo b/x11-drivers/xf86-video-fbdev/distinfo
index 26ed50186775..c9115eba6f52 100644
--- a/x11-drivers/xf86-video-fbdev/distinfo
+++ b/x11-drivers/xf86-video-fbdev/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-fbdev-0.3.1.tar.bz2) = 9ae810c6c6c3c9713a67866fe794d4ff
-SHA256 (xorg/driver/xf86-video-fbdev-0.3.1.tar.bz2) = 309d1f618c77559ea494c05d45b09577790c44900685e17bc812e4e1b19df6e7
-SIZE (xorg/driver/xf86-video-fbdev-0.3.1.tar.bz2) = 217635
+MD5 (xorg/driver/xf86-video-fbdev-0.4.0.tar.bz2) = 6572b39fec77b8e6de1c858a93992924
+SHA256 (xorg/driver/xf86-video-fbdev-0.4.0.tar.bz2) = bba725daeb2a313b83f2b92855a9ae8aa72c4cc8581f9f62f101ebdf00ac359d
+SIZE (xorg/driver/xf86-video-fbdev-0.4.0.tar.bz2) = 242435
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
index 0f915a8fcf8a..029389bda32f 100644
--- a/x11-drivers/xf86-video-glint/Makefile
+++ b/x11-drivers/xf86-video-glint/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-glint
-PORTVERSION= 1.1.1
-PORTREVISION= 4
+PORTVERSION= 1.2.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-glint/distinfo b/x11-drivers/xf86-video-glint/distinfo
index 8cb471c608ec..0a29c808517c 100644
--- a/x11-drivers/xf86-video-glint/distinfo
+++ b/x11-drivers/xf86-video-glint/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-glint-1.1.1.tar.bz2) = 2cf49f701024a145bd25aff9da11d479
-SHA256 (xorg/driver/xf86-video-glint-1.1.1.tar.bz2) = d63e0dd3f5cecebaf1915193a68ac83e90c1e973e3276a71bd14651d67115e6d
-SIZE (xorg/driver/xf86-video-glint-1.1.1.tar.bz2) = 347413
+MD5 (xorg/driver/xf86-video-glint-1.2.2.tar.bz2) = 4295a46a75fa98470c6dfb0e1a4f7e9f
+SHA256 (xorg/driver/xf86-video-glint-1.2.2.tar.bz2) = 41df8be5719a96abd7de5343925023296491fad10a3a9e691acf50f976970bad
+SIZE (xorg/driver/xf86-video-glint-1.2.2.tar.bz2) = 348742
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
index adc77b56888f..fef57b4064a4 100644
--- a/x11-drivers/xf86-video-i128/Makefile
+++ b/x11-drivers/xf86-video-i128/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-i128
-PORTVERSION= 1.2.1
-PORTREVISION= 2
+PORTVERSION= 1.3.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i128/distinfo b/x11-drivers/xf86-video-i128/distinfo
index a575c50907c9..b04208191181 100644
--- a/x11-drivers/xf86-video-i128/distinfo
+++ b/x11-drivers/xf86-video-i128/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-i128-1.2.1.tar.bz2) = d0080732eaa15059b0a953aa3522185a
-SHA256 (xorg/driver/xf86-video-i128-1.2.1.tar.bz2) = 0d023cacf8134241cd8efcd5744eb156399406c92f59d3895392f2b5fd055eb1
-SIZE (xorg/driver/xf86-video-i128-1.2.1.tar.bz2) = 264809
+MD5 (xorg/driver/xf86-video-i128-1.3.1.tar.bz2) = 3b170a6df5114420cd4021a057918a09
+SHA256 (xorg/driver/xf86-video-i128-1.3.1.tar.bz2) = 49bb23625654ebcd74d0d23f534b074188f4b21c3cd443b06ac83b9485bf9a75
+SIZE (xorg/driver/xf86-video-i128-1.3.1.tar.bz2) = 265350
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
index 9d40a9016dfe..cd723b2a861e 100644
--- a/x11-drivers/xf86-video-i740/Makefile
+++ b/x11-drivers/xf86-video-i740/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-i740
-PORTVERSION= 1.1.0
-PORTREVISION= 2
+PORTVERSION= 1.2.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i740/distinfo b/x11-drivers/xf86-video-i740/distinfo
index 91af48cfdf8d..a75899d29888 100644
--- a/x11-drivers/xf86-video-i740/distinfo
+++ b/x11-drivers/xf86-video-i740/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-i740-1.1.0.tar.bz2) = 57302e225060a7286ae1a970c87a589b
-SHA256 (xorg/driver/xf86-video-i740-1.1.0.tar.bz2) = b8f2144c987d8a14f8b477ee3aa43fc1c76d040a77e40938c3c97c8e34e2b7c5
-SIZE (xorg/driver/xf86-video-i740-1.1.0.tar.bz2) = 258461
+MD5 (xorg/driver/xf86-video-i740-1.2.0.tar.bz2) = d0e5a805c546b29b1dd3b55a68d16dc4
+SHA256 (xorg/driver/xf86-video-i740-1.2.0.tar.bz2) = 59c8f6ee465bef033c1c20bfff8121a318efda9656d5dc29f674bb655f18486f
+SIZE (xorg/driver/xf86-video-i740-1.2.0.tar.bz2) = 268468
diff --git a/x11-drivers/xf86-video-imstt/Makefile b/x11-drivers/xf86-video-imstt/Makefile
index 3ce73562cfa5..ff71d0732f94 100644
--- a/x11-drivers/xf86-video-imstt/Makefile
+++ b/x11-drivers/xf86-video-imstt/Makefile
@@ -13,6 +13,8 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org imstt display driver
+IGNORE= requires pciVideoPtr typedef
+
XORG_CAT= driver
MAN4= imstt.4x
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index bcf84df20e2d..5e2b5f5c59e0 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.4.3
+PORTVERSION= 2.5.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 c9fd35b33b9c..9011801415b4 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.4.3.tar.bz2) = a664819288b98a37f77ab6ae1e14c9d9
-SHA256 (xorg/driver/xf86-video-intel-2.4.3.tar.bz2) = 1752a0f6f5fd28f5c8581f6411f37df7fde5fd4a0bbedc4bf423f9824423afcd
-SIZE (xorg/driver/xf86-video-intel-2.4.3.tar.bz2) = 661105
+MD5 (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = 62e96948860b7a8507963300f56d0d16
+SHA256 (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = c203b728f1203d6d52b2963cdc6bfd87fb83eb12ab786c8122ea26c7984ac313
+SIZE (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = 716182
diff --git a/x11-drivers/xf86-video-intel29/Makefile b/x11-drivers/xf86-video-intel29/Makefile
index bcf84df20e2d..5e2b5f5c59e0 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.4.3
+PORTVERSION= 2.5.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 c9fd35b33b9c..9011801415b4 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.4.3.tar.bz2) = a664819288b98a37f77ab6ae1e14c9d9
-SHA256 (xorg/driver/xf86-video-intel-2.4.3.tar.bz2) = 1752a0f6f5fd28f5c8581f6411f37df7fde5fd4a0bbedc4bf423f9824423afcd
-SIZE (xorg/driver/xf86-video-intel-2.4.3.tar.bz2) = 661105
+MD5 (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = 62e96948860b7a8507963300f56d0d16
+SHA256 (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = c203b728f1203d6d52b2963cdc6bfd87fb83eb12ab786c8122ea26c7984ac313
+SIZE (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = 716182
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index 3f52135f5e51..409d5a5c27a0 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.9
-#PORTREVISION= 1
+PORTVERSION= 1.9.100
PORTEPOCH= 1
CATEGORIES= x11-drivers
diff --git a/x11-drivers/xf86-video-mga/distinfo b/x11-drivers/xf86-video-mga/distinfo
index 2b6ca8de43c3..7dd87686dccd 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.9.tar.bz2) = 11066b84b949cd04300ec819c9c51532
-SHA256 (xorg/driver/xf86-video-mga-1.4.9.tar.bz2) = d57dd2323052f064092167a232fb7576f46e5d62e98bc9cc6a7f270cc8d0fdc0
-SIZE (xorg/driver/xf86-video-mga-1.4.9.tar.bz2) = 419781
+MD5 (xorg/driver/xf86-video-mga-1.9.100.tar.bz2) = 3e80cfb84b62866d2f94774ecbf3e46c
+SHA256 (xorg/driver/xf86-video-mga-1.9.100.tar.bz2) = e8efee8d5269eb29f9bd499db3d47a6a4d3c320d4b0a24874cdf7b598ad77a5c
+SIZE (xorg/driver/xf86-video-mga-1.9.100.tar.bz2) = 369119
diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
index aaafa129b37d..d5128cf5afac 100644
--- a/x11-drivers/xf86-video-neomagic/Makefile
+++ b/x11-drivers/xf86-video-neomagic/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-neomagic
-PORTVERSION= 1.1.1
-PORTREVISION= 2
+PORTVERSION= 1.2.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-neomagic/distinfo b/x11-drivers/xf86-video-neomagic/distinfo
index 8111104ec84d..7bf3dd043bc6 100644
--- a/x11-drivers/xf86-video-neomagic/distinfo
+++ b/x11-drivers/xf86-video-neomagic/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-neomagic-1.1.1.tar.bz2) = 7a3d3d6e60b9686d955c45d9ebbd5c1b
-SHA256 (xorg/driver/xf86-video-neomagic-1.1.1.tar.bz2) = d6497080967b8285b663fedd7cafd4457578282ebd7da0b216b6fa214dd88a86
-SIZE (xorg/driver/xf86-video-neomagic-1.1.1.tar.bz2) = 263711
+MD5 (xorg/driver/xf86-video-neomagic-1.2.2.tar.bz2) = 896864e1a2d7333c16333a24eac17d00
+SHA256 (xorg/driver/xf86-video-neomagic-1.2.2.tar.bz2) = 1c0dfeb749ad2faacb74cc75e865878e4dde2c6c3dace04be4f65286e6ae966a
+SIZE (xorg/driver/xf86-video-neomagic-1.2.2.tar.bz2) = 278452
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
index 4b5c762cb9b3..57c0addfdf6e 100644
--- a/x11-drivers/xf86-video-rendition/Makefile
+++ b/x11-drivers/xf86-video-rendition/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-rendition
-PORTVERSION= 4.1.3
-PORTREVISION= 2
+PORTVERSION= 4.2.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-rendition/distinfo b/x11-drivers/xf86-video-rendition/distinfo
index 5e6d96c83221..900f5d1de58e 100644
--- a/x11-drivers/xf86-video-rendition/distinfo
+++ b/x11-drivers/xf86-video-rendition/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-rendition-4.1.3.tar.bz2) = a8b97feccb32184820d5856fe78d34db
-SHA256 (xorg/driver/xf86-video-rendition-4.1.3.tar.bz2) = 37e7aef72f7466485f5a3bafd0d43190cb7439de16868bfba2c59bb4c9df4408
-SIZE (xorg/driver/xf86-video-rendition-4.1.3.tar.bz2) = 292618
+MD5 (xorg/driver/xf86-video-rendition-4.2.0.tar.bz2) = 7c03de3804d4c4f6ff59f74050d24b2b
+SHA256 (xorg/driver/xf86-video-rendition-4.2.0.tar.bz2) = b57b62f707d87534a799170e31b33311449cfd7019a56e6b4fa85a4c7faaae15
+SIZE (xorg/driver/xf86-video-rendition-4.2.0.tar.bz2) = 299330
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
index 249cddb85ef0..7170e400803a 100644
--- a/x11-drivers/xf86-video-s3/Makefile
+++ b/x11-drivers/xf86-video-s3/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-s3
-PORTVERSION= 0.5.0
-PORTREVISION= 2
+PORTVERSION= 0.6.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3/distinfo b/x11-drivers/xf86-video-s3/distinfo
index bb59a8349108..edf7adc3f184 100644
--- a/x11-drivers/xf86-video-s3/distinfo
+++ b/x11-drivers/xf86-video-s3/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-s3-0.5.0.tar.bz2) = d95ab6445cab477f39adfbbc81006f67
-SHA256 (xorg/driver/xf86-video-s3-0.5.0.tar.bz2) = 4a1206cb1a200aad8881216547d9913d0e24928138f3b1bb912a3336b9c05c97
-SIZE (xorg/driver/xf86-video-s3-0.5.0.tar.bz2) = 240067
+MD5 (xorg/driver/xf86-video-s3-0.6.1.tar.bz2) = a5f1f2f93a50e56bd3aeed009c407337
+SHA256 (xorg/driver/xf86-video-s3-0.6.1.tar.bz2) = 66646138dcc7ebdf84abc3566802fcd3bf86709a1e34abd78741565e4a786596
+SIZE (xorg/driver/xf86-video-s3-0.6.1.tar.bz2) = 264633
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
index a55c42e88217..d8ccf9783e32 100644
--- a/x11-drivers/xf86-video-s3virge/Makefile
+++ b/x11-drivers/xf86-video-s3virge/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-s3virge
-PORTVERSION= 1.9.1
-PORTREVISION= 2
+PORTVERSION= 1.10.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3virge/distinfo b/x11-drivers/xf86-video-s3virge/distinfo
index 28c1a680972f..93aac418c6ad 100644
--- a/x11-drivers/xf86-video-s3virge/distinfo
+++ b/x11-drivers/xf86-video-s3virge/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-s3virge-1.9.1.tar.bz2) = a91c73285ef67ee7cd9e2da28acb6cc4
-SHA256 (xorg/driver/xf86-video-s3virge-1.9.1.tar.bz2) = cef5702963f49e737fb8b1472dc0241f7a5da49f844ac77f2df3e693a84bc822
-SIZE (xorg/driver/xf86-video-s3virge-1.9.1.tar.bz2) = 279913
+MD5 (xorg/driver/xf86-video-s3virge-1.10.2.tar.bz2) = 69784e4964d75487d81be4eae3d467dd
+SHA256 (xorg/driver/xf86-video-s3virge-1.10.2.tar.bz2) = f96bc804b123f8371f22b0ca99d77b2d209e6f46d0426d7a4f98fe57b778cb52
+SIZE (xorg/driver/xf86-video-s3virge-1.10.2.tar.bz2) = 297071
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index 8b4a8f04676e..13a776bccd66 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.3
-PORTREVISION= 1
+PORTVERSION= 2.2.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo
index 39e16869811c..e33089f37e45 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.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
+MD5 (xorg/driver/xf86-video-savage-2.2.1.tar.bz2) = 62b8aba48b54eaefeae87df502bf219c
+SHA256 (xorg/driver/xf86-video-savage-2.2.1.tar.bz2) = adf95cae0fbaf72326c51c4c9e61486eef062bb1706f6ab46d942f2c36d8a37e
+SIZE (xorg/driver/xf86-video-savage-2.2.1.tar.bz2) = 305286
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
index 468a2b0983d4..4f69f49551ca 100644
--- a/x11-drivers/xf86-video-siliconmotion/Makefile
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-siliconmotion
-PORTVERSION= 1.5.1
-PORTREVISION= 1
+PORTVERSION= 1.7.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo
index a8822e45239b..e09890b78ab4 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.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
+MD5 (xorg/driver/xf86-video-siliconmotion-1.7.0.tar.bz2) = f9acffba89d8be200f91bab3d1df80da
+SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.0.tar.bz2) = c1ee0111e2b903f1060cd07d0c971c09511d71241e0a355bf0a3bc5506942a99
+SIZE (xorg/driver/xf86-video-siliconmotion-1.7.0.tar.bz2) = 328748
diff --git a/x11-drivers/xf86-video-sis-intel/Makefile b/x11-drivers/xf86-video-sis-intel/Makefile
index fb9fdb082b3c..a0a6c8389aa8 100644
--- a/x11-drivers/xf86-video-sis-intel/Makefile
+++ b/x11-drivers/xf86-video-sis-intel/Makefile
@@ -15,6 +15,8 @@ DISTNAME= sis_drv_src_300407
MAINTAINER= littlesavage@orionet.ru
COMMENT= X.Org sis display driver provided by Intel
+IGNORE= requires pciVideoPtr typedef
+
CONFLICTS= xf86-video-sis-[0-9]*
WRKSRC= ${WRKDIR}/2d-driver
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index 230d0815dd1a..73f43c750844 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-sis
-PORTVERSION= 0.10.0
-#PORTREVISION= 1
+PORTVERSION= 0.10.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sis/distinfo b/x11-drivers/xf86-video-sis/distinfo
index 3fae8012c91c..dfb418922f61 100644
--- a/x11-drivers/xf86-video-sis/distinfo
+++ b/x11-drivers/xf86-video-sis/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-sis-0.10.0.tar.bz2) = 331d432dccccca91ec7da39ff6bf1218
-SHA256 (xorg/driver/xf86-video-sis-0.10.0.tar.bz2) = bcc0dcde5d469cc2500676e0ad29dcd12b1370066289902387ead762260e4b40
-SIZE (xorg/driver/xf86-video-sis-0.10.0.tar.bz2) = 630049
+MD5 (xorg/driver/xf86-video-sis-0.10.1.tar.bz2) = 9f57c2f5ccbd8340db32da1c74083771
+SHA256 (xorg/driver/xf86-video-sis-0.10.1.tar.bz2) = 11529f094cbdcdaba505596488eda623e0f0bd3c51139359d587ea58b6527307
+SIZE (xorg/driver/xf86-video-sis-0.10.1.tar.bz2) = 637423
diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile
index 777e45c9fcd5..9c91c51d7ae1 100644
--- a/x11-drivers/xf86-video-sunffb/Makefile
+++ b/x11-drivers/xf86-video-sunffb/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-sunffb
-PORTVERSION= 1.1.0
-PORTREVISION= 5
+PORTVERSION= 1.2.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sunffb/distinfo b/x11-drivers/xf86-video-sunffb/distinfo
index b5c0eaa23b0e..072277c3434d 100644
--- a/x11-drivers/xf86-video-sunffb/distinfo
+++ b/x11-drivers/xf86-video-sunffb/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-sunffb-1.1.0.tar.bz2) = dee23564c0d8069f52c7cd29c78be667
-SHA256 (xorg/driver/xf86-video-sunffb-1.1.0.tar.bz2) = f897a427e83cf6965fd82724e3298aea44eb3131ba62f904cb514dfd0a879029
-SIZE (xorg/driver/xf86-video-sunffb-1.1.0.tar.bz2) = 268148
+MD5 (xorg/driver/xf86-video-sunffb-1.2.0.tar.bz2) = 816842de26bce8a935f3c9c3cfedbc42
+SHA256 (xorg/driver/xf86-video-sunffb-1.2.0.tar.bz2) = 59f2f8fc2399a4d6b0ce733481c58694e723a989f4712c00436d35e27c059292
+SIZE (xorg/driver/xf86-video-sunffb-1.2.0.tar.bz2) = 277524
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
index ce0f637b5780..7ee3467f62f3 100644
--- a/x11-drivers/xf86-video-tdfx/Makefile
+++ b/x11-drivers/xf86-video-tdfx/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-tdfx
-PORTVERSION= 1.3.0
-PORTREVISION= 3
+PORTVERSION= 1.4.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tdfx/distinfo b/x11-drivers/xf86-video-tdfx/distinfo
index 1fb963e32cf3..ab907ff4c5ed 100644
--- a/x11-drivers/xf86-video-tdfx/distinfo
+++ b/x11-drivers/xf86-video-tdfx/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-tdfx-1.3.0.tar.bz2) = 04c49acb5c5dbde14eabd32d06df6e73
-SHA256 (xorg/driver/xf86-video-tdfx-1.3.0.tar.bz2) = 6b1a00df5c9628817d08f07c6f18f578950744f3eb63b4397be8b0754e728624
-SIZE (xorg/driver/xf86-video-tdfx-1.3.0.tar.bz2) = 261448
+MD5 (xorg/driver/xf86-video-tdfx-1.4.1.tar.bz2) = 59acf2a4f721f9b7abbd121748467b16
+SHA256 (xorg/driver/xf86-video-tdfx-1.4.1.tar.bz2) = d741c68a9a90b8bec4dd94e43844346237e9c5cffec98fee8719ec92933b9498
+SIZE (xorg/driver/xf86-video-tdfx-1.4.1.tar.bz2) = 286452
diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile
index 1d78f11ac159..836f1a5711b8 100644
--- a/x11-drivers/xf86-video-tga/Makefile
+++ b/x11-drivers/xf86-video-tga/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-tga
-PORTVERSION= 1.1.0
-PORTREVISION= 2
+PORTVERSION= 1.2.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tga/distinfo b/x11-drivers/xf86-video-tga/distinfo
index df6f9124213f..2375ee35d233 100644
--- a/x11-drivers/xf86-video-tga/distinfo
+++ b/x11-drivers/xf86-video-tga/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-tga-1.1.0.tar.bz2) = 9eda4d4490706b2dd8f4ecdbaf779856
-SHA256 (xorg/driver/xf86-video-tga-1.1.0.tar.bz2) = 50143dfdd259fd114dc2f41518a4898d5407bf55422251df75812b96a1fa6e9b
-SIZE (xorg/driver/xf86-video-tga-1.1.0.tar.bz2) = 260342
+MD5 (xorg/driver/xf86-video-tga-1.2.0.tar.bz2) = f3bddf0a64932ca9bd72041ccd3b5501
+SHA256 (xorg/driver/xf86-video-tga-1.2.0.tar.bz2) = a92f8cad0e21318be465719a9f30a50d5719b0b70bf8e15f3937e7850cf1aea6
+SIZE (xorg/driver/xf86-video-tga-1.2.0.tar.bz2) = 269406
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
index 69441bc67042..df1f14669afc 100644
--- a/x11-drivers/xf86-video-trident/Makefile
+++ b/x11-drivers/xf86-video-trident/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-trident
-PORTVERSION= 1.2.3
-PORTREVISION= 2
+PORTVERSION= 1.3.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-trident/distinfo b/x11-drivers/xf86-video-trident/distinfo
index 9a37d95edf96..8ea730bbbda8 100644
--- a/x11-drivers/xf86-video-trident/distinfo
+++ b/x11-drivers/xf86-video-trident/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-trident-1.2.3.tar.bz2) = c0e8b2f54942b6902b7dd4f30defe800
-SHA256 (xorg/driver/xf86-video-trident-1.2.3.tar.bz2) = d23eb8fa165d238ddf64da63dcd60c70a01cd761608a18402cfb95aed6722495
-SIZE (xorg/driver/xf86-video-trident-1.2.3.tar.bz2) = 288372
+MD5 (xorg/driver/xf86-video-trident-1.3.1.tar.bz2) = 9f280bef235426394013cb5e1854b823
+SHA256 (xorg/driver/xf86-video-trident-1.3.1.tar.bz2) = c74b2af84c4b4f11ea2068ec056574a1ba0402459bada3518c4800307ab7c8bf
+SIZE (xorg/driver/xf86-video-trident-1.3.1.tar.bz2) = 293180
diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile
index b26865e033f1..7ce9b00f4b93 100644
--- a/x11-drivers/xf86-video-tseng/Makefile
+++ b/x11-drivers/xf86-video-tseng/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-tseng
-PORTVERSION= 1.1.1
-PORTREVISION= 2
+PORTVERSION= 1.2.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tseng/distinfo b/x11-drivers/xf86-video-tseng/distinfo
index 9d86bd5720c5..888a56163072 100644
--- a/x11-drivers/xf86-video-tseng/distinfo
+++ b/x11-drivers/xf86-video-tseng/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-tseng-1.1.1.tar.bz2) = 488aa9c3ec7a95e6589afa4b50bec8b4
-SHA256 (xorg/driver/xf86-video-tseng-1.1.1.tar.bz2) = c9c1f3318715b7268068bc733d00bcab93924e97eb38f94548e442fd6cdfd56e
-SIZE (xorg/driver/xf86-video-tseng-1.1.1.tar.bz2) = 273211
+MD5 (xorg/driver/xf86-video-tseng-1.2.1.tar.bz2) = 2f687eddae5dafa5dcc05116561e267c
+SHA256 (xorg/driver/xf86-video-tseng-1.2.1.tar.bz2) = 540bb96efb0f2ec61e08fe1cc6e2e887fba34a6332ddf7e947ace59f0fad34ba
+SIZE (xorg/driver/xf86-video-tseng-1.2.1.tar.bz2) = 280383
diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
index d7f886851b56..ed65d0edccc9 100644
--- a/x11-drivers/xf86-video-vesa/Makefile
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-vesa
-PORTVERSION= 1.3.0
-PORTREVISION= 2
+PORTVERSION= 2.1.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vesa/distinfo b/x11-drivers/xf86-video-vesa/distinfo
index 307da5ea252a..1309765ad9e6 100644
--- a/x11-drivers/xf86-video-vesa/distinfo
+++ b/x11-drivers/xf86-video-vesa/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-vesa-1.3.0.tar.bz2) = 4a307852f3b4850e436a41dab2a73676
-SHA256 (xorg/driver/xf86-video-vesa-1.3.0.tar.bz2) = b96c80ae81f5123ecef344dac4c734b2e281143d3ab7a7e633d6bf04c893e203
-SIZE (xorg/driver/xf86-video-vesa-1.3.0.tar.bz2) = 237759
+MD5 (xorg/driver/xf86-video-vesa-2.1.0.tar.bz2) = d813269613b4d63ff6dbfbfbd104cc84
+SHA256 (xorg/driver/xf86-video-vesa-2.1.0.tar.bz2) = de06caf86d3c1a1f086b8b55c054d60218fdf3956e93e411d9ee0d96bb42a6f8
+SIZE (xorg/driver/xf86-video-vesa-2.1.0.tar.bz2) = 245147
diff --git a/x11-drivers/xf86-video-via/Makefile b/x11-drivers/xf86-video-via/Makefile
index a133dfb0e6ff..ccef504b4920 100644
--- a/x11-drivers/xf86-video-via/Makefile
+++ b/x11-drivers/xf86-video-via/Makefile
@@ -13,10 +13,12 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org via display driver
-USE_GL= gl
+IGNORE= requires pciVideoPtr typedef
+USE_GL= gl
XORG_CAT= driver
USE_XORG= xvmc xf86driproto xextproto x11 glproto
+
MAN4= via.4x
.include <bsd.port.pre.mk>
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
index 874381c2f419..d1700668ebe6 100644
--- a/x11-drivers/xf86-video-vmware/Makefile
+++ b/x11-drivers/xf86-video-vmware/Makefile
@@ -6,15 +6,15 @@
#
PORTNAME= xf86-video-vmware
-PORTVERSION= 10.15.2
-PORTREVISION= 1
+PORTVERSION= 10.16.5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org vmware display driver
XORG_CAT= driver
-USE_XORG= xextproto xineramaproto
+USE_XORG= xextproto xineramaproto videoproto
+
MAN4= vmware.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-vmware/distinfo b/x11-drivers/xf86-video-vmware/distinfo
index c911c4abb014..0988761da421 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.15.2.tar.bz2) = 99322cbcc9081ad44e9cba63e3df8f7e
-SHA256 (xorg/driver/xf86-video-vmware-10.15.2.tar.bz2) = edae155c82d348b76dabe1373605bf6715b577cdd7a95f8b54ad534dc47c71ff
-SIZE (xorg/driver/xf86-video-vmware-10.15.2.tar.bz2) = 269346
+MD5 (xorg/driver/xf86-video-vmware-10.16.5.tar.bz2) = 6d78c82ea7c2bb0fcb587d7bb4e8f60a
+SHA256 (xorg/driver/xf86-video-vmware-10.16.5.tar.bz2) = 3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366
+SIZE (xorg/driver/xf86-video-vmware-10.16.5.tar.bz2) = 278790
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
index 0dd14663ac82..66e963c23a2f 100644
--- a/x11-drivers/xf86-video-voodoo/Makefile
+++ b/x11-drivers/xf86-video-voodoo/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-voodoo
-PORTVERSION= 1.1.1
-PORTREVISION= 2
+PORTVERSION= 1.2.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-voodoo/distinfo b/x11-drivers/xf86-video-voodoo/distinfo
index 671498aacf80..e980065889a0 100644
--- a/x11-drivers/xf86-video-voodoo/distinfo
+++ b/x11-drivers/xf86-video-voodoo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-voodoo-1.1.1.tar.bz2) = bc878e795688b49a595b355482d27174
-SHA256 (xorg/driver/xf86-video-voodoo-1.1.1.tar.bz2) = 3975601baee674b2bad0dfe696586f17cc913f1dc7f1d5c4e184623e0461751c
-SIZE (xorg/driver/xf86-video-voodoo-1.1.1.tar.bz2) = 248401
+MD5 (xorg/driver/xf86-video-voodoo-1.2.0.tar.bz2) = 7c681d9b57f5e1f798263fc1a9d99245
+SHA256 (xorg/driver/xf86-video-voodoo-1.2.0.tar.bz2) = b79ba6d5d4300570c00f8be37c536f47f2d78c18845f70f525da2a29e47c4b8c
+SIZE (xorg/driver/xf86-video-voodoo-1.2.0.tar.bz2) = 256472
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index 9c8bdfbe0d8a..2087c2c3852b 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xorg-drivers
-PORTVERSION= 7.3
-PORTREVISION= 3
+PORTVERSION= 7.4
CATEGORIES= x11-drivers
MASTER_SITES= # none
DISTFILES= # none
@@ -31,12 +30,12 @@ VIDEO_ON= ati \
nv \
r128 \
radeonhd \
- vesa vga
+ vesa
.if ${ARCH} == "sparc64"
VIDEO_ON+= sunffb
.else
-VIDEO_ON+= via
+VIDEO_ON+= openchrome
.endif
VIDEO_OFF= apm ark \
@@ -47,11 +46,10 @@ VIDEO_OFF= apm ark \
i128 i740 imstt \
mga \
neomagic newport nsc \
- openchrome \
rendition \
s3 s3virge savage siliconmotion sis \
tdfx tga trident tseng \
- vmware voodoo
+ via vmware voodoo
VIDEO_EXCL= via:openchrome
@@ -66,7 +64,7 @@ INPUT_OFF= acecad \
jamstudio joystick \
magellan magictouch microtouch mutouch \
palmax penmount \
- spaceorb summa \
+ spaceorb summa synaptics \
tek4957 \
vmmouse void