19 files changed, 100 insertions, 271 deletions

diff --git a/x11-servers/mga_hal/Makefile b/x11-servers/mga_hal/Makefile
index cf56a40d12cb..eb37cadf2496 100644
--- a/x11-servers/mga_hal/Makefile
+++ b/x11-servers/mga_hal/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mga_hal
-# Date created:				12 Jan 2005
-# Whom:					anholt@FreeBSD.org
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mga_hal
 PORTVERSION=	4.4.0
diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile
index d14a67957d61..08a055bc676d 100644
--- a/x11-servers/xephyr/Makefile
+++ b/x11-servers/xephyr/Makefile
@@ -1,14 +1,9 @@
-# New ports collection makefile for:	xephyr
-# Date created:				2008-05-18
-# Whom:					Max Brazhnikov <makc@issp.ac.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xephyr
 PORTREVISION=	0
 
-COMMENT=	A kdrive based X server from X.Org
+COMMENT=	X server from X.Org based on kdrive
 
 MASTERDIR=	${.CURDIR}/../xorg-server
 DESCR=		${.CURDIR}/pkg-descr
@@ -22,8 +17,7 @@ USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 
 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
+		--disable-xnest --localstatedir=/var --without-dtrace
 
 SLAVE_PORT=	yes
 PLIST_FILES=	bin/Xephyr
diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index aa3ebc94315f..2521fdf2bb0e 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    xorg-dmx
-# Date created:		13 Mar 2005
-# Whom:			lesi@FreeBSD.org
-#
+# Created by: lesi@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-dmx
 PORTREVISION=	0
@@ -21,7 +17,7 @@ USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
 		xau dmx xtst xres pixman xtrans
 
-CONFIGURE_ARGS=	--disable-xvfb --disable-xorg --disable-xnest \
+CONFIGURE_ARGS=	--disable-xvfb --disable-xnest \
 		--without-xmlto	--disable-docs --disable-devel-docs \
 		--enable-dmx --localstatedir=/var --without-dtrace
 
diff --git a/x11-servers/xorg-dmx/pkg-plist b/x11-servers/xorg-dmx/pkg-plist
index 657dfd5608de..c7fea5a1956a 100644
--- a/x11-servers/xorg-dmx/pkg-plist
+++ b/x11-servers/xorg-dmx/pkg-plist
@@ -11,5 +11,3 @@ bin/dmxtodmx
 bin/dmxwininfo
 bin/vdltodmx
 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 ef991df92b30..ea01804d9bf4 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:    xorg-nestserver
-# Date created:		21 July 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-nestserver
-PORTREVISION=	1
 
 COMMENT=	Nesting X server from X.Org
 
@@ -20,7 +15,7 @@ USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
 		xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
 
-CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xorg \
+CONFIGURE_ARGS=	--disable-dmx --disable-xvfb \
 		--without-xmlto --disable-docs --disable-devel-docs \
 		--localstatedir=/var --without-dtrace
 
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index e8d26f81b980..0359b5b06f1f 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -1,45 +1,42 @@
-# New ports collection makefile for:    xorg-server
-# Date created:		7 May 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME?=	xorg-server
 PORTVERSION=	${XORG_VERSION}
 PORTREVISION?=	${XORG_REVISION}
 PORTEPOCH?=	1
 CATEGORIES=	x11-servers
-MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
-DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2
+MASTER_SITES=	XORG
+MASTER_SITE_SUBDIR=	individual/xserver
+DISTNAME=	xorg-server-${PORTVERSION}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT?=	X.Org X server and related programs
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-
-RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config \
+RUN_DEPENDS=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
 		xkbcomp:${PORTSDIR}/x11/xkbcomp
 
 XORG_CAT=	xserver
 SLAVE_PORT?=	no
 
 .if defined(WITH_NEW_XORG)
-XORG_VERSION=	1.10.6
-XORG_REVISION=	2
+XORG_VERSION=	1.12.4
+XORG_REVISION=	0
 PLIST_SUB+=	OLD="@comment " NEW=""
-EXTRA_PATCHES+=	${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \
-		${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h \
-		${FILESDIR}/extra-clang
+EXTRA_PATCHES+=	${FILESDIR}/extra-clang
 .else
 XORG_VERSION=	1.7.7
 XORG_REVISION=	6
 PLIST_SUB+=	OLD="" NEW="@comment "
-EXTRA_PATCHES+=	${FILESDIR}/extra-dix_events.c
-EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-os-utils.c
+EXTRA_PATCHES+=	${FILESDIR}/extra-include_eventstr.h \
+		${FILESDIR}/extra-os-utils.c \
+		${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \
+		${FILESDIR}/extra-Xserver-os-xprintf.c \
+		${FILESDIR}/extra-servermd.h
 .endif
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GL=		gl
 USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
@@ -48,8 +45,7 @@ USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
 		resourceproto fontsproto inputproto xf86dgaproto \
 		videoproto compositeproto trapproto recordproto xineramaproto \
-		xinerama evieproto xfont fontenc xkbui pixman pciaccess \
-		xorg-macros
+		xinerama evieproto xfont fontenc xkbui pixman pciaccess
 
 MAKE_JOBS_UNSAFE=	yes
 USE_OPENSSL=	yes
@@ -96,7 +92,7 @@ CONFIGURE_ENV=	SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
 .endif
 
 .if ${PORT_OPTIONS:MHAL}
-LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
 CONFIGURE_ARGS+=	--enable-config-hal=yes
 .else
 CONFIGURE_ARGS+=	--enable-config-hal=no
@@ -115,7 +111,11 @@ CONFIGURE_ARGS+=--enable-install-setuid=no
 .endif
 
 .if ${ARCH} == i386
-EXTRA_PATCHES+=	${FILESDIR}/extra-arch-i386
+.if defined(WITH_NEW_XORG)
+EXTRA_PATCHES+=	${FILESDIR}/extra-new-arch-i386
+.else
+EXTRA_PATCHES+=	${FILESDIR}/extra-old-arch-i386
+.endif
 .endif
 
 .if ${ARCH} == ia64
@@ -166,6 +166,8 @@ post-patch:
 
 .if ${SLAVE_PORT} == "no"
 pre-su-install:
+# The .xorg dir because else the xorg-server might not load the correct 
+# libglx module.
 	${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/.xorg
 	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
 		${PREFIX}/lib/xorg/modules/extensions/.xorg/
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 7e27de5b2ce5..7f1ac5194b83 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,4 +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
+SHA256 (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
+SIZE (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 5444761
diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c b/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
index 651be80114fe..651be80114fe 100644
--- a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
+++ b/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
diff --git a/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c b/x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
index e9fb876333cc..e9fb876333cc 100644
--- a/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
+++ b/x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c
diff --git a/x11-servers/xorg-server/files/extra-clang b/x11-servers/xorg-server/files/extra-clang
index 82817592415a..359e55e0b8f4 100644
--- a/x11-servers/xorg-server/files/extra-clang
+++ b/x11-servers/xorg-server/files/extra-clang
@@ -1,53 +1,75 @@
---- hw/xfree86/common/xf86Xinput.c.orig	2012-12-13 23:58:55.673738569 +0100
-+++ hw/xfree86/common/xf86Xinput.c	2012-12-13 23:59:52.528738525 +0100
-@@ -479,7 +479,7 @@
- MatchAttrToken(const char *attr, struct list *patterns,
-                int (*compare)(const char *attr, const char *pattern))
+--- dix/events.c.orig	2012-07-09 02:32:59.000000000 +0200
++++ dix/events.c	2012-07-22 14:34:46.000000000 +0200
+@@ -5189,7 +5189,8 @@
+ InitEvents(void)
+ {
+     int i;
+-    QdEventPtr qe, tmp;
++    QdEventPtr qe = NULL;
++    QdEventPtr tmp;
+ 
+     inputInfo.numDevices = 0;
+     inputInfo.devices = (DeviceIntPtr) NULL;
+--- hw/xfree86/common/xf86Xinput.c.orig	2012-06-26 08:24:18.000000000 +0200
++++ hw/xfree86/common/xf86Xinput.c	2012-07-22 14:34:46.000000000 +0200
+@@ -524,7 +524,7 @@
+ MatchAttrToken(const char *attr, struct xorg_list *patterns,
+                int (*compare) (const char *attr, const char *pattern))
  {
 -    const xf86MatchGroup *group;
 +    const xf86MatchGroup *group = NULL;
  
      /* If there are no patterns, accept the match */
-     if (list_is_empty(patterns))
---- hw/xfree86/parser/InputClass.c.orig	2012-12-14 00:03:07.149734651 +0100
-+++ hw/xfree86/parser/InputClass.c	2012-12-14 00:04:09.522735172 +0100
-@@ -338,7 +338,8 @@
-     XF86ConfInputClassPtr prev;
- 
-     while (ptr) {
--        xf86MatchGroup *group, *next;
-+        xf86MatchGroup *group = NULL;
-+        xf86MatchGroup *next;
-         char **list;
- 
-         TestFree(ptr->identifier);
---- hw/xfree86/dri2/dri2.c.orig	2012-12-14 00:06:39.680738243 +0100
-+++ hw/xfree86/dri2/dri2.c	2012-12-14 00:08:14.310729622 +0100
-@@ -201,7 +201,7 @@
+     if (xorg_list_is_empty(patterns))
+--- hw/xfree86/dri2/dri2.c.orig	2012-07-09 02:32:59.000000000 +0200
++++ hw/xfree86/dri2/dri2.c	2012-07-22 14:38:42.000000000 +0200
+@@ -239,7 +239,7 @@
  static DRI2DrawableRefPtr
  DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
  {
 -    DRI2DrawableRefPtr ref;
 +    DRI2DrawableRefPtr ref = NULL;
  
-     list_for_each_entry(ref, &pPriv->reference_list, link) {
- 	if (ref->id == id)
-@@ -267,7 +267,8 @@
+     xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
+         if (ref->id == id)
+@@ -306,7 +306,8 @@
  {
      DRI2DrawablePtr pPriv = p;
-     DRI2ScreenPtr   ds = pPriv->dri2_screen;
+     DRI2ScreenPtr ds = pPriv->dri2_screen;
 -    DRI2DrawableRefPtr ref, next;
 +    DRI2DrawableRefPtr ref = NULL;
-+    DRI2DrawableRefPtr  next;
++    DRI2DrawableRefPtr next;
      WindowPtr pWin;
      PixmapPtr pPixmap;
      DrawablePtr pDraw;
-@@ -534,7 +535,7 @@
+@@ -587,7 +588,7 @@
  DRI2InvalidateDrawable(DrawablePtr pDraw)
  {
      DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
 -    DRI2DrawableRefPtr ref;
 +    DRI2DrawableRefPtr ref = NULL;
  
-     if (!pPriv)
+     if (!pPriv || !pPriv->needInvalidate)
          return;
+--- test/list.c.orig	2012-06-26 06:12:51.000000000 +0200
++++ test/list.c	2012-07-22 14:34:46.000000000 +0200
+@@ -187,7 +187,7 @@
+ {
+     struct parent parent = { 0 };
+     struct child child[3];
+-    struct child *c;
++    struct child *c = NULL;
+     int i = 0;
+ 
+     xorg_list_init(&parent.children);
+--- xfixes/cursor.c.orig	2012-07-06 07:17:19.000000000 +0200
++++ xfixes/cursor.c	2012-07-22 14:34:46.000000000 +0200
+@@ -1143,7 +1143,7 @@
+ barrier_find_nearest(CursorScreenPtr cs, int dir,
+                      int x1, int y1, int x2, int y2)
+ {
+-    struct PointerBarrierClient *c;
++    struct PointerBarrierClient *c = NULL;
+     struct PointerBarrier *nearest = NULL;
+     double min_distance = INT_MAX;      /* can't get higher than that in X anyway */
+ 
diff --git a/x11-servers/xorg-server/files/extra-dix_events.c b/x11-servers/xorg-server/files/extra-dix_events.c
deleted file mode 100644
index caa7a99ec255..000000000000
--- a/x11-servers/xorg-server/files/extra-dix_events.c
+++ /dev/null
@@ -1,89 +0,0 @@
---- dix/events.c.orig	2010-05-04 02:47:57.000000000 +0200
-+++ dix/events.c	2012-04-24 12:59:22.000000000 +0200
-@@ -3440,7 +3440,6 @@ CheckPassiveGrabsOnWindow(
-     {
- 	DeviceIntPtr	gdev;
- 	XkbSrvInfoPtr	xkbi = NULL;
--	Mask		mask = 0;
- 
- 	gdev= grab->modifierDevice;
-         if (grab->grabtype == GRABTYPE_CORE)
-@@ -3555,9 +3554,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);
-@@ -3569,34 +3565,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);
-@@ -3607,23 +3575,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);
-@@ -3632,7 +3583,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/extra-hw_dmx_glxProxy_compsize.h b/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
deleted file mode 100644
index 612a7b0dc98b..000000000000
--- a/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
+++ /dev/null
@@ -1,54 +0,0 @@
---- 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
deleted file mode 100644
index b75028b6745c..000000000000
--- a/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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-new-arch-i386 b/x11-servers/xorg-server/files/extra-new-arch-i386
new file mode 100644
index 000000000000..1a0bdeef2bd0
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-new-arch-i386
@@ -0,0 +1,11 @@
+--- hw/xfree86/common/compiler.h.orig	2012-05-17 19:09:03.000000000 +0200
++++ hw/xfree86/common/compiler.h	2013-01-18 13:59:18.366436857 +0100
+@@ -1335,7 +1335,7 @@
+ 
+ #if !defined(__SUNPRO_C)
+ #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
+-#ifdef GCCUSESGAS
++#if defined(GCCUSESGAS) || defined(__clang__)
+ 
+ /*
+  * If gcc uses gas rather than the native assembler, the syntax of these
diff --git a/x11-servers/xorg-server/files/extra-arch-i386 b/x11-servers/xorg-server/files/extra-old-arch-i386
index c5e558c2cdd0..c5e558c2cdd0 100644
--- a/x11-servers/xorg-server/files/extra-arch-i386
+++ b/x11-servers/xorg-server/files/extra-old-arch-i386
diff --git a/x11-servers/xorg-server/files/extra-patch-os-utils.c b/x11-servers/xorg-server/files/extra-os-utils.c
index 2980ded6fd7d..2980ded6fd7d 100644
--- a/x11-servers/xorg-server/files/extra-patch-os-utils.c
+++ b/x11-servers/xorg-server/files/extra-os-utils.c
diff --git a/x11-servers/xorg-server/files/patch-servermd.h b/x11-servers/xorg-server/files/extra-servermd.h
index 5bbb1e4d8ab5..5bbb1e4d8ab5 100644
--- a/x11-servers/xorg-server/files/patch-servermd.h
+++ b/x11-servers/xorg-server/files/extra-servermd.h
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index 48be23a5e47d..bee307f57e51 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -12,6 +12,7 @@ include/xorg/bt829.h
 %%OLD%%include/xorg/bstorestr.h
 %%NEW%%include/xorg/callback.h
 %%OLD%%include/xorg/cfb8_16.h
+%%NEW%%include/xorg/client.h
 include/xorg/closestr.h
 include/xorg/closure.h
 include/xorg/colormap.h
@@ -83,6 +84,7 @@ include/xorg/mioverlay.h
 include/xorg/msp3430.h
 include/xorg/opaque.h
 include/xorg/os.h
+%%NEW%%include/xorg/optionstr.h
 include/xorg/panoramiXsrv.h
 include/xorg/panoramiX.h
 include/xorg/picture.h
@@ -138,6 +140,7 @@ include/xorg/xf86DDC.h
 include/xorg/xf86Modes.h
 include/xorg/xf86Module.h
 include/xorg/xf86Opt.h
+%%NEW%%include/xorg/xf86Optionstr.h
 include/xorg/xf86Optrec.h
 include/xorg/xf86Parser.h
 include/xorg/xf86Pci.h
@@ -225,7 +228,7 @@ 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
+@comment %%NEW%%@dirrm share/doc/xorg-server
 @dirrm include/xorg
 @dirrm lib/xorg/modules/extensions/.xorg
 @dirrm lib/xorg/modules/extensions
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
index 3f4bd301e232..1dd6ee2c035c 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:    xorg-vfbserver
-# Date created:		17 June 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-vfbserver
-PORTREVISION=	1
 
 COMMENT=	X virtual framebuffer server from X.Org
 
@@ -20,8 +15,8 @@ USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		xineramaproto xinerama evieproto xkbfile xfont fontenc \
 		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
 
-CONFIGURE_ARGS=	--disable-dmx --disable-xnest --disable-xorg \
-		--without-xmlto --disable-docs --disable-devel-docs \
+CONFIGURE_ARGS=	--disable-dmx --disable-xnest \
+		--without-xmlto --disable-docs --disable-devel1-docs \
 		--localstatedir=/var --without-dtrace
 
 SLAVE_PORT=	yes