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.

3 files changed, 40 insertions, 8 deletions

diff --git a/x11/xorg-manpages/Makefile b/x11/xorg-manpages/Makefile
index ddebb00532e6..d1d07babd194 100644
--- a/x11/xorg-manpages/Makefile
+++ b/x11/xorg-manpages/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-manpages
-PORTVERSION=	6.8.2
+PORTVERSION=	6.9.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
diff --git a/x11/xorg-manpages/distinfo b/x11/xorg-manpages/distinfo
index d70b415d1ac1..177370c87899 100644
--- a/x11/xorg-manpages/distinfo
+++ b/x11/xorg-manpages/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-manpages/files/manpages b/x11/xorg-manpages/files/manpages
index bc50600695cd..d53fb28d8f3c 100644
--- a/x11/xorg-manpages/files/manpages
+++ b/x11/xorg-manpages/files/manpages
@@ -10,6 +10,15 @@ MAN3=	AllPlanes.3 \
 	ClientWhitePointOfCCC.3 \
 	ConnectionNumber.3 \
 	DBE.3 \
+	DPMSCapable.3 \
+	DPMSDisable.3 \
+	DPMSEnable.3 \
+	DPMSForceLevel.3 \
+	DPMSGetTimeouts.3 \
+	DPMSGetVersion.3 \
+	DPMSInfo.3 \
+	DPMSQueryExtension.3 \
+	DPMSSetTimeouts.3 \
 	DefaultColormap.3 \
 	DefaultColormapOfScreen.3 \
 	DefaultDepth.3 \
@@ -45,7 +54,7 @@ MAN3=	AllPlanes.3 \
 	IsFunctionKey.3 \
 	IsKeypadKey.3 \
 	IsMiscFunctionKey.3 \
-	IsModiferKey.3 \
+	IsModifierKey.3 \
 	IsPFKey.3 \
 	IsPrivateKeypadKey.3 \
 	LastKnownRequestProcessed.3 \
@@ -227,6 +236,7 @@ MAN3=	AllPlanes.3 \
 	XFreeColors.3 \
 	XFreeCursor.3 \
 	XFreeDeviceList.3 \
+	XFreeExtensionList.3 \
 	XFreeFont.3 \
 	XFreeFontInfo.3 \
 	XFreeFontNames.3 \
@@ -321,6 +331,7 @@ MAN3=	AllPlanes.3 \
 	XKeysymToString.3 \
 	XKillClient.3 \
 	XListDepths.3 \
+	XListExtensions.3 \
 	XListFonts.3 \
 	XListFontsWithInfo.3 \
 	XListHosts.3 \
@@ -382,12 +393,29 @@ MAN3=	AllPlanes.3 \
 	XQueryColor.3 \
 	XQueryColors.3 \
 	XQueryDeviceState.3 \
+	XQueryExtension.3 \
 	XQueryFont.3 \
 	XQueryKeymap.3 \
 	XQueryPointer.3 \
 	XQueryTextExtents.3 \
 	XQueryTextExtents16.3 \
 	XQueryTree.3 \
+	XRRConfig.3 \
+	XRRConfigCurrentConfiguration.3 \
+	XRRConfigCurrentRate.3 \
+	XRRConfigRates.3 \
+	XRRConfigRotations.3 \
+	XRRConfigSizes.3 \
+	XRRConfigTimes.3 \
+	XRRFreeScreenConfigInfo.3 \
+	XRRGetScreenInfo.3 \
+	XRRQueryExtension.3 \
+	XRRQueryVersion.3 \
+	XRRRootToScreen.3 \
+	XRRScreenConfig.3 \
+	XRRSelectInput.3 \
+	XRRSetScreenConfig.3 \
+	XRRSetScreenConfigAndRate.3 \
 	XRaiseWindow.3 \
 	XReadBitmapFile.3 \
 	XReadBitmapFileData.3 \
@@ -610,6 +638,9 @@ MAN3=	AllPlanes.3 \
 	XcmsTekHVCQueryMaxVC.3 \
 	XcmsTekHVCQueryMaxVSamples.3 \
 	XcmsTekHVCQueryMinV.3 \
+	XcupGetReservedColormapEntries.3 \
+	XcupQueryVersion.3 \
+	XcupStoreColors.3 \
 	Xcursor.3 \
 	XdbeAllocateBackBufferName.3 \
 	XdbeBeginIdiom.3 \
@@ -721,6 +752,7 @@ MAN3=	AllPlanes.3 \
 	XtAddRawEventHandler.3 \
 	XtAddTimeOut.3 \
 	XtAddTimeout.3 \
+	XtAddWorkProc.3 \
 	XtAllocateGC.3 \
 	XtAppAddActionHook.3 \
 	XtAppAddActions.3 \