head	1.5;
access;
symbols
	pkgsrc-2013Q2:1.5.0.4
	pkgsrc-2013Q2-base:1.5
	pkgsrc-2012Q4:1.5.0.2
	pkgsrc-2012Q4-base:1.5
	pkgsrc-2012Q2:1.4.0.22
	pkgsrc-2012Q2-base:1.4
	pkgsrc-2012Q1:1.4.0.20
	pkgsrc-2012Q1-base:1.4
	pkgsrc-2011Q4:1.4.0.18
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q3:1.4.0.16
	pkgsrc-2011Q3-base:1.4
	pkgsrc-2011Q2:1.4.0.14
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2011Q1:1.4.0.12
	pkgsrc-2011Q1-base:1.4
	pkgsrc-2010Q4:1.4.0.10
	pkgsrc-2010Q4-base:1.4
	pkgsrc-2010Q3:1.4.0.8
	pkgsrc-2010Q3-base:1.4
	pkgsrc-2010Q2:1.4.0.6
	pkgsrc-2010Q2-base:1.4
	pkgsrc-2010Q1:1.4.0.4
	pkgsrc-2010Q1-base:1.4
	pkgsrc-2009Q4:1.4.0.2
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2009Q3:1.2.0.10
	pkgsrc-2009Q3-base:1.2
	pkgsrc-2009Q2:1.2.0.8
	pkgsrc-2009Q2-base:1.2
	pkgsrc-2009Q1:1.2.0.6
	pkgsrc-2009Q1-base:1.2
	pkgsrc-2008Q4:1.2.0.4
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.2
	pkgsrc-2008Q3-base:1.2;
locks; strict;
comment	@# @;


1.5
date	2012.09.16.06.18.08;	author taca;	state dead;
branches;
next	1.4;

1.4
date	2009.12.10.19.26.22;	author fhajny;	state Exp;
branches;
next	1.3;

1.3
date	2009.12.04.15.57.47;	author fhajny;	state Exp;
branches;
next	1.2;

1.2
date	2008.09.23.08.06.04;	author taca;	state Exp;
branches;
next	1.1;

1.1
date	2008.09.15.09.08.19;	author taca;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Update ruby-eventmachine to 1.0.0.

Changes are unavailable.
@
text
@$NetBSD: patch-aa,v 1.4 2009/12/10 19:26:22 fhajny Exp $

--- ext/em.cpp.orig	2009-12-10 21:13:48.000000000 +0100
+++ ext/em.cpp
@@@@ -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;
+#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);
 		if (t < 0) {
 			char buf [200];
@@@@ -1644,7 +1652,11 @@@@ void EventMachine_t::ArmKqueueReader (Ev
 		if (!ed)
 			throw std::runtime_error ("added bad descriptor");
 		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);
 		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);
 		}
@


1.4
log
@Fix NetBSD build by expanding the pattern in patch-aa to two more cases.
@
text
@d1 1
a1 1
$NetBSD$
@


1.3
log
@Update ruby-eventmachine to 0.12.10.

More than a year worth of fixes and improvements.
@
text
@d3 1
a3 1
--- ext/em.cpp.orig	2009-11-22 13:20:52.694811390 +0000
d5 13
a17 1
@@@@ -1622,7 +1622,11 @@@@ void EventMachine_t::ArmKqueueWriter (Ev
d29 1
a29 1
@@@@ -1644,7 +1648,11 @@@@ void EventMachine_t::ArmKqueueReader (Ev
d41 12
@


1.2
log
@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?
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1 2008/09/15 09:08:19 taca Exp $
d3 1
a3 1
--- ext/em.cpp.orig	2008-09-19 21:55:47.000000000 +0900
d5 1
a5 1
@@@@ -1417,7 +1417,11 @@@@ void EventMachine_t::ArmKqueueWriter (Ev
d15 3
a17 3
 		assert (t == 0);
 	}
@@@@ -1435,7 +1439,11 @@@@ void EventMachine_t::ArmKqueueReader (Ev
d27 2
a28 2
 		assert (t == 0);
 	}
@


1.1
log
@Update ruby-eventmachine to 0.12.0.

Changes are unknown.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- ext/em.cpp.orig	2008-09-15 14:10:15.000000000 +0900
d5 1
a5 1
@@@@ -1417,7 +1417,7 @@@@ void EventMachine_t::ArmKqueueWriter (Ev
d9 1
a9 1
-		EV_SET (&k, ed->GetSocket(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, ed);
d11 3
d17 1
a17 1
@@@@ -1435,7 +1435,7 @@@@ void EventMachine_t::ArmKqueueReader (Ev
d21 1
a21 1
-		EV_SET (&k, ed->GetSocket(), EVFILT_READ, EV_ADD, 0, 0, ed);
d23 3
@