This updates ruby-unicorn and the related ports kgio, raindrops, and rainbows to their most current versions.
Getting the regression test suites to work took a surprisingly long amount of time, but I've worked with upstream and I've got patches committed that should make the regress tests work correctly in future versions. I'm attaching a tarball of the regress patches for unicorn and kgio that make the current versions pass. Jeremy Index: devel/ruby-kgio/Makefile =================================================================== RCS file: /cvs/ports/devel/ruby-kgio/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- devel/ruby-kgio/Makefile 16 Sep 2011 09:24:57 -0000 1.6 +++ devel/ruby-kgio/Makefile 16 Nov 2011 19:08:46 -0000 @@ -2,9 +2,8 @@ COMMENT = kinder, gentler I/O for Ruby -DISTNAME = kgio-2.5.0 +DISTNAME = kgio-2.6.0 CATEGORIES = devel -REVISION= 0 MAINTAINER = Jeremy Evans <[email protected]> @@ -22,6 +21,6 @@ REGRESS_DEPENDS = devel/gmake # Couple failing regress tests do-regress: - @cd ${WRKSRC} && gmake test RUBY=${RUBY} + @cd ${WRKSRC} && gmake -k test RUBY=${RUBY} .include <bsd.port.mk> Index: devel/ruby-kgio/distinfo =================================================================== RCS file: /cvs/ports/devel/ruby-kgio/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- devel/ruby-kgio/distinfo 6 Jul 2011 01:17:19 -0000 1.4 +++ devel/ruby-kgio/distinfo 16 Nov 2011 19:08:46 -0000 @@ -1,5 +1,5 @@ -MD5 (kgio-2.5.0.gem) = xxkQDr7wDRcNpn137qPLIA== -RMD160 (kgio-2.5.0.gem) = 3sYt8ZTmvCJHSXu9xtL0ukdgbY0= -SHA1 (kgio-2.5.0.gem) = k5jvxeDu5Dr84LPjge1/AsmBRAQ= -SHA256 (kgio-2.5.0.gem) = iGNijUMS8fZeuUuKXtvOD0oVGoKqEdjyLEbn47cHGJw= -SIZE (kgio-2.5.0.gem) = 65024 +MD5 (kgio-2.6.0.gem) = xEbDe6kTReKvKM3G3NBgwQ== +RMD160 (kgio-2.6.0.gem) = 52qhTsc7e2QHHxqgGpen7l11cEA= +SHA1 (kgio-2.6.0.gem) = BMLVITKzHTAA2xBcJWKXi4s/3eU= +SHA256 (kgio-2.6.0.gem) = 59TYLk9U6gTbRjDkw0c4RMjg1Zwdr1rNkOJh+d2UJZM= +SIZE (kgio-2.6.0.gem) = 66048 Index: devel/ruby-kgio/pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/ruby-kgio/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- devel/ruby-kgio/pkg/PLIST 6 Jul 2011 01:17:19 -0000 1.4 +++ devel/ruby-kgio/pkg/PLIST 16 Nov 2011 19:08:46 -0000 @@ -59,6 +59,7 @@ ${GEM_LIB}/gems/${DISTNAME}/test/ ${GEM_LIB}/gems/${DISTNAME}/test/lib_read_write.rb ${GEM_LIB}/gems/${DISTNAME}/test/lib_server_accept.rb ${GEM_LIB}/gems/${DISTNAME}/test/test_accept_class.rb +${GEM_LIB}/gems/${DISTNAME}/test/test_accept_flags.rb ${GEM_LIB}/gems/${DISTNAME}/test/test_autopush.rb ${GEM_LIB}/gems/${DISTNAME}/test/test_connect_fd_leak.rb ${GEM_LIB}/gems/${DISTNAME}/test/test_cross_thread_close.rb Index: www/ruby-raindrops/Makefile =================================================================== RCS file: /cvs/ports/www/ruby-raindrops/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- www/ruby-raindrops/Makefile 16 Sep 2011 12:00:09 -0000 1.2 +++ www/ruby-raindrops/Makefile 16 Nov 2011 19:08:46 -0000 @@ -2,8 +2,7 @@ COMMENT = real-time stats toolkit for Rack HTTP servers -DISTNAME = raindrops-0.7.0 -REVISION= 0 +DISTNAME = raindrops-0.8.0 CATEGORIES = www MAINTAINER = Jeremy Evans <[email protected]> @@ -22,7 +21,7 @@ CONFIGURE_STYLE = ruby gem ext BUILD_DEPENDS += libatomic_ops-*:devel/boehm-gc,-atomic REGRESS_DEPENDS = devel/gmake \ - www/ruby-rack,${MODRUBY_FLAVOR} \ + www/ruby-unicorn,${MODRUBY_FLAVOR} \ ${FULLPKGNAME}:${BUILD_PKGPATH} do-regress: Index: www/ruby-raindrops/distinfo =================================================================== RCS file: /cvs/ports/www/ruby-raindrops/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- www/ruby-raindrops/distinfo 6 Jul 2011 01:14:09 -0000 1.1.1.1 +++ www/ruby-raindrops/distinfo 16 Nov 2011 19:08:46 -0000 @@ -1,5 +1,5 @@ -MD5 (raindrops-0.7.0.gem) = Z3ck4Gt3MMPwH3V02hX38g== -RMD160 (raindrops-0.7.0.gem) = VjoXAlf0SgHFjDGknPZJAHVXIzI= -SHA1 (raindrops-0.7.0.gem) = MkPOQFk9uQBsfUtnAGiArDfRHPk= -SHA256 (raindrops-0.7.0.gem) = lVcsG/0kyYVRAVEf0EwzAllSSIPp83RRsazb2/ogRJg= -SIZE (raindrops-0.7.0.gem) = 68096 +MD5 (raindrops-0.8.0.gem) = 8bWQ03GMQQAsKChj9gvfgg== +RMD160 (raindrops-0.8.0.gem) = xoXX4lvHUgDvJWFm4/aHnj6YvPo= +SHA1 (raindrops-0.8.0.gem) = ykyzvfrhIqahN86+Ts5VCqmAGbk= +SHA256 (raindrops-0.8.0.gem) = qsewBZP9ekAxGoxGWJNnDqbue/ipwpXKFTRUiW9+uJs= +SIZE (raindrops-0.8.0.gem) = 70144 Index: www/ruby-raindrops/patches/patch-test_test_linux_tcp_info_rb =================================================================== RCS file: www/ruby-raindrops/patches/patch-test_test_linux_tcp_info_rb diff -N www/ruby-raindrops/patches/patch-test_test_linux_tcp_info_rb --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/ruby-raindrops/patches/patch-test_test_linux_tcp_info_rb 16 Nov 2011 19:08:46 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ + +Skip linux specific tests, backported from +499e63e2666f88134f7d47f3bcfdfedd72396e70. + +--- test/test_linux_tcp_info.rb.orig Mon Nov 14 19:22:35 2011 ++++ test/test_linux_tcp_info.rb Mon Nov 14 19:22:43 2011 +@@ -58,4 +58,4 @@ class TestLinuxTCP_Info < Test::Unit::TestCase + a.close if a + s.close + end +-end ++end if RUBY_PLATFORM =~ /linux/ Index: www/ruby-unicorn/Makefile =================================================================== RCS file: /cvs/ports/www/ruby-unicorn/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- www/ruby-unicorn/Makefile 16 Sep 2011 12:00:09 -0000 1.6 +++ www/ruby-unicorn/Makefile 16 Nov 2011 19:08:46 -0000 @@ -2,8 +2,7 @@ COMMENT = ruby-rack HTTP server for Unix and fast clients -DISTNAME = unicorn-4.0.1 -REVISION= 0 +DISTNAME = unicorn-4.1.1 CATEGORIES = www HOMEPAGE = http://unicorn.bogomips.org/ @@ -35,6 +34,6 @@ REGRESS_DEPENDS = devel/gmake \ devel/ruby-isolate,${MODRUBY_FLAVOR} do-regress: cd ${WRKSRC} && RUBYOPT=-rubygems RUBY=${RUBY} MRI=${RUBY} \ - MAKE='gmake -e' gmake -e test + MAKE='gmake -ek' gmake -ek test-integration test .include <bsd.port.mk> Index: www/ruby-unicorn/distinfo =================================================================== RCS file: /cvs/ports/www/ruby-unicorn/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- www/ruby-unicorn/distinfo 6 Jul 2011 01:18:27 -0000 1.4 +++ www/ruby-unicorn/distinfo 16 Nov 2011 19:08:46 -0000 @@ -1,5 +1,5 @@ -MD5 (unicorn-4.0.1.gem) = Kp0lMVL/xFvUTOostf3Vig== -RMD160 (unicorn-4.0.1.gem) = 5nVbIJlWIQgA1U+Qj65Dmd0NHO4= -SHA1 (unicorn-4.0.1.gem) = O44KA+D52Q1hZ+D4zA3H/NCWxVQ= -SHA256 (unicorn-4.0.1.gem) = JytWFVpSWkjGgUGwDvMJOtZ1hYd+4itx/znluxGCEWQ= -SIZE (unicorn-4.0.1.gem) = 242176 +MD5 (unicorn-4.1.1.gem) = qxAQXCvmE5NzMIlOcN8sdQ== +RMD160 (unicorn-4.1.1.gem) = ZUXABK4/CylvWKt71qydGcQdTrI= +SHA1 (unicorn-4.1.1.gem) = PnvebfTN2YIYkJzNQNh+3toBBQY= +SHA256 (unicorn-4.1.1.gem) = 12rVdrl+oCNtHw3t16rNeRCY1K3T7/vzZpzpIdCL2tM= +SIZE (unicorn-4.1.1.gem) = 247296 Index: www/ruby-unicorn/pkg/PLIST =================================================================== RCS file: /cvs/ports/www/ruby-unicorn/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- www/ruby-unicorn/pkg/PLIST 6 Jul 2011 01:18:27 -0000 1.4 +++ www/ruby-unicorn/pkg/PLIST 16 Nov 2011 19:08:46 -0000 @@ -9,6 +9,7 @@ ${GEM_LIB}/gems/${DISTNAME}/.gitignore ${GEM_LIB}/gems/${DISTNAME}/.mailmap ${GEM_LIB}/gems/${DISTNAME}/.manifest ${GEM_LIB}/gems/${DISTNAME}/.wrongdoc.yml +${GEM_LIB}/gems/${DISTNAME}/Application_Timeouts ${GEM_LIB}/gems/${DISTNAME}/CONTRIBUTORS ${GEM_LIB}/gems/${DISTNAME}/COPYING ${GEM_LIB}/gems/${DISTNAME}/ChangeLog Index: www/ruby-rainbows/Makefile =================================================================== RCS file: /cvs/ports/www/ruby-rainbows/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- www/ruby-rainbows/Makefile 16 Sep 2011 12:00:09 -0000 1.6 +++ www/ruby-rainbows/Makefile 16 Nov 2011 19:08:46 -0000 @@ -2,8 +2,7 @@ COMMENT = ruby-unicorn for sleepy apps and slow clients -DISTNAME = rainbows-4.0.0 -REVISION= 0 +DISTNAME = rainbows-4.3.1 CATEGORIES = www HOMEPAGE = http://rainbows.rubyforge.org/ @@ -19,8 +18,8 @@ PERMIT_DISTFILES_FTP = Yes MODULES = lang/ruby BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = devel/ruby-kgio,${MODRUBY_FLAVOR}>=2.4,<3.0 \ - www/ruby-unicorn,${MODRUBY_FLAVOR}>=4.0,<5.0 \ +RUN_DEPENDS = devel/ruby-kgio,${MODRUBY_FLAVOR}>=2.5,<3.0 \ + www/ruby-unicorn,${MODRUBY_FLAVOR}>=4.1,<5.0 \ www/ruby-rack,${MODRUBY_FLAVOR}>=1.1.0,<2.0 CONFIGURE_STYLE = ruby gem ext @@ -30,15 +29,12 @@ post-install: mv rainbows.1 ${WRKINST}/${LOCALBASE}/man/man1/rainbows${GEM_MAN_SUFFIX}.1 rm -r ${WRKINST}/${LOCALBASE}/${GEM_LIB}/gems/${DISTNAME}/man -# Regress fails for various different reasons, -# many of which are due to nonportable test code -REGRESS_DEPENDS = devel/gmake \ - devel/ruby-isolate,${MODRUBY_FLAVOR}>=3.0.0,<3.1 \ +REGRESS_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} \ net/socat \ net/curl do-regress: - cd ${WRKSRC} && RUBYLIB=$$(dirname `${GEM} which rack`) \ - RUBY=${RUBY} MRI=${RUBY} MAKE="gmake -e" gmake -e test + cd ${WRKSRC}/t && mkdir -p trash && for x in t00[0-24]*; do \ + echo $$x && RUBY=${RUBY} RUBYOPT=-rubygems sh $$x; done .include <bsd.port.mk> Index: www/ruby-rainbows/distinfo =================================================================== RCS file: /cvs/ports/www/ruby-rainbows/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- www/ruby-rainbows/distinfo 6 Jul 2011 01:19:20 -0000 1.4 +++ www/ruby-rainbows/distinfo 16 Nov 2011 19:08:46 -0000 @@ -1,5 +1,5 @@ -MD5 (rainbows-4.0.0.gem) = 9FfQYrqryZUb/9tV6vyC+g== -RMD160 (rainbows-4.0.0.gem) = FiU++n6mCK3Q3IRI6WK8lT3Ev7E= -SHA1 (rainbows-4.0.0.gem) = qvFrjGGfkisAmIic48gd/6Dw/zk= -SHA256 (rainbows-4.0.0.gem) = MYFAN9iF1JDxojWIIzqYBj+wYHnhpdeucjB+WLfhgj0= -SIZE (rainbows-4.0.0.gem) = 185856 +MD5 (rainbows-4.3.1.gem) = JKDhhkAVMuEgCiX3NPJsyQ== +RMD160 (rainbows-4.3.1.gem) = illdf5eJnuFYMZw573XDVKcIjl8= +SHA1 (rainbows-4.3.1.gem) = qqntKVA8HJs75vM++DURuSBMsb4= +SHA256 (rainbows-4.3.1.gem) = MxWgEYgbrxJB+C3Tb2zHm45ECbLkYrCBhDee4CF1JzQ= +SIZE (rainbows-4.3.1.gem) = 188928 Index: www/ruby-rainbows/pkg/PLIST =================================================================== RCS file: /cvs/ports/www/ruby-rainbows/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- www/ruby-rainbows/pkg/PLIST 6 Jul 2011 01:19:20 -0000 1.3 +++ www/ruby-rainbows/pkg/PLIST 16 Nov 2011 19:08:46 -0000 @@ -101,7 +101,6 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/rainbows ${GEM_LIB}/gems/${DISTNAME}/lib/rainbows/fiber_pool.rb ${GEM_LIB}/gems/${DISTNAME}/lib/rainbows/fiber_spawn.rb ${GEM_LIB}/gems/${DISTNAME}/lib/rainbows/http_parser.rb -${GEM_LIB}/gems/${DISTNAME}/lib/rainbows/http_response.rb ${GEM_LIB}/gems/${DISTNAME}/lib/rainbows/http_server.rb ${GEM_LIB}/gems/${DISTNAME}/lib/rainbows/join_threads.rb ${GEM_LIB}/gems/${DISTNAME}/lib/rainbows/max_body/
unicorn.tar.gz
Description: application/tar-gz
