[pkgsrc/trunk]: pkgsrc/devel/ruby-eventmachine Restrict cast with patch-aa to...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cece83a8f4d5
branches:  trunk
changeset: 547642:cece83a8f4d5
user:      taca <taca%pkgsrc.org@localhost>
date:      Tue Sep 23 08:06:04 2008 +0000

description:
Restrict cast with patch-aa to NetBSD only.  It should fix PR pkg/39586.

Other *BSD has void pointer for udata member of kevent structure.
NetBSD's kqueue is something behind to others?

diffstat:

 devel/ruby-eventmachine/distinfo         |   4 ++--
 devel/ruby-eventmachine/patches/patch-aa |  18 ++++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diffs (50 lines):

diff -r 39c7f58b0705 -r cece83a8f4d5 devel/ruby-eventmachine/distinfo
--- a/devel/ruby-eventmachine/distinfo  Tue Sep 23 07:22:10 2008 +0000
+++ b/devel/ruby-eventmachine/distinfo  Tue Sep 23 08:06:04 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2008/09/15 09:08:19 taca Exp $
+$NetBSD: distinfo,v 1.3 2008/09/23 08:06:04 taca Exp $
 
 SHA1 (eventmachine-0.12.0.gem) = 718de243c00252489eac970c971e081677034a25
 RMD160 (eventmachine-0.12.0.gem) = 685e10f06d83884eb66055ffca9d8838cee0ae60
 Size (eventmachine-0.12.0.gem) = 145408 bytes
-SHA1 (patch-aa) = 51f6e971240282a8088f5fa39025996340cd4d29
+SHA1 (patch-aa) = 2848fa75820ed4f2825ae65f359ac353d07f7d0a
diff -r 39c7f58b0705 -r cece83a8f4d5 devel/ruby-eventmachine/patches/patch-aa
--- a/devel/ruby-eventmachine/patches/patch-aa  Tue Sep 23 07:22:10 2008 +0000
+++ b/devel/ruby-eventmachine/patches/patch-aa  Tue Sep 23 08:06:04 2008 +0000
@@ -1,22 +1,28 @@
-$NetBSD: patch-aa,v 1.1 2008/09/15 09:08:19 taca Exp $
+$NetBSD: patch-aa,v 1.2 2008/09/23 08:06:04 taca Exp $
 
---- ext/em.cpp.orig    2008-09-15 14:10:15.000000000 +0900
+--- ext/em.cpp.orig    2008-09-19 21:55:47.000000000 +0900
 +++ ext/em.cpp
-@@ -1417,7 +1417,7 @@ void EventMachine_t::ArmKqueueWriter (Ev
+@@ -1417,7 +1417,11 @@ void EventMachine_t::ArmKqueueWriter (Ev
                if (!ed)
                        throw std::runtime_error ("added bad descriptor");
                struct kevent k;
--              EV_SET (&k, ed->GetSocket(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, ed);
++#ifdef __NetBSD__
 +              EV_SET (&k, ed->GetSocket(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, (intptr_t)ed);
++#else
+               EV_SET (&k, ed->GetSocket(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, ed);
++#endif
                int t = kevent (kqfd, &k, 1, NULL, 0, NULL);
                assert (t == 0);
        }
-@@ -1435,7 +1435,7 @@ void EventMachine_t::ArmKqueueReader (Ev
+@@ -1435,7 +1439,11 @@ void EventMachine_t::ArmKqueueReader (Ev
                if (!ed)
                        throw std::runtime_error ("added bad descriptor");
                struct kevent k;
--              EV_SET (&k, ed->GetSocket(), EVFILT_READ, EV_ADD, 0, 0, ed);
++#ifdef __NetBSD__
 +              EV_SET (&k, ed->GetSocket(), EVFILT_READ, EV_ADD, 0, 0, (intptr_t)ed);
++#else
+               EV_SET (&k, ed->GetSocket(), EVFILT_READ, EV_ADD, 0, 0, ed);
++#endif
                int t = kevent (kqfd, &k, 1, NULL, 0, NULL);
                assert (t == 0);
        }