From cbbe4e5d4f1090408da45a25c4103d372481db54 Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 19 Dec 2019 22:21:57 +0000 Subject: Deal with the kqueue type change in NetBSD. --- net/zeromq/distinfo | 3 ++- net/zeromq/patches/patch-src_kqueue.cpp | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 net/zeromq/patches/patch-src_kqueue.cpp diff --git a/net/zeromq/distinfo b/net/zeromq/distinfo index d7e46e35970..9a92947e1e3 100644 --- a/net/zeromq/distinfo +++ b/net/zeromq/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.29 2019/08/09 12:01:34 adam Exp $ +$NetBSD: distinfo,v 1.30 2019/12/19 22:21:57 joerg Exp $ SHA1 (zeromq-4.3.2.tar.gz) = e5253bff214f77621b3d29443f1aa6e5a106ffe5 RMD160 (zeromq-4.3.2.tar.gz) = 01621ad7d28f7eb2de939441bd1b4f2c21fb3663 SHA512 (zeromq-4.3.2.tar.gz) = b6251641e884181db9e6b0b705cced7ea4038d404bdae812ff47bdd0eed12510b6af6846b85cb96898e253ccbac71eca7fe588673300ddb9c3109c973250c8e4 Size (zeromq-4.3.2.tar.gz) = 1697442 bytes SHA1 (patch-src_ipc__listener.cpp) = 08b79008e5c331e6cb603244a91abddc55454678 +SHA1 (patch-src_kqueue.cpp) = b0313bf68e3c8b906a2770f625b6706f40fc0530 SHA1 (patch-src_tcp__listener.cpp) = 8960a2f5e4d59aa8e4e5fd29a4770e9d1b04a21a diff --git a/net/zeromq/patches/patch-src_kqueue.cpp b/net/zeromq/patches/patch-src_kqueue.cpp new file mode 100644 index 00000000000..da0e3a751b6 --- /dev/null +++ b/net/zeromq/patches/patch-src_kqueue.cpp @@ -0,0 +1,23 @@ +$NetBSD: patch-src_kqueue.cpp,v 1.1 2019/12/19 22:21:57 joerg Exp $ + +--- src/kqueue.cpp.orig 2019-12-19 14:32:14.474104176 +0000 ++++ src/kqueue.cpp +@@ -46,10 +46,15 @@ + #include "i_poll_events.hpp" + #include "likely.hpp" + +-// NetBSD defines (struct kevent).udata as intptr_t, everyone else +-// as void *. ++// NetBSD before 9.99.15 defined (struct kevent).udata as intptr_t, ++// everyone else as void *. + #if defined ZMQ_HAVE_NETBSD +-#define kevent_udata_t intptr_t ++# include ++# if __NetBSD_Version__ < 999001500 ++# define kevent_udata_t intptr_t ++# else ++# define kevent_udata_t void * ++# endif + #else + #define kevent_udata_t void * + #endif -- cgit v1.2.3