Update ruby-eventmachine to 0.12.10.

More than a year worth of fixes and improvements.

4 files changed, 107 insertions, 42 deletions

diff --git a/devel/ruby-eventmachine/Makefile b/devel/ruby-eventmachine/Makefile
index 6393a0ae737..dc51bbb79ee 100644
--- a/devel/ruby-eventmachine/Makefile
+++ b/devel/ruby-eventmachine/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2008/09/15 09:08:19 taca Exp $
+# $NetBSD: Makefile,v 1.3 2009/12/04 15:57:47 fhajny Exp $
 
-DISTNAME=	eventmachine-0.12.0
+DISTNAME=	eventmachine-0.12.10
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://rubyeventmachine.com/
 COMMENT=	Ruby event-driven I/O using the Reactor pattern
+LICENSE=	ruby-license
 
 USE_LANGUAGES=	c c++
 GEM_BUILD=	gemspec
diff --git a/devel/ruby-eventmachine/PLIST b/devel/ruby-eventmachine/PLIST
index fddd699aad1..3f717d7e702 100644
--- a/devel/ruby-eventmachine/PLIST
+++ b/devel/ruby-eventmachine/PLIST
@@ -1,18 +1,26 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:49:09 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/12/04 15:57:47 fhajny Exp $
 ${GEM_HOME}/cache/eventmachine-${PKGVERSION}.gem
-${GEM_LIBDIR}/COPYING
-${GEM_LIBDIR}/DEFERRABLES
-${GEM_LIBDIR}/EPOLL
-${GEM_LIBDIR}/GNU
-${GEM_LIBDIR}/KEYBOARD
-${GEM_LIBDIR}/LEGAL
-${GEM_LIBDIR}/LIGHTWEIGHT_CONCURRENCY
-${GEM_LIBDIR}/PURE_RUBY
+${GEM_LIBDIR}/.gitignore
 ${GEM_LIBDIR}/README
-${GEM_LIBDIR}/RELEASE_NOTES
-${GEM_LIBDIR}/SMTP
-${GEM_LIBDIR}/SPAWNED_PROCESSES
-${GEM_LIBDIR}/TODO
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/docs/COPYING
+${GEM_LIBDIR}/docs/ChangeLog
+${GEM_LIBDIR}/docs/DEFERRABLES
+${GEM_LIBDIR}/docs/EPOLL
+${GEM_LIBDIR}/docs/GNU
+${GEM_LIBDIR}/docs/INSTALL
+${GEM_LIBDIR}/docs/KEYBOARD
+${GEM_LIBDIR}/docs/LEGAL
+${GEM_LIBDIR}/docs/LIGHTWEIGHT_CONCURRENCY
+${GEM_LIBDIR}/docs/PURE_RUBY
+${GEM_LIBDIR}/docs/RELEASE_NOTES
+${GEM_LIBDIR}/docs/SMTP
+${GEM_LIBDIR}/docs/SPAWNED_PROCESSES
+${GEM_LIBDIR}/docs/TODO
+${GEM_LIBDIR}/eventmachine.gemspec
+${GEM_LIBDIR}/examples/ex_channel.rb
+${GEM_LIBDIR}/examples/ex_queue.rb
+${GEM_LIBDIR}/examples/helper.rb
 ${GEM_LIBDIR}/ext/binder.cpp
 ${GEM_LIBDIR}/ext/binder.h
 ${GEM_LIBDIR}/ext/cmain.cpp
@@ -28,6 +36,10 @@ ${GEM_LIBDIR}/ext/epoll.h
 ${GEM_LIBDIR}/ext/eventmachine.h
 ${GEM_LIBDIR}/ext/eventmachine_cpp.h
 ${GEM_LIBDIR}/ext/extconf.rb
+${GEM_LIBDIR}/ext/fastfilereader/extconf.rb
+${GEM_LIBDIR}/ext/fastfilereader/mapper.cpp
+${GEM_LIBDIR}/ext/fastfilereader/mapper.h
+${GEM_LIBDIR}/ext/fastfilereader/rubymain.cpp
 ${GEM_LIBDIR}/ext/files.cpp
 ${GEM_LIBDIR}/ext/files.h
 ${GEM_LIBDIR}/ext/kb.cpp
@@ -40,51 +52,99 @@ ${GEM_LIBDIR}/ext/sigs.cpp
 ${GEM_LIBDIR}/ext/sigs.h
 ${GEM_LIBDIR}/ext/ssl.cpp
 ${GEM_LIBDIR}/ext/ssl.h
+${GEM_LIBDIR}/java/.classpath
+${GEM_LIBDIR}/java/.project
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/EmReactor.java
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/EmReactorException.java
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/EventableChannel.java
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/EventableDatagramChannel.java
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/EventableSocketChannel.java
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/application/Application.java
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/application/Connection.java
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/application/ConnectionFactory.java
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/application/DefaultConnectionFactory.java
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/application/PeriodicTimer.java
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/application/Timer.java
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/tests/ApplicationTest.java
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/tests/ConnectTest.java
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/tests/EMTest.java
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/tests/TestDatagrams.java
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/tests/TestServers.java
+${GEM_LIBDIR}/java/src/com/rubyeventmachine/tests/TestTimers.java
+${GEM_LIBDIR}/lib/em/buftok.rb
+${GEM_LIBDIR}/lib/em/callback.rb
+${GEM_LIBDIR}/lib/em/channel.rb
+${GEM_LIBDIR}/lib/em/connection.rb
 ${GEM_LIBDIR}/lib/em/deferrable.rb
-${GEM_LIBDIR}/lib/em/eventable.rb
+${GEM_LIBDIR}/lib/em/file_watch.rb
 ${GEM_LIBDIR}/lib/em/future.rb
 ${GEM_LIBDIR}/lib/em/messages.rb
+${GEM_LIBDIR}/lib/em/process_watch.rb
 ${GEM_LIBDIR}/lib/em/processes.rb
+${GEM_LIBDIR}/lib/em/protocols.rb
+${GEM_LIBDIR}/lib/em/protocols/header_and_content.rb
+${GEM_LIBDIR}/lib/em/protocols/httpclient.rb
+${GEM_LIBDIR}/lib/em/protocols/httpclient2.rb
+${GEM_LIBDIR}/lib/em/protocols/line_and_text.rb
+${GEM_LIBDIR}/lib/em/protocols/linetext2.rb
+${GEM_LIBDIR}/lib/em/protocols/memcache.rb
+${GEM_LIBDIR}/lib/em/protocols/object_protocol.rb
+${GEM_LIBDIR}/lib/em/protocols/postgres3.rb
+${GEM_LIBDIR}/lib/em/protocols/saslauth.rb
+${GEM_LIBDIR}/lib/em/protocols/smtpclient.rb
+${GEM_LIBDIR}/lib/em/protocols/smtpserver.rb
+${GEM_LIBDIR}/lib/em/protocols/socks4.rb
+${GEM_LIBDIR}/lib/em/protocols/stomp.rb
+${GEM_LIBDIR}/lib/em/protocols/tcptest.rb
+${GEM_LIBDIR}/lib/em/queue.rb
 ${GEM_LIBDIR}/lib/em/spawnable.rb
 ${GEM_LIBDIR}/lib/em/streamer.rb
+${GEM_LIBDIR}/lib/em/timers.rb
+${GEM_LIBDIR}/lib/em/version.rb
 ${GEM_LIBDIR}/lib/eventmachine.rb
-${GEM_LIBDIR}/lib/eventmachine_version.rb
 ${GEM_LIBDIR}/lib/evma.rb
 ${GEM_LIBDIR}/lib/evma/callback.rb
 ${GEM_LIBDIR}/lib/evma/container.rb
 ${GEM_LIBDIR}/lib/evma/factory.rb
 ${GEM_LIBDIR}/lib/evma/protocol.rb
 ${GEM_LIBDIR}/lib/evma/reactor.rb
+${GEM_LIBDIR}/lib/fastfilereaderext.${RUBY_DLEXT}
 ${GEM_LIBDIR}/lib/jeventmachine.rb
 ${GEM_LIBDIR}/lib/pr_eventmachine.rb
-${GEM_LIBDIR}/lib/protocols/buftok.rb
-${GEM_LIBDIR}/lib/protocols/header_and_content.rb
-${GEM_LIBDIR}/lib/protocols/httpcli2.rb
-${GEM_LIBDIR}/lib/protocols/httpclient.rb
-${GEM_LIBDIR}/lib/protocols/line_and_text.rb
-${GEM_LIBDIR}/lib/protocols/linetext2.rb
-${GEM_LIBDIR}/lib/protocols/saslauth.rb
-${GEM_LIBDIR}/lib/protocols/smtpclient.rb
-${GEM_LIBDIR}/lib/protocols/smtpserver.rb
-${GEM_LIBDIR}/lib/protocols/stomp.rb
-${GEM_LIBDIR}/lib/protocols/tcptest.rb
 ${GEM_LIBDIR}/lib/rubyeventmachine.${RUBY_DLEXT}
+${GEM_LIBDIR}/setup.rb
+${GEM_LIBDIR}/tasks/cpp.rake_example
+${GEM_LIBDIR}/tests/client.crt
+${GEM_LIBDIR}/tests/client.key
+${GEM_LIBDIR}/tests/test_attach.rb
 ${GEM_LIBDIR}/tests/test_basic.rb
+${GEM_LIBDIR}/tests/test_channel.rb
+${GEM_LIBDIR}/tests/test_connection_count.rb
 ${GEM_LIBDIR}/tests/test_defer.rb
 ${GEM_LIBDIR}/tests/test_epoll.rb
+${GEM_LIBDIR}/tests/test_error_handler.rb
 ${GEM_LIBDIR}/tests/test_errors.rb
-${GEM_LIBDIR}/tests/test_eventables.rb
 ${GEM_LIBDIR}/tests/test_exc.rb
+${GEM_LIBDIR}/tests/test_file_watch.rb
 ${GEM_LIBDIR}/tests/test_futures.rb
+${GEM_LIBDIR}/tests/test_get_sock_opt.rb
+${GEM_LIBDIR}/tests/test_handler_check.rb
 ${GEM_LIBDIR}/tests/test_hc.rb
 ${GEM_LIBDIR}/tests/test_httpclient.rb
 ${GEM_LIBDIR}/tests/test_httpclient2.rb
+${GEM_LIBDIR}/tests/test_inactivity_timeout.rb
 ${GEM_LIBDIR}/tests/test_kb.rb
 ${GEM_LIBDIR}/tests/test_ltp.rb
 ${GEM_LIBDIR}/tests/test_ltp2.rb
 ${GEM_LIBDIR}/tests/test_next_tick.rb
+${GEM_LIBDIR}/tests/test_object_protocol.rb
+${GEM_LIBDIR}/tests/test_pause.rb
+${GEM_LIBDIR}/tests/test_pending_connect_timeout.rb
+${GEM_LIBDIR}/tests/test_process_watch.rb
 ${GEM_LIBDIR}/tests/test_processes.rb
+${GEM_LIBDIR}/tests/test_proxy_connection.rb
 ${GEM_LIBDIR}/tests/test_pure.rb
+${GEM_LIBDIR}/tests/test_queue.rb
 ${GEM_LIBDIR}/tests/test_running.rb
 ${GEM_LIBDIR}/tests/test_sasl.rb
 ${GEM_LIBDIR}/tests/test_send_file.rb
@@ -92,7 +152,11 @@ ${GEM_LIBDIR}/tests/test_servers.rb
 ${GEM_LIBDIR}/tests/test_smtpclient.rb
 ${GEM_LIBDIR}/tests/test_smtpserver.rb
 ${GEM_LIBDIR}/tests/test_spawn.rb
+${GEM_LIBDIR}/tests/test_ssl_args.rb
+${GEM_LIBDIR}/tests/test_ssl_methods.rb
+${GEM_LIBDIR}/tests/test_ssl_verify.rb
 ${GEM_LIBDIR}/tests/test_timers.rb
 ${GEM_LIBDIR}/tests/test_ud.rb
 ${GEM_LIBDIR}/tests/testem.rb
+${GEM_LIBDIR}/web/whatis
 ${GEM_HOME}/specifications/eventmachine-${PKGVERSION}.gemspec
diff --git a/devel/ruby-eventmachine/distinfo b/devel/ruby-eventmachine/distinfo
index 6276233937e..04b5760a57b 100644
--- a/devel/ruby-eventmachine/distinfo
+++ b/devel/ruby-eventmachine/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/09/23 08:06:04 taca Exp $
+$NetBSD: distinfo,v 1.4 2009/12/04 15:57:47 fhajny 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) = 2848fa75820ed4f2825ae65f359ac353d07f7d0a
+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
diff --git a/devel/ruby-eventmachine/patches/patch-aa b/devel/ruby-eventmachine/patches/patch-aa
index f68050a214c..8235e3735bd 100644
--- a/devel/ruby-eventmachine/patches/patch-aa
+++ b/devel/ruby-eventmachine/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2008/09/23 08:06:04 taca Exp $
+$NetBSD: patch-aa,v 1.3 2009/12/04 15:57:47 fhajny Exp $
 
---- ext/em.cpp.orig	2008-09-19 21:55:47.000000000 +0900
+--- ext/em.cpp.orig	2009-11-22 13:20:52.694811390 +0000
 +++ ext/em.cpp
-@@ -1417,7 +1417,11 @@ void EventMachine_t::ArmKqueueWriter (Ev
+@@ -1622,7 +1622,11 @@ void EventMachine_t::ArmKqueueWriter (Ev
  		if (!ed)
  			throw std::runtime_error ("added bad descriptor");
  		struct kevent k;
@@ -12,9 +12,9 @@ $NetBSD: patch-aa,v 1.2 2008/09/23 08:06:04 taca Exp $
  		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 +1439,11 @@ void EventMachine_t::ArmKqueueReader (Ev
+ 		if (t < 0) {
+ 			char buf [200];
+@@ -1644,7 +1648,11 @@ void EventMachine_t::ArmKqueueReader (Ev
  		if (!ed)
  			throw std::runtime_error ("added bad descriptor");
  		struct kevent k;
@@ -24,5 +24,5 @@ $NetBSD: patch-aa,v 1.2 2008/09/23 08:06:04 taca Exp $
  		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);
- 	}
+ 		if (t < 0) {
+ 			char buf [200];