19 files changed, 60 insertions, 566 deletions

diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile
index 05e3e587143c..bd43c1ec697f 100644
--- a/x11-servers/xephyr/Makefile
+++ b/x11-servers/xephyr/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xephyr
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	1.5.3
 CATEGORIES=	x11-servers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -16,13 +15,15 @@ COMMENT=	A kdrive based X server from X.Org
 XORG_CAT=	xserver
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
+
+USE_GL=		gl
 USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		damageproto xcmiscproto xtrans inputproto \
 		xf86bigfontproto scrnsaverproto bigreqsproto \
 		resourceproto fontsproto videoproto \
 		compositeproto trapproto recordproto \
 		xineramaproto evieproto xkbfile xfont \
-		xau xdmcp xext fontenc pixman
+		xau xdmcp xext fontenc xv pixman
 
 CONFIGURE_ARGS=	--enable-kdrive --enable-xephyr	--disable-dmx --disable-xvfb \
 		--disable-xorg --disable-xnest --disable-xprint \
diff --git a/x11-servers/xephyr/distinfo b/x11-servers/xephyr/distinfo
index 70c76c2b2663..0a7c42acf73d 100644
--- a/x11-servers/xephyr/distinfo
+++ b/x11-servers/xephyr/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220
-SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
-SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392
+MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8
+SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
+SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625
diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index fa947a219ec4..191dc638d379 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xorg-dmx
-PORTVERSION=	1.4
-PORTREVISION=	3
+PORTVERSION=	1.5.3
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 
@@ -19,6 +18,8 @@ CONFLICTS=	XFree86-dmx-[0-9]*
 XORG_CAT=	xserver
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
+
+USE_GL=		gl
 USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		damageproto xcmiscproto xextproto xf86miscproto \
 		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo
index 70c76c2b2663..0a7c42acf73d 100644
--- a/x11-servers/xorg-dmx/distinfo
+++ b/x11-servers/xorg-dmx/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220
-SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
-SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392
+MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8
+SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
+SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625
diff --git a/x11-servers/xorg-dmx/files/patch-hw_dmx_Makefile.in b/x11-servers/xorg-dmx/files/patch-hw_dmx_Makefile.in
deleted file mode 100644
index be7571e1aefa..000000000000
--- a/x11-servers/xorg-dmx/files/patch-hw_dmx_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- hw/dmx/Makefile.in.orig	2007-12-12 17:55:26.000000000 +0000
-+++ hw/dmx/Makefile.in	2007-12-12 17:55:56.000000000 +0000
-@@ -476,6 +476,7 @@
- Xdmx_LDADD = $(XORG_CORE_LIBS) \
-              $(XDMX_LIBS) \
-              $(GLX_LIBS) \
-+             $(XSERVER_LIBS) \
-              input/libdmxinput.a \
-              config/libdmxconfig.a \
-              @DMXMODULES_LIBS@
diff --git a/x11-servers/xorg-dmx/files/patch-hw_dmx_dmxinput.c b/x11-servers/xorg-dmx/files/patch-hw_dmx_dmxinput.c
deleted file mode 100644
index c860dc10b278..000000000000
--- a/x11-servers/xorg-dmx/files/patch-hw_dmx_dmxinput.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- hw/dmx/dmxinput.c.orig	2007-12-12 17:52:53.000000000 +0000
-+++ hw/dmx/dmxinput.c	2007-12-12 17:53:22.000000000 +0000
-@@ -105,3 +105,14 @@
-         if (!dmxInput->detached && dmxInput->updateWindowInfo)
-             dmxInput->updateWindowInfo(dmxInput, type, pWindow);
- }
-+
-+int
-+NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
-+{
-+    return BadValue;
-+}
-+
-+void
-+DeleteInputDeviceRequest(DeviceIntPtr dev)
-+{
-+}
diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
index 7546cb56a54c..992c65780fca 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xorg-nestserver
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	1.5.3
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 
@@ -19,6 +18,8 @@ CONFLICTS=	XFree86-NestServer-*
 XORG_CAT=	xserver
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
+
+USE_GL=		gl
 USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		damageproto xcmiscproto xextproto xf86miscproto inputproto \
 		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo
index 70c76c2b2663..0a7c42acf73d 100644
--- a/x11-servers/xorg-nestserver/distinfo
+++ b/x11-servers/xorg-nestserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220
-SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
-SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392
+MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8
+SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
+SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index fcc7e476f1f1..ba94e80c09fd 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -6,48 +6,45 @@
 #
 
 PORTNAME=	xorg-server
-PORTVERSION=	1.4.2
+PORTVERSION=	1.5.3
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
-MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/:fdo \
-		${MASTER_SITE_SOURCEFORGE:S/$/:mesa/}
-MASTER_SITE_SUBDIR=mesa3d/:mesa
-DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2:fdo \
-		MesaLib-7.0.1.tar.bz2:mesa
+MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
+DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org X server and related programs
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
+
 RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
 
 CONFLICTS=	XFree86-Server-*
 
 XORG_CAT=	xserver
 
+USE_GL=		gl
 USE_XORG=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 		xmu xt xpm xext randrproto renderproto fixesproto damageproto \
 		xcmiscproto xextproto xproto xtrans xf86miscproto \
 		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
 		resourceproto fontsproto inputproto xf86dgaproto \
 		videoproto compositeproto trapproto recordproto xineramaproto \
-		evieproto xfont fontenc xkbui pixman
+		evieproto xfont fontenc xkbui pixman pciaccess
 
+USE_OPENSSL=	yes
 USE_PERL5_BUILD=yes
-CONFIGURE_ARGS=	--with-mesa-source=${WRKDIR}/Mesa-7.0.1 \
-		--disable-dmx --disable-xvfb --disable-xnest --disable-xprint \
-		--localstatedir=/var --without-dtrace
+CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xnest --disable-xprint \
+		--localstatedir=/var --without-dtrace --disable-xephyr
 
 MAN1=		Xorg.1 \
 		Xserver.1 \
 		cvt.1 \
 		gtf.1 \
-		pcitweak.1 \
 		xorgconfig.1
 MAN4=		exa.4 \
 		fbdevhw.4
-MAN5=		xorg.conf.5 \
-		SecurityPolicy.5
+MAN5=		xorg.conf.5
 
 NOT_FOR_ARCHS=	ia64 alpha
 
@@ -57,6 +54,13 @@ 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
@@ -101,7 +105,6 @@ PLIST_SUB+=	SPARC64_NA=""
 
 .if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == sparc64
 PLIST_SUB+=	AMD64_I386_SPARC64=""
-MAN1+=		scanpci.1
 .else
 PLIST_SUB+=	AMD64_I386_SPARC64="@comment "
 .endif
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 03b4020c6793..0a7c42acf73d 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,6 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = fa2915ae377f61c340a18ebef484b64b
-SHA256 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d
-SIZE (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 6216638
-MD5 (xorg/xserver/MesaLib-7.0.1.tar.bz2) = c056abd763e899114bf745c9eedbf9ad
-SHA256 (xorg/xserver/MesaLib-7.0.1.tar.bz2) = 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7
-SIZE (xorg/xserver/MesaLib-7.0.1.tar.bz2) = 3343538
+MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8
+SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
+SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625
diff --git a/x11-servers/xorg-server/files/patch-Pci.h b/x11-servers/xorg-server/files/patch-Pci.h
deleted file mode 100644
index 0d6991b41700..000000000000
--- a/x11-servers/xorg-server/files/patch-Pci.h
+++ /dev/null
@@ -1,88 +0,0 @@
---- hw/xfree86/os-support/bus/Pci.h.orig	2007-09-06 02:48:26.000000000 +0200
-+++ hw/xfree86/os-support/bus/Pci.h	2007-09-28 21:43:06.000000000 +0200
-@@ -112,6 +112,10 @@
- #include "xf86Pci.h"
- #include "xf86PciInfo.h"
- 
-+#if defined(__FreeBSD__)
-+#include <osreldate.h>
-+#endif
-+
- /*
-  * Global Definitions
-  */
-@@ -123,6 +127,10 @@
- # define MAX_PCI_DOMAINS	512
- # define PCI_DOM_MASK	0x01fful
- # define MAX_PCI_BUSES	(MAX_PCI_DOMAINS*256) /* 256 per domain      */
-+#elif defined(FreeBSD) && __FreeBSD_version >= 700053 && !defined(__i386__)
-+# define MAX_PCI_DOMAINS	256 /* limited by 32-bit xf86 PCITAG */
-+# define PCI_DOM_MASK	(MAX_PCI_DOMAINS - 1)
-+# define MAX_PCI_BUSES	(MAX_PCI_DOMAINS*256) /* 256 per domain      */
- #else
- # define MAX_PCI_BUSES   256	/* Max number of PCI buses           */
- #endif
-@@ -238,7 +246,9 @@
- # elif defined(__FreeBSD__) || defined(__OpenBSD__)
- #  define ARCH_PCI_INIT freebsdPciInit
- #  define INCLUDE_XF86_MAP_PCI_MEM
--#  define INCLUDE_XF86_NO_DOMAIN
-+#  if __FreeBSD_version < 700053 || defined(__OpenBSD__)
-+#   define INCLUDE_XF86_NO_DOMAIN
-+#  endif
- # elif defined(__NetBSD__)
- #  define ARCH_PCI_INIT netbsdPciInit
- #  define INCLUDE_XF86_MAP_PCI_MEM
-@@ -260,10 +270,12 @@
- # if defined(linux)
- #  define ARCH_PCI_INIT ia64linuxPciInit
- #  define INCLUDE_XF86_MAP_PCI_MEM
--# elif defined(FreeBSD)
-+# elif defined(FreeBSD) || defined(__OpenBSD__)
- #  define ARCH_PCI_INIT freebsdPciInit
- #  define INCLUDE_XF86_MAP_PCI_MEM
--#  define INCLUDE_XF86_NO_DOMAIN
-+#  if __FreeBSD_version < 700053 || defined(__OpenBSD__)
-+#   define INCLUDE_XF86_NO_DOMAIN
-+#  endif
- # endif
- # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper
- #elif defined(__i386__) || defined(i386)
-@@ -293,7 +305,9 @@
- # elif defined(__FreeBSD__) || defined(__OpenBSD__)
- #  define  ARCH_PCI_INIT freebsdPciInit
- #  define INCLUDE_XF86_MAP_PCI_MEM
--#  define INCLUDE_XF86_NO_DOMAIN
-+#  if __FreeBSD_version < 700053 || defined(__OpenBSD__)
-+#   define INCLUDE_XF86_NO_DOMAIN
-+#  endif
- # elif defined(__NetBSD__)
- #  define ARCH_PCI_INIT netbsdPciInit
- #  define INCLUDE_XF86_MAP_PCI_MEM
-@@ -325,7 +339,9 @@
- # elif (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc64__)
- #  define  ARCH_PCI_INIT freebsdPciInit
- #  define INCLUDE_XF86_MAP_PCI_MEM
--#  define INCLUDE_XF86_NO_DOMAIN
-+#  if __FreeBSD_version < 700053 || defined(__OpenBSD__)
-+#   define INCLUDE_XF86_NO_DOMAIN
-+#  endif
- # endif
- # if !defined(__FreeBSD__) && !defined(linux)
- #  define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
-@@ -333,11 +349,14 @@
- #elif defined(__amd64__) || defined(__amd64)
- # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #  define ARCH_PCI_INIT freebsdPciInit
-+#  if __FreeBSD_version < 700053 || defined(__FreeBSD_kernel__)
-+#   define INCLUDE_XF86_NO_DOMAIN
-+#  endif
- # else
- #  define ARCH_PCI_INIT ix86PciInit
-+#  define INCLUDE_XF86_NO_DOMAIN
- # endif
- # define INCLUDE_XF86_MAP_PCI_MEM
--# define INCLUDE_XF86_NO_DOMAIN
- # if defined(linux)
- #  define ARCH_PCI_OS_INIT linuxPciInit
- # endif
diff --git a/x11-servers/xorg-server/files/patch-bsdResource.c b/x11-servers/xorg-server/files/patch-bsdResource.c
index 44388bb0a393..67eef5985730 100644
--- a/x11-servers/xorg-server/files/patch-bsdResource.c
+++ b/x11-servers/xorg-server/files/patch-bsdResource.c
@@ -1,15 +1,15 @@
---- hw/xfree86/os-support/bsd/bsdResource.c.orig	Fri Apr 23 21:54:07 2004
-+++ hw/xfree86/os-support/bsd/bsdResource.c	Tue May 17 00:48:36 2005
-@@ -18,7 +18,7 @@
+--- hw/xfree86/os-support/bsd/bsdResource.c.orig	2008-07-19 12:47:13.000000000 +0100
++++ hw/xfree86/os-support/bsd/bsdResource.c	2008-07-19 12:52:03.000000000 +0100
+@@ -19,7 +19,7 @@
  
  #ifdef INCLUDE_XF86_NO_DOMAIN
  
--#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__)
-+#if defined(__alpha__) || defined(__amd64__)
+-#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__x86_64__)
++#if defined(__alpha__) || defined(__amd64__) || defined(__x86_64__)
  
  resPtr
- xf86BusAccWindowsFromOS(void)
-@@ -112,7 +112,7 @@
+ xf86AccResFromOS(resPtr ret)
+@@ -60,7 +60,7 @@
      return ret;
  }
  
@@ -17,44 +17,8 @@
 +#elif defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__)
  
  resPtr
- xf86BusAccWindowsFromOS(void)
-@@ -123,7 +123,11 @@
-     RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock);
-     ret = xf86AddResToList(ret, &range, -1);
- 
-+#if defined(__sparc__) || defined(__sparc64__)
-+    RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock);
-+#else
-     RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock);
-+#endif
-     ret = xf86AddResToList(ret, &range, -1);
-     return ret;
- }
-@@ -137,7 +141,11 @@
-     RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock);
-     ret = xf86AddResToList(ret, &range, -1);
- 
-+#if defined(__sparc__) || defined(__sparc64__)
-+    RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock);
-+#else
-     RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock);
-+#endif
-     ret = xf86AddResToList(ret, &range, -1);
-     return ret;
- }
-@@ -153,7 +161,11 @@
-     RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock);
-     ret = xf86AddResToList(ret, &range, -1);
- 
-+#if defined(__sparc__) || defined(__sparc64__)         
-+    RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock);
-+#else
-     RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock);
-+#endif
-     ret = xf86AddResToList(ret, &range, -1);
-     return ret;
- }
-@@ -175,7 +187,11 @@
+ xf86AccResFromOS(resPtr ret)
+@@ -77,7 +77,11 @@
      ret = xf86AddResToList(ret, &range, -1);
      RANGE(range, 0x00000000, 0x00000000, ResExcIoBlock);
      ret = xf86AddResToList(ret, &range, -1);
diff --git a/x11-servers/xorg-server/files/patch-config-hal.c b/x11-servers/xorg-server/files/patch-config-hal.c
deleted file mode 100644
index bbe6cb07aff5..000000000000
--- a/x11-servers/xorg-server/files/patch-config-hal.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/hal.c.orig	2007-08-23 15:04:52.000000000 -0400
-+++ config/hal.c	2008-03-27 18:36:36.000000000 -0400
-@@ -212,6 +212,7 @@
-     }
- 
-     add_option(&options, "path", path);
-+    add_option(&options, "device", path);
-     add_option(&options, "driver", driver);
-     add_option(&options, "name", name);
-     config_info = xalloc(strlen(udi) + 5); /* "hal:" and NULL */
diff --git a/x11-servers/xorg-server/files/patch-configure b/x11-servers/xorg-server/files/patch-configure
deleted file mode 100644
index 1c8c8f38d3a1..000000000000
--- a/x11-servers/xorg-server/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2008-02-28 16:08:55.000000000 -0500
-+++ configure	2008-02-28 16:11:19.000000000 -0500
-@@ -30376,7 +30376,7 @@
- else
-   cat >conftest.$ac_ext <<_ACEOF
- 
--#define _POSIX_C_SOURCE 199309L
-+#define _POSIX_C_SOURCE 200112L
- #include <time.h>
- 
- int main(int argc, char *argv[]) {
diff --git a/x11-servers/xorg-server/files/patch-dix_devices.c b/x11-servers/xorg-server/files/patch-dix_devices.c
deleted file mode 100644
index f02738d39a20..000000000000
--- a/x11-servers/xorg-server/files/patch-dix_devices.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- dix/devices.c.orig  2007-10-19 17:04:51.000000000 -0200
-+++ dix/devices.c       2007-10-23 17:50:38.000000000 -0200
-@@ -294,7 +294,17 @@ CoreKeyboardBell(int volume, DeviceIntPt
- static void
- CoreKeyboardCtl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
- {
-+#ifdef XKB
-+    if (!noXkbExtension) {
-+       DeviceIntPtr dev = (DeviceIntPtr)
-+           pDev->devPrivates[CoreDevicePrivatesIndex].ptr;
-+
-+       if (dev && dev->key && dev->key->xkbInfo && dev->key->xkbInfo->kbdProc)
-+           (*dev->key->xkbInfo->kbdProc)(dev, ctrl);
-+    }
-+#else
-     return;
-+#endif
- }
-
- /**
diff --git a/x11-servers/xorg-server/files/patch-freebsdPci.c b/x11-servers/xorg-server/files/patch-freebsdPci.c
deleted file mode 100644
index 83b034fc9a3e..000000000000
--- a/x11-servers/xorg-server/files/patch-freebsdPci.c
+++ /dev/null
@@ -1,306 +0,0 @@
---- hw/xfree86/os-support/bus/freebsdPci.c.orig	Thu Sep  6 02:48:26 2007
-+++ hw/xfree86/os-support/bus/freebsdPci.c	Sat Sep 29 12:22:56 2007
-@@ -109,10 +109,6 @@
- #define PCI_CPU(val)	(val)
- #endif
- 
--
--#define BUS(tag) (((tag)>>16)&0xff)
--#define DFN(tag) (((tag)>>8)&0xff)
--
- static int pciFd = -1;
- 
- void
-@@ -133,9 +129,12 @@
- {
- 	struct pci_io io;
- 	int error;
--	io.pi_sel.pc_bus = BUS(tag);
--	io.pi_sel.pc_dev = DFN(tag) >> 3;
--	io.pi_sel.pc_func = DFN(tag) & 7;
-+#ifndef INCLUDE_XF86_NO_DOMAIN
-+	io.pi_sel.pc_domain = PCI_DOM_FROM_TAG(tag);
-+#endif
-+	io.pi_sel.pc_bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag));
-+	io.pi_sel.pc_dev = PCI_DEV_FROM_TAG(tag);
-+	io.pi_sel.pc_func = PCI_FUNC_FROM_TAG(tag);
- 	io.pi_reg = off;
- 	io.pi_width = 4;
- 	error = ioctl(pciFd, PCIOCREAD, &io);
-@@ -148,9 +147,12 @@
- freebsdPciCfgWrite(PCITAG tag, int off, CARD32 val)
- {
- 	struct pci_io io;
--	io.pi_sel.pc_bus = BUS(tag);
--	io.pi_sel.pc_dev = DFN(tag) >> 3;
--	io.pi_sel.pc_func = DFN(tag) & 7;
-+#ifndef INCLUDE_XF86_NO_DOMAIN
-+	io.pi_sel.pc_domain = PCI_DOM_FROM_TAG(tag);
-+#endif
-+	io.pi_sel.pc_bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag));
-+	io.pi_sel.pc_dev = PCI_DEV_FROM_TAG(tag);
-+	io.pi_sel.pc_func = PCI_FUNC_FROM_TAG(tag);
- 	io.pi_reg = off;
- 	io.pi_width = 4;
- 	io.pi_data = PCI_CPU(val);
-@@ -164,3 +166,260 @@
- 	val = (val & ~mask) | (bits & mask);
- 	freebsdPciCfgWrite(tag, off, val);
- }
-+
-+#ifndef INCLUDE_XF86_NO_DOMAIN
-+
-+/* This probably shouldn't be FreeBSD-specific. */
-+static pciConfigPtr
-+xf86GetPciHostConfigFromTag(PCITAG Tag)
-+{
-+	int bus = PCI_BUS_FROM_TAG(Tag);
-+	pciBusInfo_t *pBusInfo;
-+
-+	while ((bus < pciNumBuses) && (pBusInfo = pciBusInfo[bus])) {
-+		if (bus == pBusInfo->primary_bus)
-+			return pBusInfo->bridge;
-+		bus = pBusInfo->primary_bus;
-+	}
-+
-+	return NULL;	/* Bad data */
-+}
-+
-+/*
-+ * This is ugly, but until I can extract this information from the kernel,
-+ * it'll have to do. The default I/O space size is 64K, and 4G for memory.
-+ * Anything else needs to go in this table. (PowerPC folk take note.)
-+ *
-+ * Please keep this table in ascending vendor/device order.
-+ */
-+static const struct pciSizes {
-+	unsigned short vendor, device;
-+	unsigned long io_size, mem_size;
-+} pciControllerSizes[] = {
-+	{
-+		PCI_VENDOR_SUN, PCI_CHIP_PSYCHO,
-+		1U << 16, 1U << 31
-+	},
-+	{
-+		PCI_VENDOR_SUN, PCI_CHIP_SCHIZO,
-+		1U << 24, 1U << 31	/* ??? */
-+	},
-+	{
-+		PCI_VENDOR_SUN, PCI_CHIP_SABRE,
-+		1U << 24, (unsigned long)(1ULL << 32)
-+	},
-+	{
-+		PCI_VENDOR_SUN, PCI_CHIP_HUMMINGBIRD,
-+		1U << 24, (unsigned long)(1ULL << 32)
-+	}
-+};
-+#define NUM_SIZES (sizeof(pciControllerSizes) / sizeof(pciControllerSizes[0]))
-+
-+static const struct pciSizes *
-+freebsdGetSizesStruct(PCITAG Tag)
-+{
-+	static const struct pciSizes default_size = {
-+		0, 0, 1U << 16, (unsigned long)(1ULL << 32)
-+	};
-+	pciConfigPtr pPCI;
-+	int i;
-+
-+	/* Find host bridge */
-+	if ((pPCI = xf86GetPciHostConfigFromTag(Tag))) {
-+		/* Look up vendor/device */
-+		for (i = 0; i < NUM_SIZES; i++) {
-+			if ((pPCI->pci_vendor ==
-+			    pciControllerSizes[i].vendor) &&
-+			    (pPCI->pci_device ==
-+			    pciControllerSizes[i].device)) {
-+				return & pciControllerSizes[i];
-+			}
-+		}
-+	}
-+
-+	/* Default to 64KB I/O and 4GB memory. */
-+	return & default_size;
-+}
-+
-+static __inline__ unsigned long
-+freebsdGetIOSize(PCITAG Tag)
-+{
-+	const struct pciSizes * const sizes = freebsdGetSizesStruct(Tag);
-+	return sizes->io_size;
-+}
-+
-+static __inline__ void
-+freebsdGetSizes(PCITAG Tag, unsigned long *io_size, unsigned long *mem_size)
-+{
-+	const struct pciSizes * const sizes = freebsdGetSizesStruct(Tag);
-+
-+	*io_size = sizes->io_size;
-+	*mem_size = sizes->mem_size;
-+}
-+
-+_X_EXPORT int
-+xf86GetPciDomain(PCITAG Tag)
-+{
-+	return PCI_DOM_FROM_TAG(Tag);
-+}
-+
-+_X_EXPORT pointer
-+xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag, ADDRESS Base,
-+    unsigned long Size)
-+{
-+	return xf86MapVidMem(ScreenNum, Flags, Base, Size);
-+}
-+
-+_X_EXPORT IOADDRESS
-+xf86MapDomainIO(int ScreenNum, int Flags, PCITAG Tag, IOADDRESS Base,
-+    unsigned long Size)
-+{
-+	return Base;
-+}
-+
-+_X_EXPORT int
-+xf86ReadDomainMemory(PCITAG Tag, ADDRESS Base, int Len, unsigned char *Buf)
-+{
-+	int ret, length, rlength;
-+
-+	/* Read in 64kB chunks. */
-+	ret = 0;
-+	while ((length = Len) > 0) {
-+		if (length > 0x010000) length = 0x010000;
-+		rlength = xf86ReadBIOS(Base, 0, Buf, length);
-+		if (rlength < 0) {
-+			ret = rlength;
-+			break;
-+		}
-+		ret += rlength;
-+		if (rlength < length) break;
-+		Base += rlength;
-+		Buf += rlength;
-+		Len -= rlength;
-+	}
-+
-+	return ret;
-+}
-+
-+resPtr
-+xf86BusAccWindowsFromOS(void)
-+{
-+	pciConfigPtr *ppPCI, pPCI;
-+	resPtr pRes = NULL;
-+	resRange range;
-+	unsigned long io_size, mem_size;
-+	int domain;
-+
-+	if ((ppPCI = xf86scanpci(0))) {
-+		for (; (pPCI = *ppPCI); ppPCI++) {
-+			if ((pPCI->pci_base_class != PCI_CLASS_BRIDGE) ||
-+			    (pPCI->pci_sub_class != PCI_SUBCLASS_BRIDGE_HOST))
-+				continue;
-+
-+			domain = xf86GetPciDomain(pPCI->tag);
-+			freebsdGetSizes(pPCI->tag, &io_size, &mem_size);
-+
-+			RANGE(range, 0, (ADDRESS)(mem_size - 1),
-+			    RANGE_TYPE(ResExcMemBlock, domain));
-+			pRes = xf86AddResToList(pRes, &range, -1);
-+
-+			RANGE(range, 0, (IOADDRESS)(io_size - 1),
-+			    RANGE_TYPE(ResExcIoBlock, domain));
-+			pRes = xf86AddResToList(pRes, &range, -1);
-+
-+			if (domain <= 0)
-+				break;
-+		}
-+	}
-+
-+	return pRes;
-+}
-+
-+resPtr
-+xf86PciBusAccWindowsFromOS(void)
-+{
-+	pciConfigPtr *ppPCI, pPCI;
-+	resPtr pRes = NULL;
-+	resRange range;
-+	unsigned long io_size, mem_size;
-+	int domain;
-+
-+	if ((ppPCI = xf86scanpci(0))) {
-+		for (; (pPCI = *ppPCI); ppPCI++) {
-+			if ((pPCI->pci_base_class != PCI_CLASS_BRIDGE) ||
-+			    (pPCI->pci_sub_class != PCI_SUBCLASS_BRIDGE_HOST))
-+				continue;
-+
-+			domain = xf86GetPciDomain(pPCI->tag);
-+			freebsdGetSizes(pPCI->tag, &io_size, &mem_size);
-+
-+			RANGE(range, 0, (ADDRESS)(mem_size - 1),
-+			    RANGE_TYPE(ResExcMemBlock, domain));
-+			pRes = xf86AddResToList(pRes, &range, -1);
-+
-+			RANGE(range, 0, (IOADDRESS)(io_size - 1),
-+			    RANGE_TYPE(ResExcIoBlock, domain));
-+			pRes = xf86AddResToList(pRes, &range, -1);
-+
-+			if (domain <= 0)
-+				break;
-+		}
-+	}
-+
-+	return pRes;
-+}
-+
-+resPtr
-+xf86AccResFromOS(resPtr pRes)
-+{
-+	pciConfigPtr *ppPCI, pPCI;
-+	resRange range;
-+	unsigned long io_size, mem_size;
-+	int domain;
-+
-+	if ((ppPCI = xf86scanpci(0))) {
-+		for (; (pPCI = *ppPCI); ppPCI++) {
-+			if ((pPCI->pci_base_class != PCI_CLASS_BRIDGE) ||
-+			    (pPCI->pci_sub_class != PCI_SUBCLASS_BRIDGE_HOST))
-+				continue;
-+
-+			domain = xf86GetPciDomain(pPCI->tag);
-+			freebsdGetSizes(pPCI->tag, &io_size, &mem_size);
-+
-+			/*
-+			 * At minimum, the top and bottom resources must be
-+			 * claimed, so that resources that are (or appear to
-+			 * be) unallocated can be relocated.
-+			 */
-+			RANGE(range, 0x00000000u, 0x0009ffffu,
-+			    RANGE_TYPE(ResExcMemBlock, domain));
-+			pRes = xf86AddResToList(pRes, &range, -1);
-+			RANGE(range, 0x000c0000u, 0x000effffu,
-+			    RANGE_TYPE(ResExcMemBlock, domain));
-+			pRes = xf86AddResToList(pRes, &range, -1);
-+			RANGE(range, 0x000f0000u, 0x000fffffu,
-+			    RANGE_TYPE(ResExcMemBlock, domain));
-+			pRes = xf86AddResToList(pRes, &range, -1);
-+
-+			RANGE(range, (ADDRESS)(mem_size - 1),
-+			    (ADDRESS)(mem_size - 1),
-+			    RANGE_TYPE(ResExcMemBlock, domain));
-+			pRes = xf86AddResToList(pRes, &range, -1);
-+
-+			RANGE(range, 0x00000000u, 0x00000000u,
-+			    RANGE_TYPE(ResExcIoBlock, domain));
-+			pRes = xf86AddResToList(pRes, &range, -1);
-+			RANGE(range, (IOADDRESS)(io_size - 1),
-+			    (IOADDRESS)(io_size - 1),
-+			    RANGE_TYPE(ResExcIoBlock, domain));
-+			pRes = xf86AddResToList(pRes, &range, -1);
-+
-+			if (domain <= 0)
-+				break;
-+		}
-+	}
-+
-+	return pRes;
-+}
-+
-+#endif /* !INCLUDE_XF86_NO_DOMAIN */
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index 1dc5f28c943b..11a219543338 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -9,8 +9,6 @@ bin/gtf
 %%PPC_NA%%bin/outb
 %%PPC_NA%%bin/outl
 %%PPC_NA%%bin/outw
-bin/pcitweak
-%%AMD64_I386_SPARC64%%bin/scanpci
 bin/xorgconfig
 include/xorg/BT.h
 include/xorg/IBM.h
@@ -42,6 +40,7 @@ include/xorg/damagestr.h
 include/xorg/dbestruct.h
 include/xorg/dgaproc.h
 include/xorg/dix.h
+include/xorg/dixaccess.h
 include/xorg/dixevents.h
 include/xorg/dixfont.h
 include/xorg/dixfontstr.h
@@ -98,11 +97,13 @@ include/xorg/picture.h
 include/xorg/picturestr.h
 include/xorg/pixmap.h
 include/xorg/pixmapstr.h
+include/xorg/privates.h
 include/xorg/property.h
 include/xorg/propertyst.h
 include/xorg/randrstr.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
@@ -157,8 +158,6 @@ include/xorg/xf86Version.h
 include/xorg/xf86Xinput.h
 include/xorg/xf86_OSlib.h
 include/xorg/xf86_OSproc.h
-include/xorg/xf86_ansic.h
-include/xorg/xf86_libc.h
 include/xorg/xf86cmap.h
 include/xorg/xf86fbman.h
 include/xorg/xf86i2c.h
@@ -169,15 +168,15 @@ include/xorg/xf86xv.h
 include/xorg/xf86xvmc.h
 include/xorg/xf86xvpriv.h
 include/xorg/xisb.h
+include/xorg/xkbfile.h
 include/xorg/xkbsrv.h
+include/xorg/xkbstr.h
 include/xorg/xorg-server.h
 include/xorg/xorgVersion.h
 include/xorg/xvdix.h
 include/xorg/xvmcext.h
 lib/X11/Cards
 lib/X11/Options
-lib/xorg/modules/extensions/libGLcore.la
-lib/xorg/modules/extensions/libGLcore.so
 lib/xorg/modules/extensions/libdbe.la
 lib/xorg/modules/extensions/libdbe.so
 lib/xorg/modules/extensions/libdri.la
@@ -186,14 +185,8 @@ lib/xorg/modules/extensions/libextmod.la
 lib/xorg/modules/extensions/libextmod.so
 lib/xorg/modules/extensions/libglx.la
 lib/xorg/modules/extensions/libglx.so
-lib/xorg/modules/extensions/librecord.la
-lib/xorg/modules/extensions/librecord.so
-lib/xorg/modules/extensions/libxtrap.la
-lib/xorg/modules/extensions/libxtrap.so
 lib/xorg/modules/fonts/libfreetype.la
 lib/xorg/modules/fonts/libfreetype.so
-lib/xorg/modules/fonts/libtype1.la
-lib/xorg/modules/fonts/libtype1.so
 %%ALPHA_NA%%lib/xorg/modules/libafb.la
 %%ALPHA_NA%%lib/xorg/modules/libafb.so
 lib/xorg/modules/libcfb.la
@@ -208,10 +201,6 @@ lib/xorg/modules/libint10.la
 lib/xorg/modules/libint10.so
 lib/xorg/modules/libmfb.la
 lib/xorg/modules/libmfb.so
-lib/xorg/modules/libpcidata.la
-lib/xorg/modules/libpcidata.so
-lib/xorg/modules/libscanpci.la
-lib/xorg/modules/libscanpci.so
 lib/xorg/modules/libshadow.la
 lib/xorg/modules/libshadow.so
 lib/xorg/modules/libshadowfb.la
@@ -248,7 +237,7 @@ lib/xorg/modules/multimedia/tda9885_drv.la
 lib/xorg/modules/multimedia/tda9885_drv.so
 lib/xorg/modules/multimedia/uda1380_drv.la
 lib/xorg/modules/multimedia/uda1380_drv.so
-lib/xserver/SecurityPolicy
+lib/xorg/protocol.txt
 libdata/pkgconfig/xorg-server.pc
 share/X11/xkb/compiled/README.compiled
 share/aclocal/xorg-server.m4
@@ -259,7 +248,6 @@ share/aclocal/xorg-server.m4
 @dirrm lib/xorg/modules/multimedia
 @dirrm lib/xorg/modules
 @dirrm lib/xorg
-@dirrm lib/xserver
 @dirrmtry include/X11/bitmaps
 @dirrmtry include/X11/pixmaps
 @dirrmtry lib/X11/doc
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
index b68eb7fd8187..b267cd774745 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xorg-vfbserver
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	1.5.3
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 
@@ -19,6 +18,8 @@ CONFLICTS=	XFree86-VirtualFramebufferServer-*
 XORG_CAT=	xserver
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
+
+USE_GL=		gl
 USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		damageproto xcmiscproto xextproto xf86miscproto inputproto \
 		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo
index 70c76c2b2663..0a7c42acf73d 100644
--- a/x11-servers/xorg-vfbserver/distinfo
+++ b/x11-servers/xorg-vfbserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220
-SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
-SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392
+MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8
+SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
+SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625