aboutsummaryrefslogtreecommitdiff
path: root/x11-drivers
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2013-12-16 11:11:09 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2013-12-16 11:11:09 +0000
commit47be7a61c97731aa5fe34c56767ad5e10bb5c5d2 (patch)
tree2df88f8b6e2af92b78ac24eb382268b7c290efab /x11-drivers
parent7b9110d87c22c27df1baa93f8cb4cf30e205efc7 (diff)
downloadports-47be7a61c97731aa5fe34c56767ad5e10bb5c5d2.tar.gz
ports-47be7a61c97731aa5fe34c56767ad5e10bb5c5d2.zip
Notes
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/input-wacom/Makefile2
-rw-r--r--x11-drivers/xf86-input-acecad/Makefile3
-rw-r--r--x11-drivers/xf86-input-acecad/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-elographics/Makefile4
-rw-r--r--x11-drivers/xf86-input-elographics/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-fpit/Makefile3
-rw-r--r--x11-drivers/xf86-input-hyperpen/Makefile3
-rw-r--r--x11-drivers/xf86-input-joystick/Makefile4
-rw-r--r--x11-drivers/xf86-input-joystick/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-keyboard/Makefile4
-rw-r--r--x11-drivers/xf86-input-keyboard/distinfo4
-rw-r--r--x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c14
-rw-r--r--x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c24
-rw-r--r--x11-drivers/xf86-input-keyboard/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-magictouch/Makefile6
-rw-r--r--x11-drivers/xf86-input-magictouch/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-mouse/Makefile3
-rw-r--r--x11-drivers/xf86-input-mouse/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-mutouch/Makefile6
-rw-r--r--x11-drivers/xf86-input-mutouch/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-penmount/Makefile4
-rw-r--r--x11-drivers/xf86-input-penmount/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-synaptics/Makefile31
-rw-r--r--x11-drivers/xf86-input-synaptics/distinfo4
-rw-r--r--x11-drivers/xf86-input-synaptics/pkg-plist10
-rw-r--r--x11-drivers/xf86-input-vmmouse/Makefile7
-rw-r--r--x11-drivers/xf86-input-vmmouse/pkg-plist2
-rw-r--r--x11-drivers/xf86-input-void/Makefile5
-rw-r--r--x11-drivers/xf86-input-void/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-apm/Makefile3
-rw-r--r--x11-drivers/xf86-video-apm/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-ark/Makefile2
-rw-r--r--x11-drivers/xf86-video-ati/Makefile5
-rw-r--r--x11-drivers/xf86-video-ati/pkg-plist2
-rw-r--r--x11-drivers/xf86-video-chips/Makefile3
-rw-r--r--x11-drivers/xf86-video-chips/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-cirrus/Makefile3
-rw-r--r--x11-drivers/xf86-video-cirrus/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-cyrix/Makefile4
-rw-r--r--x11-drivers/xf86-video-cyrix/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-dummy/Makefile2
-rw-r--r--x11-drivers/xf86-video-fbdev/Makefile4
-rw-r--r--x11-drivers/xf86-video-fbdev/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-glint/Makefile3
-rw-r--r--x11-drivers/xf86-video-glint/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-i128/Makefile3
-rw-r--r--x11-drivers/xf86-video-i128/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-i740/Makefile3
-rw-r--r--x11-drivers/xf86-video-i740/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-imstt/Makefile8
-rw-r--r--x11-drivers/xf86-video-imstt/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-intel/Makefile24
-rw-r--r--x11-drivers/xf86-video-intel/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-mach64/Makefile2
-rw-r--r--x11-drivers/xf86-video-mga/Makefile1
-rw-r--r--x11-drivers/xf86-video-neomagic/Makefile2
-rw-r--r--x11-drivers/xf86-video-newport/Makefile3
-rw-r--r--x11-drivers/xf86-video-newport/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-nouveau/Makefile11
-rw-r--r--x11-drivers/xf86-video-nouveau/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-nv/Makefile4
-rw-r--r--x11-drivers/xf86-video-nv/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-openchrome/Makefile3
-rw-r--r--x11-drivers/xf86-video-openchrome/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-r128/Makefile1
-rw-r--r--x11-drivers/xf86-video-radeonhd/Makefile5
-rw-r--r--x11-drivers/xf86-video-radeonhd/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-rdc/Makefile3
-rw-r--r--x11-drivers/xf86-video-rendition/Makefile4
-rw-r--r--x11-drivers/xf86-video-rendition/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-s3/Makefile3
-rw-r--r--x11-drivers/xf86-video-s3/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-s3virge/Makefile3
-rw-r--r--x11-drivers/xf86-video-s3virge/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-savage/Makefile1
-rw-r--r--x11-drivers/xf86-video-siliconmotion/Makefile3
-rw-r--r--x11-drivers/xf86-video-siliconmotion/pkg-plist1
-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/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-sunffb/Makefile1
-rw-r--r--x11-drivers/xf86-video-tdfx/Makefile4
-rw-r--r--x11-drivers/xf86-video-tdfx/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-tga/Makefile1
-rw-r--r--x11-drivers/xf86-video-trident/Makefile4
-rw-r--r--x11-drivers/xf86-video-trident/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-tseng/Makefile4
-rw-r--r--x11-drivers/xf86-video-tseng/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-vesa/Makefile3
-rw-r--r--x11-drivers/xf86-video-vesa/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-via/Makefile9
-rw-r--r--x11-drivers/xf86-video-via/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-vmware/Makefile4
-rw-r--r--x11-drivers/xf86-video-vmware/files/patch-src_vmware.c11
-rw-r--r--x11-drivers/xf86-video-vmware/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-voodoo/Makefile4
-rw-r--r--x11-drivers/xf86-video-voodoo/pkg-plist1
-rw-r--r--x11-drivers/xorg-drivers/Makefile5
98 files changed, 185 insertions, 167 deletions
diff --git a/x11-drivers/input-wacom/Makefile b/x11-drivers/input-wacom/Makefile
index 7754c0fac70f..511d1db4c41b 100644
--- a/x11-drivers/input-wacom/Makefile
+++ b/x11-drivers/input-wacom/Makefile
@@ -3,7 +3,7 @@
PORTNAME= input-wacom
PORTVERSION= ${KLD_VERSION}.${WACOM_VERSION:C/-/./g}
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= x11-drivers kld
MASTER_SITES= http://www.chillt.de/bsdwacom/:bsdwacom \
SF/linuxwacom/xf86-input-wacom/:linuxwacom
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
index b3059da6472c..36840f9987f1 100644
--- a/x11-drivers/xf86-input-acecad/Makefile
+++ b/x11-drivers/xf86-input-acecad/Makefile
@@ -2,13 +2,12 @@
PORTNAME= xf86-input-acecad
PORTVERSION= 1.5.0
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org acecad input driver
XORG_CAT= driver
-MAN4= acecad.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-acecad/pkg-plist b/x11-drivers/xf86-input-acecad/pkg-plist
index bece9a428b81..eb4b093f30e2 100644
--- a/x11-drivers/xf86-input-acecad/pkg-plist
+++ b/x11-drivers/xf86-input-acecad/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/input/acecad_drv.la
lib/xorg/modules/input/acecad_drv.so
+man/man4/acecad.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile
index 0e6a9a3f2823..50eb5511e396 100644
--- a/x11-drivers/xf86-input-elographics/Makefile
+++ b/x11-drivers/xf86-input-elographics/Makefile
@@ -9,7 +9,8 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org elographics input driver
XORG_CAT= driver
-MAN4= elographics.4x
+
+.include <bsd.port.options.mk>
.if defined(WITH_NEW_XORG)
ELO_VERSION= 1.4.1
@@ -19,5 +20,4 @@ ELO_VERSION= 1.2.4
ELO_REVISION= 0
.endif
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-elographics/pkg-plist b/x11-drivers/xf86-input-elographics/pkg-plist
index b6f57b12c197..04b774da2de4 100644
--- a/x11-drivers/xf86-input-elographics/pkg-plist
+++ b/x11-drivers/xf86-input-elographics/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/input/elographics_drv.la
lib/xorg/modules/input/elographics_drv.so
+man/man4/elographics.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile
index ef79732c2bb2..b2c03ed78b04 100644
--- a/x11-drivers/xf86-input-fpit/Makefile
+++ b/x11-drivers/xf86-input-fpit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86-input-fpit
PORTVERSION= 1.4.0
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -10,6 +11,8 @@ COMMENT= X.Org fpit input driver
XORG_CAT= driver
USE_XORG= xrandr
+.include <bsd.port.options.mk>
+
.if !defined(WITH_NEW_XORG)
IGNORE= does not build with X server 1.7.7
.endif
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile
index 30505e50e9a6..ba6a1a37f438 100644
--- a/x11-drivers/xf86-input-hyperpen/Makefile
+++ b/x11-drivers/xf86-input-hyperpen/Makefile
@@ -10,6 +10,8 @@ COMMENT= X.Org hyperpen input driver
XORG_CAT= driver
+.include <bsd.port.options.mk>
+
.if defined(WITH_NEW_XORG)
HYPERVER= 1.4.1
HYPERREVISION= 0
@@ -19,5 +21,4 @@ HYPERREVISION= 6
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_xf86HyperPen.c
.endif
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
index 81b59d03630d..372d0e436389 100644
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -9,7 +9,8 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org joystick input driver
XORG_CAT= driver
-MAN4= joystick.4x
+
+.include <bsd.port.options.mk>
.if defined(WITH_NEW_XORG)
JOYVER= 1.6.2
@@ -19,7 +20,6 @@ JOYVER= 1.5.0
JOYREVISION= 1
.endif
-NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
${WRKSRC}/Makefile.in
diff --git a/x11-drivers/xf86-input-joystick/pkg-plist b/x11-drivers/xf86-input-joystick/pkg-plist
index 1a0ab467f87b..dba9b4c7ef03 100644
--- a/x11-drivers/xf86-input-joystick/pkg-plist
+++ b/x11-drivers/xf86-input-joystick/pkg-plist
@@ -2,6 +2,7 @@ include/xorg/joystick-properties.h
lib/xorg/modules/input/joystick_drv.la
lib/xorg/modules/input/joystick_drv.so
libdata/pkgconfig/xorg-joystick.pc
+man/man4/joystick.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 607fb124ce97..841bd4cdbd5e 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xf86-input-keyboard
-PORTVERSION= 1.7.0
+PORTVERSION= 1.8.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -9,7 +9,5 @@ COMMENT= X.Org keyboard input driver
XORG_CAT= driver
USE_XORG= kbproto
-MAN4= kbd.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo
index 35dda24723c9..158af292e26b 100644
--- a/x11-drivers/xf86-input-keyboard/distinfo
+++ b/x11-drivers/xf86-input-keyboard/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c
-SIZE (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 319043
+SHA256 (xorg/driver/xf86-input-keyboard-1.8.0.tar.bz2) = 41c51c4e0a87aad6a1c4973c68a8de23b61162d0223f4ab36c627c307830cb5b
+SIZE (xorg/driver/xf86-input-keyboard-1.8.0.tar.bz2) = 323838
diff --git a/x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c b/x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c
new file mode 100644
index 000000000000..2f62b8206b6b
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c
@@ -0,0 +1,14 @@
+Index: src/bsd_kbd.c
+@@ -205,6 +205,12 @@
+ #endif
+ }
+ }
++/*
++ * Switch keyboards which are not attached to console in RAW mode
++ */
++#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
++ ioctl(pInfo->fd, KDSKBMODE, K_RAW);
++#endif
+ return Success;
+ }
+
diff --git a/x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c b/x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c
new file mode 100644
index 000000000000..e9b0397baea7
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c
@@ -0,0 +1,24 @@
+Index: src/kbd.c
+@@ -25,6 +25,7 @@
+
+ #include "xf86.h"
+ #include "atKeynames.h"
++#include "xf86Priv.h"
+ #include "xf86Privstr.h"
+
+ #include <X11/extensions/XI.h>
+@@ -392,6 +393,14 @@
+ RemoveEnabledDevice(pInfo->fd);
+ pKbd->KbdOff(pInfo, what);
+ device->public.on = FALSE;
++ /*
++ * Close device file for keyboards which are not attached
++ * to console, otherwise they can't be opened again after
++ * relogin when using session manager like xdm.
++ * X server will take care about console attached keyboards.
++ */
++ if (pInfo->fd != xf86Info.consoleFd)
++ close(pInfo->fd);
+ break;
+
+ default:
diff --git a/x11-drivers/xf86-input-keyboard/pkg-plist b/x11-drivers/xf86-input-keyboard/pkg-plist
index 7e9f47e9ffe1..a2281aefc6f9 100644
--- a/x11-drivers/xf86-input-keyboard/pkg-plist
+++ b/x11-drivers/xf86-input-keyboard/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/input/kbd_drv.la
lib/xorg/modules/input/kbd_drv.so
+man/man4/kbd.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile
index 61d5036b3a54..b070fdbd524f 100644
--- a/x11-drivers/xf86-input-magictouch/Makefile
+++ b/x11-drivers/xf86-input-magictouch/Makefile
@@ -8,11 +8,13 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org magictouch input driver
+.include <bsd.port.options.mk>
+
+.if defined(WITH_NEW_XORG)
IGNORE= needs xf86_ansic.h which doesn't exist with recent xserver
+.endif
XORG_CAT= driver
-MAN4= magictouch.4x
USE_AUTOTOOLS= libtool
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-magictouch/pkg-plist b/x11-drivers/xf86-input-magictouch/pkg-plist
index c9dff9282436..18cb36565da1 100644
--- a/x11-drivers/xf86-input-magictouch/pkg-plist
+++ b/x11-drivers/xf86-input-magictouch/pkg-plist
@@ -1,6 +1,7 @@
lib/xorg/modules/input/magictouch_drv.a
lib/xorg/modules/input/magictouch_drv.la
lib/xorg/modules/input/magictouch_drv.so
+man/man4/magictouch.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index 3bbe02f61dac..c5fe1623806d 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86-input-mouse
PORTVERSION= 1.9.0
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -9,7 +10,5 @@ COMMENT= X.Org mouse input driver
XORG_CAT= driver
USES= pathfix
-MAN4= mousedrv.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-mouse/pkg-plist b/x11-drivers/xf86-input-mouse/pkg-plist
index 3e9b203c360f..b871c54a7a66 100644
--- a/x11-drivers/xf86-input-mouse/pkg-plist
+++ b/x11-drivers/xf86-input-mouse/pkg-plist
@@ -2,6 +2,7 @@ include/xorg/xf86-mouse-properties.h
lib/xorg/modules/input/mouse_drv.la
lib/xorg/modules/input/mouse_drv.so
libdata/pkgconfig/xorg-mouse.pc
+man/man4/mousedrv.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile
index 00e303ad0567..aab8ea3f0a73 100644
--- a/x11-drivers/xf86-input-mutouch/Makefile
+++ b/x11-drivers/xf86-input-mutouch/Makefile
@@ -8,13 +8,11 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org mutouch input driver
XORG_CAT= driver
-MAN4= mutouch.4x
+
+.include <bsd.port.options.mk>
.if !defined(WITH_NEW_XORG)
IGNORE= does not build with xorg-server 1.7.7
-.else
-
.endif
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-mutouch/pkg-plist b/x11-drivers/xf86-input-mutouch/pkg-plist
index b3ef9f346861..595ac731d28a 100644
--- a/x11-drivers/xf86-input-mutouch/pkg-plist
+++ b/x11-drivers/xf86-input-mutouch/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/input/mutouch_drv.la
lib/xorg/modules/input/mutouch_drv.so
+man/man4/mutouch.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile
index 06efbd521dfb..9b7cbe39583c 100644
--- a/x11-drivers/xf86-input-penmount/Makefile
+++ b/x11-drivers/xf86-input-penmount/Makefile
@@ -9,7 +9,8 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org penmount input driver
XORG_CAT= driver
-MAN4= penmount.4x
+
+.include <bsd.port.options.mk>
.if defined(WITH_NEW_XORG)
PEN_VERSION= 1.5.0
@@ -19,5 +20,4 @@ PEN_VERSION= 1.4.1
PEN_REVISION= 1
.endif
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-penmount/pkg-plist b/x11-drivers/xf86-input-penmount/pkg-plist
index a48eb1404b7c..46a7a8ac267d 100644
--- a/x11-drivers/xf86-input-penmount/pkg-plist
+++ b/x11-drivers/xf86-input-penmount/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/input/penmount_drv.la
lib/xorg/modules/input/penmount_drv.so
+man/man4/penmount.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index 9434c1eee5e2..d0e1183787ea 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -10,29 +10,12 @@ COMMENT= X.Org synaptics input driver
CONFLICTS= synaptics-[0-9]*
-OPTIONS_DEFINE= HAL
-OPTIONS_DEFAULT=HAL
-
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
USES= pathfix
USE_XORG= x11 xtst
XORG_CAT= driver
-.if ${PORT_OPTIONS:MHAL}
-PLIST_SUB+= HAL=""
-LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
-.else
-PLIST_SUB+= HAL="@comment "
-.endif
-
-MAN1= syndaemon.1 \
- synclient.1
-MAN4= synaptics.4x
-
.if defined(WITH_NEW_XORG)
-SYNAPTICS_VERSION= 1.7.1
+SYNAPTICS_VERSION= 1.7.2
SYNAPTICS_REVISION= 0
PLIST_SUB+= NEW="" OLD="@comment "
.else
@@ -42,16 +25,4 @@ PLIST_SUB+= NEW="@comment " OLD=""
EXTRA_PATCHES+= ${PATCHDIR}/extra-Makefile.in
.endif
-post-install:
-.if ${PORT_OPTIONS:MHAL}
- ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
- ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
- ${PREFIX}/share/hal/fdi/policy/10osvendor/
-.if !defined(WITH_NEW_XORG)
- ${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty
- ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
- ${PREFIX}/share/hal/fdi/policy/20thirdparty/
-.endif
-.endif
-
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo
index bad1c22f40ed..a82a418573c0 100644
--- a/x11-drivers/xf86-input-synaptics/distinfo
+++ b/x11-drivers/xf86-input-synaptics/distinfo
@@ -1,4 +1,4 @@
SHA256 (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = fe15b1afc61b40800f74a0dcf976c15b299ca0680ae5e537baef543455a732ee
SIZE (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = 447004
-SHA256 (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e
-SIZE (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = 441407
+SHA256 (xorg/driver/xf86-input-synaptics-1.7.2.tar.bz2) = 63957fa55f0d8662ef8c57f6325155c9884a854554d33921f0738e097f2a7dcd
+SIZE (xorg/driver/xf86-input-synaptics-1.7.2.tar.bz2) = 448170
diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist
index 3f9ad117dbf2..d29caf256087 100644
--- a/x11-drivers/xf86-input-synaptics/pkg-plist
+++ b/x11-drivers/xf86-input-synaptics/pkg-plist
@@ -5,14 +5,12 @@ include/xorg/synaptics-properties.h
lib/xorg/modules/input/synaptics_drv.la
lib/xorg/modules/input/synaptics_drv.so
libdata/pkgconfig/xorg-synaptics.pc
+man/man1/synclient.1.gz
+man/man1/syndaemon.1.gz
+man/man4/synaptics.4x.gz
%%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
-%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
-%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
+%%NEW%%@dirrmtry share/X11/xorg.conf.d
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
@dirrmtry include/xorg
-%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor
-%%HAL%%@dirrmtry share/hal/fdi/policy
-%%HAL%%@dirrmtry share/hal/fdi
-%%HAL%%@dirrmtry share/hal
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
index d84f01f016f9..eb55ffa9e155 100644
--- a/x11-drivers/xf86-input-vmmouse/Makefile
+++ b/x11-drivers/xf86-input-vmmouse/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xf86-input-vmmouse
PORTVERSION= 13.0.0
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -14,17 +15,15 @@ XORG_CAT= driver
CONFIGURE_ARGS= --with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
USE_GMAKE= yes
-MAN1= vmmouse_detect.1
-MAN4= vmmouse.4x
-
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= The vmmouse protocol is only supported on x86-compatible architectures.
+.include <bsd.port.options.mk>
+
.if defined(WITH_NEW_XORG)
PLIST_SUB+= NEW=""
.else
PLIST_SUB+= NEW="@comment "
.endif
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-vmmouse/pkg-plist b/x11-drivers/xf86-input-vmmouse/pkg-plist
index 0af5d7981aff..35717b9231d7 100644
--- a/x11-drivers/xf86-input-vmmouse/pkg-plist
+++ b/x11-drivers/xf86-input-vmmouse/pkg-plist
@@ -2,6 +2,8 @@ bin/vmmouse_detect
libexec/hal/scripts/hal-probe-vmmouse
lib/xorg/modules/input/vmmouse_drv.la
lib/xorg/modules/input/vmmouse_drv.so
+man/man1/vmmouse_detect.1.gz
+man/man4/vmmouse.4x.gz
%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
@dirrmtry lib/xorg/modules/input
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
index 4493a71bf8de..b2bf5ef78add 100644
--- a/x11-drivers/xf86-input-void/Makefile
+++ b/x11-drivers/xf86-input-void/Makefile
@@ -9,7 +9,8 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org void input driver
XORG_CAT= driver
-MAN4= void.4x
+
+.include <bsd.port.options.mk>
.if defined(WITH_NEW_XORG)
VOID_VERSION= 1.4.0
@@ -19,6 +20,4 @@ VOID_VERSION= 1.3.1
VOID_REVISION= 0
.endif
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-void/pkg-plist b/x11-drivers/xf86-input-void/pkg-plist
index 554c36808518..e63ae58bbc28 100644
--- a/x11-drivers/xf86-input-void/pkg-plist
+++ b/x11-drivers/xf86-input-void/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/input/void_drv.la
lib/xorg/modules/input/void_drv.so
+man/man4/void.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile
index 815688873d27..49f83a350775 100644
--- a/x11-drivers/xf86-video-apm/Makefile
+++ b/x11-drivers/xf86-video-apm/Makefile
@@ -2,13 +2,12 @@
PORTNAME= xf86-video-apm
PORTVERSION= 1.2.5
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org apm display driver
XORG_CAT= driver
-MAN4= apm.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-apm/pkg-plist b/x11-drivers/xf86-video-apm/pkg-plist
index e43fd8984848..3f8be66a23a4 100644
--- a/x11-drivers/xf86-video-apm/pkg-plist
+++ b/x11-drivers/xf86-video-apm/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/apm_drv.la
lib/xorg/modules/drivers/apm_drv.so
+man/man4/apm.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
index 84fd8c18f273..df031c8d07c7 100644
--- a/x11-drivers/xf86-video-ark/Makefile
+++ b/x11-drivers/xf86-video-ark/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-ark
PORTVERSION= 0.7.5
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -9,5 +10,4 @@ COMMENT= X.Org ark display driver
XORG_CAT= driver
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index 17ed8f40b305..077caa18b9a1 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-ati
PORTVERSION= ${ATI_VERSION}
+PORTREVISION= ${ATI_REVISION}
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -10,17 +11,17 @@ COMMENT= X.Org ati display driver
USE_GL= gl
XORG_CAT= driver
USE_XORG= xf86driproto xineramaproto xf86miscproto glproto
-MAN4= ati.4x radeon.4x
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 1000051 || !defined(WITH_NEW_XORG)
ATI_VERSION= 6.14.6
+ATI_REVISION= 1
CONFIGURE_ARGS+=--disable-kms
PLIST_SUB+= OLD=""
.else
ATI_VERSION= 7.2.0
+ATI_REVISION= 1
CONFIGURE_ARGS+=--disable-udev
EXTRA_PATCHES+= ${FILESDIR}/extra-src__radeon_kms.c
PLIST_SUB+= OLD="@comment "
diff --git a/x11-drivers/xf86-video-ati/pkg-plist b/x11-drivers/xf86-video-ati/pkg-plist
index 1c0799ff6e61..a244776f38d1 100644
--- a/x11-drivers/xf86-video-ati/pkg-plist
+++ b/x11-drivers/xf86-video-ati/pkg-plist
@@ -8,6 +8,8 @@ lib/xorg/modules/drivers/radeon_drv.so
%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.so
%%OLD%%lib/xorg/modules/multimedia/theatre_drv.la
%%OLD%%lib/xorg/modules/multimedia/theatre_drv.so
+man/man4/ati.4x.gz
+man/man4/radeon.4x.gz
@dirrmtry lib/xorg/modules/drivers
%%OLD%%@dirrmtry lib/xorg/modules/multimedia
@dirrmtry lib/xorg/modules
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
index decf7db48a6a..cefa98a2b766 100644
--- a/x11-drivers/xf86-video-chips/Makefile
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -2,13 +2,12 @@
PORTNAME= xf86-video-chips
PORTVERSION= 1.2.5
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org chips display driver
XORG_CAT= driver
-MAN4= chips.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-chips/pkg-plist b/x11-drivers/xf86-video-chips/pkg-plist
index 437be4ca72ac..7204691323b3 100644
--- a/x11-drivers/xf86-video-chips/pkg-plist
+++ b/x11-drivers/xf86-video-chips/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/chips_drv.la
lib/xorg/modules/drivers/chips_drv.so
+man/man4/chips.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
index c9a9cf9d53f2..a6dd1a257dc3 100644
--- a/x11-drivers/xf86-video-cirrus/Makefile
+++ b/x11-drivers/xf86-video-cirrus/Makefile
@@ -2,13 +2,12 @@
PORTNAME= xf86-video-cirrus
PORTVERSION= 1.5.2
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org cirrus display driver
XORG_CAT= driver
-MAN4= cirrus.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-cirrus/pkg-plist b/x11-drivers/xf86-video-cirrus/pkg-plist
index 74f53f53dc0e..b47e0b8d149b 100644
--- a/x11-drivers/xf86-video-cirrus/pkg-plist
+++ b/x11-drivers/xf86-video-cirrus/pkg-plist
@@ -4,6 +4,7 @@ lib/xorg/modules/drivers/cirrus_drv.la
lib/xorg/modules/drivers/cirrus_drv.so
lib/xorg/modules/drivers/cirrus_laguna.la
lib/xorg/modules/drivers/cirrus_laguna.so
+man/man4/cirrus.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile
index f6747bdafbd4..ccce8e78cc51 100644
--- a/x11-drivers/xf86-video-cyrix/Makefile
+++ b/x11-drivers/xf86-video-cyrix/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-cyrix
PORTVERSION= 1.1.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -12,7 +12,5 @@ IGNORE= requires pciVideoPtr typedef
XORG_CAT= driver
USE_XORG= xextproto xf86dgaproto
-MAN4= cyrix.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-cyrix/pkg-plist b/x11-drivers/xf86-video-cyrix/pkg-plist
index 3354c4136282..531bfe7b56a1 100644
--- a/x11-drivers/xf86-video-cyrix/pkg-plist
+++ b/x11-drivers/xf86-video-cyrix/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/cyrix_drv.la
lib/xorg/modules/drivers/cyrix_drv.so
+man/man4/cyrix.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
index 607efd749d69..59937958e703 100644
--- a/x11-drivers/xf86-video-dummy/Makefile
+++ b/x11-drivers/xf86-video-dummy/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-dummy
PORTVERSION= 0.3.7
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -10,5 +11,4 @@ COMMENT= X.Org dummy display driver
XORG_CAT= driver
USE_XORG= xf86dgaproto
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
index 3cc799f694ae..dea21f99d36c 100644
--- a/x11-drivers/xf86-video-fbdev/Makefile
+++ b/x11-drivers/xf86-video-fbdev/Makefile
@@ -2,14 +2,12 @@
PORTNAME= xf86-video-fbdev
PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org fbdev display driver
XORG_CAT= driver
-MAN4= fbdev.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-fbdev/pkg-plist b/x11-drivers/xf86-video-fbdev/pkg-plist
index 274315cac50d..e99ec711f3b1 100644
--- a/x11-drivers/xf86-video-fbdev/pkg-plist
+++ b/x11-drivers/xf86-video-fbdev/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/fbdev_drv.la
lib/xorg/modules/drivers/fbdev_drv.so
+man/man4/fbdev.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
index ffda5d581664..0a787d88265f 100644
--- a/x11-drivers/xf86-video-glint/Makefile
+++ b/x11-drivers/xf86-video-glint/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-glint
PORTVERSION= 1.2.8
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -11,7 +12,5 @@ USE_GL= gl
XORG_CAT= driver
USE_XORG= xf86driproto xf86dgaproto glproto
-MAN4= glint.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-glint/pkg-plist b/x11-drivers/xf86-video-glint/pkg-plist
index cb5ce1fa5e07..4943f96c01cd 100644
--- a/x11-drivers/xf86-video-glint/pkg-plist
+++ b/x11-drivers/xf86-video-glint/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/glint_drv.la
lib/xorg/modules/drivers/glint_drv.so
+man/man4/glint.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
index f38e1d77caee..a7b205367041 100644
--- a/x11-drivers/xf86-video-i128/Makefile
+++ b/x11-drivers/xf86-video-i128/Makefile
@@ -2,13 +2,12 @@
PORTNAME= xf86-video-i128
PORTVERSION= 1.3.6
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org i128 display driver
XORG_CAT= driver
-MAN4= i128.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-i128/pkg-plist b/x11-drivers/xf86-video-i128/pkg-plist
index 585e6b4e044f..8231266fd2b6 100644
--- a/x11-drivers/xf86-video-i128/pkg-plist
+++ b/x11-drivers/xf86-video-i128/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/i128_drv.la
lib/xorg/modules/drivers/i128_drv.so
+man/man4/i128.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
index 15f7bf3dfe80..bb0ab79dddb3 100644
--- a/x11-drivers/xf86-video-i740/Makefile
+++ b/x11-drivers/xf86-video-i740/Makefile
@@ -2,13 +2,12 @@
PORTNAME= xf86-video-i740
PORTVERSION= 1.3.4
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org i740 display driver
XORG_CAT= driver
-MAN4= i740.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-i740/pkg-plist b/x11-drivers/xf86-video-i740/pkg-plist
index 60628b412c8e..6a6250b12f2a 100644
--- a/x11-drivers/xf86-video-i740/pkg-plist
+++ b/x11-drivers/xf86-video-i740/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/i740_drv.la
lib/xorg/modules/drivers/i740_drv.so
+man/man4/i740.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-imstt/Makefile b/x11-drivers/xf86-video-imstt/Makefile
index 54dd8f90f894..9072437f8f48 100644
--- a/x11-drivers/xf86-video-imstt/Makefile
+++ b/x11-drivers/xf86-video-imstt/Makefile
@@ -2,16 +2,16 @@
PORTNAME= xf86-video-imstt
PORTVERSION= 1.1.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org imstt display driver
-IGNORE= requires pciVideoPtr typedef
+BROKEN= Does not build, requires pciVideoPtr typedef.
+DEPRECATED= Broken, unsupported and unmaintained upstream.
+EXPIRATION_DATE=2014-01-31
XORG_CAT= driver
-MAN4= imstt.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-imstt/pkg-plist b/x11-drivers/xf86-video-imstt/pkg-plist
index b50e55fd9c44..2a09e0bb5999 100644
--- a/x11-drivers/xf86-video-imstt/pkg-plist
+++ b/x11-drivers/xf86-video-imstt/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/imstt_drv.la
lib/xorg/modules/drivers/imstt_drv.so
+man/man4/imstt.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index f34c93f32e26..708df7ff0999 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -23,14 +23,11 @@ USE_XORG= glproto \
xrender \
xvmc
-MAN4= intel.4x
-
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if defined(WITH_NEW_XORG)
INTEL_VERSION= 2.21.15
-INTEL_REVISION= 0
+INTEL_REVISION= 1
CONFIGURE_ENV+= xorg_cv_cc_flag__Wno_maybe_uninitialized=no
CONFIGURE_ARGS+= --enable-sna
MAKE_JOBS_UNSAFE=yes
@@ -39,10 +36,10 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-src__sna__sna_threads.c \
${PATCHDIR}/extra-src_sna_kgem.c \
${PATCHDIR}/extra-clang \
${PATCHDIR}/extra-i915kms
-LIB_DEPENDS+= xcb-util:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS+= libxcb-util.so:${PORTSDIR}/x11/xcb-util
.else
INTEL_VERSION= 2.7.1
-INTEL_REVISION= 5
+INTEL_REVISION= 6
PLIST_SUB+= OLD=""
EXTRA_PATCHES+= ${PATCHDIR}/extra-src_ch7017_ch7017.c \
@@ -65,14 +62,9 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-src_ch7017_ch7017.c \
${PATCHDIR}/extra-uxa_uxa-priv.h
.endif
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_NEW_XORG)
-pre-configure:
-.if !exists(${LOCALBASE}/lib/libkms.so)
- @${ECHO} "${PKGNAME}: Rebuild graphics/libdrm with the WITH_KMS option."
- @${FALSE}
-.endif
-.endif
+post-install:
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIntelXvMC.so.1
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libI810XvMC.so.1
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/drivers/intel_drv.so
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-intel/pkg-plist b/x11-drivers/xf86-video-intel/pkg-plist
index 0c16ed39e56b..2d3ca12deb10 100644
--- a/x11-drivers/xf86-video-intel/pkg-plist
+++ b/x11-drivers/xf86-video-intel/pkg-plist
@@ -16,6 +16,7 @@ lib/xorg/modules/drivers/intel_drv.so
%%OLD%%lib/xorg/modules/drivers/sil164.so
%%OLD%%lib/xorg/modules/drivers/tfp410.la
%%OLD%%lib/xorg/modules/drivers/tfp410.so
+man/man4/intel.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile
index 5143d83a7192..3c1cf88e242f 100644
--- a/x11-drivers/xf86-video-mach64/Makefile
+++ b/x11-drivers/xf86-video-mach64/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-mach64
PORTVERSION= 6.9.4
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -12,5 +13,4 @@ USE_GL= gl
XORG_CAT= driver
USE_XORG= glproto xf86driproto xf86miscproto
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index cb81cb1c2126..036b5a9df829 100644
--- a/x11-drivers/xf86-video-mga/Makefile
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-mga
PORTVERSION= 1.6.3
+PORTREVISION= 1
PORTEPOCH= 3
CATEGORIES= x11-drivers
diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
index 5cf46db951a8..a9503712e748 100644
--- a/x11-drivers/xf86-video-neomagic/Makefile
+++ b/x11-drivers/xf86-video-neomagic/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-neomagic
PORTVERSION= 1.2.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile
index b87635d14727..e03da55a9166 100644
--- a/x11-drivers/xf86-video-newport/Makefile
+++ b/x11-drivers/xf86-video-newport/Makefile
@@ -2,15 +2,14 @@
PORTNAME= xf86-video-newport
PORTVERSION= 0.2.4
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org newport display driver
XORG_CAT= driver
-MAN4= newport.4x
-NO_STAGE= yes
post-patch:
${REINPLACE_CMD} -e 's|values.h|sys/limits.h|' \
-e 's|MAXSHORT|SHRT_MAX|g' \
diff --git a/x11-drivers/xf86-video-newport/pkg-plist b/x11-drivers/xf86-video-newport/pkg-plist
index 2100eb2b282f..088860fca3da 100644
--- a/x11-drivers/xf86-video-newport/pkg-plist
+++ b/x11-drivers/xf86-video-newport/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/newport_drv.la
lib/xorg/modules/drivers/newport_drv.so
+man/man4/newport.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-nouveau/Makefile b/x11-drivers/xf86-video-nouveau/Makefile
index c44ac008e671..a2aea2f3ac86 100644
--- a/x11-drivers/xf86-video-nouveau/Makefile
+++ b/x11-drivers/xf86-video-nouveau/Makefile
@@ -4,7 +4,7 @@
PORTNAME= xf86-video-nouveau
PORTVERSION= 0.0.10.${SNAPDATE}
DISTVERSIONSUFFIX=.${SNAPREV}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MASTER_SITES= ftp://ftp.lissyara.su/users/Guest/distfiles/
@@ -13,13 +13,12 @@ COMMENT= Free nouveau display driver for nvidia-based cards
XORG_CAT= driver
USE_XORG= xf86driproto glproto
-MAN4= nouveau.4x
+# also doesn't work with mesa (libGL) version higher than 7.4.x
+BROKEN= Does not build
+DEPRECATED= Not supported, missing kernel support. use the nvidia driver.
+EXPIRATION_DATE=2014-01-31
-# also doesn't work with mesa (libGL) version higher then 7.4.x
-IGNORE= Not supported, missing kernel support. use the nvidia driver.
-
-NO_STAGE= yes
post-configure:
${REINPLACE_CMD} '/NV_DRIVER_DATE/s/".*"/"${SNAPDATE}.${SNAPREV}"/' ${WRKSRC}/config.h
diff --git a/x11-drivers/xf86-video-nouveau/pkg-plist b/x11-drivers/xf86-video-nouveau/pkg-plist
index 63ff28ca464a..d6b17908d8d4 100644
--- a/x11-drivers/xf86-video-nouveau/pkg-plist
+++ b/x11-drivers/xf86-video-nouveau/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/nouveau_drv.la
lib/xorg/modules/drivers/nouveau_drv.so
+man/man4/nouveau.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile
index 15b5b81caa45..28cf7fc8496e 100644
--- a/x11-drivers/xf86-video-nv/Makefile
+++ b/x11-drivers/xf86-video-nv/Makefile
@@ -2,14 +2,12 @@
PORTNAME= xf86-video-nv
PORTVERSION= 2.1.20
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org nv display driver
XORG_CAT= driver
-MAN4= nv.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-nv/pkg-plist b/x11-drivers/xf86-video-nv/pkg-plist
index 78ec8ce4830f..f77c367a4212 100644
--- a/x11-drivers/xf86-video-nv/pkg-plist
+++ b/x11-drivers/xf86-video-nv/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/nv_drv.la
lib/xorg/modules/drivers/nv_drv.so
+man/man4/nv.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile
index 77b60f265545..3e404a4bb4a3 100644
--- a/x11-drivers/xf86-video-openchrome/Makefile
+++ b/x11-drivers/xf86-video-openchrome/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-openchrome
PORTVERSION= 0.3.3
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -11,11 +12,9 @@ USE_GL= gl
XORG_CAT= driver
USE_XORG= xf86driproto xvmc glproto
-MAN4= openchrome.4x
MAKE_ARGS+= drivermandir=${LOCALBASE}/man/man4
ONLY_FOR_ARCHS= amd64 i386 ia64
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-openchrome/pkg-plist b/x11-drivers/xf86-video-openchrome/pkg-plist
index 51f4809b32e3..e936c4ef4609 100644
--- a/x11-drivers/xf86-video-openchrome/pkg-plist
+++ b/x11-drivers/xf86-video-openchrome/pkg-plist
@@ -6,6 +6,7 @@ lib/libchromeXvMCPro.so
lib/libchromeXvMCPro.so.1
lib/xorg/modules/drivers/openchrome_drv.la
lib/xorg/modules/drivers/openchrome_drv.so
+man/man4/openchrome.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile
index f9464149d80d..2f976e966744 100644
--- a/x11-drivers/xf86-video-r128/Makefile
+++ b/x11-drivers/xf86-video-r128/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-r128
PORTVERSION= 6.9.2
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-radeonhd/Makefile b/x11-drivers/xf86-video-radeonhd/Makefile
index 129a45325dfd..f72eae30eccf 100644
--- a/x11-drivers/xf86-video-radeonhd/Makefile
+++ b/x11-drivers/xf86-video-radeonhd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xf86-video-radeonhd
PORTVERSION= 1.3.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -17,9 +17,6 @@ USE_XORG= damageproto glproto videoproto xextproto xf86driproto
CONFIGURE_ARGS= --enable-exa
CONFLICTS= xf86-video-radeonhd-devel-[0-9]*
-MAN4= radeonhd.4x
-
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MUTILS}
diff --git a/x11-drivers/xf86-video-radeonhd/pkg-plist b/x11-drivers/xf86-video-radeonhd/pkg-plist
index 115b3f129639..5732974836e1 100644
--- a/x11-drivers/xf86-video-radeonhd/pkg-plist
+++ b/x11-drivers/xf86-video-radeonhd/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/radeonhd_drv.la
lib/xorg/modules/drivers/radeonhd_drv.so
+man/man4/radeonhd.4x.gz
%%UTILS%%sbin/rhd_conntest
%%UTILS%%sbin/rhd_dump
@dirrmtry lib/xorg/modules/drivers
diff --git a/x11-drivers/xf86-video-rdc/Makefile b/x11-drivers/xf86-video-rdc/Makefile
index b4c838f28122..136511e8b6db 100644
--- a/x11-drivers/xf86-video-rdc/Makefile
+++ b/x11-drivers/xf86-video-rdc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xf86-video-rdc
PORTVERSION= 0.9
+PORTREVISION= 1
CATEGORIES= x11-drivers
MASTER_SITES= http://www.SpringDaemons.com/stas/
@@ -13,6 +14,8 @@ COMMENT= X.Org RDC display driver
XORG_CAT= driver
USE_XORG= xvmc xf86driproto xextproto x11 glproto
+.include <bsd.port.options.mk>
+
.if defined(WITH_NEW_XORG)
IGNORE= does not build with X server 1.12
.endif
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
index 404ccb37996a..6f16dcbb7cc0 100644
--- a/x11-drivers/xf86-video-rendition/Makefile
+++ b/x11-drivers/xf86-video-rendition/Makefile
@@ -2,14 +2,12 @@
PORTNAME= xf86-video-rendition
PORTVERSION= 4.2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org rendition display driver
XORG_CAT= driver
-MAN4= rendition.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-rendition/pkg-plist b/x11-drivers/xf86-video-rendition/pkg-plist
index e27659167b4b..59aa530f8505 100644
--- a/x11-drivers/xf86-video-rendition/pkg-plist
+++ b/x11-drivers/xf86-video-rendition/pkg-plist
@@ -2,6 +2,7 @@ lib/xorg/modules/drivers/rendition_drv.la
lib/xorg/modules/drivers/rendition_drv.so
lib/xorg/modules/v10002d.uc
lib/xorg/modules/v20002d.uc
+man/man4/rendition.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
index 78028bcef927..fb0dd1c4bc57 100644
--- a/x11-drivers/xf86-video-s3/Makefile
+++ b/x11-drivers/xf86-video-s3/Makefile
@@ -2,13 +2,12 @@
PORTNAME= xf86-video-s3
PORTVERSION= 0.6.5
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org s3 display driver
XORG_CAT= driver
-MAN4= s3.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-s3/pkg-plist b/x11-drivers/xf86-video-s3/pkg-plist
index 0f96af8d750b..735f2aa01158 100644
--- a/x11-drivers/xf86-video-s3/pkg-plist
+++ b/x11-drivers/xf86-video-s3/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/s3_drv.la
lib/xorg/modules/drivers/s3_drv.so
+man/man4/s3.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
index 0a4130967f5a..0da4a4c95d2a 100644
--- a/x11-drivers/xf86-video-s3virge/Makefile
+++ b/x11-drivers/xf86-video-s3virge/Makefile
@@ -2,13 +2,12 @@
PORTNAME= xf86-video-s3virge
PORTVERSION= 1.10.6
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org s3virge display driver
XORG_CAT= driver
-MAN4= s3virge.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-s3virge/pkg-plist b/x11-drivers/xf86-video-s3virge/pkg-plist
index 0db60dcaeebe..85fbb681accf 100644
--- a/x11-drivers/xf86-video-s3virge/pkg-plist
+++ b/x11-drivers/xf86-video-s3virge/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/s3virge_drv.la
lib/xorg/modules/drivers/s3virge_drv.so
+man/man4/s3virge.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index aca57f72ca5a..414be7e07de5 100644
--- a/x11-drivers/xf86-video-savage/Makefile
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-savage
PORTVERSION= 2.3.7
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
index 4bd7ca801bfe..117af602b55f 100644
--- a/x11-drivers/xf86-video-siliconmotion/Makefile
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -2,13 +2,12 @@
PORTNAME= xf86-video-siliconmotion
PORTVERSION= 1.7.7
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org siliconmotion display driver
XORG_CAT= driver
-MAN4= siliconmotion.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-siliconmotion/pkg-plist b/x11-drivers/xf86-video-siliconmotion/pkg-plist
index 199eda7785f9..7f27c3c38015 100644
--- a/x11-drivers/xf86-video-siliconmotion/pkg-plist
+++ b/x11-drivers/xf86-video-siliconmotion/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/siliconmotion_drv.la
lib/xorg/modules/drivers/siliconmotion_drv.so
+man/man4/siliconmotion.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-sis-intel/Makefile b/x11-drivers/xf86-video-sis-intel/Makefile
index 40d26b51893e..40e4b47cc459 100644
--- a/x11-drivers/xf86-video-sis-intel/Makefile
+++ b/x11-drivers/xf86-video-sis-intel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xf86-video-sis-intel
PORTVERSION= 300407
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-drivers
MASTER_SITES= http://downloadmirror.intel.com/15443/eng/
DISTNAME= sis_drv_src_300407
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index 1fd3ede1afab..63d58c856b1d 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-sis
PORTVERSION= 0.10.7
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -13,7 +14,5 @@ USE_GL= gl
XORG_CAT= driver
USE_XORG= xf86dgaproto xf86driproto xineramaproto xf86miscproto glproto
-MAN4= sis.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-sis/pkg-plist b/x11-drivers/xf86-video-sis/pkg-plist
index e1daba86088a..efcedbc0f6db 100644
--- a/x11-drivers/xf86-video-sis/pkg-plist
+++ b/x11-drivers/xf86-video-sis/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/sis_drv.la
lib/xorg/modules/drivers/sis_drv.so
+man/man4/sis.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile
index f91d69f45af9..5ecb9e27dc1b 100644
--- a/x11-drivers/xf86-video-sunffb/Makefile
+++ b/x11-drivers/xf86-video-sunffb/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-sunffb
PORTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
index ec9c69624798..5e17cc359bdc 100644
--- a/x11-drivers/xf86-video-tdfx/Makefile
+++ b/x11-drivers/xf86-video-tdfx/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-tdfx
PORTVERSION= 1.4.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -12,7 +12,5 @@ USE_GL= gl
XORG_CAT= driver
USE_XORG= xf86driproto glproto
-MAN4= tdfx.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-tdfx/pkg-plist b/x11-drivers/xf86-video-tdfx/pkg-plist
index 97d1e6df842b..fa4d8b44a61b 100644
--- a/x11-drivers/xf86-video-tdfx/pkg-plist
+++ b/x11-drivers/xf86-video-tdfx/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/tdfx_drv.la
lib/xorg/modules/drivers/tdfx_drv.so
+man/man4/tdfx.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile
index 4458f2c8189a..827dc8b06a94 100644
--- a/x11-drivers/xf86-video-tga/Makefile
+++ b/x11-drivers/xf86-video-tga/Makefile
@@ -11,5 +11,4 @@ COMMENT= X.Org tga display driver
XORG_CAT= driver
USE_XORG= xf86dgaproto
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
index 5408db1d526f..56c9fc522a6d 100644
--- a/x11-drivers/xf86-video-trident/Makefile
+++ b/x11-drivers/xf86-video-trident/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-trident
PORTVERSION= 1.3.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= X.Org trident display driver
XORG_CAT= driver
USE_XORG= xf86dgaproto
-MAN4= trident.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-trident/pkg-plist b/x11-drivers/xf86-video-trident/pkg-plist
index a2348baf7684..f2b5b0de9faa 100644
--- a/x11-drivers/xf86-video-trident/pkg-plist
+++ b/x11-drivers/xf86-video-trident/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/trident_drv.la
lib/xorg/modules/drivers/trident_drv.so
+man/man4/trident.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile
index ec63a430d17f..71baafaf94a6 100644
--- a/x11-drivers/xf86-video-tseng/Makefile
+++ b/x11-drivers/xf86-video-tseng/Makefile
@@ -2,14 +2,12 @@
PORTNAME= xf86-video-tseng
PORTVERSION= 1.2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org tseng display driver
XORG_CAT= driver
-MAN4= tseng.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-tseng/pkg-plist b/x11-drivers/xf86-video-tseng/pkg-plist
index 62decd9aa3df..3eba34ace5b6 100644
--- a/x11-drivers/xf86-video-tseng/pkg-plist
+++ b/x11-drivers/xf86-video-tseng/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/tseng_drv.la
lib/xorg/modules/drivers/tseng_drv.so
+man/man4/tseng.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
index 3b80a5c8e154..6b2ed137f5e1 100644
--- a/x11-drivers/xf86-video-vesa/Makefile
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -2,13 +2,12 @@
PORTNAME= xf86-video-vesa
PORTVERSION= 2.3.3
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org vesa display driver
XORG_CAT= driver
-MAN4= vesa.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-vesa/pkg-plist b/x11-drivers/xf86-video-vesa/pkg-plist
index 5a9cf2e0b42c..1091e20a3eeb 100644
--- a/x11-drivers/xf86-video-vesa/pkg-plist
+++ b/x11-drivers/xf86-video-vesa/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/vesa_drv.la
lib/xorg/modules/drivers/vesa_drv.so
+man/man4/vesa.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-via/Makefile b/x11-drivers/xf86-video-via/Makefile
index 66e74aa504fe..550d304a79ff 100644
--- a/x11-drivers/xf86-video-via/Makefile
+++ b/x11-drivers/xf86-video-via/Makefile
@@ -2,21 +2,20 @@
PORTNAME= xf86-video-via
PORTVERSION= 0.2.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org via display driver
-IGNORE= requires pciVideoPtr typedef
+BROKEN= Does not build, requires pciVideoPtr typedef
+DEPRECATED= Broken, not supported upstream.
+EXPIRATION_DATE=2014-01-31
USE_GL= gl
XORG_CAT= driver
USE_XORG= xvmc xf86driproto xextproto x11 glproto
-MAN4= via.4x
-
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${ARCH} == "sparc64"
diff --git a/x11-drivers/xf86-video-via/pkg-plist b/x11-drivers/xf86-video-via/pkg-plist
index 06c919d0743b..fe1713c885a3 100644
--- a/x11-drivers/xf86-video-via/pkg-plist
+++ b/x11-drivers/xf86-video-via/pkg-plist
@@ -6,6 +6,7 @@ lib/libviaXvMCPro.so
lib/libviaXvMCPro.so.1
lib/xorg/modules/drivers/via_drv.la
lib/xorg/modules/drivers/via_drv.so
+man/man4/via.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
index 2e731b89da98..de0c5dcf8cf0 100644
--- a/x11-drivers/xf86-video-vmware/Makefile
+++ b/x11-drivers/xf86-video-vmware/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-vmware
PORTVERSION= 13.0.1
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -10,7 +11,4 @@ COMMENT= X.Org vmware display driver
XORG_CAT= driver
USE_XORG= xextproto xineramaproto videoproto
-MAN4= vmware.4x
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-vmware/files/patch-src_vmware.c b/x11-drivers/xf86-video-vmware/files/patch-src_vmware.c
new file mode 100644
index 000000000000..6f3a552bb6b0
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/files/patch-src_vmware.c
@@ -0,0 +1,11 @@
+--- src/vmware.c.orig 2013-12-16 11:39:54.616921846 +0100
++++ src/vmware.c 2013-12-16 11:40:27.592920514 +0100
+@@ -365,7 +365,7 @@
+ "No supported VMware SVGA found (read ID 0x%08x).\n", id);
+ return FALSE;
+ }
+- pVMWARE->suspensionSavedRegId = id;
++ pVMWARE->SavedReg.svga_reg_id = id;
+
+ #if !XSERVER_LIBPCIACCESS
+ pVMWARE->PciTag = pciTag(pVMWARE->PciInfo->bus, pVMWARE->PciInfo->device,
diff --git a/x11-drivers/xf86-video-vmware/pkg-plist b/x11-drivers/xf86-video-vmware/pkg-plist
index 11352322763d..5b79c8f3e2de 100644
--- a/x11-drivers/xf86-video-vmware/pkg-plist
+++ b/x11-drivers/xf86-video-vmware/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/vmware_drv.la
lib/xorg/modules/drivers/vmware_drv.so
+man/man4/vmware.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
index c3e1361fd08b..0e23246f93ec 100644
--- a/x11-drivers/xf86-video-voodoo/Makefile
+++ b/x11-drivers/xf86-video-voodoo/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-voodoo
PORTVERSION= 1.2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= X.Org voodoo display driver
XORG_CAT= driver
USE_XORG= xf86dgaproto
-MAN4= voodoo.4x
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-voodoo/pkg-plist b/x11-drivers/xf86-video-voodoo/pkg-plist
index 98df90622eca..d4ef86aed783 100644
--- a/x11-drivers/xf86-video-voodoo/pkg-plist
+++ b/x11-drivers/xf86-video-voodoo/pkg-plist
@@ -1,5 +1,6 @@
lib/xorg/modules/drivers/voodoo_drv.la
lib/xorg/modules/drivers/voodoo_drv.so
+man/man4/voodoo.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index a8f0921183f4..2729f9a59658 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -97,7 +97,6 @@ SUNFFB_DESC= Install sunffb video driver
# these drivers have a different module name compared to the plugin they install
QUIRKS= keyboard:kbd
-NO_STAGE= yes
.include <bsd.port.options.mk>
# Manual add arch specific drivers so they be added to depend lines.
@@ -122,7 +121,7 @@ RUN_DEPENDS+= ${${type:U}DIR}/${i}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-$
.endfor
do-install:
- ${MKDIR} ${PREFIX}/libdata/xorg
- ${TOUCH} ${PREFIX}/libdata/xorg/drivers
+ ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/xorg
+ ${TOUCH} ${STAGEDIR}${PREFIX}/libdata/xorg/drivers
.include <bsd.port.mk>