move X11/Xpoll.h include earlier than sys/select.h to avoid missing

out on setting FD_SETSIZE early enough. Fixes PR misc/50073

4 files changed, 76 insertions, 1 deletions

diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 275525e39a5..073db93dd0d 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.61 2015/06/30 03:27:01 tnn Exp $
+$NetBSD: distinfo,v 1.62 2015/07/25 04:10:53 markd Exp $
 
 SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262
 RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2
@@ -12,3 +12,6 @@ SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453a
 SHA1 (patch-hw_xfree86_os-support_bsd_sparc64__video.c) = eddf15142e26f10f9028088f8e4e910bb6b5df59
 SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 499e536a1189b88bc17e3df44a9ae2397decdc8b
 SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
+SHA1 (patch-os_WaitFor.c) = 6060455bd8d145116b4177c5b0f482cf39c741ea
+SHA1 (patch-os_connection.c) = 19189656fbcabb0a48b68a7606660bda33e5d605
+SHA1 (patch-os_io.c) = 42c41abee29d241e3d7e10d59764c573a2165d55
diff --git a/x11/modular-xorg-server/patches/patch-os_WaitFor.c b/x11/modular-xorg-server/patches/patch-os_WaitFor.c
new file mode 100644
index 00000000000..135396063cd
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-os_WaitFor.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-os_WaitFor.c,v 1.1 2015/07/25 04:10:53 markd 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-07-21 21:58:16.000000000 +0000
++++ os/WaitFor.c
+@@ -52,6 +52,8 @@ SOFTWARE.
+  *
+  *****************************************************************/
+ 
++#include <X11/Xpoll.h>
++
+ #ifdef HAVE_DIX_CONFIG_H
+ #include <dix-config.h>
+ #endif
+@@ -66,7 +68,6 @@ SOFTWARE.
+ #include "misc.h"
+ 
+ #include "osdep.h"
+-#include <X11/Xpoll.h>
+ #include "dixstruct.h"
+ #include "opaque.h"
+ #ifdef DPMSExtension
diff --git a/x11/modular-xorg-server/patches/patch-os_connection.c b/x11/modular-xorg-server/patches/patch-os_connection.c
new file mode 100644
index 00000000000..c7f9c442503
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-os_connection.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-os_connection.c,v 1.1 2015/07/25 04:10:53 markd 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-07-21 21:58:52.000000000 +0000
++++ os/connection.c
+@@ -60,6 +60,8 @@ SOFTWARE.
+  *
+  *****************************************************************/
+ 
++#include <X11/Xpoll.h>
++
+ #ifdef HAVE_DIX_CONFIG_H
+ #include <dix-config.h>
+ #endif
+@@ -103,7 +105,6 @@ SOFTWARE.
+ #endif                          /* WIN32 */
+ #include "misc.h"               /* for typedef of pointer */
+ #include "osdep.h"
+-#include <X11/Xpoll.h>
+ #include "opaque.h"
+ #include "dixstruct.h"
+ #include "xace.h"
diff --git a/x11/modular-xorg-server/patches/patch-os_io.c b/x11/modular-xorg-server/patches/patch-os_io.c
new file mode 100644
index 00000000000..065490b8476
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-os_io.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-os_io.c,v 1.1 2015/07/25 04:10:53 markd 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-07-21 21:58:59.000000000 +0000
++++ os/io.c
+@@ -51,6 +51,8 @@ SOFTWARE.
+  *
+  *****************************************************************/
+ 
++#include <X11/Xpoll.h>
++
+ #ifdef HAVE_DIX_CONFIG_H
+ #include <dix-config.h>
+ #endif
+@@ -74,7 +76,6 @@ SOFTWARE.
+ #include <X11/Xproto.h>
+ #include "os.h"
+ #include "osdep.h"
+-#include <X11/Xpoll.h>
+ #include "opaque.h"
+ #include "dixstruct.h"
+ #include "misc.h"