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.

17 files changed, 66 insertions, 65 deletions

diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index 9fa395eb2d84..39dc521a8057 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fontserver
-PORTVERSION=	6.8.2
+PORTVERSION=	6.9.0
 PORTREVISION=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XORG}
diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo
index 84a1e50f968a..1785b7d2df7e 100644
--- a/x11-fonts/xfs/distinfo
+++ b/x11-fonts/xfs/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-src2.tar.gz) = b6f011b3131e442b8dab85d443d9a56f
-SHA256 (xorg/X11R6.8.2-src2.tar.gz) = 8d5bf0a442eb706fe71f029606d4340afc8c05208a50dee20193378c2e25a4de
-SIZE (xorg/X11R6.8.2-src2.tar.gz) = 5974936
+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-src2.tar.gz) = f49a0993d89038a46556720688450479
+SHA256 (xorg/X11R6.9.0-src2.tar.gz) = 848289b323d6193ac03ca001f41aa3cdf9cfd129cfbda1c5add209d5c18a8e4c
+SIZE (xorg/X11R6.9.0-src2.tar.gz) = 6056976
diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile
index d65be2315da2..838406d938b8 100644
--- a/x11-fonts/xorg-fonts-100dpi/Makefile
+++ b/x11-fonts/xorg-fonts-100dpi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-100dpi
-PORTVERSION=	6.8.2
+PORTVERSION=	6.9.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
diff --git a/x11-fonts/xorg-fonts-100dpi/distinfo b/x11-fonts/xorg-fonts-100dpi/distinfo
index 6437ef7cec78..6f737f23f0df 100644
--- a/x11-fonts/xorg-fonts-100dpi/distinfo
+++ b/x11-fonts/xorg-fonts-100dpi/distinfo
@@ -1,3 +1,3 @@
-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.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
+SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
+SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile
index 6a8a0215713d..912e041ee014 100644
--- a/x11-fonts/xorg-fonts-75dpi/Makefile
+++ b/x11-fonts/xorg-fonts-75dpi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-75dpi
-PORTVERSION=	6.8.2
+PORTVERSION=	6.9.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
diff --git a/x11-fonts/xorg-fonts-75dpi/distinfo b/x11-fonts/xorg-fonts-75dpi/distinfo
index 6437ef7cec78..6f737f23f0df 100644
--- a/x11-fonts/xorg-fonts-75dpi/distinfo
+++ b/x11-fonts/xorg-fonts-75dpi/distinfo
@@ -1,3 +1,3 @@
-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.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
+SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
+SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile
index 93b97da51fc9..83ff10e0495d 100644
--- a/x11-fonts/xorg-fonts-cyrillic/Makefile
+++ b/x11-fonts/xorg-fonts-cyrillic/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-cyrillic
-PORTVERSION=	6.8.2
+PORTVERSION=	6.9.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
diff --git a/x11-fonts/xorg-fonts-cyrillic/distinfo b/x11-fonts/xorg-fonts-cyrillic/distinfo
index 6437ef7cec78..6f737f23f0df 100644
--- a/x11-fonts/xorg-fonts-cyrillic/distinfo
+++ b/x11-fonts/xorg-fonts-cyrillic/distinfo
@@ -1,3 +1,3 @@
-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.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
+SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
+SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
diff --git a/x11-fonts/xorg-fonts-encodings/Makefile b/x11-fonts/xorg-fonts-encodings/Makefile
index 989723b60683..59de097112b4 100644
--- a/x11-fonts/xorg-fonts-encodings/Makefile
+++ b/x11-fonts/xorg-fonts-encodings/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-encodings
-PORTVERSION=	6.8.2
+PORTVERSION=	6.9.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
diff --git a/x11-fonts/xorg-fonts-encodings/distinfo b/x11-fonts/xorg-fonts-encodings/distinfo
index 6437ef7cec78..6f737f23f0df 100644
--- a/x11-fonts/xorg-fonts-encodings/distinfo
+++ b/x11-fonts/xorg-fonts-encodings/distinfo
@@ -1,3 +1,3 @@
-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.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
+SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
+SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
diff --git a/x11-fonts/xorg-fonts-encodings/pkg-plist b/x11-fonts/xorg-fonts-encodings/pkg-plist
index 029682030d33..99214d6d508d 100644
--- a/x11-fonts/xorg-fonts-encodings/pkg-plist
+++ b/x11-fonts/xorg-fonts-encodings/pkg-plist
@@ -1,26 +1,27 @@
 lib/X11/fonts/encodings/adobe-dingbats.enc.gz
 lib/X11/fonts/encodings/adobe-standard.enc.gz
 lib/X11/fonts/encodings/adobe-symbol.enc.gz
-lib/X11/fonts/encodings/ansi-1251.enc
-lib/X11/fonts/encodings/armscii-8.enc
-lib/X11/fonts/encodings/ascii-0.enc
-lib/X11/fonts/encodings/dec-special.enc
+lib/X11/fonts/encodings/ansi-1251.enc.gz
+lib/X11/fonts/encodings/armscii-8.enc.gz
+lib/X11/fonts/encodings/ascii-0.enc.gz
+lib/X11/fonts/encodings/dec-special.enc.gz
 lib/X11/fonts/encodings/encodings.dir
-lib/X11/fonts/encodings/ibm-cp437.enc
-lib/X11/fonts/encodings/ibm-cp850.enc
-lib/X11/fonts/encodings/ibm-cp852.enc
-lib/X11/fonts/encodings/ibm-cp866.enc
-lib/X11/fonts/encodings/iso8859-11.enc
-lib/X11/fonts/encodings/iso8859-13.enc
-lib/X11/fonts/encodings/iso8859-16.enc
-lib/X11/fonts/encodings/iso8859-6.16.enc
-lib/X11/fonts/encodings/iso8859-6.8x.enc
+lib/X11/fonts/encodings/ibm-cp437.enc.gz
+lib/X11/fonts/encodings/ibm-cp850.enc.gz
+lib/X11/fonts/encodings/ibm-cp852.enc.gz
+lib/X11/fonts/encodings/ibm-cp866.enc.gz
+lib/X11/fonts/encodings/iso8859-11.enc.gz
+lib/X11/fonts/encodings/iso8859-13.enc.gz
+lib/X11/fonts/encodings/iso8859-16.enc.gz
+lib/X11/fonts/encodings/iso8859-6.16.enc.gz
+lib/X11/fonts/encodings/iso8859-6.8x.enc.gz
 lib/X11/fonts/encodings/large/big5.eten-0.enc.gz
 lib/X11/fonts/encodings/large/big5hkscs-0.enc.gz
 lib/X11/fonts/encodings/large/cns11643-1.enc.gz
 lib/X11/fonts/encodings/large/cns11643-2.enc.gz
 lib/X11/fonts/encodings/large/cns11643-3.enc.gz
 lib/X11/fonts/encodings/large/encodings.dir
+lib/X11/fonts/encodings/large/gb18030-0.enc.gz
 lib/X11/fonts/encodings/large/gb18030.2000-0.enc.gz
 lib/X11/fonts/encodings/large/gb18030.2000-1.enc.gz
 lib/X11/fonts/encodings/large/gb2312.1980-0.enc.gz
@@ -31,23 +32,23 @@ lib/X11/fonts/encodings/large/jisx0212.1990-0.enc.gz
 lib/X11/fonts/encodings/large/ksc5601.1987-0.enc.gz
 lib/X11/fonts/encodings/large/ksc5601.1992-3.enc.gz
 lib/X11/fonts/encodings/large/sun.unicode.india-0.enc.gz
-lib/X11/fonts/encodings/microsoft-cp1250.enc
-lib/X11/fonts/encodings/microsoft-cp1251.enc
-lib/X11/fonts/encodings/microsoft-cp1252.enc
-lib/X11/fonts/encodings/microsoft-cp1253.enc
-lib/X11/fonts/encodings/microsoft-cp1254.enc
-lib/X11/fonts/encodings/microsoft-cp1255.enc
-lib/X11/fonts/encodings/microsoft-cp1256.enc
-lib/X11/fonts/encodings/microsoft-cp1257.enc
-lib/X11/fonts/encodings/microsoft-cp1258.enc
-lib/X11/fonts/encodings/microsoft-win3.1.enc
-lib/X11/fonts/encodings/mulearabic-0.enc
-lib/X11/fonts/encodings/mulearabic-1.enc
-lib/X11/fonts/encodings/mulearabic-2.enc
-lib/X11/fonts/encodings/mulelao-1.enc
-lib/X11/fonts/encodings/suneu-greek.enc
-lib/X11/fonts/encodings/tcvn-0.enc
-lib/X11/fonts/encodings/tis620-2.enc
+lib/X11/fonts/encodings/microsoft-cp1250.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1251.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1252.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1253.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1254.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1255.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1256.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1257.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1258.enc.gz
+lib/X11/fonts/encodings/microsoft-win3.1.enc.gz
+lib/X11/fonts/encodings/mulearabic-0.enc.gz
+lib/X11/fonts/encodings/mulearabic-1.enc.gz
+lib/X11/fonts/encodings/mulearabic-2.enc.gz
+lib/X11/fonts/encodings/mulelao-1.enc.gz
+lib/X11/fonts/encodings/suneu-greek.enc.gz
+lib/X11/fonts/encodings/tcvn-0.enc.gz
+lib/X11/fonts/encodings/tis620-2.enc.gz
 lib/X11/fonts/encodings/viscii1.1-1.enc.gz
 @unexec rmdir %D/lib/X11/fonts/encodings/large 2>/dev/null || true
 @unexec rmdir %D/lib/X11/fonts/encodings 2>/dev/null || true
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
index af4a7a8628a7..dc290017b20c 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile
+++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-miscbitmaps
-PORTVERSION=	6.8.2
+PORTVERSION=	6.9.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/distinfo b/x11-fonts/xorg-fonts-miscbitmaps/distinfo
index 6437ef7cec78..6f737f23f0df 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/distinfo
+++ b/x11-fonts/xorg-fonts-miscbitmaps/distinfo
@@ -1,3 +1,3 @@
-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.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
+SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
+SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile
index 3cf3b6089e1b..6fb39156ca50 100644
--- a/x11-fonts/xorg-fonts-truetype/Makefile
+++ b/x11-fonts/xorg-fonts-truetype/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-truetype
-PORTVERSION=	6.8.2
+PORTVERSION=	6.9.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
diff --git a/x11-fonts/xorg-fonts-truetype/distinfo b/x11-fonts/xorg-fonts-truetype/distinfo
index 6437ef7cec78..6f737f23f0df 100644
--- a/x11-fonts/xorg-fonts-truetype/distinfo
+++ b/x11-fonts/xorg-fonts-truetype/distinfo
@@ -1,3 +1,3 @@
-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.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
+SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
+SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile
index f6129e4a5f44..50e3db6d1e92 100644
--- a/x11-fonts/xorg-fonts-type1/Makefile
+++ b/x11-fonts/xorg-fonts-type1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-type1
-PORTVERSION=	6.8.2
+PORTVERSION=	6.9.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
diff --git a/x11-fonts/xorg-fonts-type1/distinfo b/x11-fonts/xorg-fonts-type1/distinfo
index 6437ef7cec78..6f737f23f0df 100644
--- a/x11-fonts/xorg-fonts-type1/distinfo
+++ b/x11-fonts/xorg-fonts-type1/distinfo
@@ -1,3 +1,3 @@
-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.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
+SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
+SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996