Thu Dec 10 19:26:22 2009 UTC ()
Fix NetBSD build by expanding the pattern in patch-aa to two more cases.


(fhajny)
diff -r1.3 -r1.4 pkgsrc/devel/ruby-eventmachine/Makefile
diff -r1.4 -r1.5 pkgsrc/devel/ruby-eventmachine/distinfo
diff -r1.3 -r1.4 pkgsrc/devel/ruby-eventmachine/patches/patch-aa
cvs diff -r1.3 -r1.4 pkgsrc/devel/ruby-eventmachine/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ruby-eventmachine/Makefile 2009/12/04 15:57:47 1.3
+++ pkgsrc/devel/ruby-eventmachine/Makefile 2009/12/10 19:26:22 1.4
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.3 2009/12/04 15:57:47 fhajny Exp $ 1# $NetBSD: Makefile,v 1.4 2009/12/10 19:26:22 fhajny Exp $
2 2
3DISTNAME= eventmachine-0.12.10 3DISTNAME= eventmachine-0.12.10
4PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} 4PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= devel 6CATEGORIES= devel
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://rubyeventmachine.com/ 9HOMEPAGE= http://rubyeventmachine.com/
9COMMENT= Ruby event-driven I/O using the Reactor pattern 10COMMENT= Ruby event-driven I/O using the Reactor pattern
10LICENSE= ruby-license 11LICENSE= ruby-license
11 12
12USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
13GEM_BUILD= gemspec 14GEM_BUILD= gemspec
14 15
15.include "../../misc/rubygems/rubygem.mk" 16.include "../../misc/rubygems/rubygem.mk"
16 17
17.include "../../security/openssl/buildlink3.mk" 18.include "../../security/openssl/buildlink3.mk"
cvs diff -r1.4 -r1.5 pkgsrc/devel/ruby-eventmachine/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ruby-eventmachine/distinfo 2009/12/04 15:57:47 1.4
+++ pkgsrc/devel/ruby-eventmachine/distinfo 2009/12/10 19:26:22 1.5
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.4 2009/12/04 15:57:47 fhajny Exp $ 1$NetBSD: distinfo,v 1.5 2009/12/10 19:26:22 fhajny Exp $
2 2
3SHA1 (eventmachine-0.12.10.gem) = d9b3ec65e3e94e461ed2d53c01a2b9ab62fe6a07 3SHA1 (eventmachine-0.12.10.gem) = d9b3ec65e3e94e461ed2d53c01a2b9ab62fe6a07
4RMD160 (eventmachine-0.12.10.gem) = 625b4917e84d55fec468a810e9ee0bb5273387f0 4RMD160 (eventmachine-0.12.10.gem) = 625b4917e84d55fec468a810e9ee0bb5273387f0
5Size (eventmachine-0.12.10.gem) = 220672 bytes 5Size (eventmachine-0.12.10.gem) = 220672 bytes
6SHA1 (patch-aa) = a3880d11194a284d4730d03979048f02c83d54c9 6SHA1 (patch-aa) = 6debcc23193dca11b4312ca02b95f0659cdf0fcc
cvs diff -r1.3 -r1.4 pkgsrc/devel/ruby-eventmachine/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/ruby-eventmachine/patches/Attic/patch-aa 2009/12/04 15:57:47 1.3
+++ pkgsrc/devel/ruby-eventmachine/patches/Attic/patch-aa 2009/12/10 19:26:22 1.4
@@ -1,28 +1,52 @@ @@ -1,28 +1,52 @@
1$NetBSD: patch-aa,v 1.3 2009/12/04 15:57:47 fhajny Exp $ 1$NetBSD: patch-aa,v 1.4 2009/12/10 19:26:22 fhajny Exp $
2 2
3--- ext/em.cpp.orig 2009-11-22 13:20:52.694811390 +0000 3--- ext/em.cpp.orig 2009-12-10 21:13:48.000000000 +0100
4+++ ext/em.cpp 4+++ ext/em.cpp
5@@ -1622,7 +1622,11 @@ void EventMachine_t::ArmKqueueWriter (Ev 5@@ -1347,7 +1347,11 @@ int EventMachine_t::DetachFD (EventableD
 6 if (bKqueue) {
 7 // remove any read/write events for this fd
 8 struct kevent k;
 9+#ifdef __NetBSD__
 10+ EV_SET (&k, ed->GetSocket(), EVFILT_READ | EVFILT_WRITE, EV_DELETE, 0, 0, (intptr_t)ed);
 11+#else
 12 EV_SET (&k, ed->GetSocket(), EVFILT_READ | EVFILT_WRITE, EV_DELETE, 0, 0, ed);
 13+#endif
 14 int t = kevent (kqfd, &k, 1, NULL, 0, NULL);
 15 if (t < 0 && (errno != ENOENT) && (errno != EBADF)) {
 16 char buf [200];
 17@@ -1622,7 +1626,11 @@ void EventMachine_t::ArmKqueueWriter (Ev
6 if (!ed) 18 if (!ed)
7 throw std::runtime_error ("added bad descriptor"); 19 throw std::runtime_error ("added bad descriptor");
8 struct kevent k; 20 struct kevent k;
9+#ifdef __NetBSD__ 21+#ifdef __NetBSD__
10+ EV_SET (&k, ed->GetSocket(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, (intptr_t)ed); 22+ EV_SET (&k, ed->GetSocket(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, (intptr_t)ed);
11+#else 23+#else
12 EV_SET (&k, ed->GetSocket(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, ed); 24 EV_SET (&k, ed->GetSocket(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, ed);
13+#endif 25+#endif
14 int t = kevent (kqfd, &k, 1, NULL, 0, NULL); 26 int t = kevent (kqfd, &k, 1, NULL, 0, NULL);
15 if (t < 0) { 27 if (t < 0) {
16 char buf [200]; 28 char buf [200];
17@@ -1644,7 +1648,11 @@ void EventMachine_t::ArmKqueueReader (Ev 29@@ -1644,7 +1652,11 @@ void EventMachine_t::ArmKqueueReader (Ev
18 if (!ed) 30 if (!ed)
19 throw std::runtime_error ("added bad descriptor"); 31 throw std::runtime_error ("added bad descriptor");
20 struct kevent k; 32 struct kevent k;
21+#ifdef __NetBSD__ 33+#ifdef __NetBSD__
22+ EV_SET (&k, ed->GetSocket(), EVFILT_READ, EV_ADD, 0, 0, (intptr_t)ed); 34+ EV_SET (&k, ed->GetSocket(), EVFILT_READ, EV_ADD, 0, 0, (intptr_t)ed);
23+#else 35+#else
24 EV_SET (&k, ed->GetSocket(), EVFILT_READ, EV_ADD, 0, 0, ed); 36 EV_SET (&k, ed->GetSocket(), EVFILT_READ, EV_ADD, 0, 0, ed);
25+#endif 37+#endif
26 int t = kevent (kqfd, &k, 1, NULL, 0, NULL); 38 int t = kevent (kqfd, &k, 1, NULL, 0, NULL);
27 if (t < 0) { 39 if (t < 0) {
28 char buf [200]; 40 char buf [200];
 41@@ -1695,7 +1707,11 @@ void EventMachine_t::_AddNewDescriptors(
 42 // INCOMPLETE. Some descriptors don't want to be readable.
 43 assert (kqfd != -1);
 44 struct kevent k;
 45+#ifdef __NetBSD__
 46+ EV_SET (&k, ed->GetSocket(), EVFILT_READ, EV_ADD, 0, 0, (intptr_t)ed);
 47+#else
 48 EV_SET (&k, ed->GetSocket(), EVFILT_READ, EV_ADD, 0, 0, ed);
 49+#endif
 50 int t = kevent (kqfd, &k, 1, NULL, 0, NULL);
 51 assert (t == 0);
 52 }