diff options
| author | fhajny <fhajny> | 2009-12-10 19:26:22 +0000 |
|---|---|---|
| committer | fhajny <fhajny> | 2009-12-10 19:26:22 +0000 |
| commit | 8ce6b5533831fdf6ddeb6fb8c41b0c21b5fffc5d (patch) | |
| tree | ad828f33bea1cce89da650db05ad8e2ad8e9b195 /devel/ruby-eventmachine | |
| parent | 579e6b0d7216810ea4bd65cdbb59669486694d1e (diff) | |
| download | pkgsrc-8ce6b5533831fdf6ddeb6fb8c41b0c21b5fffc5d.tar.gz | |
Fix NetBSD build by expanding the pattern in patch-aa to two more cases.
Diffstat (limited to 'devel/ruby-eventmachine')
| -rw-r--r-- | devel/ruby-eventmachine/Makefile | 3 | ||||
| -rw-r--r-- | devel/ruby-eventmachine/distinfo | 4 | ||||
| -rw-r--r-- | devel/ruby-eventmachine/patches/patch-aa | 32 |
3 files changed, 32 insertions, 7 deletions
diff --git a/devel/ruby-eventmachine/Makefile b/devel/ruby-eventmachine/Makefile index dc51bbb79ee..2ddef2f1ad1 100644 --- a/devel/ruby-eventmachine/Makefile +++ b/devel/ruby-eventmachine/Makefile @@ -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 diff --git a/devel/ruby-eventmachine/distinfo b/devel/ruby-eventmachine/distinfo index 04b5760a57b..93326df4e3e 100644 --- a/devel/ruby-eventmachine/distinfo +++ b/devel/ruby-eventmachine/distinfo @@ -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 --git a/devel/ruby-eventmachine/patches/patch-aa b/devel/ruby-eventmachine/patches/patch-aa index 8235e3735bd..a7af85cca14 100644 --- a/devel/ruby-eventmachine/patches/patch-aa +++ b/devel/ruby-eventmachine/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.3 2009/12/04 15:57:47 fhajny Exp $ 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 @@ $NetBSD: patch-aa,v 1.3 2009/12/04 15:57:47 fhajny Exp $ 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); + } |