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.

6 files changed, 76 insertions, 31 deletions

diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index 467c53839c87..4d8e0af5f6a4 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-libraries
-PORTVERSION=	6.8.2
+PORTVERSION=	6.9.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
@@ -16,7 +16,8 @@ DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X11 libraries and headers from X.Org
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
+LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
+		freetype.9:${PORTSDIR}/print/freetype2 \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
 CONFLICTS=	Mesa-* XFree86-libraries-* \
diff --git a/x11/xorg-libraries/distinfo b/x11/xorg-libraries/distinfo
index d70b415d1ac1..177370c87899 100644
--- a/x11/xorg-libraries/distinfo
+++ b/x11/xorg-libraries/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/xorg-libraries/files/patch-GL-dri-drm-Imakefile b/x11/xorg-libraries/files/patch-GL-dri-drm-Imakefile
new file mode 100644
index 000000000000..21c89aa6217c
--- /dev/null
+++ b/x11/xorg-libraries/files/patch-GL-dri-drm-Imakefile
@@ -0,0 +1,11 @@
+--- lib/GL/dri/drm/Imakefile.orig	Sat Dec 24 01:07:33 2005
++++ lib/GL/dri/drm/Imakefile	Sat Dec 24 01:08:59 2005
+@@ -16,7 +16,7 @@
+ 		-I$(XF86OSSRC)/$(OS_SUBDIR)/drm \
+ 		-I$(DRMSRCDIR)/$(OS_SUBDIR)-core \
+ 		-I$(DRMSRCDIR)/$(OS_SUBDIR2)-core \
+-		-I$(XF86OSSRC) -I$(DRMSRCDIR)/shared-core
++		-I$(XF86OSSRC) -I$(DRMSRCDIR)/shared-core -I$(LOCALBASE)/include
+          SRCS = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
+          OBJS = xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o
+ 
diff --git a/x11/xorg-libraries/files/patch-GL-glx-Imakefile b/x11/xorg-libraries/files/patch-GL-glx-Imakefile
new file mode 100644
index 000000000000..20affa22736f
--- /dev/null
+++ b/x11/xorg-libraries/files/patch-GL-glx-Imakefile
@@ -0,0 +1,10 @@
+--- lib/GL/glx/Imakefile.orig	Sat Dec 24 00:52:20 2005
++++ lib/GL/glx/Imakefile	Sat Dec 24 00:54:30 2005
+@@ -212,6 +212,7 @@
+ 		-I$(MESASRCDIR)/src/mesa/drivers/x11 \
+ 		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
+ 		-I$(XF86OSSRC) \
++		-I$(LOCALBASE)/include \
+ 		-I$(DRMSRCDIR)/shared-core \
+ 		$(DRI_INCS)
+ 
diff --git a/x11/xorg-libraries/files/patch-UIThrStubs.c b/x11/xorg-libraries/files/patch-UIThrStubs.c
deleted file mode 100644
index a2c94e643ad8..000000000000
--- a/x11/xorg-libraries/files/patch-UIThrStubs.c
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: lib/X11/UIThrStubs.c
-===================================================================
-RCS file: /cvs/xorg/xc/lib/X11/UIThrStubs.c,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -u -r1.3 -r1.4
---- lib/X11/UIThrStubs.c	28 May 2004 23:26:44 -0000	1.3
-+++ lib/X11/UIThrStubs.c	13 Oct 2004 07:38:00 -0000	1.4
-@@ -99,7 +99,7 @@
- #else
- #include <pthread.h>
- typedef pthread_t xthread_t;
--#if __GNUC__ >= 3
-+#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
- xthread_t pthread_self()    __attribute__ ((weak, alias ("_Xthr_self_stub_")));
- int pthread_mutex_init()    __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
- int pthread_mutex_destroy() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
diff --git a/x11/xorg-libraries/pkg-plist b/x11/xorg-libraries/pkg-plist
index 7eaee36b0459..df1e52d5323d 100644
--- a/x11/xorg-libraries/pkg-plist
+++ b/x11/xorg-libraries/pkg-plist
@@ -39,33 +39,48 @@ include/GL/glxmd.h
 include/GL/glxproto.h
 include/GL/glxtokens.h
 include/GL/osmesa.h
+include/X11/CallbackI.h
 include/X11/Composite.h
 include/X11/CompositeP.h
 include/X11/ConstrainP.h
 include/X11/Constraint.h
+include/X11/ConvertI.h
 include/X11/Core.h
 include/X11/CoreP.h
+include/X11/CreateI.h
 include/X11/DECkeysym.h
+include/X11/EventI.h
 include/X11/HPkeysym.h
+include/X11/HookObjI.h
 include/X11/ICE/ICE.h
 include/X11/ICE/ICEconn.h
 include/X11/ICE/ICElib.h
 include/X11/ICE/ICEmsg.h
 include/X11/ICE/ICEproto.h
 include/X11/ICE/ICEutil.h
+include/X11/ImUtil.h
+include/X11/InitialI.h
+include/X11/IntrinsicI.h
 include/X11/Intrinsic.h
 include/X11/IntrinsicP.h
 include/X11/Object.h
 include/X11/ObjectP.h
+include/X11/PassivGraI.h
 include/X11/RectObj.h
 include/X11/RectObjP.h
+include/X11/ResourceI.h
 include/X11/SM/SM.h
 include/X11/SM/SMlib.h
 include/X11/SM/SMproto.h
+include/X11/SelectionI.h
 include/X11/Shell.h
+include/X11/ShellI.h
 include/X11/ShellP.h
 include/X11/StringDefs.h
 include/X11/Sunkeysym.h
+include/X11/ThreadsI.h
+include/X11/TranslateI.h
+include/X11/VarargsI.h
 include/X11/Vendor.h
 include/X11/VendorP.h
 include/X11/X.h
@@ -157,6 +172,7 @@ include/X11/Xdmcp.h
 include/X11/Xfuncproto.h
 include/X11/Xfuncs.h
 include/X11/Xlib.h
+include/X11/XlibConf.h
 include/X11/Xlibint.h
 include/X11/Xlocale.h
 include/X11/Xmd.h
@@ -190,6 +206,7 @@ include/X11/XprintAppUtil/xpapputil.h
 include/X11/XprintUtil/xprintutil.h
 include/X11/Xproto.h
 include/X11/Xprotostr.h
+include/X11/Xregion.h
 include/X11/Xresource.h
 include/X11/Xthreads.h
 include/X11/Xutil.h
@@ -370,13 +387,31 @@ include/X11/extensions/xtrapemacros.h
 include/X11/extensions/xtraplib.h
 include/X11/extensions/xtraplibp.h
 include/X11/extensions/xtrapproto.h
+include/X11/extensions/vldXvMC.h
 include/X11/fonts/FS.h
 include/X11/fonts/FSlib.h
 include/X11/fonts/FSproto.h
+include/X11/fonts/bdfint.h
+include/X11/fonts/bitmap.h
+include/X11/fonts/bufio.h
+include/X11/fonts/fntfil.h
+include/X11/fonts/fntfilio.h
+include/X11/fonts/fntfilst.h
+include/X11/fonts/font.h
 include/X11/fonts/fontenc.h
+include/X11/fonts/fontencc.h
+include/X11/fonts/fontmisc.h
+include/X11/fonts/fontmod.h
+include/X11/fonts/fontshow.h
+include/X11/fonts/fontstruct.h
+include/X11/fonts/fontutil.h
+include/X11/fonts/fontxlfd.h
 include/X11/fonts/fsmasks.h
+include/X11/fonts/pcf.h
 include/X11/keysym.h
 include/X11/keysymdef.h
+include/X11/misc.h
+include/X11/os.h
 include/X11/xpm.h
 include/xf86Optrec.h
 include/xf86Parser.h
@@ -514,15 +549,23 @@ lib/X11/locale/vi_VN.viscii/XI18N_OBJS
 lib/X11/locale/vi_VN.viscii/XLC_LOCALE
 lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS
 lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
+lib/X11/locale/zh_CN.gb18030/Compose
+lib/X11/locale/zh_CN.gb18030/XI18N_OBJS
+lib/X11/locale/zh_CN.gb18030/XLC_LOCALE
 lib/X11/locale/zh_CN.gbk/Compose
 lib/X11/locale/zh_CN.gbk/XI18N_OBJS
 lib/X11/locale/zh_CN.gbk/XLC_LOCALE
 lib/X11/locale/zh_CN/Compose
 lib/X11/locale/zh_CN/XI18N_OBJS
 lib/X11/locale/zh_CN/XLC_LOCALE
+lib/X11/locale/zh_HK.big5/Compose
+lib/X11/locale/zh_HK.big5/XI18N_OBJS
 lib/X11/locale/zh_HK.big5/XLC_LOCALE
+lib/X11/locale/zh_HK.big5hkscs/Compose
 lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
 lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
+lib/X11/locale/zh_HK.UTF-8/XI18N_OBJS
+lib/X11/locale/zh_HK.UTF-8/XLC_LOCALE
 lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS
 lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE
 lib/X11/locale/zh_TW.big5/Compose
@@ -648,9 +691,6 @@ lib/libXxf86vm.so.1
 lib/libdps.a
 lib/libdps.so
 lib/libdps.so.1
-lib/libdpstk.a
-lib/libdpstk.so
-lib/libdpstk.so.1
 lib/libfntstubs.a
 lib/libfontenc.a
 lib/libfontenc.so
@@ -658,9 +698,6 @@ lib/libfontenc.so.1
 lib/liboldX.a
 lib/liboldX.so
 lib/liboldX.so.6
-lib/libpsres.a
-lib/libpsres.so
-lib/libpsres.so.1
 lib/libxf86config.a
 lib/libxkbfile.a
 lib/libxkbfile.so
@@ -731,13 +768,16 @@ libdata/pkgconfig/xrender.pc
 @dirrm lib/X11/locale/vi_VN.tcvn
 @dirrm lib/X11/locale/vi_VN.viscii
 @dirrm lib/X11/locale/zh_CN
+@dirrm lib/X11/locale/zh_CN.gb18030
 @dirrm lib/X11/locale/zh_CN.gbk
 @dirrm lib/X11/locale/zh_CN.UTF-8
 @dirrm lib/X11/locale/zh_HK.big5
 @dirrm lib/X11/locale/zh_HK.big5hkscs
+@dirrm lib/X11/locale/zh_HK.UTF-8
 @dirrm lib/X11/locale/zh_TW
 @dirrm lib/X11/locale/zh_TW.big5
 @dirrm lib/X11/locale/zh_TW.UTF-8
 @dirrm lib/X11/locale/el_GR.UTF-8
+@unexec rmdir %D/include/X11/bitmaps 2>/dev/null || true
 @unexec rmdir %D/include/X11/fonts 2>/dev/null || true
 @unexec rmdir %D/lib/X11/locale 2>/dev/null || true