sync w/ modular-xorg-server

5 files changed, 60 insertions, 3 deletions

diff --git a/x11/modular-xorg-server112/Makefile b/x11/modular-xorg-server112/Makefile
index e9d1835089a..90070b98391 100644
--- a/x11/modular-xorg-server112/Makefile
+++ b/x11/modular-xorg-server112/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2015/09/20 16:39:18 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2015/10/11 17:51:47 tnn Exp $
 
 DISTNAME=	xorg-server-1.12.4
 PKGNAME=	modular-${DISTNAME}
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/modular-xorg-server112/distinfo b/x11/modular-xorg-server112/distinfo
index ff3e1692180..7e806664455 100644
--- a/x11/modular-xorg-server112/distinfo
+++ b/x11/modular-xorg-server112/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2015/09/20 16:39:18 tnn Exp $
+$NetBSD: distinfo,v 1.3 2015/10/11 17:51:47 tnn Exp $
 
 SHA1 (xorg-server-1.12.4.tar.bz2) = 6d616874f9c7677bda08dc073c03f83e78fbc585
 RMD160 (xorg-server-1.12.4.tar.bz2) = 4907b5dc42efd6b3fb6bf9d64f1441080a6a6983
@@ -53,7 +53,10 @@ SHA1 (patch-hw_xfree86_os-support_bus_xf86Sbus.h) = b05b6c6f7c68bdbfd98b559d9b87
 SHA1 (patch-hw_xfree86_os-support_xf86__OSlib.h) = 7c2760509610b44915da077b22899bef9c338cc1
 SHA1 (patch-include_dix.h) = ab0dc2debd87f29c0ac7f971a3cad4850b239c3a
 SHA1 (patch-include_regionstr.h) = c6f3e3b263593b622e7087d3ebe2b470cf9526e3
+SHA1 (patch-os_WaitFor.c) = a76c5ef4e3725f5299fa3f0860183e89c6004a71
 SHA1 (patch-os_access.c) = 94ee087d68bc9ba713dbe42102f971a1b8e6a3c4
+SHA1 (patch-os_connection.c) = d6b9bbc1ab34cec6457aa68546105ea5deb6ded6
+SHA1 (patch-os_io.c) = 6216e35e780706a8d5aaa60652c9ae7b4ec8e6e6
 SHA1 (patch-os_rpcauth.c) = 6617d5ef0e3cc5e9e10cd8db74f87e347e52ebe3
 SHA1 (patch-randr_randr.c) = e8d2b72f8230a2a8a6ade47f5459ec9b0849ed0b
 SHA1 (patch-randr_randrstr.h) = f634438dda61111b3bf3b77580951a638fbdea10
diff --git a/x11/modular-xorg-server112/patches/patch-os_WaitFor.c b/x11/modular-xorg-server112/patches/patch-os_WaitFor.c
new file mode 100644
index 00000000000..2908b590853
--- /dev/null
+++ b/x11/modular-xorg-server112/patches/patch-os_WaitFor.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-os_WaitFor.c,v 1.1 2015/10/11 17:51:47 tnn Exp $
+
+move X11/Xpoll.h include earlier than sys/select.h to avoid missing
+out on setting FD_SETSIZE early enough.
+
+--- os/WaitFor.c.orig	2015-05-21 14:23:54.000000000 +0000
++++ os/WaitFor.c
+@@ -52,6 +52,10 @@ SOFTWARE.
+  *
+  *****************************************************************/
+ 
++#ifdef __NetBSD__
++#include <X11/Xpoll.h>
++#endif
++
+ #ifdef HAVE_DIX_CONFIG_H
+ #include <dix-config.h>
+ #endif
diff --git a/x11/modular-xorg-server112/patches/patch-os_connection.c b/x11/modular-xorg-server112/patches/patch-os_connection.c
new file mode 100644
index 00000000000..61890fb0879
--- /dev/null
+++ b/x11/modular-xorg-server112/patches/patch-os_connection.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-os_connection.c,v 1.1 2015/10/11 17:51:47 tnn Exp $
+
+move X11/Xpoll.h include earlier than sys/select.h to avoid missing
+out on setting FD_SETSIZE early enough.
+
+--- os/connection.c.orig	2015-06-16 15:21:07.000000000 +0000
++++ os/connection.c
+@@ -60,6 +60,10 @@ SOFTWARE.
+  *
+  *****************************************************************/
+ 
++#ifdef __NetBSD__
++#include <X11/Xpoll.h>
++#endif
++
+ #ifdef HAVE_DIX_CONFIG_H
+ #include <dix-config.h>
+ #endif
diff --git a/x11/modular-xorg-server112/patches/patch-os_io.c b/x11/modular-xorg-server112/patches/patch-os_io.c
new file mode 100644
index 00000000000..ec95c36cbf6
--- /dev/null
+++ b/x11/modular-xorg-server112/patches/patch-os_io.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-os_io.c,v 1.1 2015/10/11 17:51:47 tnn Exp $
+
+move X11/Xpoll.h include earlier than sys/select.h to avoid missing
+out on setting FD_SETSIZE early enough.
+
+--- os/io.c.orig	2015-05-21 14:23:54.000000000 +0000
++++ os/io.c
+@@ -51,6 +51,10 @@ SOFTWARE.
+  *
+  *****************************************************************/
+ 
++#ifdef __NetBSD__
++#include <X11/Xpoll.h>
++#endif
++
+ #ifdef HAVE_DIX_CONFIG_H
+ #include <dix-config.h>
+ #endif