Adding:

xf86-input-elographics
xf86-input-fpit
xf86-input-hyperpen
xf86-input-joystick
xf86-input-mutouch
xf86-video-modesetting
xf86-video-nouveau
xf86-video-qxl
xf86-video-suncg6
xf86-video-suntcx
xf86-video-voodoo

from pkgsrc-wip on request from wiz@ last quarter. LICENSE will be fixed
later.

50 files changed, 498 insertions, 1 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 7e2771e3662..f4cf4a3070d 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.752 2015/06/05 22:45:24 youri Exp $
+# $NetBSD: Makefile,v 1.753 2015/07/02 03:37:48 rodent Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -537,8 +537,13 @@ SUBDIR+=	xev
 SUBDIR+=	xextproto
 SUBDIR+=	xeyes
 SUBDIR+=	xf86-input-acecad
+SUBDIR+=	xf86-input-elographics
+SUBDIR+=	xf86-input-fpit
+SUBDIR+=	xf86-input-hyperpen
+SUBDIR+=	xf86-input-joystick
 SUBDIR+=	xf86-input-keyboard
 SUBDIR+=	xf86-input-mouse
+SUBDIR+=	xf86-input-mutouch
 SUBDIR+=	xf86-input-penmount
 SUBDIR+=	xf86-input-vmmouse
 SUBDIR+=	xf86-input-void
@@ -557,10 +562,13 @@ SUBDIR+=	xf86-video-i740
 SUBDIR+=	xf86-video-intel
 SUBDIR+=	xf86-video-mach64
 SUBDIR+=	xf86-video-mga
+SUBDIR+=	xf86-video-modesetting
 SUBDIR+=	xf86-video-neomagic
 SUBDIR+=	xf86-video-newport
+SUBDIR+=	xf86-video-nouveau
 SUBDIR+=	xf86-video-nv
 SUBDIR+=	xf86-video-openchrome
+SUBDIR+=	xf86-video-qxl
 SUBDIR+=	xf86-video-r128
 SUBDIR+=	xf86-video-rendition
 SUBDIR+=	xf86-video-s3
@@ -570,13 +578,16 @@ SUBDIR+=	xf86-video-siliconmotion
 SUBDIR+=	xf86-video-sis
 SUBDIR+=	xf86-video-suncg14
 SUBDIR+=	xf86-video-suncg3
+SUBDIR+=	xf86-video-suncg6
 SUBDIR+=	xf86-video-sunffb
+SUBDIR+=	xf86-video-suntcx
 SUBDIR+=	xf86-video-tdfx
 SUBDIR+=	xf86-video-tga
 SUBDIR+=	xf86-video-trident
 SUBDIR+=	xf86-video-tseng
 SUBDIR+=	xf86-video-vesa
 SUBDIR+=	xf86-video-vmware
+SUBDIR+=	xf86-video-voodoo
 SUBDIR+=	xf86-video-wsfb
 SUBDIR+=	xf86bigfontproto
 SUBDIR+=	xf86dgaproto
diff --git a/x11/xf86-input-elographics/DESCR b/x11/xf86-input-elographics/DESCR
new file mode 100644
index 00000000000..d1005340ee6
--- /dev/null
+++ b/x11/xf86-input-elographics/DESCR
@@ -0,0 +1 @@
+Elographics input driver for the Xorg X server.
diff --git a/x11/xf86-input-elographics/Makefile b/x11/xf86-input-elographics/Makefile
new file mode 100644
index 00000000000..f44d32e02ab
--- /dev/null
+++ b/x11/xf86-input-elographics/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 03:37:48 rodent Exp $
+
+DISTNAME=	xf86-input-elographics-1.4.1
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Elographics input driver for the Xorg X server
+#LICENSE=	# TODO: (see mk/license.mk)
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
+.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/modular-xorg-server/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-input-elographics/PLIST b/x11/xf86-input-elographics/PLIST
new file mode 100644
index 00000000000..25c60ee2f9b
--- /dev/null
+++ b/x11/xf86-input-elographics/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 03:37:48 rodent Exp $
+lib/xorg/modules/input/elographics_drv.la
+man/man4/elographics.4
diff --git a/x11/xf86-input-elographics/distinfo b/x11/xf86-input-elographics/distinfo
new file mode 100644
index 00000000000..b0bfaa3f7cc
--- /dev/null
+++ b/x11/xf86-input-elographics/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 03:37:48 rodent Exp $
+
+SHA1 (xf86-input-elographics-1.4.1.tar.bz2) = 78455583a34ccd209edc1aba5538926df4faf47f
+RMD160 (xf86-input-elographics-1.4.1.tar.bz2) = ba2833a8627b80c538c7b98fba33aeb3f512d136
+Size (xf86-input-elographics-1.4.1.tar.bz2) = 280311 bytes
diff --git a/x11/xf86-input-fpit/DESCR b/x11/xf86-input-fpit/DESCR
new file mode 100644
index 00000000000..dfeafa2f857
--- /dev/null
+++ b/x11/xf86-input-fpit/DESCR
@@ -0,0 +1 @@
+Fujitsu Stylistic Tablet PC input driver for the Xorg X server.
diff --git a/x11/xf86-input-fpit/Makefile b/x11/xf86-input-fpit/Makefile
new file mode 100644
index 00000000000..aaf05a4b84d
--- /dev/null
+++ b/x11/xf86-input-fpit/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 03:37:48 rodent Exp $
+
+DISTNAME=	xf86-input-fpit-1.4.0
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Fujitsu Stylistic Tablet PC input driver for the Xorg X server
+#LICENSE=	# TODO: (see mk/license.mk)
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
+.include "../../devel/xorg-util-macros/buildlink3.mk"
+.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/modular-xorg-server/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-input-fpit/PLIST b/x11/xf86-input-fpit/PLIST
new file mode 100644
index 00000000000..a57f7d6c0ee
--- /dev/null
+++ b/x11/xf86-input-fpit/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 03:37:48 rodent Exp $
+lib/xorg/modules/input/fpit_drv.la
+man/man4/fpit.4
+share/X11/xorg.conf.d/50-fpit.conf
diff --git a/x11/xf86-input-fpit/distinfo b/x11/xf86-input-fpit/distinfo
new file mode 100644
index 00000000000..ea42ea8acc9
--- /dev/null
+++ b/x11/xf86-input-fpit/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 03:37:48 rodent Exp $
+
+SHA1 (xf86-input-fpit-1.4.0.tar.bz2) = 9305d30ae22d37c6b5bb975adc8ecda9b1d6c5e6
+RMD160 (xf86-input-fpit-1.4.0.tar.bz2) = bf175ce8491f13d032e03ee6808c0f845f888e18
+Size (xf86-input-fpit-1.4.0.tar.bz2) = 277843 bytes
diff --git a/x11/xf86-input-hyperpen/DESCR b/x11/xf86-input-hyperpen/DESCR
new file mode 100644
index 00000000000..f79c99051d1
--- /dev/null
+++ b/x11/xf86-input-hyperpen/DESCR
@@ -0,0 +1 @@
+Aiptek HyperPen 6000 input driver for the Xorg X server.
diff --git a/x11/xf86-input-hyperpen/Makefile b/x11/xf86-input-hyperpen/Makefile
new file mode 100644
index 00000000000..ec74eda004c
--- /dev/null
+++ b/x11/xf86-input-hyperpen/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 03:37:48 rodent Exp $
+
+DISTNAME=	xf86-input-hyperpen-1.4.1
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Aiptek HyperPen 6000 input driver for the Xorg X server
+#LICENSE=	# TODO: (see mk/license.mk)
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
+.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/modular-xorg-server/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-input-hyperpen/PLIST b/x11/xf86-input-hyperpen/PLIST
new file mode 100644
index 00000000000..b53aec7fb0c
--- /dev/null
+++ b/x11/xf86-input-hyperpen/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 03:37:48 rodent Exp $
+lib/xorg/modules/input/hyperpen_drv.la
diff --git a/x11/xf86-input-hyperpen/distinfo b/x11/xf86-input-hyperpen/distinfo
new file mode 100644
index 00000000000..6c4ce160bb5
--- /dev/null
+++ b/x11/xf86-input-hyperpen/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 03:37:48 rodent Exp $
+
+SHA1 (xf86-input-hyperpen-1.4.1.tar.bz2) = 4a3555310e812dc895b7493b11f7377314c36a75
+RMD160 (xf86-input-hyperpen-1.4.1.tar.bz2) = 500b2bff3b91fbdc3814c32dbdef88e553ba2b2a
+Size (xf86-input-hyperpen-1.4.1.tar.bz2) = 266891 bytes
diff --git a/x11/xf86-input-joystick/DESCR b/x11/xf86-input-joystick/DESCR
new file mode 100644
index 00000000000..82838463460
--- /dev/null
+++ b/x11/xf86-input-joystick/DESCR
@@ -0,0 +1 @@
+Joystick input driver for the Xorg X server.
diff --git a/x11/xf86-input-joystick/Makefile b/x11/xf86-input-joystick/Makefile
new file mode 100644
index 00000000000..57c377b1f3f
--- /dev/null
+++ b/x11/xf86-input-joystick/Makefile
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+DISTNAME=	xf86-input-joystick-1.6.2
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Joystick input driver for the Xorg X server
+#LICENSE=	# TODO: (see mk/license.mk)
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+PKGCONFIG_OVERRIDE+=	xorg-joystick.pc.in
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
+.include "../../x11/kbproto/buildlink3.mk"
+.include "../../devel/xorg-util-macros/buildlink3.mk"
+.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/modular-xorg-server/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-input-joystick/PLIST b/x11/xf86-input-joystick/PLIST
new file mode 100644
index 00000000000..d14b8274047
--- /dev/null
+++ b/x11/xf86-input-joystick/PLIST
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 03:37:49 rodent Exp $
+include/xorg/joystick-properties.h
+lib/pkgconfig/xorg-joystick.pc
+lib/xorg/modules/input/joystick_drv.la
+man/man4/joystick.4
diff --git a/x11/xf86-input-joystick/distinfo b/x11/xf86-input-joystick/distinfo
new file mode 100644
index 00000000000..ef9f11a8b8a
--- /dev/null
+++ b/x11/xf86-input-joystick/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+SHA1 (xf86-input-joystick-1.6.2.tar.bz2) = 61658b8d829fdaed6064c7c26232c3884d359187
+RMD160 (xf86-input-joystick-1.6.2.tar.bz2) = c2821f284ba33488032d0dc9fe3300c9dad95d84
+Size (xf86-input-joystick-1.6.2.tar.bz2) = 327539 bytes
diff --git a/x11/xf86-input-mutouch/DESCR b/x11/xf86-input-mutouch/DESCR
new file mode 100644
index 00000000000..8a18dd6c8f2
--- /dev/null
+++ b/x11/xf86-input-mutouch/DESCR
@@ -0,0 +1 @@
+Microtouch input driver for the Xorg X server.
diff --git a/x11/xf86-input-mutouch/Makefile b/x11/xf86-input-mutouch/Makefile
new file mode 100644
index 00000000000..f4040d1a9fa
--- /dev/null
+++ b/x11/xf86-input-mutouch/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+DISTNAME=	xf86-input-mutouch-1.3.0
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Microtouch input driver for the Xorg X server
+#LICENSE=	# TODO: (see mk/license.mk)
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
+.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/modular-xorg-server/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-input-mutouch/PLIST b/x11/xf86-input-mutouch/PLIST
new file mode 100644
index 00000000000..4924966a052
--- /dev/null
+++ b/x11/xf86-input-mutouch/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 03:37:49 rodent Exp $
+lib/xorg/modules/input/mutouch_drv.la
+man/man4/mutouch.4
diff --git a/x11/xf86-input-mutouch/distinfo b/x11/xf86-input-mutouch/distinfo
new file mode 100644
index 00000000000..55fb9dc4e61
--- /dev/null
+++ b/x11/xf86-input-mutouch/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+SHA1 (xf86-input-mutouch-1.3.0.tar.bz2) = 55702932f9ecef29bf9b096b9fdc45aa45614db5
+RMD160 (xf86-input-mutouch-1.3.0.tar.bz2) = 7b0d71c0b8a8d026291e4c5e214af376e1fc932d
+Size (xf86-input-mutouch-1.3.0.tar.bz2) = 268865 bytes
diff --git a/x11/xf86-video-modesetting/DESCR b/x11/xf86-video-modesetting/DESCR
new file mode 100644
index 00000000000..7828e11d0a2
--- /dev/null
+++ b/x11/xf86-video-modesetting/DESCR
@@ -0,0 +1,3 @@
+This is a generic modesetting driver. The idea is to piggy-back the X driver on
+top of the DRM and Gallium3D drivers (DRM for modesetting and Gallium3D for Exa
+acceleration).
diff --git a/x11/xf86-video-modesetting/Makefile b/x11/xf86-video-modesetting/Makefile
new file mode 100644
index 00000000000..99048b6430d
--- /dev/null
+++ b/x11/xf86-video-modesetting/Makefile
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+DISTNAME=	xf86-video-modesetting-0.9.0
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Generic modesetting driver
+LICENSE=	mit
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
+BUILDLINK_API_DEPENDS.xextproto+=	xextproto>=7.0.99.1
+.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../sysutils/libpciaccess/buildlink3.mk"
+.include "../../x11/libdrm/buildlink3.mk"
+.include "../../x11/fontsproto/buildlink3.mk"
+.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/modular-xorg-server/buildlink3.mk"
+.include "../../devel/xorg-util-macros/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-modesetting/PLIST b/x11/xf86-video-modesetting/PLIST
new file mode 100644
index 00000000000..ffa04606963
--- /dev/null
+++ b/x11/xf86-video-modesetting/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 03:37:49 rodent Exp $
+lib/xorg/modules/drivers/modesetting_drv.la
+man/man4/modesetting.4
diff --git a/x11/xf86-video-modesetting/distinfo b/x11/xf86-video-modesetting/distinfo
new file mode 100644
index 00000000000..f868e75317a
--- /dev/null
+++ b/x11/xf86-video-modesetting/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+SHA1 (xf86-video-modesetting-0.9.0.tar.bz2) = 982e5140ad81051d51c6370d065f3033ee4ad24b
+RMD160 (xf86-video-modesetting-0.9.0.tar.bz2) = 3b94767bbe02febd0e9d7f57f32918d11caa8412
+Size (xf86-video-modesetting-0.9.0.tar.bz2) = 304351 bytes
diff --git a/x11/xf86-video-nouveau/DESCR b/x11/xf86-video-nouveau/DESCR
new file mode 100644
index 00000000000..fb170052af9
--- /dev/null
+++ b/x11/xf86-video-nouveau/DESCR
@@ -0,0 +1 @@
+New NVidia driver.
diff --git a/x11/xf86-video-nouveau/Makefile b/x11/xf86-video-nouveau/Makefile
new file mode 100644
index 00000000000..9e54ef2dd5f
--- /dev/null
+++ b/x11/xf86-video-nouveau/Makefile
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+DISTNAME=	xf86-video-nouveau-1.0.11
+CATEGORIES=	x11
+MASTER_SITES=	http://xorg.freedesktop.org/archive/individual/driver/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	New (or nouveau) NVidia driver for modular X.org
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
+.include "../../x11/modular-xorg-server/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../x11/libdrm/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/randrproto/buildlink3.mk"
+.include "../../x11/randrproto/buildlink3.mk"
+.include "../../x11/xf86driproto/buildlink3.mk"
+.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/fontsproto/buildlink3.mk"
+.include "../../x11/glproto/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-nouveau/PLIST b/x11/xf86-video-nouveau/PLIST
new file mode 100644
index 00000000000..4953e81423c
--- /dev/null
+++ b/x11/xf86-video-nouveau/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 03:37:49 rodent Exp $
+lib/xorg/modules/drivers/nouveau_drv.la
+man/man4/nouveau.4
diff --git a/x11/xf86-video-nouveau/distinfo b/x11/xf86-video-nouveau/distinfo
new file mode 100644
index 00000000000..7b6ffbc75b5
--- /dev/null
+++ b/x11/xf86-video-nouveau/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+SHA1 (xf86-video-nouveau-1.0.11.tar.bz2) = ea94037f8dd05c223dd89c79a2e655ff58425892
+RMD160 (xf86-video-nouveau-1.0.11.tar.bz2) = fb456dd3f9a20f492860040f3b7b70e107d68e61
+Size (xf86-video-nouveau-1.0.11.tar.bz2) = 582436 bytes
diff --git a/x11/xf86-video-nouveau/patches/patch-aa b/x11/xf86-video-nouveau/patches/patch-aa
new file mode 100644
index 00000000000..92cbefb15e8
--- /dev/null
+++ b/x11/xf86-video-nouveau/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+--- src/nv_bios.c.orig	2008-06-02 01:28:36.000000000 -0400
++++ src/nv_bios.c
+@@ -23,7 +23,11 @@
+  */
+ 
+ #include "nv_include.h"
++#ifdef __NetBSD__
++#include <sys/endian.h>
++#else
+ #include <byteswap.h>
++#endif
+ 
+ /* FIXME: put these somewhere */
+ #define SEQ_INDEX VGA_SEQ_INDEX
diff --git a/x11/xf86-video-qxl/DESCR b/x11/xf86-video-qxl/DESCR
new file mode 100644
index 00000000000..ec4b68b7b63
--- /dev/null
+++ b/x11/xf86-video-qxl/DESCR
@@ -0,0 +1,2 @@
+The QXL virtual GPU is found in the RedHat Enterprise Virtualisation system,
+and also in the spice project.
diff --git a/x11/xf86-video-qxl/Makefile b/x11/xf86-video-qxl/Makefile
new file mode 100644
index 00000000000..6553f5fa279
--- /dev/null
+++ b/x11/xf86-video-qxl/Makefile
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+DISTNAME=	xf86-video-qxl-0.1.4
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	QXL virtual GPU
+LICENSE=	mit
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+.include "options.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
+BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.4.46
+.include "../../x11/libdrm/buildlink3.mk"
+.include "../../sysutils/libpciaccess/buildlink3.mk"
+.include "../../sysutils/spice-protocol/buildlink3.mk"
+.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/fontsproto/buildlink3.mk"
+.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/modular-xorg-server/buildlink3.mk"
+.include "../../devel/xorg-util-macros/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-qxl/PLIST b/x11/xf86-video-qxl/PLIST
new file mode 100644
index 00000000000..de81515a2e5
--- /dev/null
+++ b/x11/xf86-video-qxl/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 03:37:49 rodent Exp $
+lib/xorg/modules/drivers/qxl_drv.la
+@pkgdir share/doc/xf86-video-qxl
diff --git a/x11/xf86-video-qxl/distinfo b/x11/xf86-video-qxl/distinfo
new file mode 100644
index 00000000000..9add0927a2d
--- /dev/null
+++ b/x11/xf86-video-qxl/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+SHA1 (xf86-video-qxl-0.1.4.tar.bz2) = 14b8574a0066c15a627064d4986f0d82af8b993b
+RMD160 (xf86-video-qxl-0.1.4.tar.bz2) = cc0b335ae437089c2ca45a1ba0f83050b27ff46f
+Size (xf86-video-qxl-0.1.4.tar.bz2) = 487656 bytes
diff --git a/x11/xf86-video-qxl/options.mk b/x11/xf86-video-qxl/options.mk
new file mode 100644
index 00000000000..6570c599258
--- /dev/null
+++ b/x11/xf86-video-qxl/options.mk
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.xf86-video-qxl
+PKG_SUPPORTED_OPTIONS=	static
+PKG_SUGGESTED_OPTIONS+=	# blank
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mstatic)
+CONFIGURE_ARGS+=	--enable-static=yes
+.else
+CONFIGURE_ARGS+=	--enable-static=no
+.endif
diff --git a/x11/xf86-video-suncg6/DESCR b/x11/xf86-video-suncg6/DESCR
new file mode 100644
index 00000000000..89930f79586
--- /dev/null
+++ b/x11/xf86-video-suncg6/DESCR
@@ -0,0 +1 @@
+GX/Turbo GX video driver for the Xorg X server.
diff --git a/x11/xf86-video-suncg6/Makefile b/x11/xf86-video-suncg6/Makefile
new file mode 100644
index 00000000000..238d2b942fa
--- /dev/null
+++ b/x11/xf86-video-suncg6/Makefile
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+DISTNAME=	xf86-video-suncg6-1.1.2
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	GX/Turbo GX video driver for the Xorg X server
+#LICENSE=	# TODO: (see mk/license.mk)
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+.include "options.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
+.include "../../x11/fontsproto/buildlink3.mk"
+.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/modular-xorg-server/buildlink3.mk"
+.include "../../devel/xorg-util-macros/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-suncg6/PLIST b/x11/xf86-video-suncg6/PLIST
new file mode 100644
index 00000000000..74b4292ea19
--- /dev/null
+++ b/x11/xf86-video-suncg6/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 03:37:49 rodent Exp $
+lib/xorg/modules/drivers/suncg6_drv.la
+man/man4/suncg6.4
diff --git a/x11/xf86-video-suncg6/distinfo b/x11/xf86-video-suncg6/distinfo
new file mode 100644
index 00000000000..d2826f5bda6
--- /dev/null
+++ b/x11/xf86-video-suncg6/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+SHA1 (xf86-video-suncg6-1.1.2.tar.bz2) = f23daaa1bffb9ebe168c6c6fc101743becf113ac
+RMD160 (xf86-video-suncg6-1.1.2.tar.bz2) = 73cb3ba36f8106313c9d403f441352ea24ec5594
+Size (xf86-video-suncg6-1.1.2.tar.bz2) = 286663 bytes
diff --git a/x11/xf86-video-suncg6/options.mk b/x11/xf86-video-suncg6/options.mk
new file mode 100644
index 00000000000..9acc048157a
--- /dev/null
+++ b/x11/xf86-video-suncg6/options.mk
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.xf86-video-suncg6
+PKG_SUPPORTED_OPTIONS=	static
+PKG_SUGGESTED_OPTIONS+=	# blank
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mstatic)
+CONFIGURE_ARGS+=	--enable-static=yes
+.else
+CONFIGURE_ARGS+=	--enable-static=no
+.endif
diff --git a/x11/xf86-video-suntcx/DESCR b/x11/xf86-video-suntcx/DESCR
new file mode 100644
index 00000000000..65dc13a96d5
--- /dev/null
+++ b/x11/xf86-video-suntcx/DESCR
@@ -0,0 +1 @@
+TCX video driver for the Xorg X server.
diff --git a/x11/xf86-video-suntcx/Makefile b/x11/xf86-video-suntcx/Makefile
new file mode 100644
index 00000000000..ae5b28472c6
--- /dev/null
+++ b/x11/xf86-video-suntcx/Makefile
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+DISTNAME=	xf86-video-suntcx-1.1.2
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	TCX video driver for the Xorg X server
+#LICENSE=	# TODO: (see mk/license.mk)
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+.include "options.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
+.include "../../x11/fontsproto/buildlink3.mk"
+.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/modular-xorg-server/buildlink3.mk"
+.include "../../devel/xorg-util-macros/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-suntcx/PLIST b/x11/xf86-video-suntcx/PLIST
new file mode 100644
index 00000000000..621a8ed334e
--- /dev/null
+++ b/x11/xf86-video-suntcx/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 03:37:49 rodent Exp $
+lib/xorg/modules/drivers/suntcx_drv.la
+man/man4/suntcx.4
diff --git a/x11/xf86-video-suntcx/distinfo b/x11/xf86-video-suntcx/distinfo
new file mode 100644
index 00000000000..a71f423decd
--- /dev/null
+++ b/x11/xf86-video-suntcx/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+SHA1 (xf86-video-suntcx-1.1.2.tar.bz2) = 6c86212b104647e239e24b33078406fa15fdbdba
+RMD160 (xf86-video-suntcx-1.1.2.tar.bz2) = af64e3a204a58a5b71960a5f765fc6f266349a20
+Size (xf86-video-suntcx-1.1.2.tar.bz2) = 285544 bytes
diff --git a/x11/xf86-video-suntcx/options.mk b/x11/xf86-video-suntcx/options.mk
new file mode 100644
index 00000000000..f990af00a21
--- /dev/null
+++ b/x11/xf86-video-suntcx/options.mk
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.xf86-video-suntcx
+PKG_SUPPORTED_OPTIONS=	static
+PKG_SUGGESTED_OPTIONS+=	# blank
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mstatic)
+CONFIGURE_ARGS+=	--enable-static=yes
+.else
+CONFIGURE_ARGS+=	--enable-static=no
+.endif
diff --git a/x11/xf86-video-voodoo/DESCR b/x11/xf86-video-voodoo/DESCR
new file mode 100644
index 00000000000..7ff30d546fa
--- /dev/null
+++ b/x11/xf86-video-voodoo/DESCR
@@ -0,0 +1 @@
+Voodoo/Voodoo2 video driver.
diff --git a/x11/xf86-video-voodoo/Makefile b/x11/xf86-video-voodoo/Makefile
new file mode 100644
index 00000000000..6ad6887b697
--- /dev/null
+++ b/x11/xf86-video-voodoo/Makefile
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+DISTNAME=	xf86-video-voodoo-1.2.5
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Voodoo/Voodoo2 video driver
+LICENSE=	mit # XXX AND one other
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+.include "options.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
+BUILDLINK_API_DEPENDS.xextproto+=	xextproto>=7.0.99.1
+.include "../../x11/xextproto/buildlink3.mk"
+.include "../../sysutils/libpciaccess/buildlink3.mk"
+.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/fontsproto/buildlink3.mk"
+.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/modular-xorg-server/buildlink3.mk"
+.include "../../devel/xorg-util-macros/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-voodoo/PLIST b/x11/xf86-video-voodoo/PLIST
new file mode 100644
index 00000000000..e0ca46053c2
--- /dev/null
+++ b/x11/xf86-video-voodoo/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 03:37:49 rodent Exp $
+lib/xorg/modules/drivers/voodoo_drv.la
+man/man4/voodoo.4
diff --git a/x11/xf86-video-voodoo/distinfo b/x11/xf86-video-voodoo/distinfo
new file mode 100644
index 00000000000..a18e57077a6
--- /dev/null
+++ b/x11/xf86-video-voodoo/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+SHA1 (xf86-video-voodoo-1.2.5.tar.bz2) = 7316df33814694ad2fb1617bcd92e6e42c3d184f
+RMD160 (xf86-video-voodoo-1.2.5.tar.bz2) = 80d69602164641dfef9bb951f4ad694c06de9bc1
+Size (xf86-video-voodoo-1.2.5.tar.bz2) = 305489 bytes
+SHA1 (patch-src_voodoo.h) = e964411361df6bc7eafd4fc8db19a84bf76c5876
diff --git a/x11/xf86-video-voodoo/options.mk b/x11/xf86-video-voodoo/options.mk
new file mode 100644
index 00000000000..d9b2df257ec
--- /dev/null
+++ b/x11/xf86-video-voodoo/options.mk
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2015/07/02 03:37:49 rodent Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.xf86-video-voodoo
+PKG_SUPPORTED_OPTIONS=	static
+PKG_SUGGESTED_OPTIONS+=	# blank
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mstatic)
+CONFIGURE_ARGS+=	--enable-static=yes
+.else
+CONFIGURE_ARGS+=	--enable-static=no
+.endif