Update modular-xorg-server (and -xephyr) to 1.18.2.

A big pile of updates in this one. Highlights include:

- glamor is updated to use OpenGL core profiles if available, which
should improve memory usage and performance on modern hardware, and got
some other performance improvements for rpi and other GLES platforms

- DRI2, DRI3, and Present all received correctness fixes for hangs,
crashes, and other weirdness

- Xwayland server has been updated to support the Xv and the
xf86vidmode extensions for better compatibility, and fixed some bugs
with output hotplug and pointer updates

- Xwin saw improvements to window and clipboard management, and a few
new keyboard layouts

4 files changed, 10 insertions, 10 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index badddb676c8..09c1d40c88a 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.108 2016/02/27 02:34:46 tnn Exp $
+# $NetBSD: Makefile,v 1.109 2016/03/12 08:50:50 wiz Exp $
 
 DISTNAME=	xorg-server-${XORG_VERSION}
 PKGNAME=	modular-${DISTNAME}
-PKGREVISION=	2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Modular X11 server from modular X.org
diff --git a/x11/modular-xorg-server/Makefile.common b/x11/modular-xorg-server/Makefile.common
index adeaa8fa018..d5ae7175578 100644
--- a/x11/modular-xorg-server/Makefile.common
+++ b/x11/modular-xorg-server/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.7 2016/02/26 11:27:16 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.8 2016/03/12 08:50:50 wiz Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 
-XORG_VERSION=	1.18.1
+XORG_VERSION=	1.18.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST
index b717a174ed0..1c2fa0326b7 100644
--- a/x11/modular-xorg-server/PLIST
+++ b/x11/modular-xorg-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2016/01/05 13:04:23 tnn Exp $
+@comment $NetBSD: PLIST,v 1.25 2016/03/12 08:50:50 wiz Exp $
 bin/X
 bin/Xnest
 bin/Xorg
@@ -24,6 +24,7 @@ include/xorg/damage.h
 include/xorg/damagestr.h
 include/xorg/dbestruct.h
 include/xorg/dgaproc.h
+include/xorg/displaymode.h
 include/xorg/dix.h
 include/xorg/dixaccess.h
 include/xorg/dixevents.h
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index d0ed7b290ed..fce9d8c2e0e 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.72 2016/02/27 02:34:46 tnn Exp $
+$NetBSD: distinfo,v 1.73 2016/03/12 08:50:50 wiz Exp $
 
-SHA1 (xorg-server-1.18.1.tar.bz2) = 968fe85773a41296199f8733c7235c8623d7c460
-RMD160 (xorg-server-1.18.1.tar.bz2) = f01c27c3b4aa7891a7f315f49d4928dfc137cc62
-SHA512 (xorg-server-1.18.1.tar.bz2) = 4b2db85fe4386329b3d20fc53848556ce8dedeb9553d610afc45962d477c8e7ea887abb6c27ba2701160d15ddff9a500bfaae6deff9cf62a80452c4b18278429
-Size (xorg-server-1.18.1.tar.bz2) = 5846953 bytes
+SHA1 (xorg-server-1.18.2.tar.bz2) = d0c5e4f6bba68ad58e74be69c520887695adb132
+RMD160 (xorg-server-1.18.2.tar.bz2) = d4fa0ebd46568e44043d0c696e6c84087f474f3f
+SHA512 (xorg-server-1.18.2.tar.bz2) = c44a1b39150fff3ab673cb252d7b498c8c3bc5b3b2abfb6c358c64fadb9ef97789ac457d6acb8afaece29bbbe66399854fd2db13763cb40e7c63fb4237601da9
+Size (xorg-server-1.18.2.tar.bz2) = 5864615 bytes
 SHA1 (patch-configure) = b3c5ae8cd7aca96dbb5a237dda061e8c2569b2f2
 SHA1 (patch-exa_exa__render.c) = 4e144b977797d9cdc7e08c286aaedb303f1a1aa8
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92