Upgrade to X.Org 6.9.0 release.

Remove separate mtree file for X_WINDOW_SYSTEM=XOrg case. Both X11
distributions now use the one from /etc/mtree again.

4 files changed, 33 insertions, 7 deletions

diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index 9f17e4e7540b..7736c02191a8 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-dmx
-PORTVERSION=	6.8.2
+PORTVERSION=	6.9.0
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo
index d70b415d1ac1..177370c87899 100644
--- a/x11-servers/xorg-dmx/distinfo
+++ b/x11-servers/xorg-dmx/distinfo
@@ -1,6 +1,6 @@
-MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab
-SHA256 (xorg/X11R6.8.2-src1.tar.gz) = 0868eb61f3a6af7e858494416cc3b1291d7ab602a6d69ec40bdf7e4fdecbcc5e
-SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802
-MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57
-SHA256 (xorg/X11R6.8.2-src3.tar.gz) = d295a304a014d96857f9acfb4b1a4b954462e476639623f05cfd839af9447e49
-SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299
+MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
+SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
+SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
+MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
+SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
+SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
diff --git a/x11-servers/xorg-dmx/files/patch-dmx.c b/x11-servers/xorg-dmx/files/patch-dmx.c
new file mode 100644
index 000000000000..d29155b81c81
--- /dev/null
+++ b/x11-servers/xorg-dmx/files/patch-dmx.c
@@ -0,0 +1,15 @@
+--- programs/Xserver/Xext/dmx.c.orig	Mon Jan 16 07:43:55 2006
++++ programs/Xserver/Xext/dmx.c	Mon Jan 16 07:44:29 2006
+@@ -57,10 +57,10 @@
+ #include "opaque.h"
+ 
+ #include "dmxextension.h"
+-#include <X11/extensions/dmxproto.h>
++#include "dmxproto.h"
+ 
+ #define _DMX_SERVER_
+-#include <X11/extensions/dmxext.h>
++#include "dmxext.h"
+ 
+ #ifdef PANORAMIX
+ #include "panoramiX.h"
diff --git a/x11-servers/xorg-dmx/files/patch-dmxextension.c b/x11-servers/xorg-dmx/files/patch-dmxextension.c
new file mode 100644
index 000000000000..0664e3005004
--- /dev/null
+++ b/x11-servers/xorg-dmx/files/patch-dmxextension.c
@@ -0,0 +1,11 @@
+--- programs/Xserver/hw/dmx/dmxextension.c.orig	Mon Jan 16 07:48:33 2006
++++ programs/Xserver/hw/dmx/dmxextension.c	Mon Jan 16 07:51:33 2006
+@@ -62,7 +62,7 @@
+ 
+ #include "windowstr.h"
+ #include "inputstr.h"                 /* For DeviceIntRec */
+-#include <X11/extensions/dmxproto.h>  /* For DMX_BAD_* */
++#include "dmxproto.h"                 /* For DMX_BAD_* */
+ #include "cursorstr.h"
+ 
+ /* The default font is declared in dix/globals.c, but is not included in