diff options
| author | wiz <wiz@pkgsrc.org> | 2015-07-21 12:40:36 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2015-07-21 12:40:36 +0000 |
| commit | b8547a18abf9732260ccb3f8d04876aa973cef32 (patch) | |
| tree | 4aaf741cbed6bba908b69e5b8dfaa011a59d42bd /x11 | |
| parent | 44cc8b9c853c93475cdff72a8fbec916b45560b4 (diff) | |
| download | pkgsrc-b8547a18abf9732260ccb3f8d04876aa973cef32.tar.gz | |
Fix FD_SETSIZE definition.
Move the define of FD_SETSIZE before the include of select.h, so that
is actually does something useful.
Bump PKGREVISION.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xproto/Makefile | 3 | ||||
| -rw-r--r-- | x11/xproto/distinfo | 3 | ||||
| -rw-r--r-- | x11/xproto/patches/patch-Xpoll.h.in | 35 |
3 files changed, 39 insertions, 2 deletions
diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile index 2b1dd1b64bf..42f7adda3ee 100644 --- a/x11/xproto/Makefile +++ b/x11/xproto/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2015/07/02 13:11:46 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2015/07/21 12:40:36 wiz Exp $ DISTNAME= xproto-7.0.28 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=proto/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo index f8dc0d8256b..537d4b8339f 100644 --- a/x11/xproto/distinfo +++ b/x11/xproto/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.26 2015/07/02 13:11:46 wiz Exp $ +$NetBSD: distinfo,v 1.27 2015/07/21 12:40:36 wiz Exp $ SHA1 (xproto-7.0.28.tar.bz2) = d62c43e1b3619ab85732e0113eaa2104920730ac RMD160 (xproto-7.0.28.tar.bz2) = 4d5d4c8ef8e071a2de9c436755deff7a60c004f5 Size (xproto-7.0.28.tar.bz2) = 300886 bytes SHA1 (patch-Xos_r.h.in) = 6de176ec5bef08d67286a14eca651b1968d0b4bb +SHA1 (patch-Xpoll.h.in) = a0b9869a1b82c039657a68d4d7dd69382504e604 SHA1 (patch-configure) = a589cc4b75bbaa4c93789d4ffc85a05fcaf0e25c SHA1 (patch-configure.ac) = 8bc7d4b8c9c98d8902404d2e67755e0145173b36 diff --git a/x11/xproto/patches/patch-Xpoll.h.in b/x11/xproto/patches/patch-Xpoll.h.in new file mode 100644 index 00000000000..a1f7097e6a8 --- /dev/null +++ b/x11/xproto/patches/patch-Xpoll.h.in @@ -0,0 +1,35 @@ +$NetBSD: patch-Xpoll.h.in,v 1.1 2015/07/21 12:40:36 wiz Exp $ + +Fix FD_SETSIZE definition. + +Move the define of FD_SETSIZE before the include of select.h, so that +is actually does something useful. + +--- Xpoll.h.in.orig 2015-07-01 15:16:11.000000000 +0000 ++++ Xpoll.h.in +@@ -54,6 +54,12 @@ from The Open Group. + + #ifndef USE_POLL + ++#define XFD_SETSIZE 512 ++ ++#ifndef FD_SETSIZE ++#define FD_SETSIZE XFD_SETSIZE ++#endif ++ + #include <X11/Xos.h> + + #include <sys/select.h> /* Get the FD_* macros. */ +@@ -67,12 +73,6 @@ typedef long fd_mask; + # endif + #endif + +-#define XFD_SETSIZE 512 +- +-#ifndef FD_SETSIZE +-#define FD_SETSIZE XFD_SETSIZE +-#endif +- + #ifndef NBBY + #define NBBY 8 /* number of bits in a byte */ + #endif |