Fix another instance of FD_SETSIZE defined too late.

4 files changed, 40 insertions, 2 deletions

diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index f2920be23fc..9af5a596820 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2015/10/11 18:28:53 tnn Exp $
+$NetBSD: distinfo,v 1.67 2015/10/12 21:48:33 tnn Exp $
 
 SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262
 RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2
@@ -16,4 +16,5 @@ SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a226
 SHA1 (patch-os_WaitFor.c) = a76c5ef4e3725f5299fa3f0860183e89c6004a71
 SHA1 (patch-os_connection.c) = d6b9bbc1ab34cec6457aa68546105ea5deb6ded6
 SHA1 (patch-os_io.c) = 6216e35e780706a8d5aaa60652c9ae7b4ec8e6e6
+SHA1 (patch-os_xdmcp.c) = 3d0f3a1d8c7078f3c8752e5ca12929e41d76f899
 SHA1 (patch-os_xstrans.c) = 489a4f4b226ecd361b922895204fb9041b065d4e
diff --git a/x11/modular-xorg-server/patches/patch-os_xdmcp.c b/x11/modular-xorg-server/patches/patch-os_xdmcp.c
new file mode 100644
index 00000000000..1239cdb8526
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-os_xdmcp.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-os_xdmcp.c,v 1.1 2015/10/12 21:48:33 tnn Exp $
+
+move X11/Xpoll.h include earlier than sys/select.h to avoid missing
+out on setting FD_SETSIZE early enough.
+
+--- os/xdmcp.c.orig	2015-06-16 15:21:07.000000000 +0000
++++ os/xdmcp.c
+@@ -13,6 +13,10 @@
+  *
+  */
+ 
++#ifdef __NetBSD__
++#include <X11/Xpoll.h>
++#endif
++
+ #ifdef HAVE_DIX_CONFIG_H
+ #include <dix-config.h>
+ #endif
diff --git a/x11/modular-xorg-server112/distinfo b/x11/modular-xorg-server112/distinfo
index 7e806664455..74575ad9689 100644
--- a/x11/modular-xorg-server112/distinfo
+++ b/x11/modular-xorg-server112/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2015/10/11 17:51:47 tnn Exp $
+$NetBSD: distinfo,v 1.4 2015/10/12 21:48:33 tnn Exp $
 
 SHA1 (xorg-server-1.12.4.tar.bz2) = 6d616874f9c7677bda08dc073c03f83e78fbc585
 RMD160 (xorg-server-1.12.4.tar.bz2) = 4907b5dc42efd6b3fb6bf9d64f1441080a6a6983
@@ -58,6 +58,7 @@ 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-os_xdmcp.c) = 9252ad64caa8429650545c79f78c5dcdaf5b33b8
 SHA1 (patch-randr_randr.c) = e8d2b72f8230a2a8a6ade47f5459ec9b0849ed0b
 SHA1 (patch-randr_randrstr.h) = f634438dda61111b3bf3b77580951a638fbdea10
 SHA1 (patch-randr_rrsdispatch.c) = 13a2e819fea3ab8fa4caee7f9450a518ac41e517
diff --git a/x11/modular-xorg-server112/patches/patch-os_xdmcp.c b/x11/modular-xorg-server112/patches/patch-os_xdmcp.c
new file mode 100644
index 00000000000..5a1b5ac77d5
--- /dev/null
+++ b/x11/modular-xorg-server112/patches/patch-os_xdmcp.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-os_xdmcp.c,v 1.1 2015/10/12 21:48:33 tnn Exp $
+
+move X11/Xpoll.h include earlier than sys/select.h to avoid missing
+out on setting FD_SETSIZE early enough.
+
+--- os/xdmcp.c.orig	2012-05-17 17:09:04.000000000 +0000
++++ os/xdmcp.c
+@@ -13,6 +13,10 @@
+  *
+  */
+ 
++#ifdef __NetBSD__
++#include <X11/Xpoll.h>
++#endif
++
+ #ifdef HAVE_DIX_CONFIG_H
+ #include <dix-config.h>
+ #endif