This wasn't included with the previous update diff because one of the tests crashes. Doing more research, the same code also crashes the current version in ports. The crashing test is new and is already tracked on upstream's bugtracker. This diff includes a patch to skip the crashing test so the test suite can complete.
Tested on amd64. Will be committing in a day or so unless I hear objections. Thanks, Jeremy Index: Makefile =================================================================== RCS file: /cvs/ports/net/ruby-eventmachine/Makefile,v retrieving revision 1.26 diff -u -p -u -p -r1.26 Makefile --- Makefile 26 Jul 2017 22:45:28 -0000 1.26 +++ Makefile 2 Nov 2017 17:22:37 -0000 @@ -2,9 +2,8 @@ COMMENT= event-driven I/O for Ruby using the Reactor pattern -DISTNAME= eventmachine-1.2.0.1 +DISTNAME= eventmachine-1.2.5 CATEGORIES= net devel -REVISION= 0 HOMEPAGE= http://rubyeventmachine.com/ Index: distinfo =================================================================== RCS file: /cvs/ports/net/ruby-eventmachine/distinfo,v retrieving revision 1.6 diff -u -p -u -p -r1.6 distinfo --- distinfo 4 Nov 2016 21:39:12 -0000 1.6 +++ distinfo 2 Nov 2017 17:22:42 -0000 @@ -1,2 +1,2 @@ -SHA256 (eventmachine-1.2.0.1.gem) = oj1lvjSStehplpnFSXmenQ+/+qx7+fXA/Zr9I+KH+/E= -SIZE (eventmachine-1.2.0.1.gem) = 241152 +SHA256 (eventmachine-1.2.5.gem) = H+0A/aTt6eDWry7szeA04xRSZhMVqz60fo3+5wBvsBw= +SIZE (eventmachine-1.2.5.gem) = 246272 Index: patches/patch-ext_ed_cpp =================================================================== RCS file: /cvs/ports/net/ruby-eventmachine/patches/patch-ext_ed_cpp,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-ext_ed_cpp --- patches/patch-ext_ed_cpp 10 Jan 2015 17:29:14 -0000 1.2 +++ patches/patch-ext_ed_cpp 3 Nov 2017 11:07:01 -0000 @@ -1,7 +1,9 @@ $OpenBSD: patch-ext_ed_cpp,v 1.2 2015/01/10 17:29:14 jeremy Exp $ ---- ext/ed.cpp.orig Wed Dec 31 16:00:00 1969 -+++ ext/ed.cpp Fri Nov 28 18:16:12 2014 -@@ -1018,11 +1018,8 @@ void ConnectionDescriptor::_WriteOutboundData() + +Index: ext/ed.cpp +--- ext/ed.cpp.orig ++++ ext/ed.cpp +@@ -1115,11 +1115,8 @@ void ConnectionDescriptor::_WriteOutboundData() } #endif @@ -15,8 +17,8 @@ $OpenBSD: patch-ext_ed_cpp,v 1.2 2015/01 assert (GetSocket() != INVALID_SOCKET); #ifdef HAVE_WRITEV -@@ -1687,6 +1684,9 @@ void DatagramDescriptor::Write() - EpollEvent.events = (EPOLLIN | (SelectForWrite() ? EPOLLOUT : 0)); +@@ -1862,6 +1859,9 @@ void DatagramDescriptor::Write() + EpollEvent.events |= EPOLLOUT; assert (MyEventMachine); MyEventMachine->Modify (this); + #endif @@ -24,4 +26,4 @@ $OpenBSD: patch-ext_ed_cpp,v 1.2 2015/01 + MyEventMachine->ArmKqueueWriter (this); #endif #ifdef HAVE_KQUEUE - if (SelectForWrite()) + bKqueueArmWrite = SelectForWrite(); Index: patches/patch-ext_extconf_rb =================================================================== RCS file: /cvs/ports/net/ruby-eventmachine/patches/patch-ext_extconf_rb,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-ext_extconf_rb --- patches/patch-ext_extconf_rb 10 Jan 2015 17:29:14 -0000 1.2 +++ patches/patch-ext_extconf_rb 3 Nov 2017 11:06:51 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-ext_extconf_rb,v 1.2 2015/01/10 17:29:14 jeremy Exp $ ---- ext/extconf.rb.orig Wed Dec 31 16:00:00 1969 -+++ ext/extconf.rb Fri Nov 28 18:16:12 2014 -@@ -98,7 +98,7 @@ if RbConfig::CONFIG["host_os"] =~ /mingw/ +Index: ext/extconf.rb +--- ext/extconf.rb.orig ++++ ext/extconf.rb +@@ -147,7 +147,7 @@ if RbConfig::CONFIG["host_os"] =~ /mingw/ add_define "FD_SETSIZE=32767" unless found end Index: patches/patch-tests_test_exc_rb =================================================================== RCS file: patches/patch-tests_test_exc_rb diff -N patches/patch-tests_test_exc_rb --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tests_test_exc_rb 3 Nov 2017 11:08:18 -0000 @@ -0,0 +1,20 @@ +$OpenBSD$ + +Skip test that crashes with SIGILL. This same code also crashes +previous versions, so it is not a regression, just a newly added +test. Details at: + +https://github.com/eventmachine/eventmachine/issues/777 + +Index: tests/test_exc.rb +--- tests/test_exc.rb.orig ++++ tests/test_exc.rb +@@ -32,7 +32,7 @@ class TestSomeExceptions < Test::Unit::TestCase + } + end + +- def test_exception_on_unbind ++ def skip_test_exception_on_unbind + assert_raises(DoomedConnectionError) { + EM.run { + EM.connect("localhost", 8888, DoomedConnection) Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/ruby-eventmachine/pkg/PLIST,v retrieving revision 1.10 diff -u -p -u -p -r1.10 PLIST --- pkg/PLIST 4 Nov 2016 21:39:12 -0000 1.10 +++ pkg/PLIST 2 Nov 2017 17:24:58 -0000 @@ -88,6 +88,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/rubyeven ${GEM_LIB}/gems/${DISTNAME}/rakelib/ ${GEM_LIB}/gems/${DISTNAME}/rakelib/package.rake ${GEM_LIB}/gems/${DISTNAME}/rakelib/test.rake +${GEM_LIB}/gems/${DISTNAME}/rakelib/test_pure.rake ${GEM_LIB}/gems/${DISTNAME}/tests/ ${GEM_LIB}/gems/${DISTNAME}/tests/client.crt ${GEM_LIB}/gems/${DISTNAME}/tests/client.key @@ -107,7 +108,6 @@ ${GEM_LIB}/gems/${DISTNAME}/tests/test_e ${GEM_LIB}/gems/${DISTNAME}/tests/test_file_watch.rb ${GEM_LIB}/gems/${DISTNAME}/tests/test_fork.rb ${GEM_LIB}/gems/${DISTNAME}/tests/test_futures.rb -${GEM_LIB}/gems/${DISTNAME}/tests/test_get_sock_opt.rb ${GEM_LIB}/gems/${DISTNAME}/tests/test_handler_check.rb ${GEM_LIB}/gems/${DISTNAME}/tests/test_hc.rb ${GEM_LIB}/gems/${DISTNAME}/tests/test_httpclient.rb @@ -137,10 +137,10 @@ ${GEM_LIB}/gems/${DISTNAME}/tests/test_r ${GEM_LIB}/gems/${DISTNAME}/tests/test_sasl.rb ${GEM_LIB}/gems/${DISTNAME}/tests/test_send_file.rb ${GEM_LIB}/gems/${DISTNAME}/tests/test_servers.rb -${GEM_LIB}/gems/${DISTNAME}/tests/test_set_sock_opt.rb ${GEM_LIB}/gems/${DISTNAME}/tests/test_shutdown_hooks.rb ${GEM_LIB}/gems/${DISTNAME}/tests/test_smtpclient.rb ${GEM_LIB}/gems/${DISTNAME}/tests/test_smtpserver.rb +${GEM_LIB}/gems/${DISTNAME}/tests/test_sock_opt.rb ${GEM_LIB}/gems/${DISTNAME}/tests/test_spawn.rb ${GEM_LIB}/gems/${DISTNAME}/tests/test_ssl_args.rb ${GEM_LIB}/gems/${DISTNAME}/tests/test_ssl_dhparam.rb
