[pkgsrc/trunk]: pkgsrc/devel/ruby-eventmachine Fix NetBSD build by expanding ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cefaa202fd51
branches:  trunk
changeset: 568307:cefaa202fd51
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Thu Dec 10 19:26:22 2009 +0000

description:
Fix NetBSD build by expanding the pattern in patch-aa to two more cases.

diffstat:

 devel/ruby-eventmachine/Makefile         |   3 ++-
 devel/ruby-eventmachine/distinfo         |   4 ++--
 devel/ruby-eventmachine/patches/patch-aa |  32 ++++++++++++++++++++++++++++----
 3 files changed, 32 insertions(+), 7 deletions(-)

diffs (77 lines):

diff -r bc2c3f39395e -r cefaa202fd51 devel/ruby-eventmachine/Makefile
--- a/devel/ruby-eventmachine/Makefile  Thu Dec 10 19:03:45 2009 +0000
+++ b/devel/ruby-eventmachine/Makefile  Thu Dec 10 19:26:22 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2009/12/04 15:57:47 fhajny Exp $
+# $NetBSD: Makefile,v 1.4 2009/12/10 19:26:22 fhajny Exp $
 
 DISTNAME=      eventmachine-0.12.10
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r bc2c3f39395e -r cefaa202fd51 devel/ruby-eventmachine/distinfo
--- a/devel/ruby-eventmachine/distinfo  Thu Dec 10 19:03:45 2009 +0000
+++ b/devel/ruby-eventmachine/distinfo  Thu Dec 10 19:26:22 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2009/12/04 15:57:47 fhajny Exp $
+$NetBSD: distinfo,v 1.5 2009/12/10 19:26:22 fhajny Exp $
 
 SHA1 (eventmachine-0.12.10.gem) = d9b3ec65e3e94e461ed2d53c01a2b9ab62fe6a07
 RMD160 (eventmachine-0.12.10.gem) = 625b4917e84d55fec468a810e9ee0bb5273387f0
 Size (eventmachine-0.12.10.gem) = 220672 bytes
-SHA1 (patch-aa) = a3880d11194a284d4730d03979048f02c83d54c9
+SHA1 (patch-aa) = 6debcc23193dca11b4312ca02b95f0659cdf0fcc
diff -r bc2c3f39395e -r cefaa202fd51 devel/ruby-eventmachine/patches/patch-aa
--- a/devel/ruby-eventmachine/patches/patch-aa  Thu Dec 10 19:03:45 2009 +0000
+++ b/devel/ruby-eventmachine/patches/patch-aa  Thu Dec 10 19:26:22 2009 +0000
@@ -1,8 +1,20 @@
-$NetBSD: patch-aa,v 1.3 2009/12/04 15:57:47 fhajny Exp $
+$NetBSD: patch-aa,v 1.4 2009/12/10 19:26:22 fhajny Exp $
 
---- ext/em.cpp.orig    2009-11-22 13:20:52.694811390 +0000
+--- ext/em.cpp.orig    2009-12-10 21:13:48.000000000 +0100
 +++ ext/em.cpp
-@@ -1622,7 +1622,11 @@ void EventMachine_t::ArmKqueueWriter (Ev
+@@ -1347,7 +1347,11 @@ int EventMachine_t::DetachFD (EventableD
+       if (bKqueue) {
+               // remove any read/write events for this fd
+               struct kevent k;
++#ifdef __NetBSD__
++              EV_SET (&k, ed->GetSocket(), EVFILT_READ | EVFILT_WRITE, EV_DELETE, 0, 0, (intptr_t)ed);
++#else
+               EV_SET (&k, ed->GetSocket(), EVFILT_READ | EVFILT_WRITE, EV_DELETE, 0, 0, ed);
++#endif
+               int t = kevent (kqfd, &k, 1, NULL, 0, NULL);
+               if (t < 0 && (errno != ENOENT) && (errno != EBADF)) {
+                       char buf [200];
+@@ -1622,7 +1626,11 @@ void EventMachine_t::ArmKqueueWriter (Ev
                if (!ed)
                        throw std::runtime_error ("added bad descriptor");
                struct kevent k;
@@ -14,7 +26,7 @@
                int t = kevent (kqfd, &k, 1, NULL, 0, NULL);
                if (t < 0) {
                        char buf [200];
-@@ -1644,7 +1648,11 @@ void EventMachine_t::ArmKqueueReader (Ev
+@@ -1644,7 +1652,11 @@ void EventMachine_t::ArmKqueueReader (Ev
                if (!ed)
                        throw std::runtime_error ("added bad descriptor");
                struct kevent k;
@@ -26,3 +38,15 @@
                int t = kevent (kqfd, &k, 1, NULL, 0, NULL);
                if (t < 0) {
                        char buf [200];
+@@ -1695,7 +1707,11 @@ void EventMachine_t::_AddNewDescriptors(
+                       // INCOMPLETE. Some descriptors don't want to be readable.
+                       assert (kqfd != -1);
+                       struct kevent k;
++#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);
+               }