summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--UPDATING22
-rw-r--r--graphics/dri/Makefile31
-rw-r--r--graphics/dri/distinfo4
-rw-r--r--graphics/dri/pkg-descr5
-rw-r--r--graphics/dri/pkg-plist21
-rw-r--r--graphics/libGL/Makefile24
-rw-r--r--graphics/libGL/bsd.mesalib.mk114
-rw-r--r--graphics/libGL/distinfo4
-rw-r--r--graphics/libGL/files/extra-mach64_context.h21
-rw-r--r--graphics/libGL/files/extra-sis_context.h22
-rw-r--r--graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp14
-rw-r--r--graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S12
-rw-r--r--graphics/libGL/files/extra-src__mesa__x86-64__xform4.S74
-rw-r--r--graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S11
-rw-r--r--graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S11
-rw-r--r--graphics/libGL/pkg-descr4
-rw-r--r--graphics/libGL/pkg-plist20
-rw-r--r--graphics/libGLU/Makefile24
-rw-r--r--graphics/libGLU/distinfo4
-rw-r--r--graphics/libGLU/pkg-descr3
-rw-r--r--graphics/libGLU/pkg-plist5
-rw-r--r--graphics/libGLw/Makefile22
-rw-r--r--graphics/libGLw/distinfo4
-rw-r--r--graphics/libGLw/pkg-descr3
-rw-r--r--graphics/libGLw/pkg-plist8
-rw-r--r--graphics/libdrm/Makefile57
-rw-r--r--graphics/libdrm/distinfo4
-rw-r--r--graphics/libdrm/files/extra-xf86drmMode.c29
-rw-r--r--graphics/libdrm/pkg-descr3
-rw-r--r--graphics/libdrm/pkg-plist74
-rw-r--r--graphics/libglut/Makefile25
-rw-r--r--graphics/libglut/distinfo8
-rw-r--r--graphics/libglut/pkg-descr5
-rw-r--r--graphics/libglut/pkg-plist6
-rw-r--r--graphics/mesa-demos/Makefile87
-rw-r--r--graphics/mesa-demos/distinfo4
-rw-r--r--graphics/mesa-demos/files/patch-progs-xdemos-glxpixmap.c11
-rw-r--r--graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c28
-rw-r--r--graphics/mesa-demos/files/patch-src__mesa__x86-64__glapi_x86-64.S12
-rw-r--r--graphics/mesa-demos/files/patch-src__mesa__x86-64__xform4.S74
-rw-r--r--graphics/mesa-demos/files/patch-src__mesa__x86__glapi_x86.S11
-rw-r--r--graphics/mesa-demos/files/patch-src__mesa__x86__read_rgba_span_x86.S11
-rw-r--r--graphics/mesa-demos/pkg-descr10
-rw-r--r--graphics/mesa-demos/pkg-plist94
-rw-r--r--x11-drivers/xf86-input-acecad/Makefile19
-rw-r--r--x11-drivers/xf86-input-acecad/distinfo2
-rw-r--r--x11-drivers/xf86-input-acecad/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-acecad/pkg-plist5
-rw-r--r--x11-drivers/xf86-input-egalax/Makefile31
-rw-r--r--x11-drivers/xf86-input-egalax/distinfo2
-rw-r--r--x11-drivers/xf86-input-egalax/pkg-descr1
-rw-r--r--x11-drivers/xf86-input-egalax/pkg-plist5
-rw-r--r--x11-drivers/xf86-input-elographics/Makefile28
-rw-r--r--x11-drivers/xf86-input-elographics/distinfo4
-rw-r--r--x11-drivers/xf86-input-elographics/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-elographics/pkg-plist5
-rw-r--r--x11-drivers/xf86-input-fpit/Makefile24
-rw-r--r--x11-drivers/xf86-input-fpit/distinfo2
-rw-r--r--x11-drivers/xf86-input-fpit/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-fpit/pkg-plist6
-rw-r--r--x11-drivers/xf86-input-hyperpen/Makefile22
-rw-r--r--x11-drivers/xf86-input-hyperpen/distinfo2
-rw-r--r--x11-drivers/xf86-input-hyperpen/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-hyperpen/pkg-plist5
-rw-r--r--x11-drivers/xf86-input-joystick/Makefile23
-rw-r--r--x11-drivers/xf86-input-joystick/distinfo2
-rw-r--r--x11-drivers/xf86-input-joystick/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-joystick/pkg-plist7
-rw-r--r--x11-drivers/xf86-input-keyboard/Makefile19
-rw-r--r--x11-drivers/xf86-input-keyboard/distinfo2
-rw-r--r--x11-drivers/xf86-input-keyboard/files/patch-at_scancode.c31
-rw-r--r--x11-drivers/xf86-input-keyboard/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-keyboard/pkg-plist5
-rw-r--r--x11-drivers/xf86-input-mouse/Makefile21
-rw-r--r--x11-drivers/xf86-input-mouse/distinfo2
-rw-r--r--x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c250
-rw-r--r--x11-drivers/xf86-input-mouse/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-mouse/pkg-plist5
-rw-r--r--x11-drivers/xf86-input-mutouch/Makefile25
-rw-r--r--x11-drivers/xf86-input-mutouch/distinfo2
-rw-r--r--x11-drivers/xf86-input-mutouch/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-mutouch/pkg-plist5
-rw-r--r--x11-drivers/xf86-input-penmount/Makefile28
-rw-r--r--x11-drivers/xf86-input-penmount/distinfo4
-rw-r--r--x11-drivers/xf86-input-penmount/pkg-descr4
-rw-r--r--x11-drivers/xf86-input-penmount/pkg-plist5
-rw-r--r--x11-drivers/xf86-input-synaptics/Makefile38
-rw-r--r--x11-drivers/xf86-input-synaptics/distinfo2
-rw-r--r--x11-drivers/xf86-input-synaptics/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-synaptics/pkg-plist18
-rw-r--r--x11-drivers/xf86-input-vmmouse/Makefile34
-rw-r--r--x11-drivers/xf86-input-vmmouse/distinfo2
-rw-r--r--x11-drivers/xf86-input-vmmouse/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-vmmouse/pkg-plist9
-rw-r--r--x11-drivers/xf86-input-void/Makefile29
-rw-r--r--x11-drivers/xf86-input-void/distinfo4
-rw-r--r--x11-drivers/xf86-input-void/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-void/pkg-plist5
-rw-r--r--x11-drivers/xf86-video-ark/Makefile19
-rw-r--r--x11-drivers/xf86-video-ark/distinfo2
-rw-r--r--x11-drivers/xf86-video-ark/pkg-descr1
-rw-r--r--x11-drivers/xf86-video-ark/pkg-plist5
-rw-r--r--x11-drivers/xf86-video-ati613/Makefile26
-rw-r--r--x11-drivers/xf86-video-ati613/distinfo2
-rw-r--r--x11-drivers/xf86-video-ati613/pkg-descr1
-rw-r--r--x11-drivers/xf86-video-ati613/pkg-plist14
-rw-r--r--x11-drivers/xf86-video-chips/Makefile19
-rw-r--r--x11-drivers/xf86-video-chips/distinfo2
-rw-r--r--x11-drivers/xf86-video-chips/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-chips/pkg-plist5
-rw-r--r--x11-drivers/xf86-video-dummy/Makefile18
-rw-r--r--x11-drivers/xf86-video-dummy/distinfo2
-rw-r--r--x11-drivers/xf86-video-dummy/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-dummy/pkg-plist5
-rw-r--r--x11-drivers/xf86-video-glint/Makefile22
-rw-r--r--x11-drivers/xf86-video-glint/distinfo2
-rw-r--r--x11-drivers/xf86-video-glint/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-glint/pkg-plist5
-rw-r--r--x11-drivers/xf86-video-intel/Makefile64
-rw-r--r--x11-drivers/xf86-video-intel/distinfo4
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c17
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c17
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c111
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c10
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_i810_video.c10
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c14
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c97
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c80
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c11
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_i830_render.c78
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_i830_video.c10
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c10
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_i915_render.c69
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_i965_render.c78
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c17
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c17
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c17
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h32
-rw-r--r--x11-drivers/xf86-video-intel/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-intel/pkg-plist21
-rw-r--r--x11-drivers/xf86-video-intel29/Makefile26
-rw-r--r--x11-drivers/xf86-video-intel29/distinfo2
-rw-r--r--x11-drivers/xf86-video-intel29/pkg-descr5
-rw-r--r--x11-drivers/xf86-video-intel29/pkg-plist21
-rw-r--r--x11-drivers/xf86-video-mach64/Makefile20
-rw-r--r--x11-drivers/xf86-video-mach64/distinfo2
-rw-r--r--x11-drivers/xf86-video-mach64/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-mach64/pkg-plist5
-rw-r--r--x11-drivers/xf86-video-mga/Makefile28
-rw-r--r--x11-drivers/xf86-video-mga/distinfo2
-rw-r--r--x11-drivers/xf86-video-mga/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-mga/pkg-plist5
-rw-r--r--x11-drivers/xf86-video-nouveau/Makefile60
-rw-r--r--x11-drivers/xf86-video-nouveau/Makefile.rev2
-rw-r--r--x11-drivers/xf86-video-nouveau/distinfo2
-rw-r--r--x11-drivers/xf86-video-nouveau/pkg-descr7
-rw-r--r--x11-drivers/xf86-video-nouveau/pkg-message15
-rw-r--r--x11-drivers/xf86-video-nouveau/pkg-plist5
-rw-r--r--x11-drivers/xf86-video-rendition/Makefile20
-rw-r--r--x11-drivers/xf86-video-rendition/distinfo2
-rw-r--r--x11-drivers/xf86-video-rendition/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-rendition/pkg-plist7
-rw-r--r--x11-drivers/xf86-video-savage/Makefile22
-rw-r--r--x11-drivers/xf86-video-savage/distinfo2
-rw-r--r--x11-drivers/xf86-video-savage/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-savage/pkg-plist5
-rw-r--r--x11-drivers/xf86-video-siliconmotion/Makefile19
-rw-r--r--x11-drivers/xf86-video-siliconmotion/distinfo2
-rw-r--r--x11-drivers/xf86-video-siliconmotion/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-siliconmotion/pkg-plist5
-rw-r--r--x11-drivers/xf86-video-sis/Makefile23
-rw-r--r--x11-drivers/xf86-video-sis/distinfo2
-rw-r--r--x11-drivers/xf86-video-sis/pkg-descr1
-rw-r--r--x11-drivers/xf86-video-sis/pkg-plist5
-rw-r--r--x11-drivers/xf86-video-vesa/Makefile20
-rw-r--r--x11-drivers/xf86-video-vesa/distinfo2
-rw-r--r--x11-drivers/xf86-video-vesa/pkg-descr1
-rw-r--r--x11-drivers/xf86-video-vesa/pkg-plist5
-rw-r--r--x11-drivers/xf86-video-voodoo/Makefile20
-rw-r--r--x11-drivers/xf86-video-voodoo/distinfo2
-rw-r--r--x11-drivers/xf86-video-voodoo/pkg-descr1
-rw-r--r--x11-drivers/xf86-video-voodoo/pkg-plist5
-rw-r--r--x11-servers/xephyr/Makefile34
-rw-r--r--x11-servers/xephyr/distinfo2
-rw-r--r--x11-servers/xephyr/pkg-descr5
-rw-r--r--x11-servers/xorg-dmx/Makefile35
-rw-r--r--x11-servers/xorg-dmx/distinfo2
-rw-r--r--x11-servers/xorg-dmx/pkg-descr6
-rw-r--r--x11-servers/xorg-dmx/pkg-plist12
-rw-r--r--x11-servers/xorg-nestserver/Makefile39
-rw-r--r--x11-servers/xorg-nestserver/distinfo2
-rw-r--r--x11-servers/xorg-nestserver/pkg-descr3
-rw-r--r--x11-servers/xorg-server/Makefile156
-rw-r--r--x11-servers/xorg-server/distinfo4
-rw-r--r--x11-servers/xorg-server/files/extra-arch-ia64221
-rw-r--r--x11-servers/xorg-server/files/extra-arch-powerpc14
-rw-r--r--x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c11
-rw-r--r--x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c12
-rw-r--r--x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c13
-rw-r--r--x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c12
-rw-r--r--x11-servers/xorg-server/files/patch-os-utils.c20
-rw-r--r--x11-servers/xorg-server/files/patch-servermd.h11
-rw-r--r--x11-servers/xorg-server/files/patch-xorgconf.cpp14
-rw-r--r--x11-servers/xorg-server/pkg-descr3
-rw-r--r--x11-servers/xorg-server/pkg-plist245
-rw-r--r--x11-servers/xorg-vfbserver/Makefile34
-rw-r--r--x11-servers/xorg-vfbserver/distinfo2
-rw-r--r--x11-servers/xorg-vfbserver/pkg-descr3
-rw-r--r--x11-toolkits/libXaw/Makefile23
-rw-r--r--x11-toolkits/libXaw/distinfo2
-rw-r--r--x11-toolkits/libXaw/pkg-descr3
-rw-r--r--x11-toolkits/libXaw/pkg-plist132
-rw-r--r--x11-toolkits/libXt/Makefile287
-rw-r--r--x11-toolkits/libXt/distinfo2
-rw-r--r--x11-toolkits/libXt/pkg-descr3
-rw-r--r--x11-toolkits/libXt/pkg-plist38
-rw-r--r--x11/dmxproto/Makefile17
-rw-r--r--x11/dmxproto/distinfo2
-rw-r--r--x11/dmxproto/pkg-descr3
-rw-r--r--x11/dmxproto/pkg-plist4
-rw-r--r--x11/dri2proto/Makefile17
-rw-r--r--x11/dri2proto/distinfo2
-rw-r--r--x11/dri2proto/pkg-descr3
-rw-r--r--x11/dri2proto/pkg-plist6
-rw-r--r--x11/glproto/Makefile17
-rw-r--r--x11/glproto/distinfo2
-rw-r--r--x11/glproto/pkg-descr3
-rw-r--r--x11/glproto/pkg-plist9
-rw-r--r--x11/libXi/Makefile93
-rw-r--r--x11/libXi/distinfo2
-rw-r--r--x11/libXi/pkg-descr3
-rw-r--r--x11/libXi/pkg-plist8
-rw-r--r--x11/libxcb/Makefile54
-rw-r--r--x11/libxcb/distinfo2
-rw-r--r--x11/libxcb/files/patch-Makefile.in11
-rw-r--r--x11/libxcb/files/patch-tests-check_public.c23
-rw-r--r--x11/libxcb/pkg-descr5
-rw-r--r--x11/libxcb/pkg-plist148
-rw-r--r--x11/xcb-proto/Makefile25
-rw-r--r--x11/xcb-proto/distinfo2
-rw-r--r--x11/xcb-proto/pkg-descr5
-rw-r--r--x11/xcb-proto/pkg-plist49
-rw-r--r--x11/xdm/Makefile59
-rw-r--r--x11/xdm/distinfo2
-rw-r--r--x11/xdm/files/patch-greeter-greet.c19
-rw-r--r--x11/xdm/files/patch-xdm_session.c27
-rw-r--r--x11/xdm/pkg-descr1
-rw-r--r--x11/xdm/pkg-plist52
-rw-r--r--x11/xdpyinfo/Makefile26
-rw-r--r--x11/xdpyinfo/distinfo2
-rw-r--r--x11/xdpyinfo/pkg-descr2
-rw-r--r--x11/xdriinfo/Makefile22
-rw-r--r--x11/xdriinfo/distinfo2
-rw-r--r--x11/xdriinfo/pkg-descr2
-rw-r--r--x11/xinit/Makefile29
-rw-r--r--x11/xinit/distinfo2
-rw-r--r--x11/xinit/pkg-descr1
-rw-r--r--x11/xkeyboard-config/Makefile53
-rw-r--r--x11/xkeyboard-config/distinfo2
-rw-r--r--x11/xkeyboard-config/pkg-descr7
-rw-r--r--x11/xkeyboard-config/pkg-plist403
261 files changed, 5789 insertions, 0 deletions
diff --git a/UPDATING b/UPDATING
new file mode 100644
index 0000000..efa2c15
--- /dev/null
+++ b/UPDATING
@@ -0,0 +1,22 @@
+
+** This needs at least a review **
+
+20120105:
+ AFFECTS: users of mesa based ports (libGL etc) and xorg-server.
+ AUTHOR: x11@FreeBSD.org
+
+ Update default mesa (libGL and friends) to 7.6.1 and xorg-server to 1.7.7.
+ Add a new switch WITH_NEW_XORG, for people that want mesa 7.11.x and
+ xorg-server 1.10.4, this will also update xf86-video-intel to the version
+ that only supports KMS. If you FreeBSD version doesn't have KMS then you
+ shouldn't use the WITH_NEW_XORG macro on machines with intel graphics.
+ Supported versions of FreeBSD with KMS kernel support:
+ 10.0-Current with a patch
+
+ When switching xorg-server versions make sure to rebuild your xf86-* ports.
+
+ Mention acceleration issues with KDE and 1.10.x. Nvidia should be without
+ any problems. Ati should work, but acceleration might be botched.
+ The nouveau driver is sadly a casualty, it needs both a update and kernel
+ support needs to be written. Other rarer drivers aren't tested.
+
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
new file mode 100644
index 0000000..922c37e
--- /dev/null
+++ b/graphics/dri/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for: dri
+# Date created: 8 Nov 2003
+# Whom: anholt@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME= dri
+PORTVERSION= ${MESAVERSION}
+PORTEPOCH= 2
+CATEGORIES= graphics
+
+COMMENT= OpenGL hardware acceleration drivers for the DRI
+
+LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm \
+ expat.6:${PORTSDIR}/textproc/expat2
+
+USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto
+
+do-install:
+ cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
+
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "ia64"
+BROKEN= Does not install on ia64
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo
new file mode 100644
index 0000000..106ab0b
--- /dev/null
+++ b/graphics/dri/distinfo
@@ -0,0 +1,4 @@
+SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
+SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
+SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
diff --git a/graphics/dri/pkg-descr b/graphics/dri/pkg-descr
new file mode 100644
index 0000000..776a52a
--- /dev/null
+++ b/graphics/dri/pkg-descr
@@ -0,0 +1,5 @@
+This package contains the current stable release of the client drivers for the
+DRI. With an X Server configured for the DRI they allow direct rendering of
+hardware-accelerated OpenGL.
+
+WWW: http://dri.sourceforge.net/
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
new file mode 100644
index 0000000..0025383
--- /dev/null
+++ b/graphics/dri/pkg-plist
@@ -0,0 +1,21 @@
+include/GL/internal/dri_interface.h
+lib/dri/i810_dri.so
+lib/dri/i915_dri.so
+lib/dri/i965_dri.so
+lib/dri/mach64_dri.so
+lib/dri/mga_dri.so
+%%NEW%%lib/dri/nouveau_vieux_dri.so
+lib/dri/r128_dri.so
+lib/dri/r200_dri.so
+lib/dri/r300_dri.so
+lib/dri/r600_dri.so
+lib/dri/radeon_dri.so
+lib/dri/savage_dri.so
+lib/dri/sis_dri.so
+lib/dri/swrast_dri.so
+lib/dri/tdfx_dri.so
+lib/dri/unichrome_dri.so
+libdata/pkgconfig/dri.pc
+@dirrm lib/dri
+@dirrmtry include/GL/internal
+@dirrmtry include/GL
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
new file mode 100644
index 0000000..f3f054a
--- /dev/null
+++ b/graphics/libGL/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for: xorg-server
+# Date created: 7 May 2004
+# Whom: anholt@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME= libGL
+PORTVERSION= ${MESAVERSION}
+CATEGORIES= graphics
+
+COMMENT= OpenGL library that renders using GLX or DRI
+
+LIB_DEPENDS+= drm:${PORTSDIR}/graphics/libdrm \
+ expat.6:${PORTSDIR}/textproc/expat2
+
+USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto:both
+
+do-install:
+ ${RM} -f ${WRKSRC}/include/GL/glu*.h
+ cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl
+
+.include "${.CURDIR}/bsd.mesalib.mk"
+.include <bsd.port.mk>
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
new file mode 100644
index 0000000..c01d7f4
--- /dev/null
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -0,0 +1,114 @@
+#-*- mode: Fundamental; tab-width: 4; -*-
+# ex:ts=4
+#
+# bsd.mesa.mk - an attempt to refactor MesaLib ports.
+#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
+#
+# !!! Here be dragons !!! (they seem to be everywhere these days)
+#
+# Remember to upgrade the following ports everytime you bump MESAVERSION:
+#
+# - graphics/libGL
+# - graphics/libGLU
+# - graphics/libGLw
+# - graphics/libglut
+# - graphics/dri
+#
+# $FreeBSD$
+#
+
+MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
+MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
+
+.if defined(WITH_NEW_XORG)
+MESABASEVERSION= 7.11.2
+# if there is a subversion, include the '-' between 7.11-rc2 for example.
+MESASUBVERSION=
+PLIST_SUB+= OLD="@comment " NEW=""
+.else
+MESABASEVERSION= 7.6.1
+MESASUBVERSION=
+PLIST_SUB+= OLD="" NEW="@comment "
+.endif
+
+MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
+DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
+MAINTAINER?= x11@FreeBSD.org
+
+BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \
+ ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
+
+USE_BISON= build
+USE_PYTHON_BUILD=yes
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+MAKE_JOBS_SAFE= yes
+
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \
+ --disable-egl
+
+.if defined(WITH_NEW_XORG)
+EXTRA_PATCHES+= ${PATCHDIR}/extra-mach64_context.h \
+ ${PATCHDIR}/extra-sis_context.h \
+ ${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp
+.else
+EXTRA_PATCHES+= ${PATCHDIR}/extra-src__mesa__x86-64__glapi_x86-64.S \
+ ${PATCHDIR}/extra-src__mesa__x86-64__xform4.S \
+ ${PATCHDIR}/extra-src__mesa__x86__glapi_x86.S \
+ ${PATCHDIR}/extra-src__mesa__x86__read_rgba_span_x86.S
+.endif
+
+ALL_TARGET= default
+
+PATCHDIR= ${.CURDIR}/../../graphics/libGL/files
+WRKSRC= ${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
+
+.if !defined(ARCH)
+ARCH!= uname -p
+.endif
+
+COMPONENT= ${PORTNAME:L:C/^lib//:C/mesa-//}
+
+.if ${COMPONENT:Mglut} == ""
+. if ${COMPONENT:Mglu} == ""
+CONFIGURE_ARGS+= --disable-glu --disable-glut
+. else
+CONFIGURE_ARGS+= --disable-glut
+. endif
+.else
+DISTFILES+= MesaGLUT-${MESADISTVERSION}${EXTRACT_SUFX}:glut
+.endif
+
+.if ${COMPONENT:Mglw} == ""
+CONFIGURE_ARGS+= --disable-glw
+.else
+CONFIGURE_ARGS+= --enable-motif
+.endif
+
+.if ${COMPONENT:Mdri} == ""
+CONFIGURE_ARGS+= --with-dri-drivers=no
+.endif
+
+.if defined(WITHOUT_XCB)
+CONFIGURE_ARGS+= --disable-xcb
+.else
+CONFIGURE_ARGS+= --enable-xcb
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
+ ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+ ${WRKSRC}/src/glu/Makefile \
+ ${WRKSRC}/src/glw/Makefile \
+ ${WRKSRC}/src/mesa/Makefile \
+ ${WRKSRC}/src/mesa/drivers/dri/Makefile
+.if ${COMPONENT:Mglut} != ""
+ @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+ ${WRKSRC}/src/glut/glx/Makefile
+.endif
diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo
new file mode 100644
index 0000000..106ab0b
--- /dev/null
+++ b/graphics/libGL/distinfo
@@ -0,0 +1,4 @@
+SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
+SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
+SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
diff --git a/graphics/libGL/files/extra-mach64_context.h b/graphics/libGL/files/extra-mach64_context.h
new file mode 100644
index 0000000..f844599
--- /dev/null
+++ b/graphics/libGL/files/extra-mach64_context.h
@@ -0,0 +1,21 @@
+--- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2011-05-13 01:47:18.000000000 +0200
++++ src/mesa/drivers/dri/mach64/mach64_context.h 2011-07-27 09:59:53.000000000 +0200
+@@ -289,7 +289,7 @@
+ /* ================================================================
+ * Byte ordering
+ */
+-#if MESA_LITTLE_ENDIAN == 1
++#if defined(MESA_LITTLE_ENDIAN) && MESA_LITTLE_ENDIAN == 1
+ #define LE32_IN( x ) ( *(GLuint *)(x) )
+ #define LE32_IN_FLOAT( x ) ( *(GLfloat *)(x) )
+ #define LE32_OUT( x, y ) do { *(GLuint *)(x) = (y); } while (0)
+@@ -298,6 +298,9 @@
+ #if defined(__OpenBSD__) || defined(__NetBSD__)
+ #include <machine/endian.h>
+ #define bswap_32 bswap32
++#elif defined(__FreeBSD__)
++#include <sys/endian.h>
++#define bswap_32 bswap32
+ #else
+ #include <byteswap.h>
+ #endif
diff --git a/graphics/libGL/files/extra-sis_context.h b/graphics/libGL/files/extra-sis_context.h
new file mode 100644
index 0000000..0e16f51
--- /dev/null
+++ b/graphics/libGL/files/extra-sis_context.h
@@ -0,0 +1,22 @@
+--- src/mesa/drivers/dri/sis/sis_context.h.orig 2010-12-14 22:43:15.000000000 +0100
++++ src/mesa/drivers/dri/sis/sis_context.h 2011-07-27 09:58:22.000000000 +0200
+@@ -400,10 +400,18 @@
+ #define MMIO_READ(reg) *(volatile GLint *)(smesa->IOBase + (reg))
+ #define MMIO_READf(reg) *(volatile GLfloat *)(smesa->IOBase + (reg))
+
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
+ #define MMIO_WMB() __asm __volatile("" : : : "memory")
+ #elif defined(__ia64__)
+ #define MMIO_WMB() __asm __volatile("mf" : : : "memory")
++#elif defined(__powerpc__)
++#define MMIO_WMB() __asm __volatile("eieio" : : : "memory")
++#elif defined(__sparc64__)
++/*
++ * #StoreStore probably would be sufficient for this driver at the
++ * time of this writing but we use #Sync for safety.
++ */
++#define MMIO_WMB() __asm __volatile("membar #Sync" : : : "memory")
+ #else
+ #error platform needs WMB
+ #endif
diff --git a/graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp b/graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp
new file mode 100644
index 0000000..8df4043
--- /dev/null
+++ b/graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp
@@ -0,0 +1,14 @@
+--- src/glsl/ir_constant_expression.cpp.orig 2011-07-23 15:08:44.000000000 +0200
++++ src/glsl/ir_constant_expression.cpp 2011-07-23 15:09:03.000000000 +0200
+@@ -39,6 +39,11 @@
+ #include "ir_visitor.h"
+ #include "glsl_types.h"
+
++#include <sys/param.h>
++#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
++#define log2(x) (log(x) / log(2))
++#endif
++
+ static float
+ dot(ir_constant *op0, ir_constant *op1)
+ {
diff --git a/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S b/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S
new file mode 100644
index 0000000..908a6fe
--- /dev/null
+++ b/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S
@@ -0,0 +1,12 @@
+--- ./src/mesa/x86-64/glapi_x86-64.S.orig 2009-03-13 04:28:49.000000000 +0100
++++ ./src/mesa/x86-64/glapi_x86-64.S 2011-01-28 18:12:18.000000000 +0100
+@@ -73,7 +73,8 @@ _x86_64_get_dispatch:
+
+ .p2align 4,,15
+ _x86_64_get_dispatch:
+- movq _gl_DispatchTSD(%rip), %rdi
++ movq _gl_DispatchTSD@GOTPCREL(%rip), %rax
++ movl (%rax), %edi
+ jmp pthread_getspecific@PLT
+
+ #elif defined(THREADS)
diff --git a/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S b/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S
new file mode 100644
index 0000000..193e6cc
--- /dev/null
+++ b/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S
@@ -0,0 +1,74 @@
+--- src/mesa/x86-64/xform4.S.orig 2009-01-22 18:38:35.000000000 +0100
++++ src/mesa/x86-64/xform4.S 2011-05-09 21:26:00.000000000 +0200
+@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general:
+ * rdx = source
+ */
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -116,7 +116,7 @@ p4_constants:
+ .byte 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00
+-.float 0f+1.0
++.float 1.0
+
+ .text
+ .align 16
+@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d:
+ movaps 16(%rax), %xmm10
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -195,7 +195,7 @@ p4_3d_done:
+ _mesa_x86_64_transform_points4_identity:
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -223,7 +223,7 @@ p4_identity_done:
+ _mesa_3dnow_transform_points4_3d_no_rot:
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -287,7 +287,7 @@ p4_3d_no_rot_done:
+ _mesa_3dnow_transform_points4_perspective:
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -353,7 +353,7 @@ p4_perspective_done:
+ _mesa_3dnow_transform_points4_2d_no_rot:
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -408,7 +408,7 @@ p4_2d_no_rot_done:
+ _mesa_3dnow_transform_points4_2d:
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
diff --git a/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S b/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S
new file mode 100644
index 0000000..71da78c
--- /dev/null
+++ b/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S
@@ -0,0 +1,11 @@
+--- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100
++++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100
+@@ -47,7 +47,7 @@
+ #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))
+
+ #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)
+-#define GLOBL_FN(x) GLOBL x ; .type x, function
++#define GLOBL_FN(x) GLOBL x ; .type x, @function
+ #else
+ #define GLOBL_FN(x) GLOBL x
+ #endif
diff --git a/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S b/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S
new file mode 100644
index 0000000..37b08d1
--- /dev/null
+++ b/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S
@@ -0,0 +1,11 @@
+--- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.000000000 +0200
++++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0100
+@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX:
+ testl $0x01, %ecx
+ je .L01
+
+- movzxw (%eax), %ecx
++ movzwl (%eax), %ecx
+ movd %ecx, %mm4
+
+ pshufw $0x00, %mm4, %mm0
diff --git a/graphics/libGL/pkg-descr b/graphics/libGL/pkg-descr
new file mode 100644
index 0000000..eeba293
--- /dev/null
+++ b/graphics/libGL/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the OpenGL library, which can perform rendering over GLX
+or using the Direct Rendering Infrastructure.
+
+WWW: http://www.freedesktop.org/Software/xorg
diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist
new file mode 100644
index 0000000..4125f74
--- /dev/null
+++ b/graphics/libGL/pkg-plist
@@ -0,0 +1,20 @@
+%%OLD%%include/GL/dmesa.h
+%%OLD%%include/GL/ggimesa.h
+include/GL/gl.h
+include/GL/gl_mangle.h
+include/GL/glext.h
+include/GL/glfbdev.h
+include/GL/glx.h
+include/GL/glx_mangle.h
+include/GL/glxext.h
+include/GL/mesa_wgl.h
+%%OLD%%include/GL/mglmesa.h
+include/GL/osmesa.h
+%%OLD%%include/GL/svgamesa.h
+include/GL/vms_x_fix.h
+include/GL/wglext.h
+include/GL/wmesa.h
+lib/libGL.so
+lib/libGL.so.1
+libdata/pkgconfig/gl.pc
+@dirrmtry include/GL
diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
new file mode 100644
index 0000000..0a19926
--- /dev/null
+++ b/graphics/libGLU/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for: libGLU
+# Date created: 7 May 2004
+# Whom: anholt@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME= libGLU
+PORTVERSION= ${MESAVERSION}
+CATEGORIES= graphics
+
+COMMENT= OpenGL utility library
+
+USE_GL= gl
+USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto
+
+do-install:
+ @${MKDIR} ${PREFIX}/include/GL/
+ cd ${WRKSRC}/src/glu; ${GMAKE} install
+ ${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
+ cd ${WRKSRC}/src/glu; ${GMAKE} install
+
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+.include <bsd.port.mk>
diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo
new file mode 100644
index 0000000..106ab0b
--- /dev/null
+++ b/graphics/libGLU/distinfo
@@ -0,0 +1,4 @@
+SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
+SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
+SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
diff --git a/graphics/libGLU/pkg-descr b/graphics/libGLU/pkg-descr
new file mode 100644
index 0000000..3a7d2e7
--- /dev/null
+++ b/graphics/libGLU/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the OpenGL utility library.
+
+WWW: http://www.freedesktop.org/Software/xorg
diff --git a/graphics/libGLU/pkg-plist b/graphics/libGLU/pkg-plist
new file mode 100644
index 0000000..330c54e
--- /dev/null
+++ b/graphics/libGLU/pkg-plist
@@ -0,0 +1,5 @@
+include/GL/glu.h
+include/GL/glu_mangle.h
+lib/libGLU.so
+lib/libGLU.so.1
+libdata/pkgconfig/glu.pc
diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile
new file mode 100644
index 0000000..4c9f14d
--- /dev/null
+++ b/graphics/libGLw/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: libGLw
+# Date created: 7 May 2004
+# Whom: anholt@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME= libGLw
+PORTVERSION= ${MESAVERSION}
+CATEGORIES= graphics
+
+COMMENT= OpenGL widgets library
+
+USE_GL= gl
+USE_MOTIF= yes
+USE_XORG= glproto xt x11 xext xxf86vm xdamage xfixes dri2proto
+
+do-install:
+ cd ${WRKSRC}/src/glw; ${GMAKE} install
+
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+.include <bsd.port.mk>
diff --git a/graphics/libGLw/distinfo b/graphics/libGLw/distinfo
new file mode 100644
index 0000000..106ab0b
--- /dev/null
+++ b/graphics/libGLw/distinfo
@@ -0,0 +1,4 @@
+SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
+SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
+SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
diff --git a/graphics/libGLw/pkg-descr b/graphics/libGLw/pkg-descr
new file mode 100644
index 0000000..d3a7ea7
--- /dev/null
+++ b/graphics/libGLw/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the OpenGL widgets library.
+
+WWW: http://www.mesa3d.org/
diff --git a/graphics/libGLw/pkg-plist b/graphics/libGLw/pkg-plist
new file mode 100644
index 0000000..211b586
--- /dev/null
+++ b/graphics/libGLw/pkg-plist
@@ -0,0 +1,8 @@
+include/GL/GLwDrawA.h
+include/GL/GLwDrawAP.h
+include/GL/GLwMDrawA.h
+include/GL/GLwMDrawAP.h
+lib/libGLw.so
+lib/libGLw.so.1
+libdata/pkgconfig/glw.pc
+@dirrmtry include/GL
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
new file mode 100644
index 0000000..8d859d2
--- /dev/null
+++ b/graphics/libdrm/Makefile
@@ -0,0 +1,57 @@
+# New ports collection makefile for: libdrm
+# Date created: 29 Dec 2005
+# Whom: lesi@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME= libdrm
+PORTVERSION= ${LIBDRM_VERSION}
+PORTREVISION= ${LIBDRM_REVISION}
+CATEGORIES= graphics x11
+MASTER_SITES= http://dri.freedesktop.org/libdrm/
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Userspace interface to kernel Direct Rendering Module services
+
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
+LIB_DEPENDS= pciaccess.0:${PORTSDIR}/devel/libpciaccess \
+ pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
+RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
+
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+
+CONFIGURE_ARGS= --enable-nouveau-experimental-api
+
+MAKE_JOBS_SAFE= yes
+
+.if defined(WITH_NEW_XORG)
+
+OPTIONS= KMS "Enable KMS support (very experimental)" off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_KMS)
+CONFIGURE_ARGS+=--enable-libkms
+EXTRA_PATCHES+= ${FILESDIR}/extra-xf86drmMode.c
+PLIST_SUB+= KMS=""
+.else
+PLIST_SUB+= KMS="@comment "
+.endif
+
+LIBDRM_VERSION= 2.4.30
+LIBDRM_REVISION=1
+PLIST_SUB+= OLD="@comment " NEW=""
+.else
+LIBDRM_VERSION= 2.4.17
+LIBDRM_REVISION=0
+PLIST_SUB+= OLD="" NEW="@comment "
+.endif
+
+pre-patch:
+ @${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \
+ ${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo
new file mode 100644
index 0000000..86810e9
--- /dev/null
+++ b/graphics/libdrm/distinfo
@@ -0,0 +1,4 @@
+SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
+SIZE (libdrm-2.4.17.tar.bz2) = 408882
+SHA256 (libdrm-2.4.30.tar.bz2) = cacea9c157ec824ad278a06f4910659b2f3ae69686518ece8d6967843cddcd56
+SIZE (libdrm-2.4.30.tar.bz2) = 547931
diff --git a/graphics/libdrm/files/extra-xf86drmMode.c b/graphics/libdrm/files/extra-xf86drmMode.c
new file mode 100644
index 0000000..d91a923
--- /dev/null
+++ b/graphics/libdrm/files/extra-xf86drmMode.c
@@ -0,0 +1,29 @@
+--- xf86drmMode.c.orig 2010-09-08 14:23:39.000000000 +0200
++++ xf86drmMode.c 2011-07-18 18:59:11.000000000 +0200
+@@ -54,7 +54,7 @@
+
+ static inline DRM_IOCTL(int fd, int cmd, void *arg)
+ {
+- int ret = drmIoctl(fd, cmd, arg);
++ int ret = drmIoctl(fd, (unsigned)cmd, arg);
+ return ret < 0 ? -errno : ret;
+ }
+
+@@ -659,7 +659,7 @@
+ */
+ int drmCheckModesettingSupported(const char *busid)
+ {
+-#ifdef __linux__
++#if defined (__linux__)
+ char pci_dev_dir[1024];
+ int domain, bus, dev, func;
+ DIR *sysdir;
+@@ -709,6 +709,8 @@
+ closedir(sysdir);
+ if (found)
+ return 0;
++#elif defined(__FreeBSD__)
++ return 0;
+ #endif
+ return -ENOSYS;
+
diff --git a/graphics/libdrm/pkg-descr b/graphics/libdrm/pkg-descr
new file mode 100644
index 0000000..2258459
--- /dev/null
+++ b/graphics/libdrm/pkg-descr
@@ -0,0 +1,3 @@
+Userspace interface to kernel DRM (Direct Rendering Module) services.
+
+WWW: http://dri.freedesktop.org
diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist
new file mode 100644
index 0000000..75af57d
--- /dev/null
+++ b/graphics/libdrm/pkg-plist
@@ -0,0 +1,74 @@
+%%OLD%%include/drm/drm.h
+%%OLD%%include/drm/drm_mode.h
+%%OLD%%include/drm/drm_sarea.h
+%%OLD%%include/drm/i915_drm.h
+%%OLD%%include/drm/mach64_drm.h
+%%OLD%%include/drm/mga_drm.h
+%%OLD%%include/drm/nouveau_drm.h
+%%OLD%%include/drm/nouveau_drmif.h
+%%OLD%%include/drm/r128_drm.h
+%%OLD%%include/drm/radeon_drm.h
+%%OLD%%include/drm/savage_drm.h
+%%OLD%%include/drm/sis_drm.h
+%%OLD%%include/drm/via_drm.h
+%%OLD%%include/intel_bufmgr.h
+%%NEW%%include/libdrm/drm.h
+%%NEW%%include/libdrm/drm_fourcc.h
+%%NEW%%include/libdrm/drm_mode.h
+%%NEW%%include/libdrm/drm_sarea.h
+%%NEW%%include/libdrm/i915_drm.h
+%%NEW%%include/libdrm/intel_bufmgr.h
+%%NEW%%include/libdrm/intel_debug.h
+%%NEW%%include/libdrm/mach64_drm.h
+%%NEW%%include/libdrm/mga_drm.h
+%%NEW%%include/libdrm/nouveau_drm.h
+%%NEW%%include/libdrm/nouveau_drmif.h
+%%NEW%%include/libdrm/r128_drm.h
+%%NEW%%include/libdrm/radeon_bo.h
+%%NEW%%include/libdrm/radeon_bo_gem.h
+%%NEW%%include/libdrm/radeon_bo_int.h
+%%NEW%%include/libdrm/radeon_cs.h
+%%NEW%%include/libdrm/radeon_cs_gem.h
+%%NEW%%include/libdrm/radeon_cs_int.h
+%%NEW%%include/libdrm/radeon_drm.h
+%%NEW%%include/libdrm/savage_drm.h
+%%NEW%%include/libdrm/sis_drm.h
+%%NEW%%include/libdrm/via_drm.h
+%%NEW%%%%KMS%%include/libkms/libkms.h
+include/nouveau/nouveau_bo.h
+include/nouveau/nouveau_channel.h
+%%OLD%%include/nouveau/nouveau_class.h
+include/nouveau/nouveau_device.h
+include/nouveau/nouveau_grobj.h
+include/nouveau/nouveau_notifier.h
+include/nouveau/nouveau_pushbuf.h
+%%NEW%%include/nouveau/nouveau_reloc.h
+include/nouveau/nouveau_resource.h
+%%NEW%%include/nouveau/nv04_pushbuf.h
+%%NEW%%include/nouveau/nvc0_pushbuf.h
+include/xf86drm.h
+include/xf86drmMode.h
+lib/libdrm.la
+lib/libdrm.so
+lib/libdrm.so.2
+lib/libdrm_intel.la
+lib/libdrm_intel.so
+lib/libdrm_intel.so.1
+lib/libdrm_nouveau.la
+lib/libdrm_nouveau.so
+lib/libdrm_nouveau.so.1
+%%NEW%%lib/libdrm_radeon.la
+%%NEW%%lib/libdrm_radeon.so
+%%NEW%%lib/libdrm_radeon.so.1
+%%NEW%%%%KMS%%lib/libkms.la
+%%NEW%%%%KMS%%lib/libkms.so
+%%NEW%%%%KMS%%lib/libkms.so.1
+libdata/pkgconfig/libdrm.pc
+libdata/pkgconfig/libdrm_intel.pc
+libdata/pkgconfig/libdrm_nouveau.pc
+%%NEW%%libdata/pkgconfig/libdrm_radeon.pc
+%%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc
+@dirrm include/nouveau
+%%NEW%%%%KMS%%@dirrm include/libkms
+%%NEW%%@dirrm include/libdrm
+%%OLD%%@dirrm include/drm
diff --git a/graphics/libglut/Makefile b/graphics/libglut/Makefile
new file mode 100644
index 0000000..1d55cf4
--- /dev/null
+++ b/graphics/libglut/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for: libglut
+# Date created: Tue Feb 7 12:02:49 1995
+# Whom: anholt
+#
+# $FreeBSD$
+#
+
+PORTNAME= libglut
+PORTVERSION= ${MESAVERSION}
+CATEGORIES= graphics
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= OpenGL utility toolkit
+
+USE_GL= glu
+USE_XORG= glproto x11 xext xxf86vm xdamage xfixes xi xmu dri2proto
+
+do-install:
+ cd ${WRKSRC}/src/glut/glx; ${GMAKE} install
+ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${WRKSRC}/include/GL/glutf90.h \
+ ${PREFIX}/include/GL
+
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+.include <bsd.port.mk>
diff --git a/graphics/libglut/distinfo b/graphics/libglut/distinfo
new file mode 100644
index 0000000..6726d9c
--- /dev/null
+++ b/graphics/libglut/distinfo
@@ -0,0 +1,8 @@
+SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
+SHA256 (MesaGLUT-7.6.1.tar.bz2) = c828f572a4e5c521e87ef265c5d2f1f02ba99ea2307e6323aa8165b152e4eb9d
+SIZE (MesaGLUT-7.6.1.tar.bz2) = 321756
+SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
+SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
+SHA256 (MesaGLUT-7.11.2.tar.bz2) = 46b9fd1c261cbbd090a71ae1db328c37d2ff5118b83c38b8ebc8f150484e94f7
+SIZE (MesaGLUT-7.11.2.tar.bz2) = 201575
diff --git a/graphics/libglut/pkg-descr b/graphics/libglut/pkg-descr
new file mode 100644
index 0000000..e5a5452
--- /dev/null
+++ b/graphics/libglut/pkg-descr
@@ -0,0 +1,5 @@
+libglut is a library provided with Mesa which provides an interface for creating
+windows containing OpenGL contexts on a wide variety of platforms and handling
+user interaction.
+
+WWW: http://www.mesa3d.org/
diff --git a/graphics/libglut/pkg-plist b/graphics/libglut/pkg-plist
new file mode 100644
index 0000000..382dca6
--- /dev/null
+++ b/graphics/libglut/pkg-plist
@@ -0,0 +1,6 @@
+include/GL/glut.h
+include/GL/glutf90.h
+lib/libglut.so
+lib/libglut.so.3
+libdata/pkgconfig/glut.pc
+@dirrmtry include/GL
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
new file mode 100644
index 0000000..1bceb96
--- /dev/null
+++ b/graphics/mesa-demos/Makefile
@@ -0,0 +1,87 @@
+# New ports collection makefile for: mesa-demos
+# Date created: 7 Nov 2003
+# Whom: anholt@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME= mesa-demos
+PORTVERSION= 7.6.1
+CATEGORIES= graphics
+MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PORTVERSION}/
+DISTFILES= MesaLib-${PORTVERSION}${EXTRACT_SUFX} \
+ MesaDemos-${PORTVERSION}${EXTRACT_SUFX}
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= OpenGL demos distributed with Mesa
+
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+MAKE_JOBS_SAFE= yes
+USE_GL= glu glut
+USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ARGS= --disable-gallium --with-demos=demos,xdemos
+
+#ALL_TARGET= yes
+
+WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION}/
+
+DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
+
+OPTIONS= NVIDIA_GL "Use NVIDIA's libraries" off
+
+.if defined(WITHOUT_XCB)
+CONFIGURE_ARGS+= --disable-xcb
+.else
+CONFIGURE_ARGS+= --enable-xcb
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
+ ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+ ${WRKSRC}/src/glu/Makefile \
+ ${WRKSRC}/src/glw/Makefile \
+ ${WRKSRC}/src/mesa/Makefile \
+ ${WRKSRC}/src/mesa/drivers/dri/Makefile
+ @${REINPLACE_CMD} -e 's|../images/|${DATADIR}/images/|g' \
+ -e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \
+ -e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \
+ -e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \
+ ${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c
+
+do-install:
+ @for i in demos xdemos; do \
+ cd ${WRKSRC}/progs/$$i; \
+ for j in `${MAKE} -V PROGS`; do \
+ ${ECHO_CMD} ${INSTALL_PROGRAM} $$j ${PREFIX}/bin; \
+ ${INSTALL_PROGRAM} $$j ${PREFIX}/bin; \
+ done; \
+ done
+ ${MKDIR} ${DATADIR}/images ${DATADIR}/data
+ @cd ${WRKSRC}/progs/images; \
+ for i in `ls *.rgb*`; do \
+ ${ECHO_CMD} ${INSTALL_DATA} $$i ${DATADIR}/images; \
+ ${INSTALL_DATA} $$i ${DATADIR}/images; \
+ done
+ @cd ${WRKSRC}/progs/demos; \
+ for i in `ls *.dat`; do \
+ ${ECHO_CMD} ${INSTALL_DATA} $$i ${DATADIR}/data; \
+ ${INSTALL_DATA} $$i ${DATADIR}/data; \
+ done
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_NVIDIA_GL)
+CFLAGS+= -DWITH_NVIDIA_GL=1
+.endif
+
+.if !defined(ARCH)
+ARCH!= uname -p
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/graphics/mesa-demos/distinfo b/graphics/mesa-demos/distinfo
new file mode 100644
index 0000000..738047a
--- /dev/null
+++ b/graphics/mesa-demos/distinfo
@@ -0,0 +1,4 @@
+SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
+SHA256 (MesaDemos-7.6.1.tar.bz2) = d2368fc86d032dc6478df70f99b114abdf6c0c1da57bf1d3927ab179876f9c4b
+SIZE (MesaDemos-7.6.1.tar.bz2) = 1547790
diff --git a/graphics/mesa-demos/files/patch-progs-xdemos-glxpixmap.c b/graphics/mesa-demos/files/patch-progs-xdemos-glxpixmap.c
new file mode 100644
index 0000000..1dfc2c4
--- /dev/null
+++ b/graphics/mesa-demos/files/patch-progs-xdemos-glxpixmap.c
@@ -0,0 +1,11 @@
+--- progs/xdemos/glxpixmap.c.orig Fri Apr 6 22:29:09 2007
++++ progs/xdemos/glxpixmap.c Fri Apr 6 22:38:33 2007
+@@ -105,7 +105,7 @@
+ * to render correctly. This is because Mesa allows RGB rendering
+ * into any kind of visual, not just TrueColor or DirectColor.
+ */
+-#ifdef GLX_MESA_pixmap_colormap
++#if defined(GLX_MESA_pixmap_colormap) && !defined(WITH_NVIDIA_GL)
+ if (strstr(glXQueryExtensionsString(dpy, 0), "GLX_MESA_pixmap_colormap")) {
+ /* stand-alone Mesa, specify the colormap */
+ glxpm = glXCreateGLXPixmapMESA( dpy, visinfo, pm, attr.colormap );
diff --git a/graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c b/graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c
new file mode 100644
index 0000000..1dbf8e3
--- /dev/null
+++ b/graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c
@@ -0,0 +1,28 @@
+--- progs/xdemos/yuvrect_client.c.orig Fri Apr 6 22:42:30 2007
++++ progs/xdemos/yuvrect_client.c Fri Apr 6 22:48:05 2007
+@@ -140,7 +140,11 @@
+ exit(0);
+ }
+
+- glx_memory = glXAllocateMemoryMESA(dpy, screen, ImgWidth * ImgHeight * 2, 0, 0 ,0);
++ #ifdef WITH_NVIDIA_GL
++ glx_memory = glXAllocateMemoryNV(ImgWidth * ImgHeight * 2, 0, 0 ,0);
++ #else
++ glx_memory = glXAllocateMemoryMESA(dpy, screen, ImgWidth * ImgHeight * 2, 0, 0 ,0);
++ #endif
+ if (!glx_memory)
+ {
+ fprintf(stderr,"Failed to allocate MESA memory\n");
+@@ -317,7 +321,11 @@
+ glXSwapBuffers(dpy, win);
+ event_loop(dpy, win);
+
+- glXFreeMemoryMESA(dpy, DefaultScreen(dpy), glx_memory);
++ #ifdef WITH_NVIDIA_GL
++ glXFreeMemoryNV(glx_memory);
++ #else
++ glXFreeMemoryMESA(dpy, DefaultScreen(dpy), glx_memory);
++ #endif
+ glXDestroyContext(dpy, ctx);
+ XDestroyWindow(dpy, win);
+ XCloseDisplay(dpy);
diff --git a/graphics/mesa-demos/files/patch-src__mesa__x86-64__glapi_x86-64.S b/graphics/mesa-demos/files/patch-src__mesa__x86-64__glapi_x86-64.S
new file mode 100644
index 0000000..908a6fe
--- /dev/null
+++ b/graphics/mesa-demos/files/patch-src__mesa__x86-64__glapi_x86-64.S
@@ -0,0 +1,12 @@
+--- ./src/mesa/x86-64/glapi_x86-64.S.orig 2009-03-13 04:28:49.000000000 +0100
++++ ./src/mesa/x86-64/glapi_x86-64.S 2011-01-28 18:12:18.000000000 +0100
+@@ -73,7 +73,8 @@ _x86_64_get_dispatch:
+
+ .p2align 4,,15
+ _x86_64_get_dispatch:
+- movq _gl_DispatchTSD(%rip), %rdi
++ movq _gl_DispatchTSD@GOTPCREL(%rip), %rax
++ movl (%rax), %edi
+ jmp pthread_getspecific@PLT
+
+ #elif defined(THREADS)
diff --git a/graphics/mesa-demos/files/patch-src__mesa__x86-64__xform4.S b/graphics/mesa-demos/files/patch-src__mesa__x86-64__xform4.S
new file mode 100644
index 0000000..193e6cc
--- /dev/null
+++ b/graphics/mesa-demos/files/patch-src__mesa__x86-64__xform4.S
@@ -0,0 +1,74 @@
+--- src/mesa/x86-64/xform4.S.orig 2009-01-22 18:38:35.000000000 +0100
++++ src/mesa/x86-64/xform4.S 2011-05-09 21:26:00.000000000 +0200
+@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general:
+ * rdx = source
+ */
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -116,7 +116,7 @@ p4_constants:
+ .byte 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00
+-.float 0f+1.0
++.float 1.0
+
+ .text
+ .align 16
+@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d:
+ movaps 16(%rax), %xmm10
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -195,7 +195,7 @@ p4_3d_done:
+ _mesa_x86_64_transform_points4_identity:
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -223,7 +223,7 @@ p4_identity_done:
+ _mesa_3dnow_transform_points4_3d_no_rot:
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -287,7 +287,7 @@ p4_3d_no_rot_done:
+ _mesa_3dnow_transform_points4_perspective:
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -353,7 +353,7 @@ p4_perspective_done:
+ _mesa_3dnow_transform_points4_2d_no_rot:
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -408,7 +408,7 @@ p4_2d_no_rot_done:
+ _mesa_3dnow_transform_points4_2d:
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
diff --git a/graphics/mesa-demos/files/patch-src__mesa__x86__glapi_x86.S b/graphics/mesa-demos/files/patch-src__mesa__x86__glapi_x86.S
new file mode 100644
index 0000000..71da78c
--- /dev/null
+++ b/graphics/mesa-demos/files/patch-src__mesa__x86__glapi_x86.S
@@ -0,0 +1,11 @@
+--- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100
++++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100
+@@ -47,7 +47,7 @@
+ #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))
+
+ #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)
+-#define GLOBL_FN(x) GLOBL x ; .type x, function
++#define GLOBL_FN(x) GLOBL x ; .type x, @function
+ #else
+ #define GLOBL_FN(x) GLOBL x
+ #endif
diff --git a/graphics/mesa-demos/files/patch-src__mesa__x86__read_rgba_span_x86.S b/graphics/mesa-demos/files/patch-src__mesa__x86__read_rgba_span_x86.S
new file mode 100644
index 0000000..37b08d1
--- /dev/null
+++ b/graphics/mesa-demos/files/patch-src__mesa__x86__read_rgba_span_x86.S
@@ -0,0 +1,11 @@
+--- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.000000000 +0200
++++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0100
+@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX:
+ testl $0x01, %ecx
+ je .L01
+
+- movzxw (%eax), %ecx
++ movzwl (%eax), %ecx
+ movd %ecx, %mm4
+
+ pshufw $0x00, %mm4, %mm0
diff --git a/graphics/mesa-demos/pkg-descr b/graphics/mesa-demos/pkg-descr
new file mode 100644
index 0000000..2d69b2e
--- /dev/null
+++ b/graphics/mesa-demos/pkg-descr
@@ -0,0 +1,10 @@
+Mesa is a 3-D graphics library with an API which is very similar to that
+of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax
+or state machine, it is being used with authorization from Silicon Graphics,
+Inc. However, the author makes no claim that Mesa is in any way a
+compatible replacement for OpenGL or associated with Silicon Graphics, Inc.
+Those who want a licensed implementation of OpenGL should contact a licensed
+vendor. This software is distributed under the terms of the GNU Library
+General Public License, see the LICENSE file for details.
+
+WWW: http://www.mesa3d.org/
diff --git a/graphics/mesa-demos/pkg-plist b/graphics/mesa-demos/pkg-plist
new file mode 100644
index 0000000..e4cbf2e
--- /dev/null
+++ b/graphics/mesa-demos/pkg-plist
@@ -0,0 +1,94 @@
+bin/arbfplight
+bin/arbfslight
+bin/arbocclude
+bin/bounce
+bin/clearspd
+bin/copypix
+bin/corender
+bin/cubemap
+bin/dinoshade
+bin/drawpix
+bin/engine
+bin/fbo_firecube
+bin/fbotexture
+bin/fire
+bin/fogcoord
+bin/fplight
+bin/fslight
+bin/gamma
+bin/gearbox
+bin/gears
+bin/geartrain
+bin/glinfo
+bin/gloss
+bin/glsync
+bin/gltestperf
+bin/glthreads
+bin/glxcontexts
+bin/glxdemo
+bin/glxgears
+bin/glxgears_fbconfig
+bin/glxgears_pixmap
+bin/glxheads
+bin/glxinfo
+bin/glxpbdemo
+bin/glxpixmap
+bin/glxsnoop
+bin/glxswapcontrol
+bin/ipers
+bin/isosurf
+bin/lodbias
+bin/manywin
+bin/morph3d
+bin/multiarb
+bin/multictx
+bin/offset
+bin/overlay
+bin/paltex
+bin/pbdemo
+bin/pbinfo
+bin/pointblast
+bin/projtex
+bin/rain
+bin/ray
+bin/readpix
+bin/reflect
+bin/renormal
+bin/shadowtex
+bin/sharedtex
+bin/sharedtex_mt
+bin/singlebuffer
+bin/spectex
+bin/spriteblast
+bin/stex3d
+bin/teapot
+bin/terrain
+bin/tessdemo
+bin/texcyl
+bin/texenv
+bin/texture_from_pixmap
+bin/textures
+bin/trispd
+bin/tunnel
+bin/tunnel2
+bin/vao_demo
+bin/wincopy
+bin/winpos
+bin/xfont
+bin/xrotfontdemo
+%%DATADIR%%/data/geartrain.dat
+%%DATADIR%%/data/isosurf.dat
+%%DATADIR%%/data/terrain.dat
+%%DATADIR%%/images/arch.rgb
+%%DATADIR%%/images/bw.rgb
+%%DATADIR%%/images/girl.rgb
+%%DATADIR%%/images/girl2.rgb
+%%DATADIR%%/images/reflect.rgb
+%%DATADIR%%/images/s128.rgb
+%%DATADIR%%/images/tile.rgb
+%%DATADIR%%/images/tree2.rgba
+%%DATADIR%%/images/tree3.rgb
+%%DATADIR%%/images/wrs_logo.rgb
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
new file mode 100644
index 0000000..e73f065
--- /dev/null
+++ b/x11-drivers/xf86-input-acecad/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for: xf86-input-acecad
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-input-acecad
+PORTVERSION= 1.5.0
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org acecad input driver
+
+XORG_CAT= driver
+USE_XORG= xextproto videoproto
+MAN4= acecad.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-acecad/distinfo b/x11-drivers/xf86-input-acecad/distinfo
new file mode 100644
index 0000000..4382553
--- /dev/null
+++ b/x11-drivers/xf86-input-acecad/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-input-acecad-1.5.0.tar.bz2) = c3032f38a07b54772299ce8832e16109a685ee63eeefbb17cef9fe1dd100a448
+SIZE (xorg/driver/xf86-input-acecad-1.5.0.tar.bz2) = 262818
diff --git a/x11-drivers/xf86-input-acecad/pkg-descr b/x11-drivers/xf86-input-acecad/pkg-descr
new file mode 100644
index 0000000..ceb6161
--- /dev/null
+++ b/x11-drivers/xf86-input-acecad/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-input-acecad driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-acecad/pkg-plist b/x11-drivers/xf86-input-acecad/pkg-plist
new file mode 100644
index 0000000..bece9a4
--- /dev/null
+++ b/x11-drivers/xf86-input-acecad/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/acecad_drv.la
+lib/xorg/modules/input/acecad_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-egalax/Makefile b/x11-drivers/xf86-input-egalax/Makefile
new file mode 100644
index 0000000..d8aec0b
--- /dev/null
+++ b/x11-drivers/xf86-input-egalax/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for: xf86-input-egalax
+# Date Created: 2 June 2010
+# Whom: Gleb Smirnoff <glebius@FreeBSD.org>
+#
+# $FreeBSD: ports/x11-drivers/xf86-input-egalax/Makefile,v 1.5 2011/11/09 15:25:55 miwi Exp $
+#
+
+PORTNAME= xf86-input-egalax
+PORTVERSION= 0.2
+CATEGORIES= x11-drivers
+MASTER_SITES= LOCAL/glebius
+
+MAINTAINER= glebius@FreeBSD.org
+COMMENT= eGalax touch screen input driver for X.Org
+
+LICENSE= BSD
+
+XORG_CAT= driver
+MAN4= egalax.4x
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 800505
+IGNORE= is useless without uep(4) kernel driver
+.endif
+
+.if defined(WITH_NEW_XORG)
+IGNORE= does not build with X server 1.10
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-drivers/xf86-input-egalax/distinfo b/x11-drivers/xf86-input-egalax/distinfo
new file mode 100644
index 0000000..44b527e
--- /dev/null
+++ b/x11-drivers/xf86-input-egalax/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-input-egalax-0.2.tar.bz2) = 4396e74bd6db1f8ce4f6a95deacfd1209f01e78362a7379af970ec0e6023f895
+SIZE (xorg/driver/xf86-input-egalax-0.2.tar.bz2) = 189887
diff --git a/x11-drivers/xf86-input-egalax/pkg-descr b/x11-drivers/xf86-input-egalax/pkg-descr
new file mode 100644
index 0000000..731bf6e
--- /dev/null
+++ b/x11-drivers/xf86-input-egalax/pkg-descr
@@ -0,0 +1 @@
+This package contains the X.Org xf86-input-egalax driver. See also uep(4).
diff --git a/x11-drivers/xf86-input-egalax/pkg-plist b/x11-drivers/xf86-input-egalax/pkg-plist
new file mode 100644
index 0000000..6849aac
--- /dev/null
+++ b/x11-drivers/xf86-input-egalax/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/egalax_drv.la
+lib/xorg/modules/input/egalax_drv.so
+@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
new file mode 100644
index 0000000..fe1cddd
--- /dev/null
+++ b/x11-drivers/xf86-input-elographics/Makefile
@@ -0,0 +1,28 @@
+# New ports collection makefile for: xf86-input-elographics
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-input-elographics
+PORTVERSION= ${ELO_VERSION}
+PORTREVISION= ${ELO_REVISION}
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org elographics input driver
+
+XORG_CAT= driver
+USE_XORG= xextproto videoproto
+MAN4= elographics.4x
+
+.if defined(WITH_NEW_XORG)
+ELO_VERSION= 1.3.0
+ELO_REVISION= 0
+.else
+ELO_VERSION= 1.2.4
+ELO_REVISION= 0
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-elographics/distinfo b/x11-drivers/xf86-input-elographics/distinfo
new file mode 100644
index 0000000..a609c5a
--- /dev/null
+++ b/x11-drivers/xf86-input-elographics/distinfo
@@ -0,0 +1,4 @@
+SHA256 (xorg/driver/xf86-input-elographics-1.2.4.tar.bz2) = dfede47c14c40e51294c84bf8f9bec5f5e0b17c80f370ae2ac6bddad79f9e66b
+SIZE (xorg/driver/xf86-input-elographics-1.2.4.tar.bz2) = 259101
+SHA256 (xorg/driver/xf86-input-elographics-1.3.0.tar.bz2) = 8c0bb3864a8fbc696c8f3d5442b2f20db1249a6ca23f5d020639f2cbcfe4ab9e
+SIZE (xorg/driver/xf86-input-elographics-1.3.0.tar.bz2) = 276070
diff --git a/x11-drivers/xf86-input-elographics/pkg-descr b/x11-drivers/xf86-input-elographics/pkg-descr
new file mode 100644
index 0000000..c941465
--- /dev/null
+++ b/x11-drivers/xf86-input-elographics/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-input-elographics driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-elographics/pkg-plist b/x11-drivers/xf86-input-elographics/pkg-plist
new file mode 100644
index 0000000..b6f57b1
--- /dev/null
+++ b/x11-drivers/xf86-input-elographics/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/elographics_drv.la
+lib/xorg/modules/input/elographics_drv.so
+@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
new file mode 100644
index 0000000..886ddbb
--- /dev/null
+++ b/x11-drivers/xf86-input-fpit/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for: xf86-input-fpit
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-input-fpit
+PORTVERSION= 1.4.0
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org fpit input driver
+
+XORG_CAT= driver
+USE_XORG= xrandr xextproto videoproto
+
+MAN4= fpit.4x
+
+.if !defined(WITH_NEW_XORG)
+IGNORE= does not build with X server 1.7.7
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-fpit/distinfo b/x11-drivers/xf86-input-fpit/distinfo
new file mode 100644
index 0000000..1e97d5e
--- /dev/null
+++ b/x11-drivers/xf86-input-fpit/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-input-fpit-1.4.0.tar.bz2) = 38a80ad6e9b367e068390b2ef92e0bbb9c21c09ea835a5190ae14c2271e68f9a
+SIZE (xorg/driver/xf86-input-fpit-1.4.0.tar.bz2) = 277843
diff --git a/x11-drivers/xf86-input-fpit/pkg-descr b/x11-drivers/xf86-input-fpit/pkg-descr
new file mode 100644
index 0000000..28985ef
--- /dev/null
+++ b/x11-drivers/xf86-input-fpit/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-input-fpit driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-fpit/pkg-plist b/x11-drivers/xf86-input-fpit/pkg-plist
new file mode 100644
index 0000000..724fb95
--- /dev/null
+++ b/x11-drivers/xf86-input-fpit/pkg-plist
@@ -0,0 +1,6 @@
+lib/xorg/modules/input/fpit_drv.la
+lib/xorg/modules/input/fpit_drv.so
+share/X11/xorg.conf.d/50-fpit.conf
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile
new file mode 100644
index 0000000..d55e0ec
--- /dev/null
+++ b/x11-drivers/xf86-input-hyperpen/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xf86-input-hyperpen
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-input-hyperpen
+PORTVERSION= 1.4.1
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org hyperpen input driver
+
+XORG_CAT= driver
+USE_XORG= xextproto videoproto
+
+.if defined(WITH_NEW_XORG)
+IGNORE= does not build with Xorg-server 1.7.7
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-hyperpen/distinfo b/x11-drivers/xf86-input-hyperpen/distinfo
new file mode 100644
index 0000000..37edd2b
--- /dev/null
+++ b/x11-drivers/xf86-input-hyperpen/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-input-hyperpen-1.4.1.tar.bz2) = 31a816f032a2adf4be10909811831191a7528152347e1726b04810ff88436816
+SIZE (xorg/driver/xf86-input-hyperpen-1.4.1.tar.bz2) = 266891
diff --git a/x11-drivers/xf86-input-hyperpen/pkg-descr b/x11-drivers/xf86-input-hyperpen/pkg-descr
new file mode 100644
index 0000000..30e7b36
--- /dev/null
+++ b/x11-drivers/xf86-input-hyperpen/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-input-hyperpen driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-hyperpen/pkg-plist b/x11-drivers/xf86-input-hyperpen/pkg-plist
new file mode 100644
index 0000000..59dc017
--- /dev/null
+++ b/x11-drivers/xf86-input-hyperpen/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/hyperpen_drv.la
+lib/xorg/modules/input/hyperpen_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
new file mode 100644
index 0000000..11e0d78
--- /dev/null
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for: xf86-input-joystick
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-input-joystick
+PORTVERSION= 1.6.0
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org joystick input driver
+
+XORG_CAT= driver
+USE_XORG= xextproto videoproto
+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
new file mode 100644
index 0000000..986f4b2
--- /dev/null
+++ b/x11-drivers/xf86-input-joystick/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 4f1c15ec7372dd340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1
+SIZE (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 310552
diff --git a/x11-drivers/xf86-input-joystick/pkg-descr b/x11-drivers/xf86-input-joystick/pkg-descr
new file mode 100644
index 0000000..cfcfc76
--- /dev/null
+++ b/x11-drivers/xf86-input-joystick/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-input-joystick driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-joystick/pkg-plist b/x11-drivers/xf86-input-joystick/pkg-plist
new file mode 100644
index 0000000..1a0ab46
--- /dev/null
+++ b/x11-drivers/xf86-input-joystick/pkg-plist
@@ -0,0 +1,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
+@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
new file mode 100644
index 0000000..86be55c
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for: xf86-input-keyboard
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-input-keyboard
+PORTVERSION= 1.6.1
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org keyboard input driver
+
+XORG_CAT= driver
+USE_XORG= kbproto xextproto videoproto
+MAN4= kbd.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo
new file mode 100644
index 0000000..f093391
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
+SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = 304166
diff --git a/x11-drivers/xf86-input-keyboard/files/patch-at_scancode.c b/x11-drivers/xf86-input-keyboard/files/patch-at_scancode.c
new file mode 100644
index 0000000..4a24423
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/files/patch-at_scancode.c
@@ -0,0 +1,31 @@
+--- src/at_scancode.c.orig Sun Jul 3 09:01:35 2005
++++ src/at_scancode.c Sat Oct 7 21:27:29 2006
+@@ -84,6 +84,10 @@
+ case KEY_Prefix0:
+ pKbd->scanPrefix = 0;
+ switch (*scanCode) {
++ case 0x1e: *scanCode = KEY_AudioRaise;break;
++ case 0x1f: *scanCode = KEY_AudioLower;break;
++ case 0x20: *scanCode = KEY_Power; break;
++ case 0x25: *scanCode = KEY_Mute; break;
+ case KEY_KP_7: *scanCode = KEY_Home; break; /* curs home */
+ case KEY_KP_8: *scanCode = KEY_Up; break; /* curs up */
+ case KEY_KP_9: *scanCode = KEY_PgUp; break; /* curs pgup */
+@@ -103,6 +107,17 @@
+ case 0x5b: *scanCode = KEY_LMeta; break;
+ case 0x5c: *scanCode = KEY_RMeta; break;
+ case 0x5d: *scanCode = KEY_Menu; break;
++ case 0x5e: *scanCode = KEY_L1; break; /* stop */
++ case 0x5f: *scanCode = KEY_L2; break; /* again */
++ case 0x60: *scanCode = KEY_L3; break; /* props */
++ case 0x61: *scanCode = KEY_L4; break; /* undo */
++ case 0x62: *scanCode = KEY_L5; break; /* front */
++ case 0x63: *scanCode = KEY_L6; break; /* copy */
++ case 0x64: *scanCode = KEY_L7; break; /* open */
++ case 0x65: *scanCode = KEY_L8; break; /* paste */
++ case 0x66: *scanCode = KEY_L9; break; /* find */
++ case 0x67: *scanCode = KEY_L10; break; /* cut */
++ case 0x68: *scanCode = KEY_Help; break;
+ case KEY_F3: *scanCode = KEY_F13; break;
+ case KEY_F4: *scanCode = KEY_F14; break;
+ case KEY_F5: *scanCode = KEY_F15; break;
diff --git a/x11-drivers/xf86-input-keyboard/pkg-descr b/x11-drivers/xf86-input-keyboard/pkg-descr
new file mode 100644
index 0000000..0ee3dcb
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-input-keyboard driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-keyboard/pkg-plist b/x11-drivers/xf86-input-keyboard/pkg-plist
new file mode 100644
index 0000000..7e9f47e
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/kbd_drv.la
+lib/xorg/modules/input/kbd_drv.so
+@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
new file mode 100644
index 0000000..8e1512a
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for: xf86-input-mouse
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-input-mouse
+PORTVERSION= 1.7.1
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org mouse input driver
+
+CONFIGURE_ARGS+=--disable-silent-rules
+
+XORG_CAT= driver
+USE_XORG= xextproto videoproto
+MAN4= mousedrv.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo
new file mode 100644
index 0000000..890cfcb
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
+SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 319429
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 0000000..b1da04c
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
@@ -0,0 +1,250 @@
+--- src/bsd_mouse.c.orig 2008-11-26 23:11:36.000000000 -0500
++++ src/bsd_mouse.c 2009-04-07 17:10:17.000000000 -0400
+@@ -1,4 +1,3 @@
+-
+ /*
+ * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
+ *
+@@ -71,15 +70,20 @@
+ static const char *FindDevice(InputInfoPtr, const char *, int);
+
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
++#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106)
++#define XPS2_SUPPORT
++#endif
+ /* These are for FreeBSD and DragonFly */
+ #define DEFAULT_MOUSE_DEV "/dev/mouse"
+ #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse"
+ #define DEFAULT_PS2_DEV "/dev/psm0"
++#define DEFAULT_USB_DEV "/dev/ums0"
+
+ static const char *mouseDevs[] = {
+ DEFAULT_MOUSE_DEV,
+ DEFAULT_SYSMOUSE_DEV,
+ DEFAULT_PS2_DEV,
++ DEFAULT_USB_DEV,
+ NULL
+ };
+ #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
+@@ -100,7 +104,11 @@
+ #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 +187,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 +219,16 @@
+ if (pInfo->fd == -1)
+ return NULL;
+
++#ifdef XPS2_SUPPORT
+ /* set the driver operation level, if applicable */
++ dev = xf86FindOptionValue(pInfo->options, "Device");
++ if (dev != NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8))
++ i = 2;
++ else
++#endif
+ i = 1;
+ ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
+-
++
+ /* interrogate the driver and get some intelligence on the device. */
+ hw.iftype = MOUSE_IF_UNKNOWN;
+ hw.model = MOUSE_MODEL_GENERIC;
+@@ -209,9 +244,18 @@
+ protoPara[0] = mode.syncmask[0];
+ protoPara[1] = mode.syncmask[1];
+ }
++ proto = devproto[i].name;
++#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 +278,41 @@
+ (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
+ /*
+ * As the FreeBSD sysmouse driver defaults to protocol level 0
+- * everytime it is opened we enforce protocol level 1 again at
++ * everytime it is closed we enforce protocol level 1 again at
+ * this point.
+ */
+ mode.level = 1;
+ } 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;
+ }
+@@ -276,17 +320,17 @@
+ static const char *
+ FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
+ {
+- int fd = -1;
++ int ret = -1;
+ const char **pdev, *dev = NULL;
+ Bool devMouse = FALSE;
+ struct stat devMouseStat;
+ struct stat sb;
+
+ for (pdev = mouseDevs; *pdev; pdev++) {
+- SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
+- if (fd == -1) {
++ SYSCALL (ret = stat(*pdev, &sb));
++ if (ret == -1) {
+ #ifdef DEBUG
+- ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
++ ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
+ #endif
+ } else {
+ /*
+@@ -295,28 +339,32 @@
+ * the test for whether /dev/sysmouse is usable can be made.
+ */
+ if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
+- if (fstat(fd, &devMouseStat) == 0)
+- devMouse = TRUE;
+- close(fd);
++ memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
++ devMouse = TRUE;
+ continue;
+ } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
+ /* Check if /dev/mouse is the same as /dev/sysmouse. */
+- if (devMouse && fstat(fd, &sb) == 0 &&
+- devMouseStat.st_dev == sb.st_dev &&
++ if (devMouse && devMouseStat.st_dev == sb.st_dev &&
+ devMouseStat.st_ino == sb.st_ino) {
+ /* If the same, use /dev/sysmouse. */
+ devMouse = FALSE;
+ }
+- close(fd);
+- if (MousedRunning())
++ if (MousedRunning(NULL))
+ break;
+- else {
+-#ifdef DEBUG
+- ErrorF("moused isn't running\n");
+-#endif
+- }
+ } else {
+- close(fd);
++ /* Check if /dev/mouse is the same as this device. */
++ if (devMouse && devMouseStat.st_dev == sb.st_dev &&
++ devMouseStat.st_ino == sb.st_ino) {
++ /* If the same, use this device. */
++ devMouse = FALSE;
++ }
++ if (MousedRunning(*pdev))
++ continue;
++ /* ums(4) does not support anything but SysMouse protocol. */
++ if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
++ xf86NameCmp(protocol, "auto") != 0 &&
++ xf86NameCmp(protocol, "sysmouse") != 0)
++ continue;
+ break;
+ }
+ }
+@@ -782,7 +830,9 @@
+ 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-mouse/pkg-descr b/x11-drivers/xf86-input-mouse/pkg-descr
new file mode 100644
index 0000000..c45fe40
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-input-mouse driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-mouse/pkg-plist b/x11-drivers/xf86-input-mouse/pkg-plist
new file mode 100644
index 0000000..dd465f1
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/mouse_drv.la
+lib/xorg/modules/input/mouse_drv.so
+@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
new file mode 100644
index 0000000..adb94e6
--- /dev/null
+++ b/x11-drivers/xf86-input-mutouch/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for: xf86-input-mutouch
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-input-mutouch
+PORTVERSION= 1.3.0
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org mutouch input driver
+
+XORG_CAT= driver
+USE_XORG= xextproto videoproto
+MAN4= mutouch.4x
+
+.if !defined(WITH_NEW_XORG)
+IGNORE= does not build with xorg-server 1.7.7
+.else
+
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-mutouch/distinfo b/x11-drivers/xf86-input-mutouch/distinfo
new file mode 100644
index 0000000..1dceb72
--- /dev/null
+++ b/x11-drivers/xf86-input-mutouch/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-input-mutouch-1.3.0.tar.bz2) = e28907ec71f010353550e897c7a1f161b59969c6ad84379fb5285e032448a43c
+SIZE (xorg/driver/xf86-input-mutouch-1.3.0.tar.bz2) = 268865
diff --git a/x11-drivers/xf86-input-mutouch/pkg-descr b/x11-drivers/xf86-input-mutouch/pkg-descr
new file mode 100644
index 0000000..e3d06cc
--- /dev/null
+++ b/x11-drivers/xf86-input-mutouch/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-input-mutouch driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-mutouch/pkg-plist b/x11-drivers/xf86-input-mutouch/pkg-plist
new file mode 100644
index 0000000..b3ef9f3
--- /dev/null
+++ b/x11-drivers/xf86-input-mutouch/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/mutouch_drv.la
+lib/xorg/modules/input/mutouch_drv.so
+@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
new file mode 100644
index 0000000..5fdd360
--- /dev/null
+++ b/x11-drivers/xf86-input-penmount/Makefile
@@ -0,0 +1,28 @@
+# New ports collection makefile for: xf86-input-penmount
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-input-penmount
+PORTVERSION= ${PEN_VERSION}
+PORTREVISION= ${PEN_REVISION}
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org penmount input driver
+
+XORG_CAT= driver
+USE_XORG= xextproto videoproto
+MAN4= penmount.4x
+
+.if defined(WITH_NEW_XORG)
+PEN_VERSION= 1.5.0
+PEN_REVISION= 0
+.else
+PEN_VERSION= 1.4.1
+PEN_REVISION= 1
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-penmount/distinfo b/x11-drivers/xf86-input-penmount/distinfo
new file mode 100644
index 0000000..0b6998d
--- /dev/null
+++ b/x11-drivers/xf86-input-penmount/distinfo
@@ -0,0 +1,4 @@
+SHA256 (xorg/driver/xf86-input-penmount-1.4.1.tar.bz2) = 6f281a7bce9db34772bcf762eb0ed57b8121a204a6f15d5405fe870a0af57182
+SIZE (xorg/driver/xf86-input-penmount-1.4.1.tar.bz2) = 255951
+SHA256 (xorg/driver/xf86-input-penmount-1.5.0.tar.bz2) = f45a85911a59647ba24f84c15f49d31d5f62a9bb86ca56881bf3ecbc21113ce7
+SIZE (xorg/driver/xf86-input-penmount-1.5.0.tar.bz2) = 276864
diff --git a/x11-drivers/xf86-input-penmount/pkg-descr b/x11-drivers/xf86-input-penmount/pkg-descr
new file mode 100644
index 0000000..ea15a1e
--- /dev/null
+++ b/x11-drivers/xf86-input-penmount/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-penmount driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-penmount/pkg-plist b/x11-drivers/xf86-input-penmount/pkg-plist
new file mode 100644
index 0000000..a48eb14
--- /dev/null
+++ b/x11-drivers/xf86-input-penmount/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/penmount_drv.la
+lib/xorg/modules/input/penmount_drv.so
+@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
new file mode 100644
index 0000000..170f546
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -0,0 +1,38 @@
+# New ports collection makefile for: xf86-input-synaptics
+# Date Created: 25 Sep 2008
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-input-synaptics
+PORTVERSION= 1.5.0
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org synaptics input driver
+
+CONFLICTS= synaptics-[0-9]*
+
+LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
+
+USE_GNOME= gnomehack
+USE_XORG= x11 xextproto videoproto
+XORG_CAT= driver
+
+MAN1= syndaemon.1 \
+ synclient.1
+MAN4= synaptics.4x
+
+post-install:
+ ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
+ ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
+ ${PREFIX}/share/hal/fdi/policy/10osvendor/
+
+.if defined(WITH_NEW_XORG)
+PLIST_SUB+= NEW="" OLD="@comment "
+.else
+PLIST_SUB+= NEW="@comment " OLD=""
+.endif
+
+.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 0000000..21ece95
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 95cc5399fc49c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e
+SIZE (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 431123
diff --git a/x11-drivers/xf86-input-synaptics/pkg-descr b/x11-drivers/xf86-input-synaptics/pkg-descr
new file mode 100644
index 0000000..6d29e1b
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-input-synaptics driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist
new file mode 100644
index 0000000..4d1aec8
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/pkg-plist
@@ -0,0 +1,18 @@
+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
+%%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
+share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
+%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
+@dirrmtry include/xorg
+@dirrmtry share/hal/fdi/policy/10osvendor
+@dirrmtry share/hal/fdi/policy
+@dirrmtry share/hal/fdi
+@dirrmtry share/hal
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
new file mode 100644
index 0000000..ab5fffc
--- /dev/null
+++ b/x11-drivers/xf86-input-vmmouse/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for: xf86-input-vmmouse
+# Date Created: 17 Feb 2006
+# Whom: NIIMI Satoshi <sa2c@sa2c.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-input-vmmouse
+PORTVERSION= 12.7.0
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org vmmouse input driver
+
+LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
+
+XORG_CAT= driver
+USE_XORG= xextproto videoproto
+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.
+
+.if defined(WITH_NEW_XORG)
+PLIST_SUB+= NEW=""
+.else
+PLIST_SUB+= NEW="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-vmmouse/distinfo b/x11-drivers/xf86-input-vmmouse/distinfo
new file mode 100644
index 0000000..2987fb8
--- /dev/null
+++ b/x11-drivers/xf86-input-vmmouse/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-input-vmmouse-12.7.0.tar.bz2) = 00e5d527a0d97e6b2a6e8c519e1339427e66fa0a43af026858655c7c62bd9e35
+SIZE (xorg/driver/xf86-input-vmmouse-12.7.0.tar.bz2) = 281998
diff --git a/x11-drivers/xf86-input-vmmouse/pkg-descr b/x11-drivers/xf86-input-vmmouse/pkg-descr
new file mode 100644
index 0000000..266fa13
--- /dev/null
+++ b/x11-drivers/xf86-input-vmmouse/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-input-vmmouse driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-vmmouse/pkg-plist b/x11-drivers/xf86-input-vmmouse/pkg-plist
new file mode 100644
index 0000000..0af5d79
--- /dev/null
+++ b/x11-drivers/xf86-input-vmmouse/pkg-plist
@@ -0,0 +1,9 @@
+bin/vmmouse_detect
+libexec/hal/scripts/hal-probe-vmmouse
+lib/xorg/modules/input/vmmouse_drv.la
+lib/xorg/modules/input/vmmouse_drv.so
+%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
+share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
new file mode 100644
index 0000000..deea0df
--- /dev/null
+++ b/x11-drivers/xf86-input-void/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for: xf86-input-void
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-input-void
+PORTVERSION= ${VOID_VERSION}
+PORTREVISION= ${VOID_REVISION}
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org void input driver
+
+XORG_CAT= driver
+USE_XORG= xextproto videoproto
+MAN4= void.4x
+
+.if defined(WITH_NEW_XORG)
+VOID_VERSION= 1.4.0
+VOID_REVISION= 0
+.else
+VOID_VERSION= 1.3.1
+VOID_REVISION= 0
+.endif
+
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-void/distinfo b/x11-drivers/xf86-input-void/distinfo
new file mode 100644
index 0000000..a8c34de
--- /dev/null
+++ b/x11-drivers/xf86-input-void/distinfo
@@ -0,0 +1,4 @@
+SHA256 (xorg/driver/xf86-input-void-1.3.1.tar.bz2) = aba69784ac83f5951af3e164312adb4b8b1c91a8f79ab35dc5165c534e14c674
+SIZE (xorg/driver/xf86-input-void-1.3.1.tar.bz2) = 242189
+SHA256 (xorg/driver/xf86-input-void-1.4.0.tar.bz2) = 2ab95865252c64cc88050fa0089a74e063c357b71907bf9be7886047c4987505
+SIZE (xorg/driver/xf86-input-void-1.4.0.tar.bz2) = 273454
diff --git a/x11-drivers/xf86-input-void/pkg-descr b/x11-drivers/xf86-input-void/pkg-descr
new file mode 100644
index 0000000..7aa7847
--- /dev/null
+++ b/x11-drivers/xf86-input-void/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-input-void driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-void/pkg-plist b/x11-drivers/xf86-input-void/pkg-plist
new file mode 100644
index 0000000..554c368
--- /dev/null
+++ b/x11-drivers/xf86-input-void/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/void_drv.la
+lib/xorg/modules/input/void_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
new file mode 100644
index 0000000..de559d8
--- /dev/null
+++ b/x11-drivers/xf86-video-ark/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for: xf86-video-ark
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-video-ark
+PORTVERSION= 0.7.3
+PORTREVISION= 1
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org ark display driver
+
+XORG_CAT= driver
+USE_XORG= xextproto videoproto
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ark/distinfo b/x11-drivers/xf86-video-ark/distinfo
new file mode 100644
index 0000000..d7e2a50
--- /dev/null
+++ b/x11-drivers/xf86-video-ark/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
+SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 238946
diff --git a/x11-drivers/xf86-video-ark/pkg-descr b/x11-drivers/xf86-video-ark/pkg-descr
new file mode 100644
index 0000000..46a0bec
--- /dev/null
+++ b/x11-drivers/xf86-video-ark/pkg-descr
@@ -0,0 +1 @@
+This package contains the X.Org xf86-video-ark driver.
diff --git a/x11-drivers/xf86-video-ark/pkg-plist b/x11-drivers/xf86-video-ark/pkg-plist
new file mode 100644
index 0000000..ce3a4e9
--- /dev/null
+++ b/x11-drivers/xf86-video-ark/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/ark_drv.la
+lib/xorg/modules/drivers/ark_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-ati613/Makefile b/x11-drivers/xf86-video-ati613/Makefile
new file mode 100644
index 0000000..b4d6351
--- /dev/null
+++ b/x11-drivers/xf86-video-ati613/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for: xf86-video-ati
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD: ports/x11-drivers/xf86-video-ati613/Makefile,v 1.28 2011/11/09 15:25:57 miwi Exp $
+#
+
+PORTNAME= xf86-video-ati613
+PORTVERSION= 6.13.2
+CATEGORIES= x11-drivers
+DISTNAME= xf86-video-ati-${PORTVERSION}
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org ati display driver
+
+USE_GL= gl
+
+XORG_CAT= driver
+USE_XORG= xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
+MAN4= ati.4x radeon.4x
+
+.if defined(WITH_NEW_XORG)
+IGNORE= Please use x11-drivers/xf86-video-ati
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ati613/distinfo b/x11-drivers/xf86-video-ati613/distinfo
new file mode 100644
index 0000000..bd223cd
--- /dev/null
+++ b/x11-drivers/xf86-video-ati613/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = d85f60081e5b71bf19da4ca48bce95a9e9df3635c8540dd2640785bedfbc36ee
+SIZE (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = 985673
diff --git a/x11-drivers/xf86-video-ati613/pkg-descr b/x11-drivers/xf86-video-ati613/pkg-descr
new file mode 100644
index 0000000..fe1b01b
--- /dev/null
+++ b/x11-drivers/xf86-video-ati613/pkg-descr
@@ -0,0 +1 @@
+This package contains the X.Org xf86-video-ati driver.
diff --git a/x11-drivers/xf86-video-ati613/pkg-plist b/x11-drivers/xf86-video-ati613/pkg-plist
new file mode 100644
index 0000000..52b1421
--- /dev/null
+++ b/x11-drivers/xf86-video-ati613/pkg-plist
@@ -0,0 +1,14 @@
+lib/xorg/modules/drivers/ati_drv.la
+lib/xorg/modules/drivers/ati_drv.so
+lib/xorg/modules/drivers/radeon_drv.la
+lib/xorg/modules/drivers/radeon_drv.so
+lib/xorg/modules/multimedia/theatre200_drv.la
+lib/xorg/modules/multimedia/theatre200_drv.so
+lib/xorg/modules/multimedia/theatre_detect_drv.la
+lib/xorg/modules/multimedia/theatre_detect_drv.so
+lib/xorg/modules/multimedia/theatre_drv.la
+lib/xorg/modules/multimedia/theatre_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules/multimedia
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
new file mode 100644
index 0000000..15e327e
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for: xf86-video-chips
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-video-chips
+PORTVERSION= 1.2.4
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org chips display driver
+
+XORG_CAT= driver
+USE_XORG= videoproto xextproto
+MAN4= chips.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo
new file mode 100644
index 0000000..f03b719
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
+SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618
diff --git a/x11-drivers/xf86-video-chips/pkg-descr b/x11-drivers/xf86-video-chips/pkg-descr
new file mode 100644
index 0000000..2145d88
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-video-chips driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-chips/pkg-plist b/x11-drivers/xf86-video-chips/pkg-plist
new file mode 100644
index 0000000..437be4c
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/chips_drv.la
+lib/xorg/modules/drivers/chips_drv.so
+@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
new file mode 100644
index 0000000..c35b986
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for: xf86-video-dummy
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD: ports/x11-drivers/xf86-video-dummy/Makefile,v 1.12 2011/11/09 15:25:57 miwi Exp $
+#
+
+PORTNAME= xf86-video-dummy
+PORTVERSION= 0.3.5
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org dummy display driver
+
+XORG_CAT= driver
+USE_XORG= videoproto xf86dgaproto
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-dummy/distinfo b/x11-drivers/xf86-video-dummy/distinfo
new file mode 100644
index 0000000..899bec9
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
+SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = 274761
diff --git a/x11-drivers/xf86-video-dummy/pkg-descr b/x11-drivers/xf86-video-dummy/pkg-descr
new file mode 100644
index 0000000..4aa6c28
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-video-dummy driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-dummy/pkg-plist b/x11-drivers/xf86-video-dummy/pkg-plist
new file mode 100644
index 0000000..d9b858d
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/dummy_drv.la
+lib/xorg/modules/drivers/dummy_drv.so
+@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
new file mode 100644
index 0000000..ab3f5a8
--- /dev/null
+++ b/x11-drivers/xf86-video-glint/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xf86-video-glint
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-video-glint
+PORTVERSION= 1.2.6
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org glint display driver
+
+USE_GL= gl
+
+WITH_FBSD10_FIX=yes
+XORG_CAT= driver
+USE_XORG= xf86driproto videoproto xextproto xf86dgaproto glproto
+MAN4= glint.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-glint/distinfo b/x11-drivers/xf86-video-glint/distinfo
new file mode 100644
index 0000000..1e7a988
--- /dev/null
+++ b/x11-drivers/xf86-video-glint/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7
+SIZE (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = 393872
diff --git a/x11-drivers/xf86-video-glint/pkg-descr b/x11-drivers/xf86-video-glint/pkg-descr
new file mode 100644
index 0000000..ef6b272
--- /dev/null
+++ b/x11-drivers/xf86-video-glint/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-video-glint driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-glint/pkg-plist b/x11-drivers/xf86-video-glint/pkg-plist
new file mode 100644
index 0000000..cb5ce1f
--- /dev/null
+++ b/x11-drivers/xf86-video-glint/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/glint_drv.la
+lib/xorg/modules/drivers/glint_drv.so
+@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
new file mode 100644
index 0000000..8620b64
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -0,0 +1,64 @@
+# New ports collection makefile for: xf86-video-intel
+# Date Created: 28 May 2007
+# Whom: lesi@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-video-intel
+PORTVERSION= ${INTEL_VERSION}
+PORTREVISION= ${INTEL_REVISION}
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Driver for Intel integrated graphics chipsets
+
+ONLY_FOR_ARCHS= amd64 i386
+USE_GL= gl
+
+USE_LDCONFIG= yes
+XORG_CAT= driver
+USE_XORG= xvmc xineramaproto xextproto x11 xf86driproto glproto
+MAN4= intel.4x
+
+.if defined(WITH_NEW_XORG)
+INTEL_VERSION= 2.17.0
+INTEL_REVISION= 0
+MAKE_JOBS_UNSAFE=yes
+PLIST_SUB+= OLD="@comment "
+.else
+INTEL_VERSION= 2.7.1
+INTEL_REVISION= 4
+PLIST_SUB+= OLD=""
+
+EXTRA_PATCHES+= ${PATCHDIR}/extra-src_ch7017_ch7017.c \
+ ${PATCHDIR}/extra-src_i830_render.c \
+ ${PATCHDIR}/extra-src_ch7xxx_ch7xxx.c \
+ ${PATCHDIR}/extra-src_i830_video.c \
+ ${PATCHDIR}/extra-src_i810_driver.c \
+ ${PATCHDIR}/extra-src_i915_hwmc.c \
+ ${PATCHDIR}/extra-src_i810_hwmc.c \
+ ${PATCHDIR}/extra-src_i915_render.c \
+ ${PATCHDIR}/extra-src_i810_video.c \
+ ${PATCHDIR}/extra-src_i965_render.c \
+ ${PATCHDIR}/extra-src_i830_dri.c \
+ ${PATCHDIR}/extra-src_ivch_ivch.c \
+ ${PATCHDIR}/extra-src_i830_driver.c \
+ ${PATCHDIR}/extra-src_sil164_sil164.c \
+ ${PATCHDIR}/extra-src_i830_dvo.c \
+ ${PATCHDIR}/extra-src_tfp410_tfp410.c \
+ ${PATCHDIR}/extra-src_i830_i2c.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
+
+.include <bsd.port.post.mk>
diff --git a/x11-drivers/xf86-video-intel/distinfo b/x11-drivers/xf86-video-intel/distinfo
new file mode 100644
index 0000000..fa854eb
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/distinfo
@@ -0,0 +1,4 @@
+SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
+SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
+SHA256 (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387
+SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 1339717
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c b/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c
new file mode 100644
index 0000000..278354a
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c
@@ -0,0 +1,17 @@
+--- src/ch7017/ch7017.c.orig 2009-04-08 18:59:47.000000000 -0500
++++ src/ch7017/ch7017.c 2010-02-21 12:40:12.000000000 -0600
+@@ -34,13 +34,11 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "miscstruct.h"
+ #include "xf86i2c.h"
+ #include "xf86Crtc.h"
+-#define DPMS_SERVER
+-#include <X11/extensions/dpms.h>
++#include <X11/extensions/dpmsconst.h>
+
+ #include "../i2c_vid.h"
+ #include "ch7017_reg.h"
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c b/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c
new file mode 100644
index 0000000..6dbc0a7
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c
@@ -0,0 +1,17 @@
+--- src/ch7xxx/ch7xxx.c.orig 2010-02-21 12:42:11.000000000 -0600
++++ src/ch7xxx/ch7xxx.c 2010-02-21 12:44:40.000000000 -0600
+@@ -34,13 +34,11 @@
+ #include <string.h>
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "miscstruct.h"
+ #include "xf86i2c.h"
+ #include "xf86Crtc.h"
+-#define DPMS_SERVER
+-#include <X11/extensions/dpms.h>
++#include <X11/extensions/dpmsconst.h>
+
+ #include "../i2c_vid.h"
+ #include "ch7xxx.h"
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c b/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c
new file mode 100644
index 0000000..5ccb55a
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c
@@ -0,0 +1,111 @@
+--- src/i810_driver.c.orig 2010-02-21 12:55:16.000000000 -0600
++++ src/i810_driver.c 2010-02-21 13:17:04.000000000 -0600
+@@ -69,8 +69,6 @@
+ */
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+-#include "xf86RAC.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+ #include "mibstore.h"
+@@ -490,20 +488,6 @@
+ );
+
+ /*
+- * Tell the loader about symbols from other modules that this module
+- * might refer to.
+- */
+- LoaderRefSymLists(I810vgahwSymbols,
+- I810fbSymbols, I810xaaSymbols, I810ramdacSymbols,
+-#ifdef XF86DRI
+- I810drmSymbols,
+- I810driSymbols,
+-#endif
+- I810shadowFBSymbols,
+- I810vbeSymbols, vbeOptionalSymbols,
+- I810ddcSymbols, NULL);
+-
+- /*
+ * The return value must be non-NULL on success even though there
+ * is no TearDownProc.
+ */
+@@ -809,7 +793,6 @@
+ }
+
+ if (xf86LoadSubModule(pScrn, "vbe") && (pVbe = VBEInit(NULL, index))) {
+- xf86LoaderReqSymLists(I810vbeSymbols, NULL);
+ MonInfo = vbeDoEDID(pVbe, NULL);
+ xf86PrintEDID(MonInfo);
+ xf86SetDDCproperties(pScrn, MonInfo);
+@@ -864,8 +847,6 @@
+ if (!xf86LoadSubModule(pScrn, "vgahw"))
+ return FALSE;
+
+- xf86LoaderReqSymLists(I810vgahwSymbols, NULL);
+-
+ /* Allocate a vgaHWRec */
+ if (!vgaHWGetHWRec(pScrn))
+ return FALSE;
+@@ -878,10 +859,6 @@
+ pI810->PciInfo->func);
+ #endif
+
+- if (xf86RegisterResources(pI810->pEnt->index, NULL, ResNone))
+- return FALSE;
+- pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
+-
+ /* Set pScrn->monitor */
+ pScrn->monitor = pScrn->confScreen->monitor;
+
+@@ -960,7 +937,6 @@
+ I810FreeRec(pScrn);
+ return FALSE;
+ }
+- xf86LoaderReqSymLists(I810xaaSymbols, NULL);
+ }
+
+ #ifdef XF86DRI
+@@ -1244,14 +1220,12 @@
+ I810FreeRec(pScrn);
+ return FALSE;
+ }
+- xf86LoaderReqSymLists(I810fbSymbols, NULL);
+
+ if (!xf86ReturnOptValBool(pI810->Options, OPTION_SW_CURSOR, FALSE)) {
+ if (!xf86LoadSubModule(pScrn, "ramdac")) {
+ I810FreeRec(pScrn);
+ return FALSE;
+ }
+- xf86LoaderReqSymLists(I810ramdacSymbols, NULL);
+ }
+
+ if (xf86GetOptValInteger
+@@ -1278,9 +1252,6 @@
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Couldn't load shadowfb module:\n");
+ }
+- else {
+- xf86LoaderReqSymLists(I810shadowFBSymbols, NULL);
+- }
+ }
+
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "page flipping %s\n",
+@@ -1312,16 +1283,12 @@
+ #ifdef XF86DRI
+ /* Load the dri module if requested. */
+ if (xf86ReturnOptValBool(pI810->Options, OPTION_DRI, FALSE)) {
+- if (xf86LoadSubModule(pScrn, "dri")) {
+- xf86LoaderReqSymLists(I810driSymbols, I810drmSymbols, NULL);
+- }
++ xf86LoadSubModule(pScrn, "dri");
+ }
+ #endif
+
+ /* We won't be using the VGA access after the probe */
+ I810SetMMIOAccess(pI810);
+- xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr);
+- xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr);
+
+ return TRUE;
+ }
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c b/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c
new file mode 100644
index 0000000..ffb2ac3
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c
@@ -0,0 +1,10 @@
+--- src/i810_hwmc.c.orig 2010-02-21 13:40:44.000000000 -0600
++++ src/i810_hwmc.c 2010-02-21 13:41:16.000000000 -0600
+@@ -42,7 +42,6 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c b/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c
new file mode 100644
index 0000000..c10b5e6
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c
@@ -0,0 +1,10 @@
+--- src/i810_video.c.orig 2010-02-21 13:17:58.000000000 -0600
++++ src/i810_video.c 2010-02-21 13:18:37.000000000 -0600
+@@ -42,7 +42,6 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c
new file mode 100644
index 0000000..05bdb93
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c
@@ -0,0 +1,14 @@
+--- src/i830_dri.c.orig 2010-02-21 13:30:37.000000000 -0600
++++ src/i830_dri.c 2010-02-21 13:39:02.000000000 -0600
+@@ -1731,9 +1731,10 @@
+ info.driverName = IS_I965G(pI830) ? "i965" : "i915";
+ info.deviceName = p;
+ info.version = 1;
+-
++#if 0
+ info.CreateBuffers = I830DRI2CreateBuffers;
+ info.DestroyBuffers = I830DRI2DestroyBuffers;
++#endif
+ info.CopyRegion = I830DRI2CopyRegion;
+
+ pI830->drmSubFD = info.fd;
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c
new file mode 100644
index 0000000..776b67f
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c
@@ -0,0 +1,97 @@
+--- src/i830_driver.c.orig 2010-02-21 13:20:12.000000000 -0600
++++ src/i830_driver.c 2010-02-21 13:26:14.000000000 -0600
+@@ -175,8 +175,6 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+-#include "xf86RAC.h"
+ #include "xf86Priv.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+@@ -1050,7 +1048,6 @@
+ if (!xf86LoadSubModule(pScrn, "ddc")) {
+ pI830->ddc2 = FALSE;
+ } else {
+- xf86LoaderReqSymLists(I810ddcSymbols, NULL);
+ pI830->ddc2 = TRUE;
+ }
+
+@@ -1058,8 +1055,6 @@
+ /* Load I2C if we have the code to use it */
+ if (pI830->ddc2) {
+ if (xf86LoadSubModule(pScrn, "i2c")) {
+- xf86LoaderReqSymLists(I810i2cSymbols, NULL);
+-
+ pI830->ddc2 = TRUE;
+ } else {
+ pI830->ddc2 = FALSE;
+@@ -1511,11 +1506,9 @@
+ /* The vgahw module should be loaded here when needed */
+ if (!xf86LoadSubModule(pScrn, "vgahw"))
+ return FALSE;
+- xf86LoaderReqSymLists(I810vgahwSymbols, NULL);
+
+ if (!xf86LoadSubModule(pScrn, "ramdac"))
+ return FALSE;
+- xf86LoaderReqSymLists(I810ramdacSymbols, NULL);
+
+ return TRUE;
+ }
+@@ -1854,12 +1847,6 @@
+ pI830->PciInfo->func);
+ #endif
+
+- if (xf86RegisterResources(pI830->pEnt->index, NULL, ResNone)) {
+- PreInitCleanup(pScrn);
+- return FALSE;
+- }
+-
+- pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
+ pScrn->monitor = pScrn->confScreen->monitor;
+ pScrn->progClock = TRUE;
+ pScrn->rgbBits = 8;
+@@ -1942,8 +1929,6 @@
+ return FALSE;
+ }
+
+- xf86LoaderReqSymLists(I810fbSymbols, NULL);
+-
+ switch (pI830->accel) {
+ #ifdef I830_USE_XAA
+ case ACCEL_XAA:
+@@ -1951,7 +1936,6 @@
+ PreInitCleanup(pScrn);
+ return FALSE;
+ }
+- xf86LoaderReqSymLists(I810xaaSymbols, NULL);
+ break;
+ #endif
+
+@@ -1973,7 +1957,6 @@
+ PreInitCleanup(pScrn);
+ return FALSE;
+ }
+- xf86LoaderReqSymLists(I830exaSymbols, NULL);
+ break;
+ }
+ #endif
+@@ -1988,17 +1971,13 @@
+
+ /* We won't be using the VGA access after the probe. */
+ I830SetMMIOAccess(pI830);
+- xf86SetOperatingState(resVgaIo, pI830->pEnt->index, ResUnusedOpr);
+- xf86SetOperatingState(resVgaMem, pI830->pEnt->index, ResDisableOpr);
+ }
+
+ #if defined(XF86DRI)
+ /* Load the dri module if requested. */
+ if (xf86ReturnOptValBool(pI830->Options, OPTION_DRI, FALSE) &&
+ pI830->directRenderingType != DRI_DISABLED) {
+- if (xf86LoadSubModule(pScrn, "dri")) {
+- xf86LoaderReqSymLists(I810driSymbols, I810drmSymbols, NULL);
+- }
++ xf86LoadSubModule(pScrn, "dri");
+ }
+ #endif
+
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c
new file mode 100644
index 0000000..d392942
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c
@@ -0,0 +1,80 @@
+--- src/i830_dvo.c.orig 2010-05-03 11:09:54.000000000 -0500
++++ src/i830_dvo.c 2010-05-03 11:13:31.000000000 -0500
+@@ -38,28 +38,6 @@
+ #include "ch7xxx/ch7xxx.h"
+ #include "tfp410/tfp410.h"
+
+-static const char *SIL164Symbols[] = {
+- "Sil164VidOutput",
+- NULL
+-};
+-static const char *TFP410Symbols[] = {
+- "Tfp410VidOutput",
+- NULL
+-};
+-static const char *CH7xxxSymbols[] = {
+- "CH7xxxVidOutput",
+- NULL
+-};
+-static const char *ivch_symbols[] = {
+- "ivch_methods",
+- NULL
+-};
+-
+-static const char *ch7017_symbols[] = {
+- "ch7017_methods",
+- NULL
+-};
+-
+ /* driver list */
+ struct _I830DVODriver i830_dvo_drivers[] =
+ {
+@@ -69,7 +47,6 @@
+ .fntablename = "SIL164VidOutput",
+ .dvo_reg = DVOC,
+ .address = (SIL164_ADDR_1<<1),
+- .symbols = SIL164Symbols
+ },
+ {
+ .type = I830_OUTPUT_DVO_TMDS,
+@@ -77,7 +54,6 @@
+ .fntablename = "CH7xxxVidOutput",
+ .dvo_reg = DVOC,
+ .address = (CH7xxx_ADDR_1<<1),
+- .symbols = CH7xxxSymbols
+ },
+ {
+ .type = I830_OUTPUT_DVO_LVDS,
+@@ -85,7 +61,6 @@
+ .fntablename = "ivch_methods",
+ .dvo_reg = DVOA,
+ .address = 0x04, /* Might also be 0x44, 0x84, 0xc4 */
+- .symbols = ivch_symbols
+ },
+ {
+ .type = I830_OUTPUT_DVO_TMDS,
+@@ -93,7 +68,6 @@
+ .fntablename = "TFP410VidOutput",
+ .dvo_reg = DVOC,
+ .address = (TFP410_ADDR_1<<1),
+- .symbols = TFP410Symbols
+ },
+ {
+ .type = I830_OUTPUT_DVO_LVDS,
+@@ -101,7 +75,6 @@
+ .fntablename = "ch7017_methods",
+ .dvo_reg = DVOC,
+ .address = 0xea,
+- .symbols = ch7017_symbols,
+ .gpio = GPIOE,
+ }
+ };
+@@ -447,8 +420,6 @@
+ if (drv->modhandle == NULL)
+ continue;
+
+- xf86LoaderReqSymLists(drv->symbols, NULL);
+-
+ ret_ptr = NULL;
+ drv->vid_rec = LoaderSymbol(drv->fntablename);
+
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c
new file mode 100644
index 0000000..1f4461c
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c
@@ -0,0 +1,11 @@
+--- src/i830_i2c.c.orig 2010-02-21 13:27:07.000000000 -0600
++++ src/i830_i2c.c 2010-02-21 13:27:45.000000000 -0600
+@@ -31,8 +31,6 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+-#include "xf86RAC.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+ #include "mibstore.h"
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c
new file mode 100644
index 0000000..e292a7d
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c
@@ -0,0 +1,78 @@
+--- src/i830_render.c.orig 2009-05-12 19:12:11.000000000 -0500
++++ src/i830_render.c 2010-03-07 15:30:45.000000000 -0600
+@@ -210,26 +210,8 @@
+ (dblend << S8_DST_BLEND_FACTOR_SHIFT);
+ }
+
+-static Bool i830_check_composite_texture(PicturePtr pPict, int unit)
++static Bool i830_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict, int unit)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
+- int w = pPict->pDrawable->width;
+- int h = pPict->pDrawable->height;
+- int i;
+-
+- if ((w > 2048) || (h > 2048))
+- I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
+-
+- for (i = 0; i < sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]);
+- i++)
+- {
+- if (i830_tex_formats[i].fmt == pPict->format)
+- break;
+- }
+- if (i == sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]))
+- I830FALLBACK("Unsupported picture format 0x%x\n",
+- (int)pPict->format);
+-
+ if (pPict->repeatType > RepeatReflect)
+ I830FALLBACK("Unsupported picture repeat %d\n", pPict->repeatType);
+
+@@ -239,6 +221,26 @@
+ I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
+ }
+
++ if (pPict->pDrawable)
++ {
++ int w, h, i;
++
++ w = pPict->pDrawable->width;
++ h = pPict->pDrawable->height;
++ if ((w > 2048) || (h > 2048))
++ I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
++
++ for (i = 0; i < sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]);
++ i++)
++ {
++ if (i830_tex_formats[i].fmt == pPict->format)
++ break;
++ }
++ if (i == sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]))
++ I830FALLBACK("Unsupported picture format 0x%x\n",
++ (int)pPict->format);
++ }
++
+ return TRUE;
+ }
+
+@@ -376,9 +378,9 @@
+ "alpha and source value blending.\n");
+ }
+
+- if (!i830_check_composite_texture(pSrcPicture, 0))
++ if (!i830_check_composite_texture(pScrn, pSrcPicture, 0))
+ I830FALLBACK("Check Src picture texture\n");
+- if (pMaskPicture != NULL && !i830_check_composite_texture(pMaskPicture, 1))
++ if (pMaskPicture != NULL && !i830_check_composite_texture(pScrn, pMaskPicture, 1))
+ I830FALLBACK("Check Mask picture texture\n");
+
+ if (!i830_get_dest_format(pDstPicture, &tmp1))
+@@ -392,7 +394,7 @@
+ PicturePtr pMaskPicture, PicturePtr pDstPicture,
+ PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
++ ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ I830Ptr pI830 = I830PTR(pScrn);
+ uint32_t dst_format, dst_pitch;
+ Bool is_affine_src, is_affine_mask;
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c
new file mode 100644
index 0000000..b93a98e
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c
@@ -0,0 +1,10 @@
+--- src/i830_video.c.orig 2010-02-21 13:28:37.000000000 -0600
++++ src/i830_video.c 2010-02-21 13:29:05.000000000 -0600
+@@ -57,7 +57,6 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c b/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c
new file mode 100644
index 0000000..ab7f679
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c
@@ -0,0 +1,10 @@
+--- src/i915_hwmc.c.orig 2010-02-21 13:42:21.000000000 -0600
++++ src/i915_hwmc.c 2010-02-21 13:42:38.000000000 -0600
+@@ -32,7 +32,6 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c b/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c
new file mode 100644
index 0000000..53b1a0e
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c
@@ -0,0 +1,69 @@
+--- src/i915_render.c.orig 2009-05-12 19:12:11.000000000 -0500
++++ src/i915_render.c 2010-03-07 15:30:45.000000000 -0600
+@@ -167,26 +167,8 @@
+ return TRUE;
+ }
+
+-static Bool i915_check_composite_texture(PicturePtr pPict, int unit)
++static Bool i915_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict, int unit)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
+- int w = pPict->pDrawable->width;
+- int h = pPict->pDrawable->height;
+- int i;
+-
+- if ((w > 2048) || (h > 2048))
+- I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
+-
+- for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
+- i++)
+- {
+- if (i915_tex_formats[i].fmt == pPict->format)
+- break;
+- }
+- if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]))
+- I830FALLBACK("Unsupported picture format 0x%x\n",
+- (int)pPict->format);
+-
+ if (pPict->repeatType > RepeatReflect)
+ I830FALLBACK("Unsupported picture repeat %d\n", pPict->repeatType);
+
+@@ -194,6 +176,26 @@
+ pPict->filter != PictFilterBilinear)
+ I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
+
++ if (pPict->pDrawable)
++ {
++ int w, h, i;
++
++ w = pPict->pDrawable->width;
++ h = pPict->pDrawable->height;
++ if ((w > 2048) || (h > 2048))
++ I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
++
++ for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
++ i++)
++ {
++ if (i915_tex_formats[i].fmt == pPict->format)
++ break;
++ }
++ if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]))
++ I830FALLBACK("Unsupported picture format 0x%x\n",
++ (int)pPict->format);
++ }
++
+ return TRUE;
+ }
+
+@@ -220,9 +222,9 @@
+ "alpha and source value blending.\n");
+ }
+
+- if (!i915_check_composite_texture(pSrcPicture, 0))
++ if (!i915_check_composite_texture(pScrn, pSrcPicture, 0))
+ I830FALLBACK("Check Src picture texture\n");
+- if (pMaskPicture != NULL && !i915_check_composite_texture(pMaskPicture, 1))
++ if (pMaskPicture != NULL && !i915_check_composite_texture(pScrn, pMaskPicture, 1))
+ I830FALLBACK("Check Mask picture texture\n");
+
+ if (!i915_get_dest_format(pDstPicture, &tmp1))
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c b/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c
new file mode 100644
index 0000000..99b7d78
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c
@@ -0,0 +1,78 @@
+--- src/i965_render.c.orig 2009-05-12 19:12:11.000000000 -0500
++++ src/i965_render.c 2010-03-07 15:30:45.000000000 -0600
+@@ -181,26 +181,8 @@
+ return TRUE;
+ }
+
+-static Bool i965_check_composite_texture(PicturePtr pPict, int unit)
++static Bool i965_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict, int unit)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
+- int w = pPict->pDrawable->width;
+- int h = pPict->pDrawable->height;
+- int i;
+-
+- if ((w > 8192) || (h > 8192))
+- I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
+-
+- for (i = 0; i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
+- i++)
+- {
+- if (i965_tex_formats[i].fmt == pPict->format)
+- break;
+- }
+- if (i == sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]))
+- I830FALLBACK("Unsupported picture format 0x%x\n",
+- (int)pPict->format);
+-
+ if (pPict->repeatType > RepeatReflect)
+ I830FALLBACK("extended repeat (%d) not supported\n",
+ pPict->repeatType);
+@@ -211,6 +193,26 @@
+ I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
+ }
+
++ if (pPict->pDrawable)
++ {
++ int w, h, i;
++
++ w = pPict->pDrawable->width;
++ h = pPict->pDrawable->height;
++ if ((w > 8192) || (h > 8192))
++ I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
++
++ for (i = 0; i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
++ i++)
++ {
++ if (i965_tex_formats[i].fmt == pPict->format)
++ break;
++ }
++ if (i == sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]))
++ I830FALLBACK("Unsupported picture format 0x%x\n",
++ (int)pPict->format);
++ }
++
+ return TRUE;
+ }
+
+@@ -239,9 +241,9 @@
+ }
+ }
+
+- if (!i965_check_composite_texture(pSrcPicture, 0))
++ if (!i965_check_composite_texture(pScrn, pSrcPicture, 0))
+ I830FALLBACK("Check Src picture texture\n");
+- if (pMaskPicture != NULL && !i965_check_composite_texture(pMaskPicture, 1))
++ if (pMaskPicture != NULL && !i965_check_composite_texture(pScrn, pMaskPicture, 1))
+ I830FALLBACK("Check Mask picture texture\n");
+
+ if (!i965_get_dest_format(pDstPicture, &tmp1))
+@@ -1258,7 +1260,7 @@
+ PicturePtr pMaskPicture, PicturePtr pDstPicture,
+ PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
++ ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ I830Ptr pI830 = I830PTR(pScrn);
+ struct gen4_render_state *render_state= pI830->gen4_render_state;
+ gen4_composite_op *composite_op = &render_state->composite_op;
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c b/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c
new file mode 100644
index 0000000..b54885d
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c
@@ -0,0 +1,17 @@
+--- src/ivch/ivch.c.orig 2010-02-21 12:47:05.000000000 -0600
++++ src/ivch/ivch.c 2010-02-21 12:48:09.000000000 -0600
+@@ -31,13 +31,11 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "miscstruct.h"
+ #include "xf86i2c.h"
+ #include "xf86Crtc.h"
+-#define DPMS_SERVER
+-#include <X11/extensions/dpms.h>
++#include <X11/extensions/dpmsproto.h>
+ #include <unistd.h>
+
+ #include "../i2c_vid.h"
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c b/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c
new file mode 100644
index 0000000..f9d7177
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c
@@ -0,0 +1,17 @@
+--- src/sil164/sil164.c.orig 2010-02-21 12:49:54.000000000 -0600
++++ src/sil164/sil164.c 2010-02-21 12:50:40.000000000 -0600
+@@ -35,13 +35,11 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "miscstruct.h"
+ #include "xf86i2c.h"
+ #include "xf86Crtc.h"
+-#define DPMS_SERVER
+-#include <X11/extensions/dpms.h>
++#include <X11/extensions/dpmsproto.h>
+
+ #include "../i2c_vid.h"
+ #include "sil164.h"
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c b/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c
new file mode 100644
index 0000000..89927b3
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c
@@ -0,0 +1,17 @@
+--- src/tfp410/tfp410.c.orig 2010-02-21 12:52:35.000000000 -0600
++++ src/tfp410/tfp410.c 2010-02-21 12:53:19.000000000 -0600
+@@ -34,13 +34,11 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "miscstruct.h"
+ #include "xf86i2c.h"
+ #include "xf86Crtc.h"
+-#define DPMS_SERVER
+-#include <X11/extensions/dpms.h>
++#include <X11/extensions/dpmsconst.h>
+
+ #include "../i2c_vid.h"
+ #include "tfp410.h"
diff --git a/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h b/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h
new file mode 100644
index 0000000..46eb72e
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h
@@ -0,0 +1,32 @@
+--- uxa/uxa-priv.h.orig 2009-05-12 19:12:11.000000000 -0500
++++ uxa/uxa-priv.h 2010-02-21 12:27:32.000000000 -0600
+@@ -42,8 +42,7 @@
+ #define NEED_EVENTS
+ #include <X11/Xproto.h>
+ #ifdef MITSHM
+-#define _XSHM_SERVER_
+-#include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ #endif
+ #include "scrnintstr.h"
+ #include "pixmapstr.h"
+@@ -319,17 +318,11 @@
+ extern const GCOps uxa_ops;
+
+ #ifdef MITSHM
+-extern ShmFuncs uxa_shm_funcs;
+-
+ /* XXX these come from shmint.h, which isn't exported by the server */
+-void
+-ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
+
+-void
+-ShmSetPixmapFormat(ScreenPtr pScreen, int format);
++#include "shmint.h"
+
+-void
+-fbShmPutImage(XSHM_PUT_IMAGE_ARGS);
++extern ShmFuncs uxa_shm_funcs;
+
+ #endif
+
diff --git a/x11-drivers/xf86-video-intel/pkg-descr b/x11-drivers/xf86-video-intel/pkg-descr
new file mode 100644
index 0000000..6ace253
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/pkg-descr
@@ -0,0 +1,3 @@
+Driver for Intel integrated graphics chipsets. It supports the i810,
+i810-DC100, i810e, i815, i830M, 845G, 852GM, 855GM, 865G, 915G, 915GM,
+945G, 945GM, 965G, 965Q, 946GZ and 965GM chipsets.
diff --git a/x11-drivers/xf86-video-intel/pkg-plist b/x11-drivers/xf86-video-intel/pkg-plist
new file mode 100644
index 0000000..0c16ed3
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/pkg-plist
@@ -0,0 +1,21 @@
+lib/libI810XvMC.la
+lib/libI810XvMC.so
+lib/libI810XvMC.so.1
+lib/libIntelXvMC.la
+lib/libIntelXvMC.so.1
+lib/libIntelXvMC.so
+%%OLD%%lib/xorg/modules/drivers/ch7017.la
+%%OLD%%lib/xorg/modules/drivers/ch7017.so
+%%OLD%%lib/xorg/modules/drivers/ch7xxx.la
+%%OLD%%lib/xorg/modules/drivers/ch7xxx.so
+lib/xorg/modules/drivers/intel_drv.la
+lib/xorg/modules/drivers/intel_drv.so
+%%OLD%%lib/xorg/modules/drivers/ivch.la
+%%OLD%%lib/xorg/modules/drivers/ivch.so
+%%OLD%%lib/xorg/modules/drivers/sil164.la
+%%OLD%%lib/xorg/modules/drivers/sil164.so
+%%OLD%%lib/xorg/modules/drivers/tfp410.la
+%%OLD%%lib/xorg/modules/drivers/tfp410.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-intel29/Makefile b/x11-drivers/xf86-video-intel29/Makefile
new file mode 100644
index 0000000..b2b5bc3
--- /dev/null
+++ b/x11-drivers/xf86-video-intel29/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for: xf86-video-intel
+# Date Created: 28 May 2007
+# Whom: lesi@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-video-intel29
+PORTVERSION= 2.9.1
+CATEGORIES= x11-drivers
+DISTNAME= xf86-video-intel-${PORTVERSION}
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Driver for Intel integrated graphics chipsets
+
+IGNORE= Not supported.
+CONFLICTS= xf86-video-intel-2.7.[0-9]* xf86-video-intel-2.15.[0-9]*
+
+ONLY_FOR_ARCHS= amd64 i386
+USE_GL= gl
+
+XORG_CAT= driver
+USE_XORG= xvmc xineramaproto xextproto x11 xf86driproto glproto
+MAN4= intel.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-intel29/distinfo b/x11-drivers/xf86-video-intel29/distinfo
new file mode 100644
index 0000000..763d1c0
--- /dev/null
+++ b/x11-drivers/xf86-video-intel29/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-intel-2.9.1.tar.bz2) = 95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76
+SIZE (xorg/driver/xf86-video-intel-2.9.1.tar.bz2) = 789001
diff --git a/x11-drivers/xf86-video-intel29/pkg-descr b/x11-drivers/xf86-video-intel29/pkg-descr
new file mode 100644
index 0000000..69bd312
--- /dev/null
+++ b/x11-drivers/xf86-video-intel29/pkg-descr
@@ -0,0 +1,5 @@
+Driver for Intel integrated graphics chipsets. It supports the i810,
+i810-DC100, i810e, i815, i830M, 845G, 852GM, 855GM, 865G, 915G, 915GM,
+945G, 945GM, 965G, 965Q, 946GZ and 965GM chipsets.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-intel29/pkg-plist b/x11-drivers/xf86-video-intel29/pkg-plist
new file mode 100644
index 0000000..900e0a9
--- /dev/null
+++ b/x11-drivers/xf86-video-intel29/pkg-plist
@@ -0,0 +1,21 @@
+lib/libI810XvMC.la
+lib/libI810XvMC.so
+lib/libI810XvMC.so.1
+lib/libIntelXvMC.la
+lib/libIntelXvMC.so.1
+lib/libIntelXvMC.so
+lib/xorg/modules/drivers/ch7017.la
+lib/xorg/modules/drivers/ch7017.so
+lib/xorg/modules/drivers/ch7xxx.la
+lib/xorg/modules/drivers/ch7xxx.so
+lib/xorg/modules/drivers/intel_drv.la
+lib/xorg/modules/drivers/intel_drv.so
+lib/xorg/modules/drivers/ivch.la
+lib/xorg/modules/drivers/ivch.so
+lib/xorg/modules/drivers/sil164.la
+lib/xorg/modules/drivers/sil164.so
+lib/xorg/modules/drivers/tfp410.la
+lib/xorg/modules/drivers/tfp410.so
+@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
new file mode 100644
index 0000000..fbd0fdd
--- /dev/null
+++ b/x11-drivers/xf86-video-mach64/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xf86-video-mach64
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-video-mach64
+PORTVERSION= 6.9.0
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org mach64 display driver
+
+USE_GL= gl
+
+XORG_CAT= driver
+USE_XORG= glproto videoproto xextproto xf86driproto xf86miscproto
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-mach64/distinfo b/x11-drivers/xf86-video-mach64/distinfo
new file mode 100644
index 0000000..356c869
--- /dev/null
+++ b/x11-drivers/xf86-video-mach64/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = a214f066c1cc997cb2d4db8474b51f731b51f8486c023c62a0e2c69f283bcd1a
+SIZE (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = 505200
diff --git a/x11-drivers/xf86-video-mach64/pkg-descr b/x11-drivers/xf86-video-mach64/pkg-descr
new file mode 100644
index 0000000..98066b1
--- /dev/null
+++ b/x11-drivers/xf86-video-mach64/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-video-mach64 driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-mach64/pkg-plist b/x11-drivers/xf86-video-mach64/pkg-plist
new file mode 100644
index 0000000..32f0985
--- /dev/null
+++ b/x11-drivers/xf86-video-mach64/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/mach64_drv.la
+lib/xorg/modules/drivers/mach64_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
new file mode 100644
index 0000000..b343fb2
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -0,0 +1,28 @@
+# New ports collection makefile for: xf86-video-mga
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-video-mga
+PORTVERSION= 1.4.13
+PORTEPOCH= 2
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org mga display driver
+
+USE_GL= gl
+
+XORG_CAT= driver
+USE_XORG= xf86driproto videoproto xextproto glproto
+MAN4= mga.4x
+
+pre-patch:
+# ${REINPLACE_CMD} \
+# -e 's|values.h|sys/limits.h|g' \
+# -e 's|MAXSHORT|SHRT_MAX|g' \
+# ${WRKSRC}/src/mga_arc.c
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-mga/distinfo b/x11-drivers/xf86-video-mga/distinfo
new file mode 100644
index 0000000..7a6ef1a
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6
+SIZE (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = 423134
diff --git a/x11-drivers/xf86-video-mga/pkg-descr b/x11-drivers/xf86-video-mga/pkg-descr
new file mode 100644
index 0000000..6dbb594
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-video-mga driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-mga/pkg-plist b/x11-drivers/xf86-video-mga/pkg-plist
new file mode 100644
index 0000000..5653292
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/mga_drv.la
+lib/xorg/modules/drivers/mga_drv.so
+@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
new file mode 100644
index 0000000..62ab26e
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/Makefile
@@ -0,0 +1,60 @@
+# New ports collection makefile for: xf86-video-nouveau
+# Date Created: 29 Jan 2009
+# Whom: Anonymous <swell.k@gmail.com>
+#
+# $FreeBSD: ports/x11-drivers/xf86-video-nouveau/Makefile,v 1.14 2011/11/09 15:25:59 miwi Exp $
+#
+
+PORTNAME= xf86-video-nouveau
+PORTVERSION= 0.0.10.${SNAPDATE}
+DISTVERSIONSUFFIX=.${SNAPREV}
+PORTREVISION= 3
+CATEGORIES= x11-drivers
+MASTER_SITES= ftp://ftp.lissyara.su/users/Guest/distfiles/
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Free nouveau display driver for nvidia-based cards
+
+XORG_CAT= driver
+USE_XORG= videoproto xextproto xf86driproto glproto
+MAN4= nouveau.4x
+
+MAKE_JOBS_SAFE= yes
+
+# also doesn't work with mesa (libGL) version higher then 7.4.x
+IGNORE= Not supported, missing kernel support. use the nvidia driver.
+
+post-configure:
+ ${REINPLACE_CMD} '/NV_DRIVER_DATE/s/".*"/"${SNAPDATE}.${SNAPREV}"/' ${WRKSRC}/config.h
+
+post-install: .SILENT
+ ${ECHO_MSG}
+ ${CAT} ${PKGMESSAGE}
+ ${ECHO_MSG}
+
+GIT_WORK= ${WRKDIR}/${PORTNAME}.git-clone
+GIT_DATE= $$(date -ur$$(git log --pretty=format:%ct -1 ) +%Y%m%d)
+GIT_REV= $$(git log --pretty=format:%h -1)
+NEWDISTNAME= ${DISTNAME:S/${SNAPDATE}.${SNAPREV}$$//}${GIT_DATE}.${GIT_REV}
+
+maint-gen-distfile:
+ git clone git://anongit.freedesktop.org/nouveau/xf86-video-nouveau \
+ ${GIT_WORK}
+
+ ( cd ${GIT_WORK}; \
+ git log --stat >ChangeLog; \
+ autoreconf -if; \
+ ${TAR} cjf ${DISTDIR}/${DIST_SUBDIR}/${NEWDISTNAME}${EXTRACT_SUFX} \
+ --exclude '.git*' --exclude autogen.sh \
+ --exclude autom4te.cache \
+ -s "|${GIT_WORK}|${NEWDISTNAME}|" \
+ ${GIT_WORK}; \
+ ${ECHO_CMD} "SNAPDATE= ${GIT_DATE}" \
+ >${MASTERDIR}/Makefile.rev; \
+ ${ECHO_CMD} "SNAPREV= ${GIT_REV}" \
+ >>${MASTERDIR}/Makefile.rev )
+
+ ${RM} -rf ${GIT_WORK}
+
+.include "Makefile.rev"
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-nouveau/Makefile.rev b/x11-drivers/xf86-video-nouveau/Makefile.rev
new file mode 100644
index 0000000..b8cc5e2
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/Makefile.rev
@@ -0,0 +1,2 @@
+SNAPDATE= 20090728
+SNAPREV= e259925
diff --git a/x11-drivers/xf86-video-nouveau/distinfo b/x11-drivers/xf86-video-nouveau/distinfo
new file mode 100644
index 0000000..9b4fe63
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-nouveau-0.0.10.20090728.e259925.tar.bz2) = 48e328a04a2dc9ea5dfebd21eae7c23987dcf53dcd3db7bee477d873cbb31906
+SIZE (xorg/driver/xf86-video-nouveau-0.0.10.20090728.e259925.tar.bz2) = 552302
diff --git a/x11-drivers/xf86-video-nouveau/pkg-descr b/x11-drivers/xf86-video-nouveau/pkg-descr
new file mode 100644
index 0000000..9c753dc
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/pkg-descr
@@ -0,0 +1,7 @@
+nouveau is an X.Org Foundation and Freedesktop.org project which was
+initially based on the obfuscated 2D-only free and open source "nv"
+driver, aiming to develop free software drivers for NVIDIA graphics
+cards, by reverse engineering NVIDIA's current proprietary drivers for
+Linux.
+
+WWW: http://nouveau.freedesktop.org/
diff --git a/x11-drivers/xf86-video-nouveau/pkg-message b/x11-drivers/xf86-video-nouveau/pkg-message
new file mode 100644
index 0000000..34c29a2
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/pkg-message
@@ -0,0 +1,15 @@
+The DRM part is still not in the kernel tree and will not be there
+until it stabilized. It won't happen anytime soon. So, consider using
+the following patch in the meantime unless you don't want any hardware
+accelerated 2D like EXA and Xvideo.
+
+http://people.freebsd.org/~rnoland/drm-nouveau-062309.patch
+
+Installing it should be as simple as below procedure provided you have
+base sources in /usr/src.
+
+ # cd /usr/src/sys
+ # fetch http://people.freebsd.org/~rnoland/drm-nouveau-062309.patch
+ # patch -sp0 -i drm-nouveau-062309.patch
+ # cd modules/drm
+ # make depend all install
diff --git a/x11-drivers/xf86-video-nouveau/pkg-plist b/x11-drivers/xf86-video-nouveau/pkg-plist
new file mode 100644
index 0000000..63ff28c
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/nouveau_drv.la
+lib/xorg/modules/drivers/nouveau_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
new file mode 100644
index 0000000..72fdd37
--- /dev/null
+++ b/x11-drivers/xf86-video-rendition/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xf86-video-rendition
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-video-rendition
+PORTVERSION= 4.2.4
+PORTREVISION= 1
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org rendition display driver
+
+XORG_CAT= driver
+USE_XORG= xextproto videoproto
+MAN4= rendition.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-rendition/distinfo b/x11-drivers/xf86-video-rendition/distinfo
new file mode 100644
index 0000000..2b683b7
--- /dev/null
+++ b/x11-drivers/xf86-video-rendition/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
+SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573
diff --git a/x11-drivers/xf86-video-rendition/pkg-descr b/x11-drivers/xf86-video-rendition/pkg-descr
new file mode 100644
index 0000000..151ab6c
--- /dev/null
+++ b/x11-drivers/xf86-video-rendition/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-video-rendition driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-rendition/pkg-plist b/x11-drivers/xf86-video-rendition/pkg-plist
new file mode 100644
index 0000000..e276591
--- /dev/null
+++ b/x11-drivers/xf86-video-rendition/pkg-plist
@@ -0,0 +1,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
+@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
new file mode 100644
index 0000000..7510229
--- /dev/null
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xf86-video-savage
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-video-savage
+PORTVERSION= 2.3.3
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org savage display driver
+
+USE_GL= gl
+
+WITH_FBSD10_FIX=yes
+XORG_CAT= driver
+USE_XORG= xf86driproto videoproto xextproto glproto
+MAN4= savage.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo
new file mode 100644
index 0000000..6b54372
--- /dev/null
+++ b/x11-drivers/xf86-video-savage/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2
+SIZE (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = 371252
diff --git a/x11-drivers/xf86-video-savage/pkg-descr b/x11-drivers/xf86-video-savage/pkg-descr
new file mode 100644
index 0000000..909ad78
--- /dev/null
+++ b/x11-drivers/xf86-video-savage/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-video-savage driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-savage/pkg-plist b/x11-drivers/xf86-video-savage/pkg-plist
new file mode 100644
index 0000000..6969a64
--- /dev/null
+++ b/x11-drivers/xf86-video-savage/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/savage_drv.la
+lib/xorg/modules/drivers/savage_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
new file mode 100644
index 0000000..681fdd4
--- /dev/null
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for: xf86-video-siliconmotion
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-video-siliconmotion
+PORTVERSION= 1.7.5
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org siliconmotion display driver
+
+XORG_CAT= driver
+USE_XORG= videoproto xextproto
+MAN4= siliconmotion.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo
new file mode 100644
index 0000000..5707cf9
--- /dev/null
+++ b/x11-drivers/xf86-video-siliconmotion/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913
+SIZE (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 351610
diff --git a/x11-drivers/xf86-video-siliconmotion/pkg-descr b/x11-drivers/xf86-video-siliconmotion/pkg-descr
new file mode 100644
index 0000000..6816f93
--- /dev/null
+++ b/x11-drivers/xf86-video-siliconmotion/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-video-siliconmotion driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-siliconmotion/pkg-plist b/x11-drivers/xf86-video-siliconmotion/pkg-plist
new file mode 100644
index 0000000..199eda7
--- /dev/null
+++ b/x11-drivers/xf86-video-siliconmotion/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/siliconmotion_drv.la
+lib/xorg/modules/drivers/siliconmotion_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
new file mode 100644
index 0000000..2641c7c
--- /dev/null
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for: xf86-video-sis
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-video-sis
+PORTVERSION= 0.10.3
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org sis display driver
+
+CONFLICTS= xf86-video-sis-intel-[0-9]*
+
+USE_GL= gl
+
+XORG_CAT= driver
+USE_XORG= xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
+MAN4= sis.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-sis/distinfo b/x11-drivers/xf86-video-sis/distinfo
new file mode 100644
index 0000000..0b66a0d
--- /dev/null
+++ b/x11-drivers/xf86-video-sis/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737
+SIZE (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 649750
diff --git a/x11-drivers/xf86-video-sis/pkg-descr b/x11-drivers/xf86-video-sis/pkg-descr
new file mode 100644
index 0000000..506af9c
--- /dev/null
+++ b/x11-drivers/xf86-video-sis/pkg-descr
@@ -0,0 +1 @@
+This package contains the X.Org xf86-video-sis driver.
diff --git a/x11-drivers/xf86-video-sis/pkg-plist b/x11-drivers/xf86-video-sis/pkg-plist
new file mode 100644
index 0000000..e1daba8
--- /dev/null
+++ b/x11-drivers/xf86-video-sis/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/sis_drv.la
+lib/xorg/modules/drivers/sis_drv.so
+@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
new file mode 100644
index 0000000..5fdfb03
--- /dev/null
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xf86-video-vesa
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-video-vesa
+PORTVERSION= 2.3.0
+PORTREVISION= 2
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org vesa display driver
+
+XORG_CAT= driver
+USE_XORG= xextproto videoproto
+MAN4= vesa.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-vesa/distinfo b/x11-drivers/xf86-video-vesa/distinfo
new file mode 100644
index 0000000..59364f5
--- /dev/null
+++ b/x11-drivers/xf86-video-vesa/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
+SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539
diff --git a/x11-drivers/xf86-video-vesa/pkg-descr b/x11-drivers/xf86-video-vesa/pkg-descr
new file mode 100644
index 0000000..5d851fe
--- /dev/null
+++ b/x11-drivers/xf86-video-vesa/pkg-descr
@@ -0,0 +1 @@
+This package contains the X.Org xf86-video-vesa driver.
diff --git a/x11-drivers/xf86-video-vesa/pkg-plist b/x11-drivers/xf86-video-vesa/pkg-plist
new file mode 100644
index 0000000..5a9cf2e
--- /dev/null
+++ b/x11-drivers/xf86-video-vesa/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/vesa_drv.la
+lib/xorg/modules/drivers/vesa_drv.so
+@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
new file mode 100644
index 0000000..5cc2a7d
--- /dev/null
+++ b/x11-drivers/xf86-video-voodoo/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xf86-video-voodoo
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-video-voodoo
+PORTVERSION= 1.2.4
+PORTREVISION= 1
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org voodoo display driver
+
+XORG_CAT= driver
+USE_XORG= xf86dgaproto xextproto videoproto
+MAN4= voodoo.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-voodoo/distinfo b/x11-drivers/xf86-video-voodoo/distinfo
new file mode 100644
index 0000000..20eff8e
--- /dev/null
+++ b/x11-drivers/xf86-video-voodoo/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
+SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = 274523
diff --git a/x11-drivers/xf86-video-voodoo/pkg-descr b/x11-drivers/xf86-video-voodoo/pkg-descr
new file mode 100644
index 0000000..49fc9d9
--- /dev/null
+++ b/x11-drivers/xf86-video-voodoo/pkg-descr
@@ -0,0 +1 @@
+This package contains the X.Org xf86-video-voodoo driver.
diff --git a/x11-drivers/xf86-video-voodoo/pkg-plist b/x11-drivers/xf86-video-voodoo/pkg-plist
new file mode 100644
index 0000000..98df906
--- /dev/null
+++ b/x11-drivers/xf86-video-voodoo/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/voodoo_drv.la
+lib/xorg/modules/drivers/voodoo_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile
new file mode 100644
index 0000000..d14a679
--- /dev/null
+++ b/x11-servers/xephyr/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for: xephyr
+# Date created: 2008-05-18
+# Whom: Max Brazhnikov <makc@issp.ac.ru>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xephyr
+PORTREVISION= 0
+
+COMMENT= A kdrive based X server from X.Org
+
+MASTERDIR= ${.CURDIR}/../xorg-server
+DESCR= ${.CURDIR}/pkg-descr
+USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \
+ dri2proto damageproto xcmiscproto xtrans inputproto \
+ xf86bigfontproto scrnsaverproto bigreqsproto \
+ resourceproto fontsproto videoproto \
+ compositeproto trapproto recordproto \
+ xineramaproto xinerama evieproto xkbfile xfont \
+ xau xdmcp xext fontenc xv pixman
+
+CONFIGURE_ARGS= --enable-kdrive --enable-xephyr --disable-dmx --disable-xvfb \
+ --without-xmlto --disable-docs --disable-devel-docs \
+ --disable-xorg --disable-xnest \
+ --localstatedir=/var --without-dtrace
+
+SLAVE_PORT= yes
+PLIST_FILES= bin/Xephyr
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/hw/kdrive/ephyr/Xephyr ${PREFIX}/bin/
+
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-servers/xephyr/distinfo b/x11-servers/xephyr/distinfo
new file mode 100644
index 0000000..bc91bed
--- /dev/null
+++ b/x11-servers/xephyr/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/xserver/xorg-server-1.10.4.tar.bz2) = fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
+SIZE (xorg/xserver/xorg-server-1.10.4.tar.bz2) = 5386174
diff --git a/x11-servers/xephyr/pkg-descr b/x11-servers/xephyr/pkg-descr
new file mode 100644
index 0000000..be55863
--- /dev/null
+++ b/x11-servers/xephyr/pkg-descr
@@ -0,0 +1,5 @@
+Xephyr is a a kdrive server that outputs to a window on a pre-existing
+'host' X display. Think Xnest but with support for modern extensions
+like composite, damage and randr.
+
+WWW: http://www.x.org/
diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
new file mode 100644
index 0000000..aa3ebc9
--- /dev/null
+++ b/x11-servers/xorg-dmx/Makefile
@@ -0,0 +1,35 @@
+# New ports collection makefile for: xorg-dmx
+# Date created: 13 Mar 2005
+# Whom: lesi@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME= xorg-dmx
+PORTREVISION= 0
+
+COMMENT= Distributed Multihead X from X.Org
+
+MASTERDIR= ${.CURDIR}/../xorg-server
+DESCR= ${.CURDIR}/pkg-descr
+USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \
+ dri2proto damageproto xcmiscproto xextproto xf86miscproto \
+ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
+ resourceproto fontsproto xf86dgaproto videoproto \
+ compositeproto trapproto recordproto resourceproto \
+ xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
+ xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
+ xau dmx xtst xres pixman xtrans
+
+CONFIGURE_ARGS= --disable-xvfb --disable-xorg --disable-xnest \
+ --without-xmlto --disable-docs --disable-devel-docs \
+ --enable-dmx --localstatedir=/var --without-dtrace
+
+MAN1= Xdmx.1 dmxtodmx.1 vdltodmx.1 xdmxconfig.1
+
+SLAVE_PORT= yes
+
+do-install:
+ cd ${WRKSRC}/hw/dmx; ${MAKE} install
+
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo
new file mode 100644
index 0000000..bc91bed
--- /dev/null
+++ b/x11-servers/xorg-dmx/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/xserver/xorg-server-1.10.4.tar.bz2) = fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
+SIZE (xorg/xserver/xorg-server-1.10.4.tar.bz2) = 5386174
diff --git a/x11-servers/xorg-dmx/pkg-descr b/x11-servers/xorg-dmx/pkg-descr
new file mode 100644
index 0000000..646bc81
--- /dev/null
+++ b/x11-servers/xorg-dmx/pkg-descr
@@ -0,0 +1,6 @@
+Xdmx is proxy X server that provides multi-head support for multiple displays
+attached to different machines (each of which is running a typical X server).
+When Xinerama is used with Xdmx, the multiple displays on multiple machines
+are presented to the user as a single unified screen.
+
+WWW: http://www.x.org/
diff --git a/x11-servers/xorg-dmx/pkg-plist b/x11-servers/xorg-dmx/pkg-plist
new file mode 100644
index 0000000..4a5262d
--- /dev/null
+++ b/x11-servers/xorg-dmx/pkg-plist
@@ -0,0 +1,12 @@
+bin/Xdmx
+bin/dmxaddinput
+bin/dmxaddscreen
+%%NEW%%bin/dmxinfo
+bin/dmxreconfig
+bin/dmxresize
+bin/dmxrminput
+bin/dmxrmscreen
+bin/dmxtodmx
+bin/dmxwininfo
+bin/vdltodmx
+bin/xdmxconfig
diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
new file mode 100644
index 0000000..ef991df
--- /dev/null
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for: xorg-nestserver
+# Date created: 21 July 2004
+# Whom: anholt@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME= xorg-nestserver
+PORTREVISION= 1
+
+COMMENT= Nesting X server from X.Org
+
+MASTERDIR= ${.CURDIR}/../xorg-server
+DESCR= ${.CURDIR}/pkg-descr
+USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \
+ damageproto xcmiscproto xextproto xf86miscproto inputproto \
+ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
+ dri2proto resourceproto fontsproto xf86dgaproto videoproto \
+ compositeproto trapproto recordproto resourceproto \
+ xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
+ xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
+
+CONFIGURE_ARGS= --disable-dmx --disable-xvfb --disable-xorg \
+ --without-xmlto --disable-docs --disable-devel-docs \
+ --localstatedir=/var --without-dtrace
+
+SLAVE_PORT= yes
+PLIST_FILES= bin/Xnest
+MAN1= Xnest.1
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${PREFIX}/bin/
+.if defined(WITH_NEW_XORG)
+ ${INSTALL_MAN} ${WRKSRC}/hw/xnest/man/Xnest.1 ${PREFIX}/man/man1/
+.else
+ ${INSTALL_MAN} ${WRKSRC}/hw/xnest/Xnest.1 ${PREFIX}/man/man1/
+.endif
+
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo
new file mode 100644
index 0000000..bc91bed
--- /dev/null
+++ b/x11-servers/xorg-nestserver/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/xserver/xorg-server-1.10.4.tar.bz2) = fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
+SIZE (xorg/xserver/xorg-server-1.10.4.tar.bz2) = 5386174
diff --git a/x11-servers/xorg-nestserver/pkg-descr b/x11-servers/xorg-nestserver/pkg-descr
new file mode 100644
index 0000000..2b9c485
--- /dev/null
+++ b/x11-servers/xorg-nestserver/pkg-descr
@@ -0,0 +1,3 @@
+This package contains Xnest, a nesting X Server that displays on an X Server.
+
+WWW: http://www.x.org/
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
new file mode 100644
index 0000000..1db1b17
--- /dev/null
+++ b/x11-servers/xorg-server/Makefile
@@ -0,0 +1,156 @@
+# New ports collection makefile for: xorg-server
+# Date created: 7 May 2004
+# Whom: anholt@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME?= xorg-server
+PORTVERSION= ${XORG_VERSION}
+PORTREVISION?= ${XORG_REVISION}
+PORTEPOCH?= 1
+CATEGORIES= x11-servers
+MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/
+DISTFILES= xorg-server-${PORTVERSION}.tar.bz2
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT?= X.Org X server and related programs
+
+LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm
+
+RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
+
+XORG_CAT= xserver
+
+.if defined(WITH_NEW_XORG)
+XORG_VERSION= 1.10.4
+XORG_REVISION= 1
+PLIST_SUB+= OLD="@comment " NEW=""
+.else
+XORG_VERSION= 1.7.7
+XORG_REVISION= 3
+PLIST_SUB+= OLD="" NEW="@comment "
+.endif
+
+USE_GMAKE= yes
+USE_GL= gl
+USE_XORG?= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
+ xmu xt xpm xext randrproto renderproto fixesproto damageproto \
+ dri2proto xcmiscproto xextproto xproto xtrans xf86miscproto \
+ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
+ resourceproto fontsproto inputproto xf86dgaproto \
+ videoproto compositeproto trapproto recordproto xineramaproto \
+ xinerama evieproto xfont fontenc xkbui pixman pciaccess
+
+MAKE_JOBS_UNSAFE= yes
+USE_OPENSSL= yes
+USE_PERL5_BUILD=yes
+CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \
+ --without-xmlto --disable-docs --disable-devel-docs \
+ --localstatedir=/var --without-dtrace --disable-xephyr \
+ --enable-record=yes
+
+.if !defined(SLAVE_PORT)
+MAN1= Xorg.1 \
+ Xserver.1 \
+ cvt.1 \
+ gtf.1
+MAN4= exa.4 \
+ fbdevhw.4
+MAN5= xorg.conf.5
+
+.if (WITH_NEW_XORG)
+MAN5+= xorg.conf.d.5
+.endif
+.else
+# for slave ports we need to overwrite PLIST, so it doesn't overwrite
+# PLIST_FILES, with the masterport plist.
+PLIST= ${.CURDIR}/pkg-plist
+.endif
+
+OPTIONS= AIGLX "Compile with Accelerated Indirect GLX support" on \
+ SUID "Install the Xorg server with setuid bit set" on
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == sparc64
+OPTIONS+= HAL "Compile with HAL config support" off
+.else
+OPTIONS+= HAL "Compile with HAL config support" on
+.endif
+
+
+.if defined(WITH_OPENSSL_BASE)
+# The reason why I use this is cause openssl from base doesn't install a .pc file
+# and configure will fail trying to find it. Setting both of those variables to
+# a *non-empty* value by-passes the pkg-config check.
+CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
+.endif
+
+.if !defined(WITHOUT_HAL)
+LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
+CONFIGURE_ARGS+= --enable-config-hal=yes
+.else
+CONFIGURE_ARGS+= --enable-config-hal=no
+.endif
+
+.if !defined(WITHOUT_AIGLX)
+CONFIGURE_ARGS+= --enable-aiglx=yes
+.else
+CONFIGURE_ARGS+= --enable-aiglx=no
+.endif
+
+.if !defined(WITHOUT_SUID) && (!defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO)
+CONFIGURE_ARGS+=--enable-install-setuid=yes
+.else
+CONFIGURE_ARGS+=--enable-install-setuid=no
+.endif
+
+.if ${ARCH} == ia64
+PLIST_SUB+= IA64_NA="@comment "
+EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-ia64
+.else
+PLIST_SUB+= IA64_NA=""
+.endif
+
+.if ${ARCH} == powerpc || ${ARCH} == powerpc64
+PLIST_SUB+= PPC_NA="@comment "
+EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-powerpc
+.else
+PLIST_SUB+= PPC_NA=""
+.endif
+
+.if ${ARCH} == sparc64
+PLIST_SUB+= SPARC64=""
+PLIST_SUB+= SPARC64_NA="@comment "
+.else
+PLIST_SUB+= SPARC64="@comment "
+PLIST_SUB+= SPARC64_NA=""
+.endif
+
+.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == sparc64
+PLIST_SUB+= AMD64_I386_SPARC64=""
+.else
+PLIST_SUB+= AMD64_I386_SPARC64="@comment "
+.endif
+
+.if !defined(WITHOUT_SUID) && (!defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO)
+pre-everything::
+ @${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by"
+ @${ECHO_MSG} "a normal user, it checks arguments and environment as done in the x11/wrapper"
+ @${ECHO_MSG} "port before handling them normally. If you are concerned about the security"
+ @${ECHO_MSG} "of this, but still want to run an X Server (for example using xdm/kdm/gdm,"
+ @${ECHO_MSG} "which will still run the server as root), you can cancel the build and set"
+ @${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf."
+.endif
+
+.if defined(WITH_NEW_XORG)
+post-install:
+ @${MKDIR} ${PREFIX}/share/X11/xorg.conf.d
+
+PLIST_SUB+= OLD="@comment " NEW=""
+.else
+PLIST_SUB+= OLD="" NEW="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
new file mode 100644
index 0000000..e8012a9
--- /dev/null
+++ b/x11-servers/xorg-server/distinfo
@@ -0,0 +1,4 @@
+SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
+SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
+SHA256 (xorg/xserver/xorg-server-1.10.4.tar.bz2) = fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
+SIZE (xorg/xserver/xorg-server-1.10.4.tar.bz2) = 5386174
diff --git a/x11-servers/xorg-server/files/extra-arch-ia64 b/x11-servers/xorg-server/files/extra-arch-ia64
new file mode 100644
index 0000000..9a3f48e
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-arch-ia64
@@ -0,0 +1,221 @@
+--- configure.dist 2009-06-18 17:05:59.000000000 -0700
++++ configure 2009-06-18 17:08:47.000000000 -0700
+@@ -1097,6 +1097,8 @@
+ SPARC64_VIDEO_TRUE
+ PPC_VIDEO_FALSE
+ PPC_VIDEO_TRUE
++IA64_VIDEO_FALSE
++IA64_VIDEO_TRUE
+ I386_VIDEO_FALSE
+ I386_VIDEO_TRUE
+ ARM_VIDEO_FALSE
+@@ -19134,6 +19136,7 @@
+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
+ ;;
+ ia64*)
++ IA64_VIDEO=yes
+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
+ ;;
+ s390*)
+@@ -19166,6 +19169,14 @@
+ I386_VIDEO_FALSE=
+ fi
+
++ if test "x$IA64_VIDEO" = xyes; then
++ IA64_VIDEO_TRUE=
++ IA64_VIDEO_FALSE='#'
++else
++ IA64_VIDEO_TRUE='#'
++ IA64_VIDEO_FALSE=
++fi
++
+ if test "x$PPC_VIDEO" = xyes; then
+ PPC_VIDEO_TRUE=
+ PPC_VIDEO_FALSE='#'
+--- hw/xfree86/common/compiler.h.orig 2011-06-11 18:55:47.000000000 +0200
++++ hw/xfree86/common/compiler.h 2011-07-21 20:34:44.000000000 +0200
+@@ -397,12 +397,10 @@
+ #include <machine/pio.h>
+ #endif /* __NetBSD__ */
+
+-# elif defined(linux) && defined(__ia64__)
++# elif (defined(linux) || defined(__FreeBSD__)) && defined(__ia64__)
+
+ # include <inttypes.h>
+
+-# include <sys/io.h>
+-
+ # undef outb
+ # undef outw
+ # undef outl
+--- hw/xfree86/os-support/bsd/Makefile.in.dist 2009-06-18 17:45:13.000000000 -0700
++++ hw/xfree86/os-support/bsd/Makefile.in 2009-06-18 17:45:19.000000000 -0700
+@@ -63,6 +63,7 @@
+ @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@am__objects_1 = sparc64_video.lo \
+ @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@ ioperm_noop.lo
+ @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE@am__objects_1 = ppc_video.lo
++@IA64_VIDEO_TRUE@am__objects_1 = ia64_video.lo
+ @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_TRUE@am__objects_1 = i386_video.lo
+ @ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE@am__objects_1 = arm_video.lo
+ @ALPHA_VIDEO_TRUE@am__objects_1 = alpha_video.lo bsd_ev56.lo \
+@@ -393,6 +394,7 @@
+
+ @ARM_VIDEO_TRUE@ARCH_SOURCES = arm_video.c
+ @I386_VIDEO_TRUE@ARCH_SOURCES = i386_video.c
++@IA64_VIDEO_TRUE@ARCH_SOURCES = ia64_video.c
+ @PPC_VIDEO_TRUE@ARCH_SOURCES = ppc_video.c
+
+ # Cheat here and piggyback other sparc64 bits on SPARC64_VIDEO.
+--- /dev/null 2009-06-18 18:27:23.000000000 -0700
++++ hw/xfree86/os-support/bsd/ia64_video.c 2009-06-18 18:26:02.000000000 -0700
+@@ -0,0 +1,150 @@
++#ifdef HAVE_XORG_CONFIG_H
++#include <xorg-config.h>
++#endif
++
++#include <X11/X.h>
++#include "xf86.h"
++#include "xf86Priv.h"
++
++#include "xf86_OSlib.h"
++#include "xf86OSpriv.h"
++
++#include "bus/Pci.h"
++
++#ifndef MAP_FAILED
++#define MAP_FAILED ((caddr_t)-1)
++#endif
++
++
++/***************************************************************************/
++/* Video Memory Mapping section */
++/***************************************************************************/
++
++#define DEV_MEM "/dev/mem"
++
++static pointer ia64MapVidMem(int, unsigned long, unsigned long, int flags);
++static void ia64UnmapVidMem(int, pointer, unsigned long);
++
++Bool xf86EnableIO(void);
++void xf86DisableIO(void);
++
++void
++xf86OSInitVidMem(VidMemInfoPtr pVidMem)
++{
++ pVidMem->linearSupported = TRUE;
++ pVidMem->mapMem = ia64MapVidMem;
++ pVidMem->unmapMem = ia64UnmapVidMem;
++ pVidMem->initialised = TRUE;
++ xf86EnableIO();
++}
++
++
++_X_EXPORT volatile unsigned char *ioBase = MAP_FAILED;
++
++static pointer
++ia64MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
++{
++ int fd = xf86Info.screenFd;
++ pointer base;
++#ifdef DEBUG
++ xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d",
++ Base, Size, fd);
++#endif
++
++ base = mmap(0, Size,
++ (flags & VIDMEM_READONLY) ?
++ PROT_READ : (PROT_READ | PROT_WRITE),
++ MAP_SHARED, fd, Base);
++ if (base == MAP_FAILED)
++ FatalError("%s: could not mmap screen [s=%lx,a=%lx] (%s)",
++ "xf86MapVidMem", Size, Base, strerror(errno));
++
++ return base;
++}
++
++static void
++ia64UnmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
++{
++ munmap(Base, Size);
++}
++
++_X_EXPORT int
++xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
++ int Len)
++{
++ int rv;
++ static int kmem = -1;
++
++ if (kmem == -1) {
++ kmem = open(DEV_MEM, 2);
++ if (kmem == -1) {
++ FatalError("xf86ReadBIOS: open %s", DEV_MEM);
++ }
++ }
++
++#ifdef DEBUG
++ xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS() %lx %lx, %x\n",
++ Base, Offset, Len);
++#endif
++
++
++ lseek(kmem, Base + Offset, 0);
++ rv = read(kmem, Buf, Len);
++
++ return rv;
++}
++
++Bool xf86EnableIO()
++{
++ int fd = xf86Info.screenFd;
++
++ xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
++ if (ioBase == MAP_FAILED)
++ {
++ ioBase=mmap(NULL, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, fd,
++ 0);
++ xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %p\n", ioBase);
++ if (ioBase == MAP_FAILED) {
++ xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n");
++ return FALSE;
++ }
++ }
++ return TRUE;
++}
++
++void xf86DisableIO()
++{
++
++ if (ioBase != MAP_FAILED)
++ {
++ munmap((void *)(uintptr_t)(void *)ioBase, 0x10000);
++ ioBase = MAP_FAILED;
++ }
++}
++
++void outb(unsigned long port, unsigned char val)
++{
++}
++
++void outw(unsigned long port, unsigned short val)
++{
++}
++
++void outl(unsigned long port, unsigned int val)
++{
++}
++
++unsigned int inb(unsigned long port)
++{
++ return 0xff;
++}
++
++unsigned int inw(unsigned long port)
++{
++ return 0xffff;
++}
++
++unsigned int inl(unsigned long port)
++{
++ return 0xffffffff;
++}
diff --git a/x11-servers/xorg-server/files/extra-arch-powerpc b/x11-servers/xorg-server/files/extra-arch-powerpc
new file mode 100644
index 0000000..6fa9178
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-arch-powerpc
@@ -0,0 +1,14 @@
+--- hw/xfree86/os-support/bsd/ppc_video.c.orig 2008-01-02 12:29:21.000000000 +0000
++++ hw/xfree86/os-support/bsd/ppc_video.c 2008-01-02 12:29:00.000000000 +0000
+@@ -164,7 +164,11 @@
+
+ if (ioBase != MAP_FAILED)
+ {
++#if defined(__FreeBSD__)
++ munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000);
++#else
+ munmap(__UNVOLATILE(ioBase), 0x10000);
++#endif
+ ioBase = MAP_FAILED;
+ }
+ }
diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c
new file mode 100644
index 0000000..59aad37
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c
@@ -0,0 +1,11 @@
+--- hw/xfree86/common/xf86Config.c.orig Fri Jun 23 12:32:32 2006
++++ hw/xfree86/common/xf86Config.c Fri Jun 23 12:32:46 2006
+@@ -1042,7 +1042,7 @@
+ else
+ xf86Info.estimateSizesAggressively = 0;
+
+- xf86Info.aiglx = TRUE;
++ xf86Info.aiglx = FALSE;
+ xf86Info.aiglxFrom = X_DEFAULT;
+ if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) {
+ xf86Info.aiglx = value;
diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
new file mode 100644
index 0000000..933742b
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
@@ -0,0 +1,12 @@
+Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
+diff -u -p programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
+--- hw/xfree86/os-support/bsd/i386_video.c.orig Tue Oct 4 01:46:14 2005
++++ hw/xfree86/os-support/bsd/i386_video.c Thu Jan 26 14:57:56 2006
+@@ -35,6 +35,7 @@
+ #include "xf86Priv.h"
+
+ #include <errno.h>
++#include <sys/types.h>
+ #include <sys/mman.h>
+
+ #ifdef HAS_MTRR_SUPPORT
diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
new file mode 100644
index 0000000..651be80
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
@@ -0,0 +1,13 @@
+--- hw/xfree86/os-support/bsd/sparc64_video.c.orig 2008-10-02 21:01:25.000000000 +0000
++++ hw/xfree86/os-support/bsd/sparc64_video.c 2009-03-29 19:55:40.000000000 +0000
+@@ -52,6 +52,10 @@
+ pVidMem->mapMem = sparc64MapVidMem;
+ pVidMem->unmapMem = sparc64UnmapVidMem;
+ pVidMem->initialised = TRUE;
++
++#if defined(__FreeBSD__)
++ pci_system_init_dev_mem(xf86Info.screenFd);
++#endif
+ }
+
+ static pointer
diff --git a/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c b/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
new file mode 100644
index 0000000..e9fb876
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
@@ -0,0 +1,12 @@
+diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
+--- os/xprintf.c.orig Sun Jul 3 17:53:52 2005
++++ os/xprintf.c Thu Jan 26 12:47:37 2006
+@@ -39,7 +39,7 @@
+ # ifdef __va_copy
+ # define va_copy __va_copy
+ # else
+-# error "no working va_copy was found"
++# define va_copy(dest, src) ((dest) = (src))
+ # endif
+ #endif
+
diff --git a/x11-servers/xorg-server/files/patch-os-utils.c b/x11-servers/xorg-server/files/patch-os-utils.c
new file mode 100644
index 0000000..2980ded
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-os-utils.c
@@ -0,0 +1,20 @@
+--- os/utils.c.orig 2010-05-04 02:48:00.000000000 +0200
++++ os/utils.c 2011-10-18 20:08:10.000000000 +0200
+@@ -315,7 +315,7 @@
+ FatalError("Could not create lock file in %s\n", tmp);
+ (void) sprintf(pid_str, "%10ld\n", (long)getpid());
+ (void) write(lfd, pid_str, 11);
+- (void) chmod(tmp, 0444);
++ (void) fchmod(tmp, 0444);
+ (void) close(lfd);
+
+ /*
+@@ -336,7 +336,7 @@
+ /*
+ * Read the pid from the existing file
+ */
+- lfd = open(LockFile, O_RDONLY);
++ lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
+ if (lfd < 0) {
+ unlink(tmp);
+ FatalError("Can't read lock file %s\n", LockFile);
diff --git a/x11-servers/xorg-server/files/patch-servermd.h b/x11-servers/xorg-server/files/patch-servermd.h
new file mode 100644
index 0000000..5bbb1e4
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-servermd.h
@@ -0,0 +1,11 @@
+--- include/servermd.h.orig Sun Jan 8 14:05:55 2006
++++ include/servermd.h Sun Jan 8 14:06:22 2006
+@@ -216,7 +216,7 @@
+ defined(__sparc__) || defined(__mc68000__)
+
+ #if defined(__sparc) || defined(__sparc__)
+-# if !defined(sparc)
++# if !defined(sparc) && !defined(__FreeBSD__)
+ # define sparc 1
+ # endif
+ #endif
diff --git a/x11-servers/xorg-server/files/patch-xorgconf.cpp b/x11-servers/xorg-server/files/patch-xorgconf.cpp
new file mode 100644
index 0000000..04e217b
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-xorgconf.cpp
@@ -0,0 +1,14 @@
+--- hw/xfree86/xorgconf.cpp.orig Fri Dec 31 14:40:27 2004
++++ hw/xfree86/xorgconf.cpp Fri Dec 31 14:40:28 2004
+@@ -624,3 +624,11 @@
+ InputDevice "Keyboard1" "CoreKeyboard"
+ EndSection
+
++
++XCOMM Two experimental extensions are available -- Composite and XEVIE. Uncomment
++XCOMM the section below to enable Composite. Many extensions can also be disabled
++XCOMM in this manner.
++
++XCOMM Section "Extensions"
++XCOMM Option "Composite" "Enable"
++XCOMM EndSection
diff --git a/x11-servers/xorg-server/pkg-descr b/x11-servers/xorg-server/pkg-descr
new file mode 100644
index 0000000..74ce21c
--- /dev/null
+++ b/x11-servers/xorg-server/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org X server and some associated programs.
+
+WWW: http://www.freedesktop.org/Software/xorg
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
new file mode 100644
index 0000000..29e90c8
--- /dev/null
+++ b/x11-servers/xorg-server/pkg-plist
@@ -0,0 +1,245 @@
+bin/X
+bin/Xorg
+bin/cvt
+bin/gtf
+include/xorg/BT.h
+include/xorg/IBM.h
+include/xorg/TI.h
+include/xorg/XIstubs.h
+%%NEW%%include/xorg/Xprintf.h
+include/xorg/bt829.h
+%%OLD%%include/xorg/bstore.h
+%%OLD%%include/xorg/bstorestr.h
+%%NEW%%include/xorg/callback.h
+%%OLD%%include/xorg/cfb8_16.h
+include/xorg/closestr.h
+include/xorg/closure.h
+include/xorg/colormap.h
+include/xorg/colormapst.h
+include/xorg/compiler.h
+include/xorg/compositeext.h
+include/xorg/cursor.h
+include/xorg/cursorstr.h
+include/xorg/damage.h
+include/xorg/damagestr.h
+include/xorg/dbestruct.h
+include/xorg/dgaproc.h
+include/xorg/dix.h
+include/xorg/dixaccess.h
+include/xorg/dixevents.h
+include/xorg/dixfont.h
+include/xorg/dixfontstr.h
+include/xorg/dixgrabs.h
+include/xorg/dixstruct.h
+include/xorg/dri.h
+include/xorg/dri2.h
+include/xorg/dristruct.h
+include/xorg/edid.h
+include/xorg/exa.h
+include/xorg/events.h
+include/xorg/exevents.h
+include/xorg/extension.h
+include/xorg/extinit.h
+include/xorg/extnsionst.h
+include/xorg/fb.h
+include/xorg/fbdevhw.h
+include/xorg/fboverlay.h
+include/xorg/fbrop.h
+include/xorg/fi1236.h
+include/xorg/fbpict.h
+include/xorg/fourcc.h
+include/xorg/gc.h
+include/xorg/gcstruct.h
+include/xorg/geext.h
+include/xorg/geint.h
+include/xorg/globals.h
+include/xorg/glyphstr.h
+include/xorg/hotplug.h
+include/xorg/i2c_def.h
+include/xorg/input.h
+include/xorg/inputstr.h
+%%NEW%%include/xorg/list.h
+include/xorg/mi.h
+%%OLD%%include/xorg/mibank.h
+include/xorg/mibstore.h
+include/xorg/micmap.h
+include/xorg/micoord.h
+include/xorg/mifillarc.h
+include/xorg/mifpoly.h
+include/xorg/migc.h
+include/xorg/miline.h
+include/xorg/mipict.h
+include/xorg/mipointer.h
+include/xorg/mipointrst.h
+include/xorg/misc.h
+include/xorg/miscstruct.h
+include/xorg/mispans.h
+include/xorg/mistruct.h
+%%NEW%%include/xorg/misync.h
+%%NEW%%include/xorg/misyncstr.h
+include/xorg/miwideline.h
+include/xorg/mizerarc.h
+include/xorg/mioverlay.h
+include/xorg/msp3430.h
+include/xorg/opaque.h
+include/xorg/os.h
+include/xorg/panoramiXsrv.h
+include/xorg/panoramiX.h
+include/xorg/picture.h
+include/xorg/picturestr.h
+include/xorg/pixmap.h
+include/xorg/pixmapstr.h
+include/xorg/privates.h
+include/xorg/property.h
+include/xorg/propertyst.h
+include/xorg/ptrveloc.h
+include/xorg/randrstr.h
+%%OLD%%include/xorg/renderedge.h
+include/xorg/region.h
+include/xorg/regionstr.h
+include/xorg/registry.h
+include/xorg/resource.h
+include/xorg/rgb.h
+include/xorg/rrtransform.h
+include/xorg/sarea.h
+include/xorg/screenint.h
+include/xorg/scrnintstr.h
+include/xorg/selection.h
+include/xorg/servermd.h
+include/xorg/shadow.h
+include/xorg/shadowfb.h
+include/xorg/shmint.h
+include/xorg/site.h
+include/xorg/swaprep.h
+include/xorg/swapreq.h
+%%NEW%%include/xorg/syncsdk.h
+include/xorg/tda8425.h
+include/xorg/tda9850.h
+include/xorg/tda9885.h
+include/xorg/uda1380.h
+include/xorg/validate.h
+include/xorg/vbe.h
+include/xorg/vbeModes.h
+include/xorg/vgaHW.h
+include/xorg/vidmodeproc.h
+include/xorg/wfbrename.h
+include/xorg/window.h
+include/xorg/windowstr.h
+include/xorg/xaa.h
+%%OLD%%include/xorg/xaaWrapper.h
+include/xorg/xaalocal.h
+include/xorg/xaarop.h
+include/xorg/xace.h
+include/xorg/xacestr.h
+include/xorg/xf86.h
+include/xorg/xf86Crtc.h
+include/xorg/xf86Cursor.h
+include/xorg/xf86DDC.h
+include/xorg/xf86Modes.h
+include/xorg/xf86Module.h
+include/xorg/xf86Opt.h
+include/xorg/xf86Optrec.h
+include/xorg/xf86Parser.h
+include/xorg/xf86Pci.h
+include/xorg/xf86PciInfo.h
+include/xorg/xf86Priv.h
+include/xorg/xf86Privstr.h
+include/xorg/xf86RandR12.h
+include/xorg/xf86RamDac.h
+include/xorg/xf86Rename.h
+%%SPARC64%%include/xorg/xf86Sbus.h
+include/xorg/xf86Xinput.h
+include/xorg/xf86_OSlib.h
+include/xorg/xf86_OSproc.h
+include/xorg/xf86VGAarbiter.h
+include/xorg/xf86cmap.h
+include/xorg/xf86fbman.h
+include/xorg/xf86i2c.h
+include/xorg/xf86int10.h
+include/xorg/xf86sbusBus.h
+include/xorg/xf86str.h
+include/xorg/xf86xv.h
+include/xorg/xf86xvmc.h
+include/xorg/xf86xvpriv.h
+include/xorg/xfixes.h
+include/xorg/xisb.h
+include/xorg/xkbfile.h
+include/xorg/xkbrules.h
+include/xorg/xkbsrv.h
+include/xorg/xkbstr.h
+include/xorg/xorg-server.h
+include/xorg/xorgVersion.h
+include/xorg/xserver-properties.h
+include/xorg/xvdix.h
+include/xorg/xvmcext.h
+lib/xorg/modules/extensions/libdbe.la
+lib/xorg/modules/extensions/libdbe.so
+lib/xorg/modules/extensions/libdri.la
+lib/xorg/modules/extensions/libdri.so
+lib/xorg/modules/extensions/libdri2.la
+lib/xorg/modules/extensions/libdri2.so
+lib/xorg/modules/extensions/libextmod.la
+lib/xorg/modules/extensions/libextmod.so
+lib/xorg/modules/extensions/libglx.la
+lib/xorg/modules/extensions/libglx.so
+lib/xorg/modules/extensions/librecord.la
+lib/xorg/modules/extensions/librecord.so
+lib/xorg/modules/libexa.la
+lib/xorg/modules/libexa.so
+lib/xorg/modules/libfb.la
+lib/xorg/modules/libfb.so
+%%NEW%%lib/xorg/modules/libfbdevhw.so
+%%NEW%%lib/xorg/modules/libfbdevhw.la
+lib/xorg/modules/libint10.la
+lib/xorg/modules/libint10.so
+lib/xorg/modules/libshadow.la
+lib/xorg/modules/libshadow.so
+lib/xorg/modules/libshadowfb.la
+lib/xorg/modules/libshadowfb.so
+lib/xorg/modules/libvbe.la
+lib/xorg/modules/libvbe.so
+lib/xorg/modules/libvgahw.la
+lib/xorg/modules/libvgahw.so
+lib/xorg/modules/libwfb.la
+lib/xorg/modules/libwfb.so
+lib/xorg/modules/libxaa.la
+lib/xorg/modules/libxaa.so
+%%OLD%%lib/xorg/modules/libxf8_16bpp.la
+%%OLD%%lib/xorg/modules/libxf8_16bpp.so
+%%OLD%%lib/xorg/modules/linux/libfbdevhw.la
+%%OLD%%lib/xorg/modules/linux/libfbdevhw.so
+lib/xorg/modules/multimedia/bt829_drv.la
+lib/xorg/modules/multimedia/bt829_drv.so
+lib/xorg/modules/multimedia/fi1236_drv.la
+lib/xorg/modules/multimedia/fi1236_drv.so
+lib/xorg/modules/multimedia/msp3430_drv.la
+lib/xorg/modules/multimedia/msp3430_drv.so
+lib/xorg/modules/multimedia/tda8425_drv.la
+lib/xorg/modules/multimedia/tda8425_drv.so
+lib/xorg/modules/multimedia/tda9850_drv.la
+lib/xorg/modules/multimedia/tda9850_drv.so
+lib/xorg/modules/multimedia/tda9885_drv.la
+lib/xorg/modules/multimedia/tda9885_drv.so
+lib/xorg/modules/multimedia/uda1380_drv.la
+lib/xorg/modules/multimedia/uda1380_drv.so
+lib/xorg/protocol.txt
+libdata/pkgconfig/xorg-server.pc
+share/aclocal/xorg-server.m4
+%%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d
+%%NEW%%@dirrm share/doc/xorg-server
+@dirrm include/xorg
+@dirrm lib/xorg/modules/extensions
+@dirrm lib/xorg/modules/multimedia
+%%OLD%%@dirrm lib/xorg/modules/linux
+@dirrm lib/xorg/modules
+@dirrm lib/xorg
+@dirrmtry include/X11/bitmaps
+@dirrmtry include/X11/pixmaps
+@dirrmtry lib/X11/doc
+@dirrmtry lib/X11/etc
+@dirrmtry lib/X11/xserver
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
+%%NEW%%@dirrmtry share/X11/xorg.conf.d
+@dirrmtry share/X11/app-defaults
+@dirrmtry share/X11
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
new file mode 100644
index 0000000..3f4bd30
--- /dev/null
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for: xorg-vfbserver
+# Date created: 17 June 2004
+# Whom: anholt@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME= xorg-vfbserver
+PORTREVISION= 1
+
+COMMENT= X virtual framebuffer server from X.Org
+
+MASTERDIR= ${.CURDIR}/../xorg-server
+DESCR= ${.CURDIR}/pkg-descr
+USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \
+ damageproto xcmiscproto xextproto xf86miscproto inputproto \
+ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
+ dri2proto resourceproto fontsproto xf86dgaproto videoproto \
+ compositeproto trapproto recordproto resourceproto \
+ xineramaproto xinerama evieproto xkbfile xfont fontenc \
+ xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
+
+CONFIGURE_ARGS= --disable-dmx --disable-xnest --disable-xorg \
+ --without-xmlto --disable-docs --disable-devel-docs \
+ --localstatedir=/var --without-dtrace
+
+SLAVE_PORT= yes
+PLIST_FILES= bin/Xvfb
+MAN1= Xvfb.1
+
+do-install:
+ cd ${WRKSRC}/hw/vfb; ${MAKE} install
+
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo
new file mode 100644
index 0000000..bc91bed
--- /dev/null
+++ b/x11-servers/xorg-vfbserver/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/xserver/xorg-server-1.10.4.tar.bz2) = fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
+SIZE (xorg/xserver/xorg-server-1.10.4.tar.bz2) = 5386174
diff --git a/x11-servers/xorg-vfbserver/pkg-descr b/x11-servers/xorg-vfbserver/pkg-descr
new file mode 100644
index 0000000..78ea1c5
--- /dev/null
+++ b/x11-servers/xorg-vfbserver/pkg-descr
@@ -0,0 +1,3 @@
+This package contains Xvfb, a virtual framebuffer X server.
+
+WWW: http://www.x.org/
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
new file mode 100644
index 0000000..7f7c56d
--- /dev/null
+++ b/x11-toolkits/libXaw/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for: libXaw
+# Date Created: 25 Jan, 2003
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libXaw
+PORTVERSION= 1.0.9
+PORTEPOCH= 1
+CATEGORIES= x11-toolkits
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X Athena Widgets library
+
+XORG_CAT= lib
+USE_XORG= printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
+USE_GMAKE= yes
+CONFIGURE_ARGS+=--without-xmlto
+
+MAN3= Xaw.3
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/libXaw/distinfo b/x11-toolkits/libXaw/distinfo
new file mode 100644
index 0000000..3e67ebd
--- /dev/null
+++ b/x11-toolkits/libXaw/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/lib/libXaw-1.0.9.tar.bz2) = a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037
+SIZE (xorg/lib/libXaw-1.0.9.tar.bz2) = 650634
diff --git a/x11-toolkits/libXaw/pkg-descr b/x11-toolkits/libXaw/pkg-descr
new file mode 100644
index 0000000..827c9af
--- /dev/null
+++ b/x11-toolkits/libXaw/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X Athena Widgets library.
+
+WWW: http://www.freedesktop.org/Software/xlibs
diff --git a/x11-toolkits/libXaw/pkg-plist b/x11-toolkits/libXaw/pkg-plist
new file mode 100644
index 0000000..d8c4c79
--- /dev/null
+++ b/x11-toolkits/libXaw/pkg-plist
@@ -0,0 +1,132 @@
+include/X11/Xaw/AllWidgets.h
+include/X11/Xaw/AsciiSink.h
+include/X11/Xaw/AsciiSinkP.h
+include/X11/Xaw/AsciiSrc.h
+include/X11/Xaw/AsciiSrcP.h
+include/X11/Xaw/AsciiText.h
+include/X11/Xaw/AsciiTextP.h
+include/X11/Xaw/Box.h
+include/X11/Xaw/BoxP.h
+include/X11/Xaw/Cardinals.h
+include/X11/Xaw/Command.h
+include/X11/Xaw/CommandP.h
+include/X11/Xaw/Dialog.h
+include/X11/Xaw/DialogP.h
+include/X11/Xaw/Form.h
+include/X11/Xaw/FormP.h
+include/X11/Xaw/Grip.h
+include/X11/Xaw/GripP.h
+include/X11/Xaw/Label.h
+include/X11/Xaw/LabelP.h
+include/X11/Xaw/List.h
+include/X11/Xaw/ListP.h
+include/X11/Xaw/MenuButtoP.h
+include/X11/Xaw/MenuButton.h
+include/X11/Xaw/MultiSink.h
+include/X11/Xaw/MultiSinkP.h
+include/X11/Xaw/MultiSrc.h
+include/X11/Xaw/MultiSrcP.h
+include/X11/Xaw/Paned.h
+include/X11/Xaw/PanedP.h
+include/X11/Xaw/Panner.h
+include/X11/Xaw/PannerP.h
+include/X11/Xaw/Porthole.h
+include/X11/Xaw/PortholeP.h
+include/X11/Xaw/Repeater.h
+include/X11/Xaw/RepeaterP.h
+include/X11/Xaw/Reports.h
+include/X11/Xaw/Scrollbar.h
+include/X11/Xaw/ScrollbarP.h
+include/X11/Xaw/Simple.h
+include/X11/Xaw/SimpleMenP.h
+include/X11/Xaw/SimpleMenu.h
+include/X11/Xaw/SimpleP.h
+include/X11/Xaw/Sme.h
+include/X11/Xaw/SmeBSB.h
+include/X11/Xaw/SmeBSBP.h
+include/X11/Xaw/SmeLine.h
+include/X11/Xaw/SmeLineP.h
+include/X11/Xaw/SmeP.h
+include/X11/Xaw/StripCharP.h
+include/X11/Xaw/StripChart.h
+include/X11/Xaw/Template.c
+include/X11/Xaw/Template.h
+include/X11/Xaw/TemplateP.h
+include/X11/Xaw/Text.h
+include/X11/Xaw/TextP.h
+include/X11/Xaw/TextSink.h
+include/X11/Xaw/TextSinkP.h
+include/X11/Xaw/TextSrc.h
+include/X11/Xaw/TextSrcP.h
+include/X11/Xaw/Tip.h
+include/X11/Xaw/TipP.h
+include/X11/Xaw/Toggle.h
+include/X11/Xaw/ToggleP.h
+include/X11/Xaw/Tree.h
+include/X11/Xaw/TreeP.h
+include/X11/Xaw/VendorEP.h
+include/X11/Xaw/Viewport.h
+include/X11/Xaw/ViewportP.h
+include/X11/Xaw/XawImP.h
+include/X11/Xaw/XawInit.h
+lib/libXaw.so
+lib/libXaw.so.6
+lib/libXaw.so.7
+lib/libXaw6.a
+lib/libXaw6.la
+lib/libXaw6.so
+lib/libXaw6.so.6
+lib/libXaw7.a
+lib/libXaw7.la
+lib/libXaw7.so
+lib/libXaw7.so.7
+libdata/pkgconfig/xaw6.pc
+libdata/pkgconfig/xaw7.pc
+%%DOCSDIR%%/AsciiSink.xml
+%%DOCSDIR%%/AsciiSource.xml
+%%DOCSDIR%%/AsciiText.xml
+%%DOCSDIR%%/Box.xml
+%%DOCSDIR%%/CH1.xml
+%%DOCSDIR%%/CH2.xml
+%%DOCSDIR%%/CH3.xml
+%%DOCSDIR%%/CH4.xml
+%%DOCSDIR%%/CH5.xml
+%%DOCSDIR%%/CH6.xml
+%%DOCSDIR%%/CH7.xml
+%%DOCSDIR%%/Command.xml
+%%DOCSDIR%%/Dialog.xml
+%%DOCSDIR%%/Form.xml
+%%DOCSDIR%%/Grip.xml
+%%DOCSDIR%%/Label.xml
+%%DOCSDIR%%/List.xml
+%%DOCSDIR%%/MenuButton.xml
+%%DOCSDIR%%/Paned.xml
+%%DOCSDIR%%/Panner.xml
+%%DOCSDIR%%/Porthole.xml
+%%DOCSDIR%%/Repeater.xml
+%%DOCSDIR%%/Scrollbar.xml
+%%DOCSDIR%%/Simple.xml
+%%DOCSDIR%%/SimpleMenu.xml
+%%DOCSDIR%%/Sme.xml
+%%DOCSDIR%%/SmeBSB.xml
+%%DOCSDIR%%/SmeLine.xml
+%%DOCSDIR%%/StripChart.xml
+%%DOCSDIR%%/TPage_Credits.xml
+%%DOCSDIR%%/Template.xml
+%%DOCSDIR%%/Template_private_header_file.xml
+%%DOCSDIR%%/Template_public_header_file.xml
+%%DOCSDIR%%/Template_widget_source_file.xml
+%%DOCSDIR%%/Text.xml
+%%DOCSDIR%%/TextActions.xml
+%%DOCSDIR%%/TextActions_default_translation_bindings.xml
+%%DOCSDIR%%/TextActions_text_widget_actions.xml
+%%DOCSDIR%%/TextCustom.xml
+%%DOCSDIR%%/TextFuncs.xml
+%%DOCSDIR%%/TextSink.xml
+%%DOCSDIR%%/TextSource.xml
+%%DOCSDIR%%/Toggle.xml
+%%DOCSDIR%%/Tree.xml
+%%DOCSDIR%%/Viewport.xml
+%%DOCSDIR%%/libXaw.xml
+@dirrmtry %%DOCSDIR%%
+@dirrmtry include/X11/Xaw
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
new file mode 100644
index 0000000..1aeb757
--- /dev/null
+++ b/x11-toolkits/libXt/Makefile
@@ -0,0 +1,287 @@
+# New ports collection makefile for: libXt
+# Date Created: 25 Jan, 2003
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libXt
+PORTVERSION= 1.1.1
+CATEGORIES= x11-toolkits
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X Toolkit library
+
+XORG_CAT= lib
+USE_XORG= x11 sm xproto:both kbproto
+
+MAN3= MenuPopdown.3 \
+ MenuPopup.3 \
+ XtAddActions.3 \
+ XtAddCallback.3 \
+ XtAddCallbacks.3 \
+ XtAddConverter.3 \
+ XtAddEventHandler.3 \
+ XtAddExposureToRegion.3 \
+ XtAddGrab.3 \
+ XtAddInput.3 \
+ XtAddRawEventHandler.3 \
+ XtAddTimeOut.3 \
+ XtAddWorkProc.3 \
+ XtAllocateGC.3 \
+ XtAppAddActionHook.3 \
+ XtAppAddActions.3 \
+ XtAppAddBlockHook.3 \
+ XtAppAddConverter.3 \
+ XtAppAddInput.3 \
+ XtAppAddSignal.3 \
+ XtAppAddTimeOut.3 \
+ XtAppAddWorkProc.3 \
+ XtAppCreateShell.3 \
+ XtAppError.3 \
+ XtAppErrorMsg.3 \
+ XtAppGetErrorDatabase.3 \
+ XtAppGetErrorDatabaseText.3 \
+ XtAppGetExitFlag.3 \
+ XtAppGetSelectionTimeout.3 \
+ XtAppInitialize.3 \
+ XtAppLock.3 \
+ XtAppMainLoop.3 \
+ XtAppNextEvent.3 \
+ XtAppPeekEvent.3 \
+ XtAppPending.3 \
+ XtAppProcessEvent.3 \
+ XtAppReleaseCacheRefs.3 \
+ XtAppSetErrorHandler.3 \
+ XtAppSetErrorMsgHandler.3 \
+ XtAppSetExitFlag.3 \
+ XtAppSetFallbackResources.3 \
+ XtAppSetSelectionTimeout.3 \
+ XtAppSetTypeConverter.3 \
+ XtAppSetWarningHandler.3 \
+ XtAppSetWarningMsgHandler.3 \
+ XtAppUnlock.3 \
+ XtAppWarning.3 \
+ XtAppWarningMsg.3 \
+ XtAsprintf.3 \
+ XtAugmentTranslations.3 \
+ XtBuildEventMask.3 \
+ XtCallAcceptFocus.3\
+ XtCallActionProc.3 \
+ XtCallCallbackList.3 \
+ XtCallCallbacks.3 \
+ XtCallConverter.3 \
+ XtCallbackExclusive.3 \
+ XtCallbackNone.3 \
+ XtCallbackNonexclusive.3 \
+ XtCallbackPopdown.3 \
+ XtCalloc.3 \
+ XtCancelSelectionRequest.3 \
+ XtChangeManagedSet.3 \
+ XtCheckSubclass.3 \
+ XtClass.3\
+ XtCloseDisplay.3\
+ XtConfigureWidget.3\
+ XtConvert.3\
+ XtConvertAndStore.3\
+ XtConvertCase.3\
+ XtCreateApplicationContext.3\
+ XtCreateApplicationShell.3\
+ XtCreateManagedWidget.3\
+ XtCreatePopupShell.3\
+ XtCreateSelectionRequest.3\
+ XtCreateWidget.3\
+ XtCreateWindow.3\
+ XtDatabase.3\
+ XtDestroyApplicationContext.3\
+ XtDestroyWidget.3\
+ XtDirectConvert.3\
+ XtDisownSelection.3 \
+ XtDispatchEvent.3 \
+ XtDispatchEventToWidget.3\
+ XtDisplay.3\
+ XtDisplayInitialize.3\
+ XtDisplayOfObject.3\
+ XtDisplayStringConversionWarning.3\
+ XtDisplayToApplicationContext.3\
+ XtError.3\
+ XtErrorMsg.3\
+ XtFindFile.3\
+ XtFree.3\
+ XtGetActionKeysym.3\
+ XtGetActionList.3\
+ XtGetApplicationNameAndClass.3\
+ XtGetApplicationResources.3\
+ XtGetClassExtension.3\
+ XtGetConstraintResourceList.3\
+ XtGetDisplays.3\
+ XtGetErrorDatabase.3\
+ XtGetErrorDatabaseText.3\
+ XtGetGC.3\
+ XtGetKeyboardFocusWidget.3\
+ XtGetKeysymTable.3\
+ XtGetMultiClickTime.3 \
+ XtGetResourceList.3\
+ XtGetSelectionParameters.3\
+ XtGetSelectionRequest.3\
+ XtGetSelectionTimeout.3\
+ XtGetSelectionValue.3\
+ XtGetSelectionValueIncremental.3 \
+ XtGetSelectionValues.3\
+ XtGetSelectionValuesIncremental.3 \
+ XtGetSubresources.3 \
+ XtGetSubvalues.3 \
+ XtGetValues.3 \
+ XtGrabButton.3 \
+ XtGrabKey.3 \
+ XtGrabKeyboard.3 \
+ XtGrabPointer.3 \
+ XtHasCallbacks.3 \
+ XtHooksOfDisplay.3 \
+ XtInitialize.3 \
+ XtInitializeWidgetClass.3 \
+ XtInsertEventHandler.3 \
+ XtInsertEventTypeHandler.3 \
+ XtInsertRawEventHandler.3 \
+ XtInstallAccelerators.3\
+ XtInstallAllAccelerators.3\
+ XtIsApplicationShell.3\
+ XtIsComposite.3\
+ XtIsConstraint.3\
+ XtIsManaged.3\
+ XtIsObject.3\
+ XtIsOverrideShell.3\
+ XtIsRealized.3\
+ XtIsRectObj.3\
+ XtIsSensitive.3\
+ XtIsSessionShell.3\
+ XtIsShell.3\
+ XtIsSubclass.3\
+ XtIsTopLevelShell.3\
+ XtIsTransientShell.3\
+ XtIsVendorShell.3\
+ XtIsWMShell.3\
+ XtIsWidget.3\
+ XtKeysymToKeycodeList.3\
+ XtLastEventProcessed.3\
+ XtLastTimestampProcessed.3 \
+ XtMainLoop.3 \
+ XtMakeGeometryRequest.3 \
+ XtMakeResizeRequest.3 \
+ XtMalloc.3 \
+ XtManageChild.3 \
+ XtManageChildren.3 \
+ XtMapWidget.3 \
+ XtMergeArgLists.3 \
+ XtMoveWidget.3 \
+ XtName.3 \
+ XtNameToWidget.3 \
+ XtNew.3 \
+ XtNewString.3 \
+ XtNextEvent.3 \
+ XtNoticeSignal.3 \
+ XtNumber.3 \
+ XtOffset.3 \
+ XtOffsetOf.3 \
+ XtOpenApplication.3 \
+ XtOpenDisplay.3 \
+ XtOverrideTranslations.3 \
+ XtOwnSelection.3 \
+ XtOwnSelectionIncremental.3 \
+ XtParent.3 \
+ XtParseAcceleratorTable.3 \
+ XtParseTranslationTable.3 \
+ XtPeekEvent.3 \
+ XtPending.3 \
+ XtPopdown.3 \
+ XtPopup.3 \
+ XtPopupSpringLoaded.3 \
+ XtProcessEvent.3 \
+ XtProcessLock.3 \
+ XtProcessUnlock.3 \
+ XtQueryGeometry.3 \
+ XtRealizeWidget.3 \
+ XtRealloc.3 \
+ XtRegisterCaseConverter.3 \
+ XtRegisterDrawable.3 \
+ XtRegisterExtensionSelector.3 \
+ XtRegisterGrabAction.3 \
+ XtReleaseGC.3 \
+ XtReleasePropertyAtom.3 \
+ XtRemoveActionHook.3 \
+ XtRemoveAllCallbacks.3 \
+ XtRemoveBlockHook.3 \
+ XtRemoveCallback.3 \
+ XtRemoveCallbacks.3 \
+ XtRemoveEventHandler.3\
+ XtRemoveEventTypeHandler.3\
+ XtRemoveGrab.3\
+ XtRemoveInput.3\
+ XtRemoveRawEventHandler.3\
+ XtRemoveSignal.3\
+ XtRemoveTimeOut.3\
+ XtRemoveWorkProc.3\
+ XtReservePropertyAtom.3\
+ XtResizeWidget.3\
+ XtResolvePathname.3\
+ XtScreen.3\
+ XtScreenDatabase.3\
+ XtScreenOfObject.3\
+ XtSendSelectionRequest.3\
+ XtSessionGetToken.3\
+ XtSessionReturnToken.3\
+ XtSetArg.3\
+ XtSetErrorHandler.3\
+ XtSetErrorMsgHandler.3\
+ XtSetEventDispatcher.3\
+ XtSetKeyTranslator.3\
+ XtSetKeyboardFocus.3\
+ XtSetLanguageProc.3 \
+ XtSetMappedWhenManaged.3 \
+ XtSetMultiClickTime.3 \
+ XtSetSelectionParameters.3 \
+ XtSetSelectionTimeout.3 \
+ XtSetSensitive.3 \
+ XtSetSubvalues.3 \
+ XtSetTypeConverter.3 \
+ XtSetValues.3 \
+ XtSetWMColormapWindows.3 \
+ XtSetWarningHandler.3 \
+ XtSetWarningMsgHandler.3\
+ XtStringConversionWarning.3\
+ XtSuperclass.3\
+ XtToolkitInitialize.3\
+ XtToolkitThreadInitialize.3\
+ XtTranslateCoords.3 \
+ XtTranslateKeycode.3\
+ XtUngrabButton.3\
+ XtUngrabKey.3\
+ XtUngrabKeyboard.3\
+ XtUngrabPointer.3\
+ XtUninstallTranslations.3\
+ XtUnmanageChild.3\
+ XtUnmanageChildren.3\
+ XtUnmapWidget.3\
+ XtUnrealizeWidget.3\
+ XtUnregisterDrawable.3\
+ XtVaAppCreateShell.3\
+ XtVaAppInitialize.3\
+ XtVaCreateArgsList.3\
+ XtVaCreateManagedWidget.3\
+ XtVaCreatePopupShell.3\
+ XtVaCreateWidget.3\
+ XtVaGetApplicationResources.3\
+ XtVaGetSubresources.3\
+ XtVaGetSubvalues.3 \
+ XtVaGetValues.3 \
+ XtVaOpenApplication.3\
+ XtVaSetSubvalues.3\
+ XtVaSetValues.3\
+ XtWarning.3 \
+ XtWarningMsg.3\
+ XtWidgetToApplicationContext.3\
+ XtWindow.3 \
+ XtWindowOfObject.3 \
+ XtWindowToWidget.3
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/libXt/distinfo b/x11-toolkits/libXt/distinfo
new file mode 100644
index 0000000..57b1aa7
--- /dev/null
+++ b/x11-toolkits/libXt/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/lib/libXt-1.1.1.tar.bz2) = a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7
+SIZE (xorg/lib/libXt-1.1.1.tar.bz2) = 715424
diff --git a/x11-toolkits/libXt/pkg-descr b/x11-toolkits/libXt/pkg-descr
new file mode 100644
index 0000000..0369c4f
--- /dev/null
+++ b/x11-toolkits/libXt/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X Toolkit library.
+
+WWW: http://www.freedesktop.org/Software/xlibs
diff --git a/x11-toolkits/libXt/pkg-plist b/x11-toolkits/libXt/pkg-plist
new file mode 100644
index 0000000..2020099
--- /dev/null
+++ b/x11-toolkits/libXt/pkg-plist
@@ -0,0 +1,38 @@
+include/X11/CallbackI.h
+include/X11/Composite.h
+include/X11/CompositeP.h
+include/X11/ConstrainP.h
+include/X11/Constraint.h
+include/X11/ConvertI.h
+include/X11/Core.h
+include/X11/CoreP.h
+include/X11/CreateI.h
+include/X11/EventI.h
+include/X11/HookObjI.h
+include/X11/InitialI.h
+include/X11/Intrinsic.h
+include/X11/IntrinsicI.h
+include/X11/IntrinsicP.h
+include/X11/Object.h
+include/X11/ObjectP.h
+include/X11/PassivGraI.h
+include/X11/RectObj.h
+include/X11/RectObjP.h
+include/X11/ResConfigP.h
+include/X11/ResourceI.h
+include/X11/SelectionI.h
+include/X11/Shell.h
+include/X11/ShellI.h
+include/X11/ShellP.h
+include/X11/StringDefs.h
+include/X11/ThreadsI.h
+include/X11/TranslateI.h
+include/X11/VarargsI.h
+include/X11/Vendor.h
+include/X11/VendorP.h
+include/X11/Xtos.h
+lib/libXt.a
+lib/libXt.la
+lib/libXt.so
+lib/libXt.so.6
+libdata/pkgconfig/xt.pc
diff --git a/x11/dmxproto/Makefile b/x11/dmxproto/Makefile
new file mode 100644
index 0000000..c4f5096
--- /dev/null
+++ b/x11/dmxproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: dmxproto
+# Date Created: 06 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= dmxproto
+PORTVERSION= 2.3.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= DMX extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/dmxproto/distinfo b/x11/dmxproto/distinfo
new file mode 100644
index 0000000..9ab13c6
--- /dev/null
+++ b/x11/dmxproto/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/proto/dmxproto-2.3.1.tar.bz2) = e72051e6a3e06b236d19eed56368117b745ca1e1a27bdc50fd51aa375bea6509
+SIZE (xorg/proto/dmxproto-2.3.1.tar.bz2) = 96467
diff --git a/x11/dmxproto/pkg-descr b/x11/dmxproto/pkg-descr
new file mode 100644
index 0000000..690700f
--- /dev/null
+++ b/x11/dmxproto/pkg-descr
@@ -0,0 +1,3 @@
+This package contains X.Org DMXProto protocol headers.
+
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/dmxproto/pkg-plist b/x11/dmxproto/pkg-plist
new file mode 100644
index 0000000..217d1f5
--- /dev/null
+++ b/x11/dmxproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/dmx.h
+include/X11/extensions/dmxproto.h
+libdata/pkgconfig/dmxproto.pc
+@dirrm include/X11/extensions
diff --git a/x11/dri2proto/Makefile b/x11/dri2proto/Makefile
new file mode 100644
index 0000000..6693907
--- /dev/null
+++ b/x11/dri2proto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: dri2proto
+# Date Created: Jul 28 2008
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= dri2proto
+PORTVERSION= 2.6
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= DRI2 prototype headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/dri2proto/distinfo b/x11/dri2proto/distinfo
new file mode 100644
index 0000000..f791a3e
--- /dev/null
+++ b/x11/dri2proto/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/proto/dri2proto-2.6.tar.bz2) = ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909
+SIZE (xorg/proto/dri2proto-2.6.tar.bz2) = 102188
diff --git a/x11/dri2proto/pkg-descr b/x11/dri2proto/pkg-descr
new file mode 100644
index 0000000..668bcfc
--- /dev/null
+++ b/x11/dri2proto/pkg-descr
@@ -0,0 +1,3 @@
+This package contains X.Org DRI2 prototype headers.
+
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/dri2proto/pkg-plist b/x11/dri2proto/pkg-plist
new file mode 100644
index 0000000..f9a13c3
--- /dev/null
+++ b/x11/dri2proto/pkg-plist
@@ -0,0 +1,6 @@
+include/X11/extensions/dri2proto.h
+include/X11/extensions/dri2tokens.h
+libdata/pkgconfig/dri2proto.pc
+share/doc/dri2proto/dri2proto.txt
+@dirrm share/doc/dri2proto
+@dirrmtry include/X11/extensions
diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile
new file mode 100644
index 0000000..593cf9b
--- /dev/null
+++ b/x11/glproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: glproto
+# Date Created: 06 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= glproto
+PORTVERSION= 1.4.14
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= GLX extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo
new file mode 100644
index 0000000..3423629
--- /dev/null
+++ b/x11/glproto/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/proto/glproto-1.4.14.tar.bz2) = 7aaf555a100a63c67dbffc63153dcaaa3de1a36e605a2e98fce63f64089ff999
+SIZE (xorg/proto/glproto-1.4.14.tar.bz2) = 113392
diff --git a/x11/glproto/pkg-descr b/x11/glproto/pkg-descr
new file mode 100644
index 0000000..07573ef
--- /dev/null
+++ b/x11/glproto/pkg-descr
@@ -0,0 +1,3 @@
+This package contains X.Org GLX extension headers.
+
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/glproto/pkg-plist b/x11/glproto/pkg-plist
new file mode 100644
index 0000000..da73d63
--- /dev/null
+++ b/x11/glproto/pkg-plist
@@ -0,0 +1,9 @@
+include/GL/glxint.h
+include/GL/glxmd.h
+include/GL/glxproto.h
+include/GL/glxtokens.h
+include/GL/internal/glcore.h
+libdata/pkgconfig/glproto.pc
+@dirrmtry include/GL/internal
+@dirrmtry include/GL
+@dirrmtry include/X11/extensions
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
new file mode 100644
index 0000000..5477970
--- /dev/null
+++ b/x11/libXi/Makefile
@@ -0,0 +1,93 @@
+# New ports collection makefile for: libXi
+# Date Created: 22 Nov, 2003
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD: ports/x11/libXi/Makefile,v 1.24 2011/11/09 15:25:49 miwi Exp $
+#
+
+PORTNAME= libXi
+PORTVERSION= 1.4.5
+PORTEPOCH= 1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X Input extension library
+
+LICENSE= MIT
+
+XORG_CAT= lib
+USE_XORG= xproto x11 xext xextproto inputproto:both
+
+CONFIGURE_ARGS+=--disable-specs --without-xmlto
+
+MAN3= XAllowDeviceEvents.3 \
+ XChangeDeviceControl.3 \
+ XChangeDeviceDontPropagateList.3 \
+ XChangeDeviceKeyMapping.3 \
+ XChangeDeviceProperty.3 \
+ XChangeFeedbackControl.3 \
+ XChangeKeyboardDevice.3\
+ XChangePointerDevice.3\
+ XCloseDevice.3\
+ XDeleteDeviceProperty.3\
+ XDeviceBell.3\
+ XDeviceTimeCoord.3\
+ XFreeDeviceList.3\
+ XGetDeviceButtonMapping.3\
+ XGetDeviceControl.3\
+ XGetDeviceDontPropagateList.3\
+ XGetDeviceFocus.3\
+ XGetDeviceKeyMapping.3 \
+ XGetDeviceModifierMapping.3\
+ XGetDeviceMotionEvents.3\
+ XGetDeviceProperty.3\
+ XGetExtensionVersion.3\
+ XGetFeedbackControl.3\
+ XGetSelectedExtensionEvents.3\
+ XGrabDevice.3\
+ XGrabDeviceButton.3\
+ XGrabDeviceKey.3\
+ XIChangeHierarchy.3\
+ XIChangeProperty.3\
+ XIDefineCursor.3\
+ XIDeleteProperty.3\
+ XIFreeDeviceInfo.3\
+ XIGetClientPointer.3\
+ XIGetFocus.3\
+ XIGetProperty.3\
+ XIGetSelectedEvents.3\
+ XIGrabButton.3 \
+ XIGrabDevice.3\
+ XIGrabEnter.3\
+ XIGrabFocusIn.3\
+ XIGrabKeycode.3\
+ XIListProperties.3\
+ XIQueryDevice.3\
+ XIQueryPointer.3\
+ XIQueryVersion.3\
+ XISelectEvents.3\
+ XISetClientPointer.3\
+ XISetFocus.3\
+ XIUndefineCursor.3\
+ XIUngrabButton.3\
+ XIUngrabDevice.3 \
+ XIUngrabEnter.3 \
+ XIUngrabFocusIn.3 \
+ XIUngrabKeycode.3 \
+ XIWarpPointer.3 \
+ XListDeviceProperties.3 \
+ XListInputDevices.3 \
+ XOpenDevice.3 \
+ XQueryDeviceState.3 \
+ XSelectExtensionEvent.3\
+ XSendExtensionEvent.3\
+ XSetDeviceButtonMapping.3\
+ XSetDeviceFocus.3\
+ XSetDeviceMode.3\
+ XSetDeviceModifierMapping.3 \
+ XSetDeviceValuators.3 \
+ XUngrabDevice.3 \
+ XUngrabDeviceButton.3 \
+ XUngrabDeviceKey.3
+
+.include <bsd.port.mk>
diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo
new file mode 100644
index 0000000..98b1cb1
--- /dev/null
+++ b/x11/libXi/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/lib/libXi-1.4.5.tar.bz2) = 22a99123229d22e6e1567c4cda0224a744475f427625d61b23d965157a86f1b5
+SIZE (xorg/lib/libXi-1.4.5.tar.bz2) = 416807
diff --git a/x11/libXi/pkg-descr b/x11/libXi/pkg-descr
new file mode 100644
index 0000000..99e89d8
--- /dev/null
+++ b/x11/libXi/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X Input extension library.
+
+WWW: http://www.freedesktop.org/Software/xlibs
diff --git a/x11/libXi/pkg-plist b/x11/libXi/pkg-plist
new file mode 100644
index 0000000..0f704e2
--- /dev/null
+++ b/x11/libXi/pkg-plist
@@ -0,0 +1,8 @@
+include/X11/extensions/XInput.h
+include/X11/extensions/XInput2.h
+lib/libXi.a
+lib/libXi.la
+lib/libXi.so
+lib/libXi.so.6
+libdata/pkgconfig/xi.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
new file mode 100644
index 0000000..1f41da6
--- /dev/null
+++ b/x11/libxcb/Makefile
@@ -0,0 +1,54 @@
+# New ports collection makefile for: libxcb
+# Date Created: 2006-08-23
+# Whom: Ashish Shukla <wahjava@gmail.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libxcb
+PORTVERSION= 1.7
+CATEGORIES= x11 python
+MASTER_SITES= http://xcb.freedesktop.org/dist/
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= The X protocol C-language Binding (XCB) library
+
+BUILD_DEPENDS= ${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
+ xsltproc:${PORTSDIR}/textproc/libxslt \
+ xcb-proto>=1.7:${PORTSDIR}/x11/xcb-proto \
+ ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
+
+CONFIGURE_ARGS+= --disable-build-docs --without-doxygen --enable-xinput
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+USE_BZIP2= yes
+USE_GNOME= gnomehack
+USE_GMAKE= yes
+USE_LDCONFIG= yes
+USE_XORG= xau xdmcp
+USE_PYTHON_BUILD= 2.5-2.7
+
+GNU_CONFIGURE= yes
+.for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
+CONFIGURE_ARGS+=${f}="${${f}}"
+.endfor
+CONFIGURE_ENV= LIBS="`pkg-config --libs pthread-stubs`"
+
+NEEDED_CFLAGS= -I${LOCALBASE}/include
+NEEDED_LIBS= -L${LOCALBASE}/lib -lXau ${PTHREAD_STUBS_LIBS}
+
+XDMCP_CFLAGS= -I${LOCALBASE}/include
+XDMCP_LIBS= -L${LOCALBASE}/lib -lXdmcp
+
+XPROTO_CFLAGS= -I${LOCALBASE}/include
+XPROTO_LIBS= -L${LOCALBASE}/lib
+
+post-install:
+.if !defined(NOPORTDOCS)
+ ${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET}
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11/libxcb/distinfo b/x11/libxcb/distinfo
new file mode 100644
index 0000000..6354685
--- /dev/null
+++ b/x11/libxcb/distinfo
@@ -0,0 +1,2 @@
+SHA256 (libxcb-1.7.tar.bz2) = e776dc35e2a66094e7308ce2e045fb4e27cf3ca30ab1813a8fc08538140724df
+SIZE (libxcb-1.7.tar.bz2) = 318619
diff --git a/x11/libxcb/files/patch-Makefile.in b/x11/libxcb/files/patch-Makefile.in
new file mode 100644
index 0000000..86d274f
--- /dev/null
+++ b/x11/libxcb/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Sun Jun 17 17:33:00 2007
++++ Makefile.in Sun Jun 17 17:34:18 2007
+@@ -220,7 +220,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ xcbincludedir = @xcbincludedir@
+-SUBDIRS = src tests doc
++SUBDIRS = src tests
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = \
+ xcb.pc \
diff --git a/x11/libxcb/files/patch-tests-check_public.c b/x11/libxcb/files/patch-tests-check_public.c
new file mode 100644
index 0000000..2a2f271
--- /dev/null
+++ b/x11/libxcb/files/patch-tests-check_public.c
@@ -0,0 +1,23 @@
+--- tests/check_public.c.orig Wed Jan 24 15:16:59 2007
++++ tests/check_public.c Wed Jan 24 15:22:33 2007
+@@ -70,7 +70,10 @@
+ else if(test_type == TEST_ENVIRONMENT)
+ {
+ argument = 0;
+- setenv("DISPLAY", name, 1);
++ if(name == NULL)
++ unsetenv("DISPLAY");
++ else
++ setenv("DISPLAY", name, 1);
+ }
+
+ got_host = (char *) -1;
+@@ -148,7 +151,7 @@
+
+ START_TEST(parse_display_negative)
+ {
+- parse_display_fail(0);
++ parse_display_fail(NULL); /* modified by Ashish Shukla. 0 is not NULL in ISO C but in ISO C++ */
+ parse_display_fail("");
+ parse_display_fail(":");
+ parse_display_fail("::");
diff --git a/x11/libxcb/pkg-descr b/x11/libxcb/pkg-descr
new file mode 100644
index 0000000..7550af1
--- /dev/null
+++ b/x11/libxcb/pkg-descr
@@ -0,0 +1,5 @@
+The X protocol C-language Binding (XCB) is a replacement for Xlib
+featuring a small footprint, latency hiding, direct access to the
+protocol, improved threading support, and extensibility.
+
+WWW: http://xcb.freedesktop.org/
diff --git a/x11/libxcb/pkg-plist b/x11/libxcb/pkg-plist
new file mode 100644
index 0000000..dc30e21
--- /dev/null
+++ b/x11/libxcb/pkg-plist
@@ -0,0 +1,148 @@
+include/xcb/bigreq.h
+include/xcb/composite.h
+include/xcb/damage.h
+include/xcb/dpms.h
+include/xcb/dri2.h
+include/xcb/glx.h
+include/xcb/randr.h
+include/xcb/record.h
+include/xcb/render.h
+include/xcb/res.h
+include/xcb/screensaver.h
+include/xcb/shape.h
+include/xcb/shm.h
+include/xcb/sync.h
+include/xcb/xc_misc.h
+include/xcb/xcb.h
+include/xcb/xcbext.h
+include/xcb/xevie.h
+include/xcb/xf86dri.h
+include/xcb/xfixes.h
+include/xcb/xinerama.h
+include/xcb/xinput.h
+include/xcb/xprint.h
+include/xcb/xproto.h
+include/xcb/xselinux.h
+include/xcb/xtest.h
+include/xcb/xv.h
+include/xcb/xvmc.h
+lib/libxcb-composite.a
+lib/libxcb-composite.la
+lib/libxcb-composite.so
+lib/libxcb-composite.so.0
+lib/libxcb-damage.a
+lib/libxcb-damage.la
+lib/libxcb-damage.so
+lib/libxcb-damage.so.0
+lib/libxcb-dpms.a
+lib/libxcb-dpms.la
+lib/libxcb-dpms.so
+lib/libxcb-dpms.so.0
+lib/libxcb-dri2.a
+lib/libxcb-dri2.la
+lib/libxcb-dri2.so
+lib/libxcb-dri2.so.0
+lib/libxcb-glx.a
+lib/libxcb-glx.la
+lib/libxcb-glx.so
+lib/libxcb-glx.so.0
+lib/libxcb-randr.a
+lib/libxcb-randr.la
+lib/libxcb-randr.so
+lib/libxcb-randr.so.1
+lib/libxcb-record.a
+lib/libxcb-record.la
+lib/libxcb-record.so
+lib/libxcb-record.so.0
+lib/libxcb-render.a
+lib/libxcb-render.la
+lib/libxcb-render.so
+lib/libxcb-render.so.0
+lib/libxcb-res.a
+lib/libxcb-res.la
+lib/libxcb-res.so
+lib/libxcb-res.so.0
+lib/libxcb-screensaver.a
+lib/libxcb-screensaver.la
+lib/libxcb-screensaver.so
+lib/libxcb-screensaver.so.0
+lib/libxcb-shape.a
+lib/libxcb-shape.la
+lib/libxcb-shape.so
+lib/libxcb-shape.so.0
+lib/libxcb-shm.a
+lib/libxcb-shm.la
+lib/libxcb-shm.so
+lib/libxcb-shm.so.0
+lib/libxcb-sync.a
+lib/libxcb-sync.la
+lib/libxcb-sync.so
+lib/libxcb-sync.so.0
+lib/libxcb-xevie.a
+lib/libxcb-xevie.la
+lib/libxcb-xevie.so
+lib/libxcb-xevie.so.0
+lib/libxcb-xf86dri.a
+lib/libxcb-xf86dri.la
+lib/libxcb-xf86dri.so
+lib/libxcb-xf86dri.so.0
+lib/libxcb-xfixes.a
+lib/libxcb-xfixes.la
+lib/libxcb-xfixes.so
+lib/libxcb-xfixes.so.0
+lib/libxcb-xinerama.a
+lib/libxcb-xinerama.la
+lib/libxcb-xinerama.so
+lib/libxcb-xinerama.so.0
+lib/libxcb-xinput.a
+lib/libxcb-xinput.la
+lib/libxcb-xinput.so
+lib/libxcb-xinput.so.0
+lib/libxcb-xprint.a
+lib/libxcb-xprint.la
+lib/libxcb-xprint.so
+lib/libxcb-xprint.so.0
+lib/libxcb-xtest.a
+lib/libxcb-xtest.la
+lib/libxcb-xtest.so
+lib/libxcb-xtest.so.0
+lib/libxcb-xv.a
+lib/libxcb-xv.la
+lib/libxcb-xv.so
+lib/libxcb-xv.so.0
+lib/libxcb-xvmc.a
+lib/libxcb-xvmc.la
+lib/libxcb-xvmc.so
+lib/libxcb-xvmc.so.0
+lib/libxcb.a
+lib/libxcb.la
+lib/libxcb.so
+lib/libxcb.so.2
+libdata/pkgconfig/xcb-composite.pc
+libdata/pkgconfig/xcb-damage.pc
+libdata/pkgconfig/xcb-dpms.pc
+libdata/pkgconfig/xcb-dri2.pc
+libdata/pkgconfig/xcb-glx.pc
+libdata/pkgconfig/xcb-randr.pc
+libdata/pkgconfig/xcb-record.pc
+libdata/pkgconfig/xcb-render.pc
+libdata/pkgconfig/xcb-res.pc
+libdata/pkgconfig/xcb-screensaver.pc
+libdata/pkgconfig/xcb-shape.pc
+libdata/pkgconfig/xcb-shm.pc
+libdata/pkgconfig/xcb-sync.pc
+libdata/pkgconfig/xcb-xevie.pc
+libdata/pkgconfig/xcb-xf86dri.pc
+libdata/pkgconfig/xcb-xfixes.pc
+libdata/pkgconfig/xcb-xinerama.pc
+libdata/pkgconfig/xcb-xinput.pc
+libdata/pkgconfig/xcb-xprint.pc
+libdata/pkgconfig/xcb-xtest.pc
+libdata/pkgconfig/xcb-xv.pc
+libdata/pkgconfig/xcb-xvmc.pc
+libdata/pkgconfig/xcb.pc
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/index.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/xcb.css
+@dirrmtry include/xcb
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
new file mode 100644
index 0000000..76b9206
--- /dev/null
+++ b/x11/xcb-proto/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for: xcb-proto
+# Date Created: 2006-08-23
+# Whom: Ashish Shukla <wahjava@gmail.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xcb-proto
+PORTVERSION= 1.7
+CATEGORIES= x11 python
+MASTER_SITES= http://xcb.freedesktop.org/dist/
+
+MAINTAINER= ashish@FreeBSD.org
+COMMENT= The X protocol C-language Binding (XCB) protocol
+
+BUILD_DEPENDS= xmllint:${PORTSDIR}/textproc/libxml2
+
+USE_BZIP2= yes
+USE_GNOME= gnomehack
+USE_PYTHON= 2.5+
+GNU_CONFIGURE= yes
+
+DATADIR= ${PREFIX}/share/xcb
+
+.include <bsd.port.mk>
diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo
new file mode 100644
index 0000000..3ed55f7
--- /dev/null
+++ b/x11/xcb-proto/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xcb-proto-1.7.tar.bz2) = e67eb7263f222133fb9d1de70928724bea3a448cdcd99d0fa4c63c04fc124b38
+SIZE (xcb-proto-1.7.tar.bz2) = 104353
diff --git a/x11/xcb-proto/pkg-descr b/x11/xcb-proto/pkg-descr
new file mode 100644
index 0000000..7550af1
--- /dev/null
+++ b/x11/xcb-proto/pkg-descr
@@ -0,0 +1,5 @@
+The X protocol C-language Binding (XCB) is a replacement for Xlib
+featuring a small footprint, latency hiding, direct access to the
+protocol, improved threading support, and extensibility.
+
+WWW: http://xcb.freedesktop.org/
diff --git a/x11/xcb-proto/pkg-plist b/x11/xcb-proto/pkg-plist
new file mode 100644
index 0000000..05dff4e
--- /dev/null
+++ b/x11/xcb-proto/pkg-plist
@@ -0,0 +1,49 @@
+libdata/pkgconfig/xcb-proto.pc
+%%DATADIR%%/bigreq.xml
+%%DATADIR%%/composite.xml
+%%DATADIR%%/damage.xml
+%%DATADIR%%/dpms.xml
+%%DATADIR%%/dri2.xml
+%%DATADIR%%/glx.xml
+%%DATADIR%%/randr.xml
+%%DATADIR%%/record.xml
+%%DATADIR%%/render.xml
+%%DATADIR%%/res.xml
+%%DATADIR%%/screensaver.xml
+%%DATADIR%%/shape.xml
+%%DATADIR%%/shm.xml
+%%DATADIR%%/sync.xml
+%%DATADIR%%/xc_misc.xml
+%%DATADIR%%/xcb.xsd
+%%DATADIR%%/xevie.xml
+%%DATADIR%%/xf86dri.xml
+%%DATADIR%%/xfixes.xml
+%%DATADIR%%/xkb.xml
+%%DATADIR%%/xinerama.xml
+%%DATADIR%%/xinput.xml
+%%DATADIR%%/xprint.xml
+%%DATADIR%%/xproto.xml
+%%DATADIR%%/xselinux.xml
+%%DATADIR%%/xtest.xml
+%%DATADIR%%/xv.xml
+%%DATADIR%%/xvmc.xml
+%%PYTHON_SITELIBDIR%%/xcbgen/__init__.py
+%%PYTHON_SITELIBDIR%%/xcbgen/error.py
+%%PYTHON_SITELIBDIR%%/xcbgen/expr.py
+%%PYTHON_SITELIBDIR%%/xcbgen/matcher.py
+%%PYTHON_SITELIBDIR%%/xcbgen/state.py
+%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.py
+%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/error.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/state.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xcbgen/error.pyo
+%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyo
+%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyo
+%%PYTHON_SITELIBDIR%%/xcbgen/state.pyo
+%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyo
+@dirrm %%DATADIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/xcbgen
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
new file mode 100644
index 0000000..4e8eacf
--- /dev/null
+++ b/x11/xdm/Makefile
@@ -0,0 +1,59 @@
+# New ports collection makefile for: xdm
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD: ports/x11/xdm/Makefile,v 1.11 2011/09/22 13:51:51 eadler Exp $
+#
+
+PORTNAME= xdm
+PORTVERSION= 1.1.11
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org X display manager
+
+LICENSE= MIT
+
+XORG_CAT= app
+USE_XORG= xmu x11 xau xinerama xpm xdmcp xt xext xaw
+CONFIGURE_ARGS+= --with-xdmconfigdir=${EXAMPLESDIR} \
+ --with-xdmscriptdir=${EXAMPLESDIR}
+
+MAN1= xdm.1
+
+CFFILES= GiveConsole TakeConsole Xaccess Xreset Xresources \
+ Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config
+
+OPTIONS= XDMSHELL "Install xdmshell" off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_XDMSHELL)
+CONFIGURE_ARGS+=--enable-xdmshell
+MAN1+= xdmshell.1
+PLIST_SUB+= XDMSHELL=""
+.else
+CONFIGURE_ARGS+=--disable-xdmshell
+PLIST_SUB+= XDMSHELL="@comment "
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e "s|XDMCONFIGDIR/|${PREFIX}/lib/X11/xdm/|" \
+ -e "s|XDMSCRIPTDIR/|${PREFIX}/lib/X11/xdm/|" \
+ ${WRKSRC}/config/xdm-config.cpp \
+ ${WRKSRC}/config/Xstartup.cpp \
+ ${WRKSRC}/config/Xreset.cpp
+ @${REINPLACE_CMD} -e "s|@DESTDIR@||" ${WRKSRC}/Makefile.in
+
+post-configure:
+ @${REINPLACE_CMD} -e "s|${EXAMPLESDIR}|${PREFIX}/lib/X11/xdm|" \
+ ${WRKSRC}/config.h
+
+post-install:
+.for f in ${CFFILES}
+ ${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f
+.endfor
+ ${MKDIR} /var/lib/xdm/authdir
+ ${LN} -sf /var/lib/xdm/authdir ${PREFIX}/lib/X11/xdm/authdir
+
+.include <bsd.port.mk>
diff --git a/x11/xdm/distinfo b/x11/xdm/distinfo
new file mode 100644
index 0000000..c67b21b
--- /dev/null
+++ b/x11/xdm/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/app/xdm-1.1.11.tar.bz2) = d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47
+SIZE (xorg/app/xdm-1.1.11.tar.bz2) = 446612
diff --git a/x11/xdm/files/patch-greeter-greet.c b/x11/xdm/files/patch-greeter-greet.c
new file mode 100644
index 0000000..b8a221d
--- /dev/null
+++ b/x11/xdm/files/patch-greeter-greet.c
@@ -0,0 +1,19 @@
+--- greeter/greet.c.orig Sat Feb 3 01:25:25 2007
++++ greeter/greet.c Wed Apr 4 14:03:31 2007
+@@ -612,6 +617,7 @@ greet_user_rtn GreetUser(
+ }
+ DeleteXloginResources (d, *dpy);
+ CloseGreet (d);
++ login = NULL;
+ Debug ("Greet loop finished\n");
+ /*
+ * Run system-wide initialization file
+@@ -697,6 +704,8 @@ static int pamconv(int num_msg,
+ m = *msg;
+ r = *response;
+
++ if (login == NULL) goto pam_error;
++
+ for (i = 0; i < num_msg; i++ , m++ , r++) {
+ char *username;
+ int promptId = 0;
diff --git a/x11/xdm/files/patch-xdm_session.c b/x11/xdm/files/patch-xdm_session.c
new file mode 100644
index 0000000..de1c579
--- /dev/null
+++ b/x11/xdm/files/patch-xdm_session.c
@@ -0,0 +1,27 @@
+--- xdm/session.c.orig Sun Jun 3 22:49:51 2007
++++ xdm/session.c Sun Jun 3 22:56:06 2007
+@@ -543,6 +543,7 @@
+ pid_t pid;
+ #ifdef HAS_SETUSERCONTEXT
+ struct passwd* pwd;
++ extern char **environ;
+ #endif
+ #ifdef USE_PAM
+ pam_handle_t *pamh = thepamh ();
+@@ -657,6 +660,8 @@
+ * Set the user's credentials: uid, gid, groups,
+ * environment variables, resource limits, and umask.
+ */
++ /* destroy user environment before calling setusercontext */
++ environ = verify->userEnviron;
+ pwd = getpwnam(name);
+ if (pwd) {
+ if (setusercontext(NULL, pwd, pwd->pw_uid, LOGIN_SETALL) < 0) {
+@@ -664,6 +669,7 @@
+ errno);
+ return (0);
+ }
++ verify->userEnviron = environ;
+ endpwent();
+ } else {
+ LogError ("getpwnam for \"%s\" failed, errno=%d\n", name, errno);
diff --git a/x11/xdm/pkg-descr b/x11/xdm/pkg-descr
new file mode 100644
index 0000000..d87ff4d
--- /dev/null
+++ b/x11/xdm/pkg-descr
@@ -0,0 +1 @@
+This package contains xdm, the X.Org X Display manager.
diff --git a/x11/xdm/pkg-plist b/x11/xdm/pkg-plist
new file mode 100644
index 0000000..5b28dd4
--- /dev/null
+++ b/x11/xdm/pkg-plist
@@ -0,0 +1,52 @@
+bin/xdm
+%%XDMSHELL%%bin/xdmshell
+lib/X11/xdm/authdir
+lib/X11/xdm/chooser
+lib/X11/xdm/libXdmGreet.la
+lib/X11/xdm/libXdmGreet.so
+lib/X11/xdm/pixmaps/xorg-bw.xpm
+lib/X11/xdm/pixmaps/xorg.xpm
+share/X11/app-defaults/Chooser
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xaccess %D/lib/X11/xdm/Xaccess; then rm -f %D/lib/X11/xdm/Xaccess; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xreset %D/lib/X11/xdm/Xreset; then rm -f %D/lib/X11/xdm/Xreset; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xresources %D/lib/X11/xdm/Xresources; then rm -f %D/lib/X11/xdm/Xresources; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xservers %D/lib/X11/xdm/Xservers; then rm -f %D/lib/X11/xdm/Xservers; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xsession %D/lib/X11/xdm/Xsession; then rm -f %D/lib/X11/xdm/Xsession; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xsetup_0 %D/lib/X11/xdm/Xsetup_0; then rm -f %D/lib/X11/xdm/Xsetup_0; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup; then rm -f %D/lib/X11/xdm/Xstartup; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling; then rm -f %D/lib/X11/xdm/Xwilling; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/xdm-config %D/lib/X11/xdm/xdm-config; then rm -f %D/lib/X11/xdm/xdm-config; fi
+%%EXAMPLESDIR%%/GiveConsole
+%%EXAMPLESDIR%%/TakeConsole
+%%EXAMPLESDIR%%/Xaccess
+%%EXAMPLESDIR%%/Xreset
+%%EXAMPLESDIR%%/Xresources
+%%EXAMPLESDIR%%/Xservers
+%%EXAMPLESDIR%%/Xsession
+%%EXAMPLESDIR%%/Xsetup_0
+%%EXAMPLESDIR%%/Xstartup
+%%EXAMPLESDIR%%/Xwilling
+%%EXAMPLESDIR%%/xdm-config
+@exec cp -n %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole
+@exec cp -n %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole
+@exec cp -n %D/%%EXAMPLESDIR%%/Xaccess %D/lib/X11/xdm/Xaccess
+@exec cp -n %D/%%EXAMPLESDIR%%/Xreset %D/lib/X11/xdm/Xreset
+@exec cp -n %D/%%EXAMPLESDIR%%/Xresources %D/lib/X11/xdm/Xresources
+@exec cp -n %D/%%EXAMPLESDIR%%/Xservers %D/lib/X11/xdm/Xservers
+@exec cp -n %D/%%EXAMPLESDIR%%/Xsession %D/lib/X11/xdm/Xsession
+@exec cp -n %D/%%EXAMPLESDIR%%/Xsetup_0 %D/lib/X11/xdm/Xsetup_0
+@exec cp -n %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup
+@exec cp -n %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling
+@exec cp -n %D/%%EXAMPLESDIR%%/xdm-config %D/lib/X11/xdm/xdm-config
+@exec mkdir -p /var/lib/xdm/authdir
+@dirrmtry share/X11/app-defaults
+@dirrmtry share/X11
+@unexec rm -f /var/lib/xdm/authdir/authfiles/* 2>/dev/null || true
+@unexec rmdir /var/lib/xdm/authdir/authfiles 2>/dev/null || true
+@unexec rmdir /var/lib/xdm/authdir 2>/dev/null
+@unexec rmdir /var/lib/xdm 2>/dev/null
+@dirrm lib/X11/xdm/pixmaps
+@dirrm lib/X11/xdm
+@dirrm %%EXAMPLESDIR%%
diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile
new file mode 100644
index 0000000..90ff5ea
--- /dev/null
+++ b/x11/xdpyinfo/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for: xdpyinfo
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD: ports/x11/xdpyinfo/Makefile,v 1.7 2011/09/20 08:23:01 bapt Exp $
+#
+
+PORTNAME= xdpyinfo
+PORTVERSION= 1.3.0
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Display information utility for X
+
+LICENSE= MIT
+
+XORG_CAT= app
+USE_XORG= xext x11 xtst xxf86vm xxf86dga xi xrender \
+ xinerama dmxproto xp
+CONFIGURE_ARGS= --without-xf86misc
+
+PLIST_FILES= bin/xdpyinfo
+
+MAN1= xdpyinfo.1
+
+.include <bsd.port.mk>
diff --git a/x11/xdpyinfo/distinfo b/x11/xdpyinfo/distinfo
new file mode 100644
index 0000000..08247da
--- /dev/null
+++ b/x11/xdpyinfo/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/app/xdpyinfo-1.3.0.tar.bz2) = 23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f
+SIZE (xorg/app/xdpyinfo-1.3.0.tar.bz2) = 127611
diff --git a/x11/xdpyinfo/pkg-descr b/x11/xdpyinfo/pkg-descr
new file mode 100644
index 0000000..1ab1193
--- /dev/null
+++ b/x11/xdpyinfo/pkg-descr
@@ -0,0 +1,2 @@
+This package contains xdpyinfo, which is a utility for displaying
+information about an X server.
diff --git a/x11/xdriinfo/Makefile b/x11/xdriinfo/Makefile
new file mode 100644
index 0000000..429a606
--- /dev/null
+++ b/x11/xdriinfo/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xdriinfo
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xdriinfo
+PORTVERSION= 1.0.4
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Query configuration information of DRI drivers
+
+USE_GL= gl
+
+XORG_CAT= app
+USE_XORG= x11 glproto
+MAN1= xdriinfo.1
+PLIST_FILES= bin/xdriinfo
+
+.include <bsd.port.mk>
diff --git a/x11/xdriinfo/distinfo b/x11/xdriinfo/distinfo
new file mode 100644
index 0000000..689c1f4
--- /dev/null
+++ b/x11/xdriinfo/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/app/xdriinfo-1.0.4.tar.bz2) = 35c6e43d3b68ef5d93d013b4517014fb890bad96b2c801abf4f607927a94cb1c
+SIZE (xorg/app/xdriinfo-1.0.4.tar.bz2) = 104296
diff --git a/x11/xdriinfo/pkg-descr b/x11/xdriinfo/pkg-descr
new file mode 100644
index 0000000..2330f01
--- /dev/null
+++ b/x11/xdriinfo/pkg-descr
@@ -0,0 +1,2 @@
+This package contains xdriinfo, an utility that can be used to query
+configuration information of direct rendering devices.
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
new file mode 100644
index 0000000..8b9e30c
--- /dev/null
+++ b/x11/xinit/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for: xinit
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xinit
+PORTVERSION= 1.3.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X Window System initializer
+
+LICENSE= MIT
+
+XORG_CAT= app
+USE_XORG= x11
+
+PLIST_FILES= bin/startx bin/xinit lib/X11/xinit/xinitrc
+PLIST_DIRS= lib/X11/xinit
+
+MAN1= startx.1 xinit.1
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|hexdump|/usr/bin/hexdump|' ${WRKSRC}/startx.cpp
+ @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/man/xinit.man
+
+.include <bsd.port.mk>
diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo
new file mode 100644
index 0000000..dbe3d87
--- /dev/null
+++ b/x11/xinit/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/app/xinit-1.3.2.tar.bz2) = a1867fdaa83f68750b12ba4305c3c62f5992d0f52cfeb98e96c27a8e690e0235
+SIZE (xorg/app/xinit-1.3.2.tar.bz2) = 148443
diff --git a/x11/xinit/pkg-descr b/x11/xinit/pkg-descr
new file mode 100644
index 0000000..2676f6a
--- /dev/null
+++ b/x11/xinit/pkg-descr
@@ -0,0 +1 @@
+This package contains xinit, the X Window System initializer.
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
new file mode 100644
index 0000000..5f87832
--- /dev/null
+++ b/x11/xkeyboard-config/Makefile
@@ -0,0 +1,53 @@
+# New ports collection makefile for: xkeyboard-config
+# Date Created: Dec 20 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD: ports/x11/xkeyboard-config/Makefile,v 1.21 2011/09/23 22:26:15 amdmi3 Exp $
+#
+
+PORTNAME= xkeyboard-config
+PORTVERSION= 2.5.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X Keyboard Configuration Database
+
+LICENSE= MIT
+
+BUILD_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp \
+ xsltproc:${PORTSDIR}/textproc/libxslt
+XORG_CAT= data
+
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_GNOME= intlhack gnomehack
+USE_PERL5_BUILD=yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-xkb-base=${PREFIX}/share/X11/xkb \
+ --with-xkb-rules-symlink=xorg
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+
+MAN7= xkeyboard-config.7
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+= --disable-nls
+CONFIGURE_ENV+= MSGFMT="/bin/echo '(GNU '" \
+ XGETTEXT="/bin/echo '(GNU '" \
+ MSGMERGE="/bin/echo '(GNU '"
+PLIST_SUB+= NLS="@comment "
+.else
+USE_ICONV= yes
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' -e 's|==|=|g' \
+ ${WRKSRC}/rules/merge.sh
+
+post-install:
+ ${MKDIR} /var/lib/xkb
+ ${LN} -sf /var/lib/xkb ${PREFIX}/share/X11/xkb/compiled
+
+.include <bsd.port.mk>
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
new file mode 100644
index 0000000..a1b7661
--- /dev/null
+++ b/x11/xkeyboard-config/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
+SIZE (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = 833871
diff --git a/x11/xkeyboard-config/pkg-descr b/x11/xkeyboard-config/pkg-descr
new file mode 100644
index 0000000..ad19d12
--- /dev/null
+++ b/x11/xkeyboard-config/pkg-descr
@@ -0,0 +1,7 @@
+The non-arch keyboard configuration database for X Window.
+The goal is to provide the consistent, well-structured,
+frequently released open source of X keyboard configuration
+data for X Window System implementations (free, open source
+and commercial). The project is targetted to XKB-based systems.
+
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
new file mode 100644
index 0000000..1292125
--- /dev/null
+++ b/x11/xkeyboard-config/pkg-plist
@@ -0,0 +1,403 @@
+libdata/pkgconfig/xkeyboard-config.pc
+share/X11/xkb/compat.dir
+share/X11/xkb/compat/README
+share/X11/xkb/compat/accessx
+share/X11/xkb/compat/basic
+share/X11/xkb/compat/caps
+share/X11/xkb/compat/complete
+share/X11/xkb/compat/default
+share/X11/xkb/compat/iso9995
+share/X11/xkb/compat/japan
+share/X11/xkb/compat/keypad
+share/X11/xkb/compat/ledcaps
+share/X11/xkb/compat/lednum
+share/X11/xkb/compat/ledscroll
+share/X11/xkb/compat/level5
+share/X11/xkb/compat/misc
+share/X11/xkb/compat/mousekeys
+share/X11/xkb/compat/norepeat
+share/X11/xkb/compat/olpc
+share/X11/xkb/compat/pc
+share/X11/xkb/compat/pc98
+share/X11/xkb/compat/xfree86
+share/X11/xkb/compat/xtest
+share/X11/xkb/compiled
+share/X11/xkb/geometry.dir
+share/X11/xkb/geometry/README
+share/X11/xkb/geometry/amiga
+share/X11/xkb/geometry/ataritt
+share/X11/xkb/geometry/chicony
+share/X11/xkb/geometry/dell
+share/X11/xkb/geometry/digital_vndr/lk
+share/X11/xkb/geometry/digital_vndr/pc
+share/X11/xkb/geometry/digital_vndr/unix
+share/X11/xkb/geometry/everex
+share/X11/xkb/geometry/fujitsu
+share/X11/xkb/geometry/hhk
+share/X11/xkb/geometry/hp
+share/X11/xkb/geometry/keytronic
+share/X11/xkb/geometry/kinesis
+share/X11/xkb/geometry/macintosh
+share/X11/xkb/geometry/microsoft
+share/X11/xkb/geometry/nec
+share/X11/xkb/geometry/nokia
+share/X11/xkb/geometry/northgate
+share/X11/xkb/geometry/pc
+share/X11/xkb/geometry/sanwa
+share/X11/xkb/geometry/sgi_vndr/O2
+share/X11/xkb/geometry/sgi_vndr/indigo
+share/X11/xkb/geometry/sgi_vndr/indy
+share/X11/xkb/geometry/sony
+share/X11/xkb/geometry/sun
+share/X11/xkb/geometry/thinkpad
+share/X11/xkb/geometry/typematrix
+share/X11/xkb/geometry/winbook
+share/X11/xkb/keycodes.dir
+share/X11/xkb/keycodes/README
+share/X11/xkb/keycodes/aliases
+share/X11/xkb/keycodes/amiga
+share/X11/xkb/keycodes/ataritt
+share/X11/xkb/keycodes/digital_vndr/lk
+share/X11/xkb/keycodes/digital_vndr/pc
+share/X11/xkb/keycodes/empty
+share/X11/xkb/keycodes/evdev
+share/X11/xkb/keycodes/fujitsu
+share/X11/xkb/keycodes/hp
+share/X11/xkb/keycodes/ibm
+share/X11/xkb/keycodes/macintosh
+share/X11/xkb/keycodes/sgi_vndr/indigo
+share/X11/xkb/keycodes/sgi_vndr/indy
+share/X11/xkb/keycodes/sgi_vndr/iris
+share/X11/xkb/keycodes/sony
+share/X11/xkb/keycodes/sun
+share/X11/xkb/keycodes/xfree86
+share/X11/xkb/keycodes/xfree98
+share/X11/xkb/keymap.dir
+share/X11/xkb/keymap/README
+share/X11/xkb/keymap/amiga
+share/X11/xkb/keymap/ataritt
+share/X11/xkb/keymap/digital_vndr/us
+share/X11/xkb/keymap/macintosh
+share/X11/xkb/keymap/sgi_vndr/be
+share/X11/xkb/keymap/sgi_vndr/bg
+share/X11/xkb/keymap/sgi_vndr/ca
+share/X11/xkb/keymap/sgi_vndr/ch
+share/X11/xkb/keymap/sgi_vndr/cz
+share/X11/xkb/keymap/sgi_vndr/de
+share/X11/xkb/keymap/sgi_vndr/dk
+share/X11/xkb/keymap/sgi_vndr/dvorak
+share/X11/xkb/keymap/sgi_vndr/es
+share/X11/xkb/keymap/sgi_vndr/fi
+share/X11/xkb/keymap/sgi_vndr/fr
+share/X11/xkb/keymap/sgi_vndr/gb
+share/X11/xkb/keymap/sgi_vndr/hu
+share/X11/xkb/keymap/sgi_vndr/it
+share/X11/xkb/keymap/sgi_vndr/jp
+share/X11/xkb/keymap/sgi_vndr/no
+share/X11/xkb/keymap/sgi_vndr/pl
+share/X11/xkb/keymap/sgi_vndr/pt
+share/X11/xkb/keymap/sgi_vndr/ru
+share/X11/xkb/keymap/sgi_vndr/se
+share/X11/xkb/keymap/sgi_vndr/sk
+share/X11/xkb/keymap/sgi_vndr/th
+share/X11/xkb/keymap/sgi_vndr/us
+share/X11/xkb/keymap/sony
+share/X11/xkb/keymap/sun_vndr/all
+share/X11/xkb/keymap/sun_vndr/de
+share/X11/xkb/keymap/sun_vndr/es
+share/X11/xkb/keymap/sun_vndr/fi
+share/X11/xkb/keymap/sun_vndr/fr
+share/X11/xkb/keymap/sun_vndr/no
+share/X11/xkb/keymap/sun_vndr/pl
+share/X11/xkb/keymap/sun_vndr/ru
+share/X11/xkb/keymap/sun_vndr/se
+share/X11/xkb/keymap/sun_vndr/uk
+share/X11/xkb/keymap/sun_vndr/us
+share/X11/xkb/keymap/xfree86
+share/X11/xkb/keymap/xfree98
+share/X11/xkb/rules/README
+share/X11/xkb/rules/base
+share/X11/xkb/rules/base.extras.xml
+share/X11/xkb/rules/base.lst
+share/X11/xkb/rules/base.xml
+share/X11/xkb/rules/evdev
+share/X11/xkb/rules/evdev.extras.xml
+share/X11/xkb/rules/evdev.lst
+share/X11/xkb/rules/evdev.xml
+share/X11/xkb/rules/xfree98
+share/X11/xkb/rules/xkb.dtd
+share/X11/xkb/rules/xorg
+share/X11/xkb/rules/xorg.lst
+share/X11/xkb/rules/xorg.xml
+share/X11/xkb/semantics.dir
+share/X11/xkb/semantics/basic
+share/X11/xkb/semantics/complete
+share/X11/xkb/semantics/default
+share/X11/xkb/semantics/xtest
+share/X11/xkb/symbols.dir
+share/X11/xkb/symbols/ad
+share/X11/xkb/symbols/af
+share/X11/xkb/symbols/al
+share/X11/xkb/symbols/altwin
+share/X11/xkb/symbols/am
+share/X11/xkb/symbols/apl
+share/X11/xkb/symbols/ara
+share/X11/xkb/symbols/at
+share/X11/xkb/symbols/az
+share/X11/xkb/symbols/ba
+share/X11/xkb/symbols/bd
+share/X11/xkb/symbols/be
+share/X11/xkb/symbols/bg
+share/X11/xkb/symbols/br
+share/X11/xkb/symbols/brai
+share/X11/xkb/symbols/bt
+share/X11/xkb/symbols/bw
+share/X11/xkb/symbols/by
+share/X11/xkb/symbols/ca
+share/X11/xkb/symbols/capslock
+share/X11/xkb/symbols/cd
+share/X11/xkb/symbols/ch
+share/X11/xkb/symbols/cm
+share/X11/xkb/symbols/cn
+share/X11/xkb/symbols/compose
+share/X11/xkb/symbols/ctrl
+share/X11/xkb/symbols/cz
+share/X11/xkb/symbols/de
+share/X11/xkb/symbols/digital_vndr/lk
+share/X11/xkb/symbols/digital_vndr/pc
+share/X11/xkb/symbols/digital_vndr/us
+share/X11/xkb/symbols/digital_vndr/vt
+share/X11/xkb/symbols/dk
+share/X11/xkb/symbols/ee
+share/X11/xkb/symbols/empty
+share/X11/xkb/symbols/epo
+share/X11/xkb/symbols/es
+share/X11/xkb/symbols/et
+share/X11/xkb/symbols/eurosign
+share/X11/xkb/symbols/fi
+share/X11/xkb/symbols/fo
+share/X11/xkb/symbols/fr
+share/X11/xkb/symbols/fujitsu_vndr/jp
+share/X11/xkb/symbols/fujitsu_vndr/us
+share/X11/xkb/symbols/gb
+share/X11/xkb/symbols/ge
+share/X11/xkb/symbols/gh
+share/X11/xkb/symbols/gn
+share/X11/xkb/symbols/gr
+share/X11/xkb/symbols/group
+share/X11/xkb/symbols/hp_vndr/us
+share/X11/xkb/symbols/hr
+share/X11/xkb/symbols/hu
+share/X11/xkb/symbols/ie
+share/X11/xkb/symbols/il
+share/X11/xkb/symbols/in
+share/X11/xkb/symbols/inet
+share/X11/xkb/symbols/iq
+share/X11/xkb/symbols/ir
+share/X11/xkb/symbols/is
+share/X11/xkb/symbols/it
+share/X11/xkb/symbols/jp
+share/X11/xkb/symbols/ke
+share/X11/xkb/symbols/keypad
+share/X11/xkb/symbols/kg
+share/X11/xkb/symbols/kh
+share/X11/xkb/symbols/kpdl
+share/X11/xkb/symbols/kr
+share/X11/xkb/symbols/kz
+share/X11/xkb/symbols/la
+share/X11/xkb/symbols/latam
+share/X11/xkb/symbols/latin
+share/X11/xkb/symbols/level3
+share/X11/xkb/symbols/level5
+share/X11/xkb/symbols/lk
+share/X11/xkb/symbols/lt
+share/X11/xkb/symbols/lv
+share/X11/xkb/symbols/ma
+share/X11/xkb/symbols/macintosh_vndr/apple
+share/X11/xkb/symbols/macintosh_vndr/ch
+share/X11/xkb/symbols/macintosh_vndr/de
+share/X11/xkb/symbols/macintosh_vndr/dk
+share/X11/xkb/symbols/macintosh_vndr/fi
+share/X11/xkb/symbols/macintosh_vndr/fr
+share/X11/xkb/symbols/macintosh_vndr/gb
+share/X11/xkb/symbols/macintosh_vndr/is
+share/X11/xkb/symbols/macintosh_vndr/it
+share/X11/xkb/symbols/macintosh_vndr/jp
+share/X11/xkb/symbols/macintosh_vndr/latam
+share/X11/xkb/symbols/macintosh_vndr/nl
+share/X11/xkb/symbols/macintosh_vndr/no
+share/X11/xkb/symbols/macintosh_vndr/pt
+share/X11/xkb/symbols/macintosh_vndr/se
+share/X11/xkb/symbols/macintosh_vndr/us
+share/X11/xkb/symbols/mao
+share/X11/xkb/symbols/me
+share/X11/xkb/symbols/mk
+share/X11/xkb/symbols/ml
+share/X11/xkb/symbols/mm
+share/X11/xkb/symbols/mn
+share/X11/xkb/symbols/mt
+share/X11/xkb/symbols/mv
+share/X11/xkb/symbols/nbsp
+share/X11/xkb/symbols/nec_vndr/jp
+share/X11/xkb/symbols/ng
+share/X11/xkb/symbols/nl
+share/X11/xkb/symbols/no
+share/X11/xkb/symbols/nokia_vndr/rx-44
+share/X11/xkb/symbols/nokia_vndr/rx-51
+share/X11/xkb/symbols/nokia_vndr/su-8w
+share/X11/xkb/symbols/np
+share/X11/xkb/symbols/olpc
+share/X11/xkb/symbols/pc
+share/X11/xkb/symbols/ph
+share/X11/xkb/symbols/pk
+share/X11/xkb/symbols/pl
+share/X11/xkb/symbols/pt
+share/X11/xkb/symbols/ro
+share/X11/xkb/symbols/rs
+share/X11/xkb/symbols/ru
+share/X11/xkb/symbols/rupeesign
+share/X11/xkb/symbols/se
+share/X11/xkb/symbols/sgi_vndr/jp
+share/X11/xkb/symbols/shift
+share/X11/xkb/symbols/si
+share/X11/xkb/symbols/sk
+share/X11/xkb/symbols/sn
+share/X11/xkb/symbols/sony_vndr/us
+share/X11/xkb/symbols/srvr_ctrl
+share/X11/xkb/symbols/sun_vndr/ara
+share/X11/xkb/symbols/sun_vndr/be
+share/X11/xkb/symbols/sun_vndr/br
+share/X11/xkb/symbols/sun_vndr/ca
+share/X11/xkb/symbols/sun_vndr/ch
+share/X11/xkb/symbols/sun_vndr/cz
+share/X11/xkb/symbols/sun_vndr/de
+share/X11/xkb/symbols/sun_vndr/dk
+share/X11/xkb/symbols/sun_vndr/ee
+share/X11/xkb/symbols/sun_vndr/es
+share/X11/xkb/symbols/sun_vndr/fi
+share/X11/xkb/symbols/sun_vndr/fr
+share/X11/xkb/symbols/sun_vndr/gb
+share/X11/xkb/symbols/sun_vndr/gr
+share/X11/xkb/symbols/sun_vndr/it
+share/X11/xkb/symbols/sun_vndr/jp
+share/X11/xkb/symbols/sun_vndr/kr
+share/X11/xkb/symbols/sun_vndr/lt
+share/X11/xkb/symbols/sun_vndr/lv
+share/X11/xkb/symbols/sun_vndr/nl
+share/X11/xkb/symbols/sun_vndr/no
+share/X11/xkb/symbols/sun_vndr/pl
+share/X11/xkb/symbols/sun_vndr/pt
+share/X11/xkb/symbols/sun_vndr/ro
+share/X11/xkb/symbols/sun_vndr/ru
+share/X11/xkb/symbols/sun_vndr/se
+share/X11/xkb/symbols/sun_vndr/sk
+share/X11/xkb/symbols/sun_vndr/solaris
+share/X11/xkb/symbols/sun_vndr/tr
+share/X11/xkb/symbols/sun_vndr/tuv
+share/X11/xkb/symbols/sun_vndr/tw
+share/X11/xkb/symbols/sun_vndr/ua
+share/X11/xkb/symbols/sun_vndr/us
+share/X11/xkb/symbols/sy
+share/X11/xkb/symbols/terminate
+share/X11/xkb/symbols/th
+share/X11/xkb/symbols/tj
+share/X11/xkb/symbols/tm
+share/X11/xkb/symbols/tr
+share/X11/xkb/symbols/tw
+share/X11/xkb/symbols/typo
+share/X11/xkb/symbols/tz
+share/X11/xkb/symbols/ua
+share/X11/xkb/symbols/us
+share/X11/xkb/symbols/uz
+share/X11/xkb/symbols/vn
+share/X11/xkb/symbols/xfree68_vndr/amiga
+share/X11/xkb/symbols/xfree68_vndr/ataritt
+share/X11/xkb/symbols/za
+share/X11/xkb/types.dir
+share/X11/xkb/types/README
+share/X11/xkb/types/basic
+share/X11/xkb/types/cancel
+share/X11/xkb/types/caps
+share/X11/xkb/types/complete
+share/X11/xkb/types/default
+share/X11/xkb/types/extra
+share/X11/xkb/types/iso9995
+share/X11/xkb/types/level5
+share/X11/xkb/types/mousekeys
+share/X11/xkb/types/nokia
+share/X11/xkb/types/numpad
+share/X11/xkb/types/pc
+%%NLS%%share/locale/af/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/az/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/crh/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/ky/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/rw
+%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ky
+%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
+@exec mkdir -p /var/lib/xkb
+@dirrmtry share/locale/crh
+@dirrm share/X11/xkb/types
+@dirrm share/X11/xkb/symbols/xfree68_vndr
+@dirrm share/X11/xkb/symbols/sun_vndr
+@dirrm share/X11/xkb/symbols/sony_vndr
+@dirrm share/X11/xkb/symbols/sgi_vndr
+@dirrm share/X11/xkb/symbols/nokia_vndr
+@dirrm share/X11/xkb/symbols/nec_vndr
+@dirrm share/X11/xkb/symbols/macintosh_vndr
+@dirrm share/X11/xkb/symbols/hp_vndr
+@dirrm share/X11/xkb/symbols/fujitsu_vndr
+@dirrm share/X11/xkb/symbols/digital_vndr
+@dirrm share/X11/xkb/symbols
+@dirrm share/X11/xkb/semantics
+@dirrm share/X11/xkb/rules
+@dirrm share/X11/xkb/keymap/sun_vndr
+@dirrm share/X11/xkb/keymap/sgi_vndr
+@dirrm share/X11/xkb/keymap/digital_vndr
+@dirrm share/X11/xkb/keymap
+@dirrm share/X11/xkb/keycodes/sgi_vndr
+@dirrm share/X11/xkb/keycodes/digital_vndr
+@dirrm share/X11/xkb/keycodes
+@dirrm share/X11/xkb/geometry/sgi_vndr
+@dirrm share/X11/xkb/geometry/digital_vndr
+@dirrm share/X11/xkb/geometry
+@dirrm share/X11/xkb/compat
+@dirrm share/X11/xkb
+@dirrmtry share/X11
+@dirrmtry var/lib/xkb