- Please welcome Xorg 7.5.2

The Xorg Team is pleased to announce the next round of Xorg updates. The team created a new flag called WITH_NEW_XORG that users can include in /etc/make.conf. This was created for the intel KMS work being done althouthough It probably works for other chips. Unfortunately, the intel KMS driver will only work on FreeBSD 9(RELENG|STABLE) or 10/HEAD users. Older version of FreeBSD will not be supported. Intel users will need to patch their source manually with Konstantin?s KMS kernel patch to get the newer chips to work. Please carefully read UPDATING entry. Changes: - libdrm 2.4.31 (including KMS support) - mesa 7.11.2 - xorg-server 1.10.6 - a lot of new Graphic Drivers. I would like to thank: Koop Mast Eitan Adler Niclas Zeising and all helpers and testers from x11@.
author: miwi <miwi@FreeBSD.org> 2012-04-22 01:03:32 +0800
committer: miwi <miwi@FreeBSD.org> 2012-04-22 01:03:32 +0800
commit: 8610de7ebcb688f7c822933cf96ecea22af9d9ac (patch)
tree: 58b95feaf2cd439308ad5db219bea76198f6e316
parent: 074f8111429b0ad96ac33c0e038ffb0e7ed50b11 (diff)
download: freebsd-ports-gnome-8610de7ebcb688f7c822933cf96ecea22af9d9ac.tar.gz
freebsd-ports-gnome-8610de7ebcb688f7c822933cf96ecea22af9d9ac.tar.zst
freebsd-ports-gnome-8610de7ebcb688f7c822933cf96ecea22af9d9ac.zip
187 files changed, 1027 insertions, 738 deletions
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk
index 2457de67935b..509144ffb339 100644
--- a/Mk/bsd.xorg.mk
+++ b/Mk/bsd.xorg.mk
@@ -141,6 +141,10 @@ USE_XORG+=	pciaccess
 
 .endif
 
+.if exists(${LOCALBASE}/bin/X)
+XSERVER_VER=	${LOCALBASE}/bin/X -version 2>&1 | sed -n 's;^X\.Org X Server \([^ ]*\).*;\1;p'
+.endif
+
 .if defined(_POSTMKINCLUDED) && !defined(Xorg_Post_Include)
 
 Xorg_Post_Include=		bsd.xorg.mk
diff --git a/UPDATING b/UPDATING
index a94a8bec5e1c..a70056c975ab 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,18 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20120421:
+  AFFECTS: users of x11/xorg
+  AUTHOR: x11@FreeBSD.org
+
+  The default mesa has been updated to 7.6.1 and the default xorg-server to 1.7.7.
+  A switch is available for people that want to use  mesa 7.11.x and xorg-server
+  1.10.6. This requires an nvidia card or Intel+KMS support. If you have an intel
+  card and can try these experimental KMS support patches: 10/head with a
+  patch: http://people.freebsd.org/~kib/drm/
+  FreeBSD stable/9 and releng/9.0
+  http://lists.freebsd.org/pipermail/freebsd-x11/2012-April/011640.html
+
 20120419:
   AFFECTS: users of security/openssl
   AUTHOR: dinoex@FreeBSD.org
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 6678c0ab875d..922c37e5f3ab 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -14,17 +14,9 @@ COMMENT=	OpenGL hardware acceleration drivers for the DRI
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
 		expat.6:${PORTSDIR}/textproc/expat2
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
-
-CONFLICTS=	dri-6.2.2005* dri-6.5.2006*
-MAKE_JOBS_UNSAFE=	yes
 
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
 
-EXTRA_PATCHES+=	${FILESDIR}/patch-mach64_context.h \
-		${FILESDIR}/patch-sis_context.h
-
-
 do-install:
 	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
 
diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo
index 18c51665b5c4..106ab0bf5805 100644
--- a/graphics/dri/distinfo
+++ b/graphics/dri/distinfo
@@ -1,4 +1,4 @@
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
 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-plist b/graphics/dri/pkg-plist
index 8a12d059e36b..00253838e40b 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -4,10 +4,11 @@ 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
-%%MESALIB76%%lib/dri/r600_dri.so
+lib/dri/r600_dri.so
 lib/dri/radeon_dri.so
 lib/dri/savage_dri.so
 lib/dri/sis_dri.so
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
index 02c3a88ee543..f3f054a1a859 100644
--- a/graphics/libGL/Makefile
+++ b/graphics/libGL/Makefile
@@ -11,7 +11,6 @@ CATEGORIES=	graphics
 
 COMMENT=	OpenGL library that renders using GLX or DRI
 
-BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend
 LIB_DEPENDS+=	drm:${PORTSDIR}/graphics/libdrm \
 		expat.6:${PORTSDIR}/textproc/expat2
 
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index 92419cfde5f8..c01d7f4752d5 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -21,50 +21,57 @@
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
-.ifdef	WITHOUT_NOUVEAU
-MESABASEVERSION=	7.6.1
-MESASUBVERSION=
-PLIST_SUB+=		MESALIB76= MESALIB74="@comment "
+.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.4.4
-MESASUBVERSION=
-PLIST_SUB+=		MESALIB74= MESALIB76="@comment "
-EXTRA_PATCHES+=		${PATCHDIR}/mesalib74-configure
+MESABASEVERSION=	7.6.1
+MESASUBVERSION=		
+PLIST_SUB+=	OLD="" NEW="@comment "
 .endif
 
-MASTER_SITES?=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut,demos
-MASTER_SITE_SUBDIR=	mesa3d
-DISTFILES=		MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
+MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
+DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
 MAINTAINER?=	x11@FreeBSD.org
 
-USE_BZIP2=		yes
-USE_GMAKE=		yes
+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=	--disable-gallium
+CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \
+		--disable-egl
 
-ALL_TARGET=		default
+.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
 
-#MAKE_ARGS=		SHELL=${SH}
-#CFLAGS+=		-DUSE_XSHM -DHZ=100
+ALL_TARGET=		default
 
 PATCHDIR=		${.CURDIR}/../../graphics/libGL/files
-WRKSRC=			${WRKDIR}/Mesa-${MESABASEVERSION}
+WRKSRC=			${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
 
 .if !defined(ARCH)
 ARCH!=			uname -p
 .endif
 
-.if ${ARCH} == alpha
-FAST_MATH=
-.else
-FAST_MATH=      -ffast-math
-.endif
-
 COMPONENT=		${PORTNAME:L:C/^lib//:C/mesa-//}
 
 .if ${COMPONENT:Mglut} == ""
@@ -83,13 +90,6 @@ CONFIGURE_ARGS+=	--disable-glw
 CONFIGURE_ARGS+=	--enable-motif
 .endif
 
-.if ${COMPONENT:Mdemos} == ""
-CONFIGURE_ARGS+=	--with-demos=no
-.else
-DISTFILES+=		MesaDemos-${MESADISTVERSION}${EXTRACT_SUFX}:demos
-CONFIGURE_ARGS+=	--with-demos=demos,xdemos
-.endif
-
 .if ${COMPONENT:Mdri} == ""
 CONFIGURE_ARGS+=	--with-dri-drivers=no
 .endif
@@ -112,10 +112,3 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/src/glut/glx/Makefile
 .endif
-.if ${COMPONENT:Mdemos} != ""
-	@${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
-.endif
diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo
index 18c51665b5c4..106ab0bf5805 100644
--- a/graphics/libGL/distinfo
+++ b/graphics/libGL/distinfo
@@ -1,4 +1,4 @@
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
 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/files/patch-mach64_context.h b/graphics/libGL/files/extra-mach64_context.h
index 90fe99b3f1c7..f844599bfa68 100644
--- a/graphics/dri/files/patch-mach64_context.h
+++ b/graphics/libGL/files/extra-mach64_context.h
@@ -1,6 +1,6 @@
---- src/mesa/drivers/dri/mach64/mach64_context.h.orig	2009-01-21 10:55:48.000000000 -0500
-+++ src/mesa/drivers/dri/mach64/mach64_context.h	2009-01-22 13:48:00.000000000 -0500
-@@ -288,17 +288,20 @@
+--- 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
   */
@@ -9,19 +9,13 @@
  #define LE32_IN( x )		( *(GLuint *)(x) )
  #define LE32_IN_FLOAT( x )	( *(GLfloat *)(x) )
  #define LE32_OUT( x, y )	do { *(GLuint *)(x) = (y); } while (0)
- #define LE32_OUT_FLOAT( x, y )	do { *(GLfloat *)(x) = (y); } while (0)
- #else
--#ifndef __OpenBSD__
--#include <byteswap.h>
--#else
-+#if defined(__OpenBSD__)
+@@ -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>
+ #else
+ #include <byteswap.h>
  #endif
- 
- #define LE32_IN( x )		bswap_32( *(GLuint *)(x) )
diff --git a/graphics/dri/files/patch-sis_context.h b/graphics/libGL/files/extra-sis_context.h
index 3152e2db0f7d..0e16f51c0a10 100644
--- a/graphics/dri/files/patch-sis_context.h
+++ b/graphics/libGL/files/extra-sis_context.h
@@ -1,13 +1,11 @@
---- src/mesa/drivers/dri/sis/sis_context.h.orig	2008-09-22 13:38:53.000000000 +0100
-+++ src/mesa/drivers/dri/sis/sis_context.h	2008-09-22 13:40:51.000000000 +0100
-@@ -401,10 +401,20 @@
+--- 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(__alpha__)
-+#define MMIO_WMB()	__asm __volatile("wmb" : : : "memory")
-+#elif defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
  #define MMIO_WMB()	__asm __volatile("" : : : "memory")
  #elif defined(__ia64__)
  #define MMIO_WMB()	__asm __volatile("mf" : : : "memory")
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 000000000000..8df40432dfc9
--- /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/patch-src__mesa__x86-64__glapi_x86-64.S b/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S
index 908a6fe300aa..908a6fe300aa 100644
--- a/graphics/libGL/files/patch-src__mesa__x86-64__glapi_x86-64.S
+++ b/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S
diff --git a/graphics/libGL/files/patch-src__mesa__x86-64__xform4.S b/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S
index 193e6cc30fbe..193e6cc30fbe 100644
--- a/graphics/libGL/files/patch-src__mesa__x86-64__xform4.S
+++ b/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S
diff --git a/graphics/libGL/files/patch-src__mesa__x86__glapi_x86.S b/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S
index 71da78c83ffd..71da78c83ffd 100644
--- a/graphics/libGL/files/patch-src__mesa__x86__glapi_x86.S
+++ b/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S
diff --git a/graphics/libGL/files/patch-src__mesa__x86__read_rgba_span_x86.S b/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S
index 37b08d1cda3c..37b08d1cda3c 100644
--- a/graphics/libGL/files/patch-src__mesa__x86__read_rgba_span_x86.S
+++ b/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S
diff --git a/graphics/libGL/files/mesalib74-configure b/graphics/libGL/files/mesalib74-configure
deleted file mode 100644
index af45b71f21c3..000000000000
--- a/graphics/libGL/files/mesalib74-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2009-03-28 00:59:46.000000000 +0000
-+++ configure	2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
-     ;;
- *freebsd* | dragonfly*)
-     case "$host_cpu" in
--    i*86|x86_64) default_driver="dri";;
-+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
-     esac
-     ;;
- esac
diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist
index b07eac0fa6cd..4125f7491219 100644
--- a/graphics/libGL/pkg-plist
+++ b/graphics/libGL/pkg-plist
@@ -1,5 +1,5 @@
-include/GL/dmesa.h
-include/GL/ggimesa.h
+%%OLD%%include/GL/dmesa.h
+%%OLD%%include/GL/ggimesa.h
 include/GL/gl.h
 include/GL/gl_mangle.h
 include/GL/glext.h
@@ -8,11 +8,11 @@ include/GL/glx.h
 include/GL/glx_mangle.h
 include/GL/glxext.h
 include/GL/mesa_wgl.h
-include/GL/mglmesa.h
+%%OLD%%include/GL/mglmesa.h
 include/GL/osmesa.h
-include/GL/svgamesa.h
+%%OLD%%include/GL/svgamesa.h
 include/GL/vms_x_fix.h
-%%MESALIB76%%include/GL/wglext.h
+include/GL/wglext.h
 include/GL/wmesa.h
 lib/libGL.so
 lib/libGL.so.1
diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
index b39ab7574fe5..0a199266ade3 100644
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@@ -15,6 +15,7 @@ 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
diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo
index 18c51665b5c4..106ab0bf5805 100644
--- a/graphics/libGLU/distinfo
+++ b/graphics/libGLU/distinfo
@@ -1,4 +1,4 @@
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
 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/Makefile b/graphics/libGLw/Makefile
index f0501392fa9d..4c9f14d0481f 100644
--- a/graphics/libGLw/Makefile
+++ b/graphics/libGLw/Makefile
@@ -7,13 +7,10 @@
 
 PORTNAME=	libGLw
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL widgets library
 
-BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend
-
 USE_GL=		gl
 USE_MOTIF=	yes
 USE_XORG=	glproto xt x11 xext xxf86vm xdamage xfixes dri2proto
diff --git a/graphics/libGLw/distinfo b/graphics/libGLw/distinfo
index 18c51665b5c4..106ab0bf5805 100644
--- a/graphics/libGLw/distinfo
+++ b/graphics/libGLw/distinfo
@@ -1,4 +1,4 @@
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
 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/libdrm/Makefile b/graphics/libdrm/Makefile
index 823d49d21513..4a0b85f9f601 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdrm
 PORTVERSION=	${LIBDRM_VERSION}
-PORTREVISION=	1
+PORTREVISION=	${LIBDRM_REVISION}
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://dri.freedesktop.org/libdrm/
 
@@ -15,29 +15,44 @@ 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
 
-.include <bsd.port.pre.mk>
+.if defined(WITH_NEW_XORG)
 
-.if defined(WITHOUT_NOUVEAU)
-LIBDRM_VERSION=	2.4.17
-CONFIGURE_ARGS=	--disable-nouveau-experimental-api \
-		--disable-radeon-experimental-api
-PLIST_SUB+=	NEW= OLD="@comment "
+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
-LIBDRM_VERSION=	2.4.12
-CONFIGURE_ARGS=	--enable-nouveau-experimental-api
-PLIST_SUB+=	OLD= NEW="@comment "
+PLIST_SUB+=	KMS="@comment "
+.endif
+
+LIBDRM_VERSION=	2.4.31
+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
+	@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g; \
+			   12661s/x86_/amd/g' \
+		${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo
index 27276eacad60..df36a538eeed 100644
--- a/graphics/libdrm/distinfo
+++ b/graphics/libdrm/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libdrm-2.4.12.tar.bz2) = 89e3b16aff13c5219d13b08f9143793f74777b752d87c760ec6e52fb8676bd31
-SIZE (libdrm-2.4.12.tar.bz2) = 414175
 SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
 SIZE (libdrm-2.4.17.tar.bz2) = 408882
+SHA256 (libdrm-2.4.31.tar.bz2) = 8fc7e0e5b2f9bf493447a4ef7adc49174a700824457774cb53c1b8f2da866af4
+SIZE (libdrm-2.4.31.tar.bz2) = 475677
diff --git a/graphics/libdrm/files/extra-xf86drmMode.c b/graphics/libdrm/files/extra-xf86drmMode.c
new file mode 100644
index 000000000000..d91a92300735
--- /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-plist b/graphics/libdrm/pkg-plist
index fbbc18607eca..5cef834e71f0 100644
--- a/graphics/libdrm/pkg-plist
+++ b/graphics/libdrm/pkg-plist
@@ -1,28 +1,53 @@
-include/drm/drm.h
-include/drm/drm_mode.h
-include/drm/drm_sarea.h
-include/drm/i915_drm.h
-include/drm/mach64_drm.h
-include/drm/mga_drm.h
-include/drm/nouveau_drm.h
+%%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
-include/drm/r128_drm.h
-%%OLD%%include/drm/r300_reg.h
-include/drm/radeon_drm.h
-include/drm/savage_drm.h
-include/drm/sis_drm.h
-%%OLD%%include/drm/via_3d_reg.h
-include/drm/via_drm.h
-%%OLD%%include/drm/xgi_drm.h
-include/intel_bufmgr.h
-%%OLD%%include/nouveau/nouveau_bo.h
-%%OLD%%include/nouveau/nouveau_channel.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/r600_pci_ids.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/radeon_surface.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
-%%OLD%%include/nouveau/nouveau_device.h
-%%OLD%%include/nouveau/nouveau_grobj.h
-%%OLD%%include/nouveau/nouveau_notifier.h
-%%OLD%%include/nouveau/nouveau_pushbuf.h
-%%OLD%%include/nouveau/nouveau_resource.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
@@ -31,11 +56,21 @@ lib/libdrm.so.2
 lib/libdrm_intel.la
 lib/libdrm_intel.so
 lib/libdrm_intel.so.1
-%%OLD%%lib/libdrm_nouveau.la
-%%OLD%%lib/libdrm_nouveau.so
-%%OLD%%lib/libdrm_nouveau.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
-%%OLD%%libdata/pkgconfig/libdrm_nouveau.pc
-@dirrm include/drm
-%%OLD%%@dirrm include/nouveau
+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
index 372b6e65ddd7..1d55cf44ab4b 100644
--- a/graphics/libglut/Makefile
+++ b/graphics/libglut/Makefile
@@ -12,14 +12,12 @@ CATEGORIES=	graphics
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL utility toolkit
 
-CONFLICTS=	freeglut-[0-9]*
-
 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 \
+		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${WRKSRC}/include/GL/glutf90.h \
 		${PREFIX}/include/GL
 
diff --git a/graphics/libglut/distinfo b/graphics/libglut/distinfo
index 5f61c6018253..6726d9c68d98 100644
--- a/graphics/libglut/distinfo
+++ b/graphics/libglut/distinfo
@@ -1,8 +1,8 @@
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
-SHA256 (MesaGLUT-7.4.4.tar.bz2) = 66c9486d73061ffd8d17a05b6e62851fec575867a99ad8cfc6137c2c16848c2e
-SIZE (MesaGLUT-7.4.4.tar.bz2) = 328900
 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/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index f950531a3f72..1bceb961108a 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -5,25 +5,54 @@
 # $FreeBSD$
 #
 
-PORTNAME=	demos
-PORTVERSION=	${MESAVERSION}
+PORTNAME=	mesa-demos
+PORTVERSION=	7.6.1
 CATEGORIES=	graphics
-MASTER_SITES=	CRITICAL/mesa3d:mesa,glut,demos
-PKGNAMEPREFIX=	mesa-
+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
 
-EXTRA_PATCHES+=	${FILESDIR}/patch-progs-xdemos-glxpixmap.c \
-		${FILESDIR}/patch-progs-xdemos-yuvrect_client.c
+.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 \
@@ -45,13 +74,14 @@ do-install:
 			${INSTALL_DATA} $$i ${DATADIR}/data; \
 		done
 
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 .include <bsd.port.pre.mk>
-CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 
 .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
index 379a40cf7bcd..738047a00e75 100644
--- a/graphics/mesa-demos/distinfo
+++ b/graphics/mesa-demos/distinfo
@@ -1,7 +1,3 @@
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
-SHA256 (MesaDemos-7.4.4.tar.bz2) = 2b055f1b364795caec122092dedca9ac3ecce4fcf61947f52a286a681e9d1111
-SIZE (MesaDemos-7.4.4.tar.bz2) = 1367659
 SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
 SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
 SHA256 (MesaDemos-7.6.1.tar.bz2) = d2368fc86d032dc6478df70f99b114abdf6c0c1da57bf1d3927ab179876f9c4b
diff --git a/graphics/mesa-demos/files/config b/graphics/mesa-demos/files/config
deleted file mode 100644
index a46afa0e1d7c..000000000000
--- a/graphics/mesa-demos/files/config
+++ /dev/null
@@ -1,30 +0,0 @@
-# Configuration for mesa-demos port for FreeBSD
-# Taken from Mesa CVS mesa/Mesa/configs/freebsd Rev 1.2
-# $FreeBSD$
-#
-
-# Set and remember $CFLAGS, $CXXFLAGS, $CC and $CXX before they are
-# overriden in default include
-
-_CC := $(CC)
-_CXX := $(CXX)
-_CFLAGS := -fPIC -pedantic -I$(LOCALBASE)/include -DUSE_XSHM -DHZ=100 $(CFLAGS) \
-	-DPTHREADS $(PTHREAD_CFLAGS)
-_CXXFLAGS := -fPIC -pedantic $(CXXFLAGS)
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = FreeBSD
-
-# Now reset compiler and flags
-CC = $(_CC)
-CXX = $(_CXX)
-CFLAGS = $(_CFLAGS)
-CXXFLAGS = $(_CXXFLAGS)
-
-GLUT_CFLAGS = -fexceptions
-
-LIB_DIR = $(LOCALBASE)/lib
-
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm $(PTHREAD_LIBS)
-
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 000000000000..908a6fe300aa
--- /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 000000000000..193e6cc30fbe
--- /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 000000000000..71da78c83ffd
--- /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 000000000000..37b08d1cda3c
--- /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-plist b/graphics/mesa-demos/pkg-plist
index f72940389afe..e4cbf2e03458 100644
--- a/graphics/mesa-demos/pkg-plist
+++ b/graphics/mesa-demos/pkg-plist
@@ -6,11 +6,11 @@ bin/clearspd
 bin/copypix
 bin/corender
 bin/cubemap
-%%MESALIB76%%bin/dinoshade
+bin/dinoshade
 bin/drawpix
 bin/engine
 bin/fbo_firecube
-%%MESALIB76%%bin/fbotexture
+bin/fbotexture
 bin/fire
 bin/fogcoord
 bin/fplight
@@ -21,11 +21,9 @@ bin/gears
 bin/geartrain
 bin/glinfo
 bin/gloss
-%%MESALIB74%%bin/glslnoise
 bin/glsync
 bin/gltestperf
 bin/glthreads
-%%MESALIB74%%bin/glutfx
 bin/glxcontexts
 bin/glxdemo
 bin/glxgears
@@ -43,14 +41,14 @@ bin/lodbias
 bin/manywin
 bin/morph3d
 bin/multiarb
-%%MESALIB76%%bin/multictx
+bin/multictx
 bin/offset
 bin/overlay
 bin/paltex
 bin/pbdemo
 bin/pbinfo
 bin/pointblast
-%%MESALIB76%%bin/projtex
+bin/projtex
 bin/rain
 bin/ray
 bin/readpix
@@ -58,21 +56,18 @@ bin/reflect
 bin/renormal
 bin/shadowtex
 bin/sharedtex
-%%MESALIB76%%bin/sharedtex_mt
+bin/sharedtex_mt
 bin/singlebuffer
 bin/spectex
 bin/spriteblast
 bin/stex3d
-%%MESALIB74%%bin/streaming_rect
 bin/teapot
 bin/terrain
 bin/tessdemo
 bin/texcyl
-%%MESALIB74%%bin/texdown
 bin/texenv
-%%MESALIB74%%bin/texobj
 bin/texture_from_pixmap
-%%MESALIB76%%bin/textures
+bin/textures
 bin/trispd
 bin/tunnel
 bin/tunnel2
diff --git a/x11-drivers/input-wacom/Makefile b/x11-drivers/input-wacom/Makefile
index ae156ceeb271..c03aedee0703 100644
--- a/x11-drivers/input-wacom/Makefile
+++ b/x11-drivers/input-wacom/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	input-wacom
 PORTVERSION=	${KLD_VERSION}.${WACOM_VERSION:C/-/./g}
+PORTREVISION=	1
 CATEGORIES=	x11-drivers kld
 MASTER_SITES=	http://www.chillt.de/bsdwacom/:bsdwacom \
 		SF/linuxwacom/xf86-input-wacom/:linuxwacom
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
index 6282853bd8e8..e73f065440a9 100644
--- a/x11-drivers/xf86-input-acecad/Makefile
+++ b/x11-drivers/xf86-input-acecad/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	xf86-input-acecad
-PORTVERSION=	1.4.0
-PORTREVISION=	1
+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
index f8024f3e80ad..4382553e2927 100644
--- a/x11-drivers/xf86-input-acecad/distinfo
+++ b/x11-drivers/xf86-input-acecad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 48341d8b6b0060228134b36543986c949ea828d6ce6d0484d29b3dde9ddbd556
-SIZE (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 255888
+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-egalax/Makefile b/x11-drivers/xf86-input-egalax/Makefile
index b58b18315b81..b0198f84acf3 100644
--- a/x11-drivers/xf86-input-egalax/Makefile
+++ b/x11-drivers/xf86-input-egalax/Makefile
@@ -24,4 +24,8 @@ MAN4=		egalax.4x
 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/pkg-descr b/x11-drivers/xf86-input-egalax/pkg-descr
index 2401073177fb..731bf6e2e577 100644
--- a/x11-drivers/xf86-input-egalax/pkg-descr
+++ b/x11-drivers/xf86-input-egalax/pkg-descr
@@ -1,3 +1 @@
 This package contains the X.Org xf86-input-egalax driver. See also uep(4).
-
-WWW:	http://home.eeti.com.tw/web20/eGalaxTouchDriver/linuxDriver.htm
diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile
index 48901c312f8c..fe1cdddfaf12 100644
--- a/x11-drivers/xf86-input-elographics/Makefile
+++ b/x11-drivers/xf86-input-elographics/Makefile
@@ -6,13 +6,23 @@
 #
 
 PORTNAME=	xf86-input-elographics
-PORTVERSION=	1.2.4
+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
index 8de17ce8f444..a609c5a2c28f 100644
--- a/x11-drivers/xf86-input-elographics/distinfo
+++ b/x11-drivers/xf86-input-elographics/distinfo
@@ -1,2 +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-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile
index 5a13b5284dc8..2f7b5c74d867 100644
--- a/x11-drivers/xf86-input-hyperpen/Makefile
+++ b/x11-drivers/xf86-input-hyperpen/Makefile
@@ -6,13 +6,25 @@
 #
 
 PORTNAME=	xf86-input-hyperpen
-PORTVERSION=	1.3.0
-PORTREVISION=	5
+PORTVERSION=	${HYPERVER}
+PORTREVISION=	${HYPERREVISION}
 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)
+HYPERVER=	1.4.1
+HYPERREVISION=	0
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
+
+.else
+HYPERVER=	1.3.0
+HYPERREVISION=	6
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-hyperpen/distinfo b/x11-drivers/xf86-input-hyperpen/distinfo
index bc159f51fc8b..7ccfb9b6d336 100644
--- a/x11-drivers/xf86-input-hyperpen/distinfo
+++ b/x11-drivers/xf86-input-hyperpen/distinfo
@@ -1,2 +1,4 @@
 SHA256 (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = e7a13a7597fa32f05d595d05a66cf94c529ba8ce1d03249bb9da5be9512c4b7b
 SIZE (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = 236593
+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/files/patch-src_xf86HyperPen.c b/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c
index 70713074b041..70713074b041 100644
--- a/x11-drivers/xf86-input-hyperpen/files/patch-src_xf86HyperPen.c
+++ b/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
index d533a872b1f9..94f2872da90b 100644
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -6,16 +6,25 @@
 #
 
 PORTNAME=	xf86-input-joystick
-PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTVERSION=	${JOYVER}
+PORTREVISION=	${JOYREVISION}
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org joystick input driver
 
 XORG_CAT=	driver
+USE_XORG=	xextproto videoproto
 MAN4=		joystick.4x
 
+.if defined(WITH_NEW_XORG)
+JOYVER=		1.6.0
+JOYREVISION=	0
+.else
+JOYVER=		1.5.0
+JOYREVISION=	1
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile.in
diff --git a/x11-drivers/xf86-input-joystick/distinfo b/x11-drivers/xf86-input-joystick/distinfo
index e76004102557..db447f9e87de 100644
--- a/x11-drivers/xf86-input-joystick/distinfo
+++ b/x11-drivers/xf86-input-joystick/distinfo
@@ -1,2 +1,4 @@
 SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
 SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
+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-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 1989427a0e9d..86be55c73da4 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	xf86-input-keyboard
-PORTVERSION=	1.5.0
+PORTVERSION=	1.6.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org keyboard input driver
 
 XORG_CAT=	driver
-USE_XORG=	kbproto
+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
index b484e1cdc0d7..f093391f0b88 100644
--- a/x11-drivers/xf86-input-keyboard/distinfo
+++ b/x11-drivers/xf86-input-keyboard/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-keyboard-1.5.0.tar.bz2) = 2303510e905465ebee91f22cdd75706a15afb108258bc220c7500f213de19cb0
-SIZE (xorg/driver/xf86-input-keyboard-1.5.0.tar.bz2) = 301181
+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-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile
index 29727d1ab69d..38eb7613b939 100644
--- a/x11-drivers/xf86-input-magictouch/Makefile
+++ b/x11-drivers/xf86-input-magictouch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-input-magictouch
 PORTVERSION=	1.0.0.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index 319e96c8dd86..8e1512a1d49e 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -6,13 +6,16 @@
 #
 
 PORTNAME=	xf86-input-mouse
-PORTVERSION=	1.6.0
+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
index d4f66bab3026..890cfcb50773 100644
--- a/x11-drivers/xf86-input-mouse/distinfo
+++ b/x11-drivers/xf86-input-mouse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-mouse-1.6.0.tar.bz2) = c7ae245e5168276346145f196d1d1faed618f41d5174a2031c71fab6e1a2fbdb
-SIZE (xorg/driver/xf86-input-mouse-1.6.0.tar.bz2) = 316953
+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-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile
index de568328ec74..adb94e60aaf8 100644
--- a/x11-drivers/xf86-input-mutouch/Makefile
+++ b/x11-drivers/xf86-input-mutouch/Makefile
@@ -6,14 +6,20 @@
 #
 
 PORTNAME=	xf86-input-mutouch
-PORTVERSION=	1.2.1
-PORTREVISION=	6
+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
index a1371bcf7c6c..1dceb72d17a2 100644
--- a/x11-drivers/xf86-input-mutouch/distinfo
+++ b/x11-drivers/xf86-input-mutouch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = 53bfe976042de69f87e28261ad581cf418c67b5cb69a09cfe1eea169021db35b
-SIZE (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = 246240
+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/files/patch-src_xf86MuTouch.c b/x11-drivers/xf86-input-mutouch/files/patch-src_xf86MuTouch.c
deleted file mode 100644
index 3ed8660d2323..000000000000
--- a/x11-drivers/xf86-input-mutouch/files/patch-src_xf86MuTouch.c
+++ /dev/null
@@ -1,70 +0,0 @@
---- src/xf86MuTouch.c.orig	2010-05-03 13:16:26.000000000 -0500
-+++ src/xf86MuTouch.c	2010-05-03 13:16:34.000000000 -0500
-@@ -426,9 +426,9 @@
- 	 * or we will feed X with quite bogus event positions.
- 	 */
-         if (priv->x_inverted)
--          cur_x = priv->max_x - cur_x;
-+          cur_x = priv->max_x - cur_x + priv->min_x;
-         if (priv->y_inverted)
--          cur_y = priv->max_y - cur_y;
-+          cur_y = priv->max_y - cur_y + priv->min_y;
- 	xf86PostMotionEvent(local_to_use->dev, TRUE, 0, 2, cur_x, cur_y);
- 
- 	/*
-@@ -749,6 +749,10 @@
-   unsigned char		req[MuT_PACKET_SIZE];
-   unsigned char		reply[MuT_BUFFER_SIZE];
-   char			*id_string = DEVICE_ID(local->private_flags) == FINGER_ID ? "finger" : "stylus";
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+  Atom btn_label;
-+  Atom axis_labels[2] = { 0, 0 };
-+#endif
- 
-   switch(mode) {
- 
-@@ -766,7 +770,11 @@
-       /*
-        * Device reports button press for up to 1 button.
-        */
--      if (InitButtonClassDeviceStruct(dev, 1, map) == FALSE) {
-+      if (InitButtonClassDeviceStruct(dev, 1,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+				      &btn_label,
-+#endif
-+				      map) == FALSE) {
- 	ErrorF("Unable to allocate ButtonClassDeviceStruct\n");
- 	return !Success;
-       }
-@@ -779,6 +787,9 @@
-        * screen to fit one meter.
-        */
-       if (InitValuatorClassDeviceStruct(dev, 2,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+				      axis_labels,
-+#endif
- #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
- 					xf86GetMotionEvents,
- #endif
-@@ -787,11 +798,19 @@
- 	return !Success;
-       }
-       else {
--	InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x,
-+	InitValuatorAxisStruct(dev, 0,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+			       axis_labels[0],
-+#endif
-+			       priv->min_x, priv->max_x,
- 			       9500,
- 			       0     /* min_res */,
- 			       9500  /* max_res */);
--	InitValuatorAxisStruct(dev, 1, priv->min_y, priv->max_y,
-+	InitValuatorAxisStruct(dev, 1,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+			       axis_labels[1],
-+#endif
-+			       priv->min_y, priv->max_y,
- 			       10500,
- 			       0     /* min_res */,
- 			       10500 /* max_res */);
diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile
index 90520a205175..5fdd36055de5 100644
--- a/x11-drivers/xf86-input-penmount/Makefile
+++ b/x11-drivers/xf86-input-penmount/Makefile
@@ -6,14 +6,23 @@
 #
 
 PORTNAME=	xf86-input-penmount
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+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
index 4a606598c2e5..0b6998d6f44c 100644
--- a/x11-drivers/xf86-input-penmount/distinfo
+++ b/x11-drivers/xf86-input-penmount/distinfo
@@ -1,2 +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
index 34eefd3b1b2b..ea15a1e1b21f 100644
--- a/x11-drivers/xf86-input-penmount/pkg-descr
+++ b/x11-drivers/xf86-input-penmount/pkg-descr
@@ -1 +1,4 @@
 This package contains the X.Org xf86-input-penmount driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index b251bd51b857..170f54620b7e 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-input-synaptics
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.5.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -15,8 +14,10 @@ COMMENT=	X.Org synaptics input driver
 
 CONFLICTS=	synaptics-[0-9]*
 
+LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+
 USE_GNOME=	gnomehack
-USE_XORG=	x11
+USE_XORG=	x11 xextproto videoproto
 XORG_CAT=	driver
 
 MAN1=		syndaemon.1 \
@@ -25,7 +26,13 @@ MAN4=		synaptics.4x
 
 post-install:
 	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
-	${INSTALL_DATA} ${WRKSRC}/fdi/11-x11-synaptics.fdi \
+	${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
index 1024acd5d444..21ece95f394e 100644
--- a/x11-drivers/xf86-input-synaptics/distinfo
+++ b/x11-drivers/xf86-input-synaptics/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6
-SIZE (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = 295524
+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-plist b/x11-drivers/xf86-input-synaptics/pkg-plist
index 7fa22678b658..4d1aec8680a1 100644
--- a/x11-drivers/xf86-input-synaptics/pkg-plist
+++ b/x11-drivers/xf86-input-synaptics/pkg-plist
@@ -5,7 +5,9 @@ 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
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
index 78cc5c02c74e..7bfac60c4a10 100644
--- a/x11-drivers/xf86-input-vmmouse/Makefile
+++ b/x11-drivers/xf86-input-vmmouse/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-input-vmmouse
 PORTVERSION=	12.6.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
index 530f563a8515..deea0dfbea7d 100644
--- a/x11-drivers/xf86-input-void/Makefile
+++ b/x11-drivers/xf86-input-void/Makefile
@@ -6,13 +6,24 @@
 #
 
 PORTNAME=	xf86-input-void
-PORTVERSION=	1.3.1
+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
index 7b1b4c5b2f91..a8c34dee5061 100644
--- a/x11-drivers/xf86-input-void/distinfo
+++ b/x11-drivers/xf86-input-void/distinfo
@@ -1,2 +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-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile
index 5eaddccbec44..96546c4eae21 100644
--- a/x11-drivers/xf86-video-apm/Makefile
+++ b/x11-drivers/xf86-video-apm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xf86-video-apm
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
index b3e381ae2169..de559d88acf2 100644
--- a/x11-drivers/xf86-video-ark/Makefile
+++ b/x11-drivers/xf86-video-ark/Makefile
@@ -7,12 +7,13 @@
 
 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
+USE_XORG=	xextproto videoproto
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index 4d3b485278b3..5ac3cd07c8b3 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xf86-video-ati
 PORTVERSION=	6.14.3
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c b/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
new file mode 100644
index 000000000000..84a992a3bfd9
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
@@ -0,0 +1,17 @@
+--- src/radeon_accel.c.orig	2012-04-15 19:36:08.000000000 +0200
++++ src/radeon_accel.c	2012-04-15 19:36:15.000000000 +0200
+@@ -982,10 +982,9 @@
+ 
+ 	    for (; nwords > 0; --nwords, ++d, ++s)
+ #ifdef __powerpc__
+-		asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
++		asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
+ #else
+-	        *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
+-			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
++		*d = (*s >> 8) | (*s << 8);
+ #endif
+ 	    return;
+ 	}
+
+
diff --git a/x11-drivers/xf86-video-ati613/Makefile b/x11-drivers/xf86-video-ati613/Makefile
index 78c6c7c63a77..e09523780269 100644
--- a/x11-drivers/xf86-video-ati613/Makefile
+++ b/x11-drivers/xf86-video-ati613/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xf86-video-ati613
 PORTVERSION=	6.13.2
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 DISTNAME=	xf86-video-ati-${PORTVERSION}
 
@@ -19,4 +20,8 @@ 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-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
index 2de3dc72e873..15e327e912fb 100644
--- a/x11-drivers/xf86-video-chips/Makefile
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-chips
-PORTVERSION=	1.2.3
+PORTVERSION=	1.2.4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo
index 8a19b72546b8..f03b7195566c 100644
--- a/x11-drivers/xf86-video-chips/distinfo
+++ b/x11-drivers/xf86-video-chips/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-chips-1.2.3.tar.bz2) = 0561278e06f84d4ee20317b19831cc8d42c952a1577c7865163ad2d6d900cb1d
-SIZE (xorg/driver/xf86-video-chips-1.2.3.tar.bz2) = 338968
+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-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
index 1def9f85551a..0df0cf1aa519 100644
--- a/x11-drivers/xf86-video-cirrus/Makefile
+++ b/x11-drivers/xf86-video-cirrus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-cirrus
 PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile
index 39057d8ce40a..fd32fe39cf6f 100644
--- a/x11-drivers/xf86-video-cyrix/Makefile
+++ b/x11-drivers/xf86-video-cyrix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-cyrix
 PORTVERSION=	1.1.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
index 9b0f1474aed2..2154b3a4e2a0 100644
--- a/x11-drivers/xf86-video-dummy/Makefile
+++ b/x11-drivers/xf86-video-dummy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-dummy
-PORTVERSION=	0.3.4
+PORTVERSION=	0.3.5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-dummy/distinfo b/x11-drivers/xf86-video-dummy/distinfo
index b8a7debbe393..899bec938884 100644
--- a/x11-drivers/xf86-video-dummy/distinfo
+++ b/x11-drivers/xf86-video-dummy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-dummy-0.3.4.tar.bz2) = 7e84dff50eb3a783c0bc718a08f82f1f34583531469c98ca75a815d177871bdc
-SIZE (xorg/driver/xf86-video-dummy-0.3.4.tar.bz2) = 255658
+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-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
index 5573b32c332f..09b6a6a53f7c 100644
--- a/x11-drivers/xf86-video-fbdev/Makefile
+++ b/x11-drivers/xf86-video-fbdev/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xf86-video-fbdev
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
index fe6678ebc269..320b6b13e677 100644
--- a/x11-drivers/xf86-video-glint/Makefile
+++ b/x11-drivers/xf86-video-glint/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-glint
-PORTVERSION=	1.2.5
+PORTVERSION=	1.2.6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-glint/distinfo b/x11-drivers/xf86-video-glint/distinfo
index 91b9ad94aeb9..1e7a988615d2 100644
--- a/x11-drivers/xf86-video-glint/distinfo
+++ b/x11-drivers/xf86-video-glint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-glint-1.2.5.tar.bz2) = 5675f2732ab7b099a568ef4e5c7bb0d0e1bb4b0eb4d19133dc1b2225fd9c814b
-SIZE (xorg/driver/xf86-video-glint-1.2.5.tar.bz2) = 394136
+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-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
index 3c61786b42b2..8a570b8db161 100644
--- a/x11-drivers/xf86-video-i128/Makefile
+++ b/x11-drivers/xf86-video-i128/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xf86-video-i128
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
index 7320b92768e3..b9f11c574d69 100644
--- a/x11-drivers/xf86-video-i740/Makefile
+++ b/x11-drivers/xf86-video-i740/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-i740
 PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-imstt/Makefile b/x11-drivers/xf86-video-imstt/Makefile
index 54147b76e1b9..cf048f3abe43 100644
--- a/x11-drivers/xf86-video-imstt/Makefile
+++ b/x11-drivers/xf86-video-imstt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-imstt
 PORTVERSION=	1.1.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index fbabd24c2808..8620b644eeeb 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -6,20 +6,59 @@
 #
 
 PORTNAME=	xf86-video-intel
-PORTVERSION=	2.7.1
-PORTREVISION=	4
+PORTVERSION=	${INTEL_VERSION}
+PORTREVISION=	${INTEL_REVISION}
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Driver for Intel integrated graphics chipsets
 
-CONFLICTS=	xf86-video-i810-[0-9]*
-
 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
 
-.include <bsd.port.mk>
+.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
index 3b7390eacef9..fa854ebe1516 100644
--- a/x11-drivers/xf86-video-intel/distinfo
+++ b/x11-drivers/xf86-video-intel/distinfo
@@ -1,2 +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/patch-src_ch7017_ch7017.c b/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c
index 278354a4b266..278354a4b266 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_ch7017_ch7017.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_ch7xxx_ch7xxx.c b/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c
index 6dbc0a7c36a4..6dbc0a7c36a4 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_ch7xxx_ch7xxx.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i810_driver.c b/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c
index 5ccb55a33daf..5ccb55a33daf 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_i810_driver.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i810_hwmc.c b/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c
index ffb2ac39cadf..ffb2ac39cadf 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_i810_hwmc.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i810_video.c b/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c
index c10b5e668836..c10b5e668836 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_i810_video.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_dri.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c
index 05bdb931e945..05bdb931e945 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_i830_dri.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_driver.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c
index 776b67f915d1..776b67f915d1 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_i830_driver.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_dvo.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c
index d392942ef66f..d392942ef66f 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_i830_dvo.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_i2c.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c
index 1f4461cd9fe1..1f4461cd9fe1 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_i830_i2c.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_render.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c
index e292a7dedbf7..e292a7dedbf7 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_i830_render.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_video.c b/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c
index b93a98e24932..b93a98e24932 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_i830_video.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i915_hwmc.c b/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c
index ab7f679fb4ac..ab7f679fb4ac 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_i915_hwmc.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i915_render.c b/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c
index 53b1a0e1e850..53b1a0e1e850 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_i915_render.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i965_render.c b/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c
index 99b7d787267b..99b7d787267b 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_i965_render.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_ivch_ivch.c b/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c
index b54885d9b0d8..b54885d9b0d8 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_ivch_ivch.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_sil164_sil164.c b/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c
index f9d717794304..f9d717794304 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_sil164_sil164.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_tfp410_tfp410.c b/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c
index 89927b3311b2..89927b3311b2 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_tfp410_tfp410.c
+++ b/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c
diff --git a/x11-drivers/xf86-video-intel/files/patch-uxa_uxa-priv.h b/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h
index 46eb72ea63c4..46eb72ea63c4 100644
--- a/x11-drivers/xf86-video-intel/files/patch-uxa_uxa-priv.h
+++ b/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h
diff --git a/x11-drivers/xf86-video-intel/pkg-plist b/x11-drivers/xf86-video-intel/pkg-plist
index 900e0a99785a..0c16ed39e56b 100644
--- a/x11-drivers/xf86-video-intel/pkg-plist
+++ b/x11-drivers/xf86-video-intel/pkg-plist
@@ -4,18 +4,18 @@ 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
+%%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
-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
+%%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
index 1adf954b1ae0..b2b5bc35f23f 100644
--- a/x11-drivers/xf86-video-intel29/Makefile
+++ b/x11-drivers/xf86-video-intel29/Makefile
@@ -13,7 +13,8 @@ DISTNAME=	xf86-video-intel-${PORTVERSION}
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Driver for Intel integrated graphics chipsets
 
-CONFLICTS=	xf86-video-i810-[0-9]* xf86-video-intel-[0-9]*
+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
diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile
index 2d6ae32d81bb..fbd0fdd276c4 100644
--- a/x11-drivers/xf86-video-mach64/Makefile
+++ b/x11-drivers/xf86-video-mach64/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	xf86-video-mach64
-PORTVERSION=	6.8.2
-PORTREVISION=	1
+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 xineramaproto
+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
index 7741305a57cb..356c86900bf3 100644
--- a/x11-drivers/xf86-video-mach64/distinfo
+++ b/x11-drivers/xf86-video-mach64/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-mach64-6.8.2.tar.bz2) = b91194033023a41793a525a631789df1d229b228af0d44dcbe20b06ed66c671d
-SIZE (xorg/driver/xf86-video-mach64-6.8.2.tar.bz2) = 486282
+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-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index 8ffe2ccff5f6..b343fb26f9f1 100644
--- a/x11-drivers/xf86-video-mga/Makefile
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-mga
-PORTVERSION=	1.4.11
+PORTVERSION=	1.4.13
 PORTEPOCH=	2
 CATEGORIES=	x11-drivers
 
@@ -20,9 +20,9 @@ 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
+#	${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
index ed459526e824..7a6ef1a5a4f6 100644
--- a/x11-drivers/xf86-video-mga/distinfo
+++ b/x11-drivers/xf86-video-mga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-mga-1.4.11.tar.bz2) = c91922316f486f74d41ddbda92ff94a7917cea151ad802cf25603ab6b90f97e6
-SIZE (xorg/driver/xf86-video-mga-1.4.11.tar.bz2) = 415829
+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-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
index 17a2a42b3b79..533e26b8cec1 100644
--- a/x11-drivers/xf86-video-neomagic/Makefile
+++ b/x11-drivers/xf86-video-neomagic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xf86-video-neomagic
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile
index 7d8e3627dfd5..14f6c9645814 100644
--- a/x11-drivers/xf86-video-newport/Makefile
+++ b/x11-drivers/xf86-video-newport/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-newport
 PORTVERSION=	0.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-nouveau/Makefile b/x11-drivers/xf86-video-nouveau/Makefile
index 0b4dac78c3d6..64afb7ac6bb7 100644
--- a/x11-drivers/xf86-video-nouveau/Makefile
+++ b/x11-drivers/xf86-video-nouveau/Makefile
@@ -21,9 +21,8 @@ MAN4=		nouveau.4x
 
 MAKE_JOBS_SAFE=	yes
 
-.if defined(WITHOUT_NOUVEAU)
-BROKEN=		Please disable WITHOUT_NOUVEAU global macro.
-.endif
+# 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
diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile
index 7a3dd9c60c3d..db48fb65ee64 100644
--- a/x11-drivers/xf86-video-nv/Makefile
+++ b/x11-drivers/xf86-video-nv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xf86-video-nv
 PORTVERSION=	2.1.18
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c b/x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c
new file mode 100644
index 000000000000..ad794cba31fd
--- /dev/null
+++ b/x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c
@@ -0,0 +1,32 @@
+--- src/via_vgahw.c.orig	2009-10-03 22:48:55.000000000 +0200
++++ src/via_vgahw.c	2012-02-08 10:43:08.000000000 +0100
+@@ -36,6 +36,11 @@
+ #include "via_driver.h" /* for HAVE_DEBUG */
+ #include "via_vgahw.h"
+ 
++#if ABI_VIDEODRV_VERSION < 12
++#define PIOOFFSET hwp->PIOOffset
++#else
++#define PIOOFFSET 0
++#endif
+ 
+ static CARD8
+ ViaVgahwIn(vgaHWPtr hwp, int address)
+@@ -43,7 +48,7 @@
+     if (hwp->MMIOBase)
+         return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address);
+     else
+-        return inb(hwp->PIOOffset + address);
++        return inb(PIOOFFSET + address);
+ }
+ 
+ static void
+@@ -52,7 +57,7 @@
+     if (hwp->MMIOBase)
+         MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value);
+     else
+-        outb(hwp->PIOOffset + address, value);
++        outb(PIOOFFSET + address, value);
+ }
+ 
+ /*
diff --git a/x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c b/x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c
new file mode 100644
index 000000000000..6eb3f18c11f2
--- /dev/null
+++ b/x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c
@@ -0,0 +1,83 @@
+Fix Xvideo crash in X.org server 1.10
+
+http://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=cd753845e02466b81f426793e4f5619afab05d82
+
+--- src/via_video.c.orig	2012-02-08 10:13:54.000000000 +0100
++++ src/via_video.c	2012-02-08 10:14:33.000000000 +0100
+@@ -763,67 +763,6 @@
+     return 0;
+ }
+ 
+-
+-/*
+- * This one gets called, for example, on panning.
+- */
+-
+-static int
+-viaReputImage(ScrnInfoPtr pScrn,
+-        short drw_x, short drw_y, RegionPtr clipBoxes, pointer data,
+-        DrawablePtr pDraw)
+-{
+-
+-    DDUPDATEOVERLAY UpdateOverlay_Video;
+-    LPDDUPDATEOVERLAY lpUpdateOverlay = &UpdateOverlay_Video;
+-    viaPortPrivPtr pPriv = (viaPortPrivPtr) data;
+-    VIAPtr pVia = VIAPTR(pScrn);
+-
+-    if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
+-        REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
+-        if (pPriv->autoPaint) {
+-            if (pDraw->type == DRAWABLE_WINDOW) {
+-                viaPaintColorkey(pScrn, pPriv, clipBoxes, pDraw);
+-            } else {
+-                xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey,
+-                    clipBoxes);
+-            }
+-        }
+-    }
+-
+-    if (drw_x == pPriv->old_drw_x &&
+-        drw_y == pPriv->old_drw_y &&
+-        pVia->swov.oldPanningX == pVia->swov.panning_x &&
+-        pVia->swov.oldPanningY == pVia->swov.panning_y) {
+-        viaXvError(pScrn, pPriv, xve_none);
+-        return Success;
+-    }
+-
+-    lpUpdateOverlay->SrcLeft = pPriv->old_src_x;
+-    lpUpdateOverlay->SrcTop = pPriv->old_src_y;
+-    lpUpdateOverlay->SrcRight = pPriv->old_src_x + pPriv->old_src_w;
+-    lpUpdateOverlay->SrcBottom = pPriv->old_src_y + pPriv->old_src_h;
+-
+-    lpUpdateOverlay->DstLeft = drw_x;
+-    lpUpdateOverlay->DstTop = drw_y;
+-    lpUpdateOverlay->DstRight = drw_x + pPriv->old_drw_w;
+-    lpUpdateOverlay->DstBottom = drw_y + pPriv->old_drw_h;
+-    pPriv->old_drw_x = drw_x;
+-    pPriv->old_drw_y = drw_y;
+-
+-    lpUpdateOverlay->dwFlags = DDOVER_KEYDEST;
+-
+-    if (pScrn->bitsPerPixel == 8)
+-        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey & 0xff;
+-    else
+-        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey;
+-
+-    VIAVidUpdateOverlay(pScrn, lpUpdateOverlay);
+-
+-    viaXvError(pScrn, pPriv, xve_none);
+-    return Success;
+-}
+-
+ static unsigned
+ viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
+ {
+@@ -884,7 +823,7 @@
+         viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute;
+         viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute;
+         viaAdaptPtr[i]->PutImage = viaPutImage;
+-        viaAdaptPtr[i]->ReputImage = viaReputImage;
++        viaAdaptPtr[i]->ReputImage = NULL;
+         viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes;
+         for (j = 0; j < numPorts; ++j) {
+             viaPortPriv[j].dmaBounceBuffer = NULL;
diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile
index e5aa4aa2014f..14a78b324e82 100644
--- a/x11-drivers/xf86-video-r128/Makefile
+++ b/x11-drivers/xf86-video-r128/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-r128
 PORTVERSION=	6.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-radeonhd-devel/Makefile b/x11-drivers/xf86-video-radeonhd-devel/Makefile
index 296a5dfa3a15..806d776c679d 100644
--- a/x11-drivers/xf86-video-radeonhd-devel/Makefile
+++ b/x11-drivers/xf86-video-radeonhd-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-radeonhd
 PORTVERSION=	1.3.0.20091101
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	nork
diff --git a/x11-drivers/xf86-video-radeonhd/Makefile b/x11-drivers/xf86-video-radeonhd/Makefile
index ab8364509771..80b4a8aa1660 100644
--- a/x11-drivers/xf86-video-radeonhd/Makefile
+++ b/x11-drivers/xf86-video-radeonhd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-radeonhd
 PORTVERSION=	1.3.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
index 8fc96d2825b2..72fdd37a67d3 100644
--- a/x11-drivers/xf86-video-rendition/Makefile
+++ b/x11-drivers/xf86-video-rendition/Makefile
@@ -7,13 +7,14 @@
 
 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
+USE_XORG=	xextproto videoproto
 MAN4=		rendition.4x
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
index 5397647eaeb4..e8cd85092e85 100644
--- a/x11-drivers/xf86-video-s3/Makefile
+++ b/x11-drivers/xf86-video-s3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-s3
 PORTVERSION=	0.6.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
index bd879ee46402..22581ca02e63 100644
--- a/x11-drivers/xf86-video-s3virge/Makefile
+++ b/x11-drivers/xf86-video-s3virge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-s3virge
 PORTVERSION=	1.10.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index 2cad8e1b3344..75102292a37e 100644
--- a/x11-drivers/xf86-video-savage/Makefile
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-savage
-PORTVERSION=	2.3.2
+PORTVERSION=	2.3.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,6 +14,7 @@ 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
diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo
index 5c16f9c4c1ec..6b5437235cc2 100644
--- a/x11-drivers/xf86-video-savage/distinfo
+++ b/x11-drivers/xf86-video-savage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-savage-2.3.2.tar.bz2) = 54bde0077a2369fbdd42b0b25803f3c7147a58792997b14e45ee0b856199ddf1
-SIZE (xorg/driver/xf86-video-savage-2.3.2.tar.bz2) = 366731
+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-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
index cfa486f576bd..681fdd40640e 100644
--- a/x11-drivers/xf86-video-siliconmotion/Makefile
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-siliconmotion
-PORTVERSION=	1.7.3
+PORTVERSION=	1.7.5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo
index 5d477f0de57e..5707cf9c7d92 100644
--- a/x11-drivers/xf86-video-siliconmotion/distinfo
+++ b/x11-drivers/xf86-video-siliconmotion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.3.tar.bz2) = ebda468be42695c08ceaa4043da3cf5bcd5f9ab15d1482311fd6e826a8060b2b
-SIZE (xorg/driver/xf86-video-siliconmotion-1.7.3.tar.bz2) = 330623
+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-sis-intel/Makefile b/x11-drivers/xf86-video-sis-intel/Makefile
index 1ceee027e66d..b53662053fbc 100644
--- a/x11-drivers/xf86-video-sis-intel/Makefile
+++ b/x11-drivers/xf86-video-sis-intel/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xf86-video-sis-intel
 PORTVERSION=	300407
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 MASTER_SITES=	http://downloadmirror.intel.com/15443/eng/
 DISTNAME=	sis_drv_src_300407
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index 8140572d303b..2641c7ceb699 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-sis
-PORTVERSION=	0.10.2
-PORTREVISION=	2
+PORTVERSION=	0.10.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sis/distinfo b/x11-drivers/xf86-video-sis/distinfo
index fe89fa4580c1..0b66a0d4d700 100644
--- a/x11-drivers/xf86-video-sis/distinfo
+++ b/x11-drivers/xf86-video-sis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-sis-0.10.2.tar.bz2) = 3aad701799e355669b9027a9baedd623fe6b7ce93da9ac22b6902fd7e38128c2
-SIZE (xorg/driver/xf86-video-sis-0.10.2.tar.bz2) = 642160
+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/files/patch-src-sis_driver.c b/x11-drivers/xf86-video-sis/files/patch-src-sis_driver.c
deleted file mode 100644
index 7570ee2d6047..000000000000
--- a/x11-drivers/xf86-video-sis/files/patch-src-sis_driver.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sis_driver.c.orig	2010-05-10 09:36:17.000000000 -0500
-+++ src/sis_driver.c	2010-05-10 09:36:23.000000000 -0500
-@@ -4099,6 +4099,8 @@
- 	     case SIS_315H:
- 	     case SIS_330:
- 	     case SIS_340:
-+	     case SIS_650:
-+	     case SIS_760:
- 	     case XGI_40:     readpci = TRUE;
- 			      break;
- 	     case XGI_20:     readpci = TRUE;
diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile
index 6cc72846aba3..0f5db118c02c 100644
--- a/x11-drivers/xf86-video-sunffb/Makefile
+++ b/x11-drivers/xf86-video-sunffb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-sunffb
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
index 9e80c3b636ab..b8fd2e108784 100644
--- a/x11-drivers/xf86-video-tdfx/Makefile
+++ b/x11-drivers/xf86-video-tdfx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-tdfx
 PORTVERSION=	1.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile
index 5acd2d113ab1..a78f578af9f3 100644
--- a/x11-drivers/xf86-video-tga/Makefile
+++ b/x11-drivers/xf86-video-tga/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-tga
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
index f768d3c8b92d..76b0570e00c3 100644
--- a/x11-drivers/xf86-video-trident/Makefile
+++ b/x11-drivers/xf86-video-trident/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xf86-video-trident
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile
index 06ee4272b1ce..521fc6f9406e 100644
--- a/x11-drivers/xf86-video-tseng/Makefile
+++ b/x11-drivers/xf86-video-tseng/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xf86-video-tseng
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
index a2fccafde091..5fdfb038d857 100644
--- a/x11-drivers/xf86-video-vesa/Makefile
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	xf86-video-vesa
 PORTVERSION=	2.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org vesa display driver
 
 XORG_CAT=	driver
-USE_XORG=	xextproto
+USE_XORG=	xextproto videoproto
 MAN4=		vesa.4x
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-via/Makefile b/x11-drivers/xf86-video-via/Makefile
index c769d950997e..8b6d3c97ceaa 100644
--- a/x11-drivers/xf86-video-via/Makefile
+++ b/x11-drivers/xf86-video-via/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xf86-video-via
 PORTVERSION=	0.2.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
index f3376257ef01..1d8718a1faef 100644
--- a/x11-drivers/xf86-video-vmware/Makefile
+++ b/x11-drivers/xf86-video-vmware/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-vmware
-PORTVERSION=	11.0.3
-PORTREVISION=	1
+PORTVERSION=	12.0.2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vmware/distinfo b/x11-drivers/xf86-video-vmware/distinfo
index 3e9409989c89..03af6aa5dcf8 100644
--- a/x11-drivers/xf86-video-vmware/distinfo
+++ b/x11-drivers/xf86-video-vmware/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-vmware-11.0.3.tar.bz2) = b24a7cb2d87e416561e25122eab2cd48fc64a2ba105238456eefef16f29f38a3
-SIZE (xorg/driver/xf86-video-vmware-11.0.3.tar.bz2) = 313656
+SHA256 (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147
+SIZE (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = 432468
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
index 86eef10a10d1..5cc2a7d0d85d 100644
--- a/x11-drivers/xf86-video-voodoo/Makefile
+++ b/x11-drivers/xf86-video-voodoo/Makefile
@@ -7,13 +7,14 @@
 
 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
+USE_XORG=	xf86dgaproto xextproto videoproto
 MAN4=		voodoo.4x
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index 62c017ac7edb..2ece9ff22162 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-drivers
-PORTVERSION=	7.5.1
+PORTVERSION=	7.5.2
 CATEGORIES=	x11-drivers
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -37,7 +37,7 @@ VIDEO_ON+=	sunffb
 VIDEO_ON+=	openchrome
 .endif
 
-.if ${ARCH} == "amd64" || ${ARCH} == "i386"
+.if (${ARCH} == "amd64" || ${ARCH} == "i386") && !defined(WITH_NEW_XORG)
 VIDEO_ON+=	intel
 .endif
 
diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile
index 1acc4d722b5e..d14a67957d61 100644
--- a/x11-servers/xephyr/Makefile
+++ b/x11-servers/xephyr/Makefile
@@ -6,17 +6,12 @@
 #
 
 PORTNAME=	xephyr
-PORTVERSION=	1.7.7
-CATEGORIES=	x11-servers
+PORTREVISION=	0
 
-MAINTAINER=	x11@FreeBSD.org
 COMMENT=	A kdrive based X server from X.Org
 
-XORG_CAT=	xserver
-
-LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-
-USE_GL=		gl
+MASTERDIR=	${.CURDIR}/../xorg-server
+DESCR=		${.CURDIR}/pkg-descr
 USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		dri2proto damageproto xcmiscproto xtrans inputproto \
 		xf86bigfontproto scrnsaverproto bigreqsproto \
@@ -25,32 +20,15 @@ USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		xineramaproto xinerama evieproto xkbfile xfont \
 		xau xdmcp xext fontenc xv pixman
 
-USE_OPENSSL=	yes
 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
 
-OPTIONS=	HAL	"Compile with HAL config support" on
-
-.include <bsd.port.pre.mk>
-
-.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
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hw/kdrive/ephyr/Xephyr ${PREFIX}/bin/
 
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-servers/xephyr/distinfo b/x11-servers/xephyr/distinfo
index 86aaea93dc0b..bc91bed4cb04 100644
--- a/x11-servers/xephyr/distinfo
+++ b/x11-servers/xephyr/distinfo
@@ -1,2 +1,2 @@
-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-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index 344cdffd2c9e..aa3ebc94315f 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -6,18 +6,12 @@
 #
 
 PORTNAME=	xorg-dmx
-PORTVERSION=	1.7.7
-PORTEPOCH=	1
-CATEGORIES=	x11-servers
+PORTREVISION=	0
 
-MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Distributed Multihead X from X.Org
 
-XORG_CAT=	xserver
-
-LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-
-USE_GL=		gl
+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 \
@@ -27,31 +21,15 @@ USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
 		xau dmx xtst xres pixman xtrans
 
-USE_OPENSSL=	yes
 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
 
-OPTIONS=	HAL     "Compile with HAL config support" on
-
-.include <bsd.port.pre.mk>
-
-.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
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo
index 86aaea93dc0b..bc91bed4cb04 100644
--- a/x11-servers/xorg-dmx/distinfo
+++ b/x11-servers/xorg-dmx/distinfo
@@ -1,2 +1,2 @@
-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-dmx/pkg-plist b/x11-servers/xorg-dmx/pkg-plist
index 93ae1cd4ba07..657dfd5608de 100644
--- a/x11-servers/xorg-dmx/pkg-plist
+++ b/x11-servers/xorg-dmx/pkg-plist
@@ -1,6 +1,8 @@
 bin/Xdmx
+%%OLD%%bin/xdmx
 bin/dmxaddinput
 bin/dmxaddscreen
+%%NEW%%bin/dmxinfo
 bin/dmxreconfig
 bin/dmxresize
 bin/dmxrminput
@@ -8,5 +10,6 @@ bin/dmxrmscreen
 bin/dmxtodmx
 bin/dmxwininfo
 bin/vdltodmx
-bin/xdmx
 bin/xdmxconfig
+%%NEW%%@dirrmtry share/X11/xorg.conf.d
+%%NEW%%@dirrmtry share/X11
diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
index 2ecfa9441535..ef991df92b30 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -6,18 +6,12 @@
 #
 
 PORTNAME=	xorg-nestserver
-PORTVERSION=	1.7.7
-PORTEPOCH=	1
-CATEGORIES=	x11-servers
+PORTREVISION=	1
 
-MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Nesting X server from X.Org
 
-XORG_CAT=	xserver
-
-LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-
-USE_GL=		gl
+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 \
@@ -26,24 +20,20 @@ USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
 		xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
 
-USE_OPENSSL=	yes
 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/
-
-.include <bsd.port.pre.mk>
-
-.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
 
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo
index 86aaea93dc0b..bc91bed4cb04 100644
--- a/x11-servers/xorg-nestserver/distinfo
+++ b/x11-servers/xorg-nestserver/distinfo
@@ -1,2 +1,2 @@
-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/Makefile b/x11-servers/xorg-server/Makefile
index 02fe10c85733..cb5663c7d092 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -5,25 +5,41 @@
 # $FreeBSD$
 #
 
-PORTNAME=	xorg-server
-PORTVERSION=	1.7.7
-PORTREVISION=	3
-PORTEPOCH=	1
+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
+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
+
+RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config \
+		xkbcomp:${PORTSDIR}/x11/xkbcomp
 
 XORG_CAT=	xserver
 
+.if defined(WITH_NEW_XORG)
+XORG_VERSION=	1.10.6
+XORG_REVISION=	0
+PLIST_SUB+=	OLD="@comment " NEW=""
+EXTRA_PATCHES+=	${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \
+		${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h
+.else
+XORG_VERSION=	1.7.7
+XORG_REVISION=	4
+PLIST_SUB+=	OLD="" NEW="@comment "
+EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-os-utils.c
+.endif
+
 USE_GMAKE=	yes
 USE_GL=		gl
-USE_XORG=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
+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 \
@@ -34,10 +50,12 @@ USE_XORG=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 MAKE_JOBS_UNSAFE=	yes
 USE_OPENSSL=	yes
 USE_PERL5_BUILD=yes
-CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xnest \
+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 \
@@ -46,21 +64,26 @@ MAN4=		exa.4 \
 		fbdevhw.4
 MAN5=		xorg.conf.5
 
-NOT_FOR_ARCHS=	alpha
-
-.if !defined(ARCH)
-ARCH!=	/usr/bin/uname -p
+.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
 
-.include <bsd.port.pre.mk>
 
 .if defined(WITH_OPENSSL_BASE)
 # The reason why I use this is cause openssl from base doesn't install a .pc file
@@ -88,13 +111,6 @@ CONFIGURE_ARGS+=--enable-install-setuid=yes
 CONFIGURE_ARGS+=--enable-install-setuid=no
 .endif
 
-.if ${ARCH} == alpha
-PLIST_SUB+=	ALPHA_NA="@comment "
-EXTRA_PATCHES=	${.CURDIR}/files/extra-arch-alpha
-.else
-PLIST_SUB+=	ALPHA_NA=""
-.endif
-
 .if ${ARCH} == ia64
 PLIST_SUB+=     IA64_NA="@comment "
 EXTRA_PATCHES=  ${.CURDIR}/files/extra-arch-ia64
@@ -133,4 +149,13 @@ pre-everything::
 	@${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
index 86aaea93dc0b..7e27de5b2ce5 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,2 +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.6.tar.bz2) = c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682
+SIZE (xorg/xserver/xorg-server-1.10.6.tar.bz2) = 5406712
diff --git a/x11-servers/xorg-server/files/extra-arch-alpha b/x11-servers/xorg-server/files/extra-arch-alpha
deleted file mode 100644
index b53d82ec034f..000000000000
--- a/x11-servers/xorg-server/files/extra-arch-alpha
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2008-01-02 12:40:11.000000000 +0000
-+++ configure	2008-01-02 12:41:09.000000000 +0000
-@@ -32222,7 +32222,7 @@
- 
- if test "x$XORG" = xyes -o "x$XGL" = xyes; then
- 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
--	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
-+	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/hw/xfree86/os-support/shared -I$(top_srcdir)/os'
- 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
- 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
- 	XORG_LIBS="$COMPOSITE_LIB $MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XPSTUBS_LIB $OS_LIB"
diff --git a/x11-servers/xorg-server/files/extra-arch-ia64 b/x11-servers/xorg-server/files/extra-arch-ia64
index f749a3b9c005..9a3f48eb2f77 100644
--- a/x11-servers/xorg-server/files/extra-arch-ia64
+++ b/x11-servers/xorg-server/files/extra-arch-ia64
@@ -32,11 +32,11 @@
   if test "x$PPC_VIDEO" = xyes; then
    PPC_VIDEO_TRUE=
    PPC_VIDEO_FALSE='#'
---- hw/xfree86/common/compiler.h.dist	2009-04-14 10:14:57.000000000 -0700
-+++ hw/xfree86/common/compiler.h	2009-06-18 16:22:46.000000000 -0700
-@@ -363,12 +363,10 @@
- #    endif
- 
+--- 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__) 
@@ -45,9 +45,9 @@
  
 -#    include <sys/io.h>
 -
- struct __una_u64 { uint64_t x __attribute__((packed)); };
- struct __una_u32 { uint32_t x __attribute__((packed)); };
- struct __una_u16 { uint16_t x __attribute__((packed)); };
+ #    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 @@
diff --git a/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h b/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
new file mode 100644
index 000000000000..612a7b0dc98b
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
@@ -0,0 +1,54 @@
+--- hw/dmx/glxProxy/compsize.h.orig	2012-03-15 11:14:45.000000000 +0100
++++ hw/dmx/glxProxy/compsize.h	2012-03-15 11:14:38.000000000 +0100
+@@ -0,0 +1,51 @@
++/*
++ * Copyright 2011 Apple Inc.
++ *
++ * All Rights Reserved.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation on the rights to use, copy, modify, merge,
++ * publish, distribute, sublicense, and/or sell copies of the Software,
++ * and to permit persons to whom the Software is furnished to do so,
++ * subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the
++ * next paragraph) shall be included in all copies or substantial
++ * portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
++ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
++ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++ * SOFTWARE.
++ */
++
++#ifndef __compsize_h__
++#define __compsize_h__
++
++extern GLint __glColorTableParameterfv_size(GLenum pname);
++extern GLint __glColorTableParameteriv_size(GLenum pname);
++extern GLint __glConvolutionParameterfv_size(GLenum pname);
++extern GLint __glConvolutionParameteriv_size(GLenum pname);
++extern GLint __glFogfv_size(GLenum pname);
++extern GLint __glFogiv_size(GLenum pname);
++extern GLint __glLightModelfv_size(GLenum pname);
++extern GLint __glLightModeliv_size(GLenum pname);
++extern GLint __glLightfv_size(GLenum pname);
++extern GLint __glLightiv_size(GLenum pname);
++extern GLint __glMaterialfv_size(GLenum pname);
++extern GLint __glMaterialiv_size(GLenum pname);
++extern GLint __glTexEnvfv_size(GLenum e);
++extern GLint __glTexEnviv_size(GLenum e);
++extern GLint __glTexGendv_size(GLenum e);
++extern GLint __glTexGenfv_size(GLenum e);
++extern GLint __glTexGeniv_size(GLenum e);
++extern GLint __glTexParameterfv_size(GLenum e);
++extern GLint __glTexParameteriv_size(GLenum e);
++
++#endif /* !__compsize_h__ */
diff --git a/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h b/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
new file mode 100644
index 000000000000..b75028b6745c
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
@@ -0,0 +1,40 @@
+--- hw/dmx/glxProxy/glxcmds.h.orig	2012-03-15 11:31:45.000000000 +0100
++++ hw/dmx/glxProxy/glxcmds.h	2012-03-15 11:31:11.000000000 +0100
+@@ -0,0 +1,37 @@
++/*
++ * Copyright 2011 Apple Inc.
++ *
++ * All Rights Reserved.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation on the rights to use, copy, modify, merge,
++ * publish, distribute, sublicense, and/or sell copies of the Software,
++ * and to permit persons to whom the Software is furnished to do so,
++ * subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the
++ * next paragraph) shall be included in all copies or substantial
++ * portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
++ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
++ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++ * SOFTWARE.
++ */
++
++#ifndef __GLX_cmds_h__
++#define __GLX_cmds_h__
++
++extern int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc);
++extern int __glXCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc);
++extern int __glXJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc);
++extern int __glXMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc);
++extern int __glXQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc);
++
++#endif /* !__GLX_cmds_h__ */
diff --git a/x11-servers/xorg-server/files/extra-include_eventstr.h b/x11-servers/xorg-server/files/extra-include_eventstr.h
new file mode 100644
index 000000000000..e39aadd16be6
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-include_eventstr.h
@@ -0,0 +1,14 @@
+--- include/eventstr.h.orig	2012-02-05 19:23:06.000000000 +0100
++++ include/eventstr.h	2012-02-05 19:23:35.000000000 +0100
+@@ -91,9 +91,9 @@
+         uint32_t button;  /**< Button number */
+         uint32_t key;     /**< Key code */
+     } detail;
+-    uint16_t root_x;      /**< Pos relative to root window in integral data */
++    int16_t root_x;      /**< Pos relative to root window in integral data */
+     float root_x_frac;    /**< Pos relative to root window in frac part */
+-    uint16_t root_y;      /**< Pos relative to root window in integral part */
++    int16_t root_y;      /**< Pos relative to root window in integral part */
+     float root_y_frac;    /**< Pos relative to root window in frac part */
+     uint8_t    buttons[(MAX_BUTTONS + 7)/8]; /**< Button mask */
+     struct {
diff --git a/x11-servers/xorg-server/files/patch-os-utils.c b/x11-servers/xorg-server/files/extra-patch-os-utils.c
index 3fe8530231e9..2980ded6fd7d 100644
--- a/x11-servers/xorg-server/files/patch-os-utils.c
+++ b/x11-servers/xorg-server/files/extra-patch-os-utils.c
@@ -17,16 +17,4 @@
 +      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
        if (lfd < 0) {
          unlink(tmp);
-         FatalError("Can't read lock file %s\n", LockFile);
-@@ -436,7 +436,11 @@
- 
- #ifdef MONOTONIC_CLOCK
-     struct timespec tp;
-+#if defined(__FreeBSD__) && defined(CLOCK_MONOTONIC_FAST)
-+    if (clock_gettime(CLOCK_MONOTONIC_FAST, &tp) == 0)
-+#else
-     if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
-+#endif
-         return (tp.tv_sec * 1000) + (tp.tv_nsec / 1000000L);
- #endif
- 
+         FatalError("Can't read lock file %s\n", LockFile); 
diff --git a/x11-servers/xorg-server/files/patch-dix-events.c b/x11-servers/xorg-server/files/patch-dix-events.c
deleted file mode 100644
index cda3c50eff25..000000000000
--- a/x11-servers/xorg-server/files/patch-dix-events.c
+++ /dev/null
@@ -1,89 +0,0 @@
---- dix/events.c
-+++ dix/events.c
-@@ -3420,7 +3420,6 @@ CheckPassiveGrabsOnWindow(
-     {
- 	DeviceIntPtr	gdev;
- 	XkbSrvInfoPtr	xkbi = NULL;
--	Mask		mask = 0;
- 
- 	gdev= grab->modifierDevice;
-         if (grab->grabtype == GRABTYPE_CORE)
-@@ -3535,9 +3534,6 @@ CheckPassiveGrabsOnWindow(
-                 }
-                 xE = &core;
-                 count = 1;
--                mask = grab->eventMask;
--                if (grab->ownerEvents)
--                    mask |= pWin->eventMask;
-             } else if (match & XI2_MATCH)
-             {
-                 rc = EventToXI2((InternalEvent*)event, &xE);
-@@ -3549,34 +3545,6 @@ CheckPassiveGrabsOnWindow(
-                     continue;
-                 }
-                 count = 1;
--
--                /* FIXME: EventToXI2 returns NULL for enter events, so
--                 * dereferencing the event is bad. Internal event types are
--                 * aligned with core events, so the else clause is valid.
--                 * long-term we should use internal events for enter/focus
--                 * as well */
--                if (xE)
--                    mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
--                else if (event->type == XI_Enter || event->type == XI_FocusIn)
--                    mask = grab->xi2mask[device->id][event->type/8];
--
--                if (grab->ownerEvents && wOtherInputMasks(grab->window))
--                {
--                    InputClientsPtr icp =
--                        wOtherInputMasks(grab->window)->inputClients;
--
--                    while(icp)
--                    {
--                        if (rClient(icp) == rClient(grab))
--                        {
--                            int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
--                            mask |= icp->xi2mask[device->id][evtype/8];
--                            break;
--                        }
--
--                        icp = icp->next;
--                    }
--                }
-             } else
-             {
-                 rc = EventToXI((InternalEvent*)event, &xE, &count);
-@@ -3587,23 +3555,6 @@ CheckPassiveGrabsOnWindow(
-                                 "(%d, %d).\n", device->name, event->type, rc);
-                     continue;
-                 }
--                mask = grab->eventMask;
--                if (grab->ownerEvents && wOtherInputMasks(grab->window))
--                {
--                    InputClientsPtr icp =
--                        wOtherInputMasks(grab->window)->inputClients;
--
--                    while(icp)
--                    {
--                        if (rClient(icp) == rClient(grab))
--                        {
--                            mask |= icp->mask[device->id];
--                            break;
--                        }
--
--                        icp = icp->next;
--                    }
--                }
-             }
- 
- 	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
-@@ -3612,7 +3563,8 @@ CheckPassiveGrabsOnWindow(
-             {
-                 FixUpEventFromWindow(device, xE, grab->window, None, TRUE);
- 
--                TryClientEvents(rClient(grab), device, xE, count, mask,
-+                TryClientEvents(rClient(grab), device, xE, count,
-+                                       GetEventFilter(device, xE),
-                                        GetEventFilter(device, xE), grab);
-             }
- 
diff --git a/x11-servers/xorg-server/files/patch-exa__exa_accel.c b/x11-servers/xorg-server/files/patch-exa__exa_accel.c
deleted file mode 100644
index 83f04ee754f4..000000000000
--- a/x11-servers/xorg-server/files/patch-exa__exa_accel.c
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/exa/exa_accel.c b/exa/exa_accel.c
-index 6c677c7..b4c0f83 100644
---- exa/exa_accel.c
-+++ exa/exa_accel.c
-@@ -1057,6 +1057,8 @@ exaFillRegionSolid (DrawablePtr	pDrawable, RegionPtr pRegion, Pixel pixel,
- 		*(CARD16*)pExaPixmap->sys_ptr = pixel;
- 		break;
- 	    case 8:
-+	    case 4:
-+	    case 1:
- 		*(CARD8*)pExaPixmap->sys_ptr = pixel;
- 	    }
- 
-diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
-index a078cc1..855146b 100644
---- exa/exa_unaccel.c
-+++ exa/exa_unaccel.c
-@@ -748,6 +757,8 @@ exaGetPixmapFirstPixel (PixmapPtr pPixmap)
- 	    return pixel;
- 	}
-     case 8:
-+    case 4:
-+    case 1:
- 	{
- 	    CARD8 pixel;
- 
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index bfce700b066b..29e90c810158 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -6,10 +6,12 @@ include/xorg/BT.h
 include/xorg/IBM.h
 include/xorg/TI.h
 include/xorg/XIstubs.h
-include/xorg/bstore.h
-include/xorg/bstorestr.h
+%%NEW%%include/xorg/Xprintf.h
 include/xorg/bt829.h
-include/xorg/cfb8_16.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
@@ -56,8 +58,9 @@ 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
-include/xorg/mibank.h
+%%OLD%%include/xorg/mibank.h
 include/xorg/mibstore.h
 include/xorg/micmap.h
 include/xorg/micoord.h
@@ -72,6 +75,8 @@ 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
@@ -89,10 +94,10 @@ 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/renderedge.h
 include/xorg/resource.h
 include/xorg/rgb.h
 include/xorg/rrtransform.h
@@ -107,6 +112,7 @@ 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
@@ -120,7 +126,7 @@ include/xorg/wfbrename.h
 include/xorg/window.h
 include/xorg/windowstr.h
 include/xorg/xaa.h
-include/xorg/xaaWrapper.h
+%%OLD%%include/xorg/xaaWrapper.h
 include/xorg/xaalocal.h
 include/xorg/xaarop.h
 include/xorg/xace.h
@@ -182,6 +188,8 @@ 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
@@ -196,10 +204,10 @@ lib/xorg/modules/libwfb.la
 lib/xorg/modules/libwfb.so
 lib/xorg/modules/libxaa.la
 lib/xorg/modules/libxaa.so
-lib/xorg/modules/libxf8_16bpp.la
-lib/xorg/modules/libxf8_16bpp.so
-lib/xorg/modules/linux/libfbdevhw.la
-lib/xorg/modules/linux/libfbdevhw.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
@@ -217,10 +225,12 @@ 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/linux
 @dirrm lib/xorg/modules/multimedia
+%%OLD%%@dirrm lib/xorg/modules/linux
 @dirrm lib/xorg/modules
 @dirrm lib/xorg
 @dirrmtry include/X11/bitmaps
@@ -230,5 +240,6 @@ share/aclocal/xorg-server.m4
 @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
index 4f3a47280cd3..3f4bd301e232 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -6,18 +6,12 @@
 #
 
 PORTNAME=	xorg-vfbserver
-PORTVERSION=	1.7.7
-PORTEPOCH=	1
-CATEGORIES=	x11-servers
+PORTREVISION=	1
 
-MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X virtual framebuffer server from X.Org
 
-XORG_CAT=	xserver
-
-LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-
-USE_GL=		gl
+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 \
@@ -26,23 +20,15 @@ USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		xineramaproto xinerama evieproto xkbfile xfont fontenc \
 		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
 
-USE_OPENSSL=	yes
 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 <bsd.port.pre.mk>
-
-.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
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo
index 86aaea93dc0b..bc91bed4cb04 100644
--- a/x11-servers/xorg-vfbserver/distinfo
+++ b/x11-servers/xorg-vfbserver/distinfo
@@ -1,2 +1,2 @@
-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-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index bda2de2e5a67..2ece7ea71e1e 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libXaw
-PORTVERSION=	1.0.8
+PORTVERSION=	1.0.9
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits
 
@@ -16,7 +16,7 @@ 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
+CONFIGURE_ARGS=	--without-xmlto
 
 MAN3=		Xaw.3
 
diff --git a/x11-toolkits/libXaw/distinfo b/x11-toolkits/libXaw/distinfo
index c4aa13012bf2..3e67ebd8e5ea 100644
--- a/x11-toolkits/libXaw/distinfo
+++ b/x11-toolkits/libXaw/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXaw-1.0.8.tar.bz2) = 3daeab01ee702cbc4ac91f11d553710ad31d4151510386093c186a94ccd4beba
-SIZE (xorg/lib/libXaw-1.0.8.tar.bz2) = 635256
+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/libXt/Makefile b/x11-toolkits/libXt/Makefile
index b2627d6ae4ea..0bfe440dec05 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libXt
-PORTVERSION=	1.0.9
+PORTVERSION=	1.1.1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 
@@ -64,6 +64,7 @@ MAN3=	MenuPopdown.3 \
 	XtAppUnlock.3 \
 	XtAppWarning.3 \
 	XtAppWarningMsg.3 \
+	XtAsprintf.3 \
 	XtAugmentTranslations.3 \
 	XtBuildEventMask.3 \
 	XtCallAcceptFocus.3\
diff --git a/x11-toolkits/libXt/distinfo b/x11-toolkits/libXt/distinfo
index 67f296198a07..57b1aa78e720 100644
--- a/x11-toolkits/libXt/distinfo
+++ b/x11-toolkits/libXt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXt-1.0.9.tar.bz2) = eab91b594b801f7f07a20f936dda70a629028858cbcf541becf94f2786ae6b01
-SIZE (xorg/lib/libXt-1.0.9.tar.bz2) = 685981
+SHA256 (xorg/lib/libXt-1.1.1.tar.bz2) = a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7
+SIZE (xorg/lib/libXt-1.1.1.tar.bz2) = 715424
diff --git a/x11/dmxproto/Makefile b/x11/dmxproto/Makefile
index 15c4f51a2d55..c4f509649cd5 100644
--- a/x11/dmxproto/Makefile
+++ b/x11/dmxproto/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dmxproto
-PORTVERSION=	2.3
+PORTVERSION=	2.3.1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/dmxproto/distinfo b/x11/dmxproto/distinfo
index f9842688e46c..9ab13c66218c 100644
--- a/x11/dmxproto/distinfo
+++ b/x11/dmxproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/dmxproto-2.3.tar.bz2) = 3a882ca43a1f359e3489468e6c407fd7d56d559f8895cf096a2ec877d6c403b0
-SIZE (xorg/proto/dmxproto-2.3.tar.bz2) = 83906
+SHA256 (xorg/proto/dmxproto-2.3.1.tar.bz2) = e72051e6a3e06b236d19eed56368117b745ca1e1a27bdc50fd51aa375bea6509
+SIZE (xorg/proto/dmxproto-2.3.1.tar.bz2) = 96467
diff --git a/x11/dri2proto/Makefile b/x11/dri2proto/Makefile
index 5709b1c2ae1f..6693907e485c 100644
--- a/x11/dri2proto/Makefile
+++ b/x11/dri2proto/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dri2proto
-PORTVERSION=	2.3
+PORTVERSION=	2.6
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/dri2proto/distinfo b/x11/dri2proto/distinfo
index eb210316420d..f791a3e786d2 100644
--- a/x11/dri2proto/distinfo
+++ b/x11/dri2proto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/dri2proto-2.3.tar.bz2) = b2141892a0db35feffa5e952ff5e1d2727c4436b07d7e2e9dd2ed89c8bb3e677
-SIZE (xorg/proto/dri2proto-2.3.tar.bz2) = 95466
+SHA256 (xorg/proto/dri2proto-2.6.tar.bz2) = ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909
+SIZE (xorg/proto/dri2proto-2.6.tar.bz2) = 102188
diff --git a/x11/dri2proto/pkg-plist b/x11/dri2proto/pkg-plist
index 006d862e9fce..f9a13c3529be 100644
--- a/x11/dri2proto/pkg-plist
+++ b/x11/dri2proto/pkg-plist
@@ -1,4 +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
index e7a1804122d4..bf23fc630757 100644
--- a/x11/glproto/Makefile
+++ b/x11/glproto/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	glproto
-PORTVERSION=	1.4.12
+PORTVERSION=	1.4.15
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo
index 73bbc435bcb0..e7b45bfa65de 100644
--- a/x11/glproto/distinfo
+++ b/x11/glproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/glproto-1.4.12.tar.bz2) = 48be7a9d190b600210e5ad08b4e8862a6b08e72dc52dbdf324716a888eb457de
-SIZE (xorg/proto/glproto-1.4.12.tar.bz2) = 106968
+SHA256 (xorg/proto/glproto-1.4.15.tar.bz2) = 990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171
+SIZE (xorg/proto/glproto-1.4.15.tar.bz2) = 113671
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index d4ab0714e8ca..3aaa0239733b 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libXi
-PORTVERSION=	1.4.3
+PORTVERSION=	1.4.5
 PORTEPOCH=	1
 CATEGORIES=	x11
 
diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo
index 19ae0f9ba982..98b1cb1714a2 100644
--- a/x11/libXi/distinfo
+++ b/x11/libXi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXi-1.4.3.tar.bz2) = 08c9d89a404740592621e6f5078414df86ccc78ca876e3da1af15639d81c74e0
-SIZE (xorg/lib/libXi-1.4.3.tar.bz2) = 422637
+SHA256 (xorg/lib/libXi-1.4.5.tar.bz2) = 22a99123229d22e6e1567c4cda0224a744475f427625d61b23d965157a86f1b5
+SIZE (xorg/lib/libXi-1.4.5.tar.bz2) = 416807
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index c92e1518a45c..1f41da6f3cab 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -15,8 +15,7 @@ COMMENT=	The X protocol C-language Binding (XCB) library
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto \
-		xcb-proto>=1.6:${PORTSDIR}/x11/xcb-proto \
+		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
 
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index 862fd3d2b03b..76b920676202 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xcb-proto
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 CATEGORIES=	x11 python
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo
index ec8a161d9a42..3ed55f7e4566 100644
--- a/x11/xcb-proto/distinfo
+++ b/x11/xcb-proto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xcb-proto-1.6.tar.bz2) = f52bc1159b12496f002404eb5793c01277b20c82cb72c5ff076d7b25da9b5ca2
-SIZE (xcb-proto-1.6.tar.bz2) = 92829
+SHA256 (xcb-proto-1.7.tar.bz2) = e67eb7263f222133fb9d1de70928724bea3a448cdcd99d0fa4c63c04fc124b38
+SIZE (xcb-proto-1.7.tar.bz2) = 104353
diff --git a/x11/xcb-proto/pkg-plist b/x11/xcb-proto/pkg-plist
index f7d743d7b4fb..05dff4e8b685 100644
--- a/x11/xcb-proto/pkg-plist
+++ b/x11/xcb-proto/pkg-plist
@@ -18,6 +18,7 @@ libdata/pkgconfig/xcb-proto.pc
 %%DATADIR%%/xevie.xml
 %%DATADIR%%/xf86dri.xml
 %%DATADIR%%/xfixes.xml
+%%DATADIR%%/xkb.xml
 %%DATADIR%%/xinerama.xml
 %%DATADIR%%/xinput.xml
 %%DATADIR%%/xprint.xml
diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile
index 667fb1b65e61..e4a5fd3070da 100644
--- a/x11/xdpyinfo/Makefile
+++ b/x11/xdpyinfo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xdpyinfo
-PORTVERSION=	1.2.0
+PORTVERSION=	1.3.0
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/xdpyinfo/distinfo b/x11/xdpyinfo/distinfo
index 94560818f5c6..08247da216cf 100644
--- a/x11/xdpyinfo/distinfo
+++ b/x11/xdpyinfo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xdpyinfo-1.2.0.tar.bz2) = fe5bad498ecfbf21f9a2a18eee5ece9de5d52f68878f250db8f575c9b872b5ce
-SIZE (xorg/app/xdpyinfo-1.2.0.tar.bz2) = 121514
+SHA256 (xorg/app/xdpyinfo-1.3.0.tar.bz2) = 23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f
+SIZE (xorg/app/xdpyinfo-1.3.0.tar.bz2) = 127611
diff --git a/x11/xdriinfo/Makefile b/x11/xdriinfo/Makefile
index 0d92920b8663..429a606f22c4 100644
--- a/x11/xdriinfo/Makefile
+++ b/x11/xdriinfo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xdriinfo
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/xdriinfo/distinfo b/x11/xdriinfo/distinfo
index 0808b19da372..689c1f436a01 100644
--- a/x11/xdriinfo/distinfo
+++ b/x11/xdriinfo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xdriinfo-1.0.3.tar.bz2) = 2b762afd08c798d79fd6dacfd6280da39105927fa2bd91e3b1ba75b8cddc259c
-SIZE (xorg/app/xdriinfo-1.0.3.tar.bz2) = 97688
+SHA256 (xorg/app/xdriinfo-1.0.4.tar.bz2) = 35c6e43d3b68ef5d93d013b4517014fb890bad96b2c801abf4f607927a94cb1c
+SIZE (xorg/app/xdriinfo-1.0.4.tar.bz2) = 104296
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index 253ed9a303ea..3bf4fc47fc78 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xinit
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
 PORTEPOCH=	1
 CATEGORIES=	x11
 
diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo
index 9c363d13e8f3..dbe3d873a2a6 100644
--- a/x11/xinit/distinfo
+++ b/x11/xinit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xinit-1.3.1.tar.bz2) = c7468dfae94bdb42785d79623c27156dc4bf379d8372992830482cb04d8439b0
-SIZE (xorg/app/xinit-1.3.1.tar.bz2) = 147067
+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/files/patch-xinit.c b/x11/xinit/files/patch-xinit.c
deleted file mode 100644
index abe8803b8282..000000000000
--- a/x11/xinit/files/patch-xinit.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- xinit.c.orig	2011-04-26 07:03:42.000000000 +0200
-+++ xinit.c	2011-08-06 22:14:03.000000000 +0200
-@@ -49,10 +49,10 @@
- #endif
- 
- /* For PRIO_PROCESS and setpriority() */
--#ifdef __DragonFly__
-+#if defined(__DragonFly__) || defined(__FreeBSD__)
- #include <sys/time.h>
- #include <sys/resource.h>
--#endif /* __DragonFly__ */
-+#endif
- 
- #include <stdlib.h>
- 
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index c699bd4f5cda..d23fcabca085 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	xkeyboard-config
-PORTVERSION=	2.1
+PORTVERSION=	2.5.1
 CATEGORIES=	x11
-MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Keyboard Configuration Database
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
-
+BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp \
+		xsltproc:${PORTSDIR}/textproc/libxslt
 XORG_CAT=	data
 
 USE_BZIP2=	yes
@@ -29,6 +28,8 @@ CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 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 '" \
@@ -42,9 +43,6 @@ PLIST_SUB+=	NLS=""
 .endif
 
 post-patch:
-.if defined(WITHOUT_NLS)
-	@${REINPLACE_CMD} '/^SUBDIR/s/ po//' ${WRKSRC}/Makefile.in
-.endif
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' -e 's|==|=|g' \
 		${WRKSRC}/rules/merge.sh
 
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index 7ee61f2538dd..a1b76612dc5c 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/data/xkeyboard-config-2.1.tar.bz2) = f9ee8340f2afadd2397aa4402eaf854da3738977accdbf147bc47c1cc99a3075
-SIZE (xorg/data/xkeyboard-config-2.1.tar.bz2) = 699368
+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-plist b/x11/xkeyboard-config/pkg-plist
index e9824e6bd004..1292125f7d22 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -140,6 +140,7 @@ 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
@@ -156,6 +157,7 @@ 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
@@ -172,11 +174,6 @@ share/X11/xkb/symbols/epo
 share/X11/xkb/symbols/es
 share/X11/xkb/symbols/et
 share/X11/xkb/symbols/eurosign
-share/X11/xkb/symbols/extras/apl
-share/X11/xkb/symbols/extras/ir
-share/X11/xkb/symbols/extras/rs
-share/X11/xkb/symbols/extras/ru
-share/X11/xkb/symbols/extras/us
 share/X11/xkb/symbols/fi
 share/X11/xkb/symbols/fo
 share/X11/xkb/symbols/fr
@@ -306,6 +303,7 @@ 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
@@ -347,6 +345,7 @@ share/X11/xkb/types/pc
 %%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
@@ -372,8 +371,8 @@ share/X11/xkb/types/pc
 %%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ky
 %%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/crh
 @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
@@ -384,7 +383,6 @@ share/X11/xkb/types/pc
 @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/extras
 @dirrm share/X11/xkb/symbols/digital_vndr
 @dirrm share/X11/xkb/symbols
 @dirrm share/X11/xkb/semantics
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index b54bfac28427..c9443e1a8aa7 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-apps
-PORTVERSION=	7.5.1
+PORTVERSION=	7.5.2
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index 68fa7fef2466..500b64cbd6e6 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg
-PORTVERSION=	7.5.1
+PORTVERSION=	7.5.2
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none
author	miwi <miwi@FreeBSD.org>	2012-04-22 01:03:32 +0800
committer	miwi <miwi@FreeBSD.org>	2012-04-22 01:03:32 +0800
commit	8610de7ebcb688f7c822933cf96ecea22af9d9ac (patch)
tree	58b95feaf2cd439308ad5db219bea76198f6e316
parent	074f8111429b0ad96ac33c0e038ffb0e7ed50b11 (diff)
download	freebsd-ports-gnome-8610de7ebcb688f7c822933cf96ecea22af9d9ac.tar.gz freebsd-ports-gnome-8610de7ebcb688f7c822933cf96ecea22af9d9ac.tar.zst freebsd-ports-gnome-8610de7ebcb688f7c822933cf96ecea22af9d9ac.zip