This updates www/ruby-unicorn and related ports (devel/ruby-kgio,
www/ruby-raindrops, www/ruby-rainbows) to the latest versions. This
also fixes issues with mode 600 files in the packages.
While here, remove tests for rainbows. They require downloading
gems at runtime.
I plan on committing this tomorrow unless I hear objections.
Thanks,
Jeremy
Index: devel/ruby-kgio/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-kgio/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- devel/ruby-kgio/Makefile 15 Jan 2014 02:13:58 -0000 1.15
+++ devel/ruby-kgio/Makefile 19 Jan 2014 18:19:23 -0000
@@ -2,8 +2,7 @@
COMMENT = kinder, gentler I/O for Ruby
-DISTNAME = kgio-2.7.4
-REVISION = 3
+DISTNAME = kgio-2.8.1
CATEGORIES = devel
MAINTAINER = Jeremy Evans <jer...@openbsd.org>
Index: devel/ruby-kgio/distinfo
===================================================================
RCS file: /cvs/ports/devel/ruby-kgio/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- devel/ruby-kgio/distinfo 13 Oct 2012 10:47:17 -0000 1.7
+++ devel/ruby-kgio/distinfo 19 Jan 2014 18:20:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (kgio-2.7.4.gem) = U24VGIvtPKxEsBWF5ZAumpbTl/ZWVrxS41GPNzdNdas=
-SIZE (kgio-2.7.4.gem) = 71168
+SHA256 (kgio-2.8.1.gem) = kuWaO5fQRBd7NU8UNPbr3f5QMJ0Y2EdUqwjWMqYd/G4=
+SIZE (kgio-2.8.1.gem) = 80896
Index: devel/ruby-kgio/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/ruby-kgio/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- devel/ruby-kgio/pkg/PLIST 11 Jan 2014 22:51:02 -0000 1.6
+++ devel/ruby-kgio/pkg/PLIST 19 Jan 2014 18:27:51 -0000
@@ -40,12 +40,14 @@ ${GEM_LIB}/gems/${DISTNAME}/test/test_pi
${GEM_LIB}/gems/${DISTNAME}/test/test_pipe_read_write.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_poll.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_singleton_read_write.rb
+${GEM_LIB}/gems/${DISTNAME}/test/test_socket.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_socketpair_read_write.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_tcp6_client_read_server_write.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_tcp_client_read_server_write.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_tcp_connect.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_tcp_server.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_tcp_server_read_client_write.rb
+${GEM_LIB}/gems/${DISTNAME}/test/test_tfo.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_tryopen.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_unix_client_read_server_write.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_unix_connect.rb
Index: www/ruby-rainbows/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-rainbows/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- www/ruby-rainbows/Makefile 10 Jan 2014 19:01:24 -0000 1.13
+++ www/ruby-rainbows/Makefile 19 Jan 2014 18:58:34 -0000
@@ -2,8 +2,7 @@
COMMENT = ruby-unicorn for sleepy apps and slow clients
-DISTNAME = rainbows-4.4.1
-REVISION = 2
+DISTNAME = rainbows-4.6.0
CATEGORIES = www
HOMEPAGE = http://rainbows.rubyforge.org/
@@ -17,7 +16,7 @@ MODULES = lang/ruby
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = devel/ruby-kgio,${MODRUBY_FLAVOR}>=2.5,<3.0 \
- www/ruby-unicorn,${MODRUBY_FLAVOR}>=4.1,<5.0 \
+ www/ruby-unicorn,${MODRUBY_FLAVOR}>=4.8,<5.0 \
www/ruby-rack,${MODRUBY_FLAVOR}>=1.1.0,<2.0
CONFIGURE_STYLE = ruby gem
@@ -26,20 +25,5 @@ post-install:
cd ${WRKINST}/${LOCALBASE}/${GEM_LIB}/gems/${DISTNAME}/man/man1 && \
mv rainbows.1
${WRKINST}/${LOCALBASE}/man/man1/rainbows${GEM_MAN_SUFFIX}.1
rm -r ${WRKINST}/${LOCALBASE}/${GEM_LIB}/gems/${DISTNAME}/man
-
-# Test fails for various different reasons,
-# many of which are due to nonportable test code
-TEST_DEPENDS = devel/gmake \
- devel/ruby-isolate,${MODRUBY_FLAVOR}>=3.0.0 \
- net/socat \
- net/curl
-
-# Limit to a single test file/model (which still fails), until the test suite
-# is fixed.
-do-test:
- cd ${WRKSRC}/t && RUBYLIB=$$(dirname `${GEM} which rack`)
RUBYOPT=-rubygems \
- RUBY=${RUBY} MRI=${RUBY} MAKE="gmake -ek" gmake -ek \
- ThreadSpawn.t0000-simple-http.sh
-
.include <bsd.port.mk>
Index: www/ruby-rainbows/distinfo
===================================================================
RCS file: /cvs/ports/www/ruby-rainbows/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- www/ruby-rainbows/distinfo 13 Oct 2012 10:50:14 -0000 1.6
+++ www/ruby-rainbows/distinfo 19 Jan 2014 18:24:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (rainbows-4.4.1.gem) = 466QdBpqHiXSCcoxu5YANLDf2vTSnH6GBpx5LPdbfEk=
-SIZE (rainbows-4.4.1.gem) = 191488
+SHA256 (rainbows-4.6.0.gem) = 5kTpI78DeGkPhHbEfKg48NKE+6lBvHDAh/F70JIBkPw=
+SIZE (rainbows-4.6.0.gem) = 200704
Index: www/ruby-rainbows/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/ruby-rainbows/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- www/ruby-rainbows/pkg/PLIST 18 Nov 2011 00:07:19 -0000 1.4
+++ www/ruby-rainbows/pkg/PLIST 19 Jan 2014 18:34:46 -0000
@@ -19,6 +19,7 @@ ${GEM_LIB}/gems/${DISTNAME}/FAQ
${GEM_LIB}/gems/${DISTNAME}/GIT-VERSION-FILE
${GEM_LIB}/gems/${DISTNAME}/GIT-VERSION-GEN
${GEM_LIB}/gems/${DISTNAME}/GNUmakefile
+${GEM_LIB}/gems/${DISTNAME}/HACKING
${GEM_LIB}/gems/${DISTNAME}/LATEST
${GEM_LIB}/gems/${DISTNAME}/LICENSE
${GEM_LIB}/gems/${DISTNAME}/NEWS
@@ -144,6 +145,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/rainbows
${GEM_LIB}/gems/${DISTNAME}/lib/rainbows/thread_pool.rb
${GEM_LIB}/gems/${DISTNAME}/lib/rainbows/thread_spawn.rb
${GEM_LIB}/gems/${DISTNAME}/lib/rainbows/thread_timeout.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/rainbows/version.rb
${GEM_LIB}/gems/${DISTNAME}/lib/rainbows/worker_yield.rb
${GEM_LIB}/gems/${DISTNAME}/lib/rainbows/writer_thread_pool/
${GEM_LIB}/gems/${DISTNAME}/lib/rainbows/writer_thread_pool.rb
@@ -181,7 +183,6 @@ ${GEM_LIB}/gems/${DISTNAME}/t/bin/
${GEM_LIB}/gems/${DISTNAME}/t/bin/content-md5-put
${GEM_LIB}/gems/${DISTNAME}/t/bin/sha1sum.rb
${GEM_LIB}/gems/${DISTNAME}/t/bin/unused_listen
-${GEM_LIB}/gems/${DISTNAME}/t/bin/utee
${GEM_LIB}/gems/${DISTNAME}/t/byte-range-common.sh
${GEM_LIB}/gems/${DISTNAME}/t/client_header_buffer_size.ru
${GEM_LIB}/gems/${DISTNAME}/t/close-has-env.ru
@@ -198,6 +199,7 @@ ${GEM_LIB}/gems/${DISTNAME}/t/fast-pipe-
${GEM_LIB}/gems/${DISTNAME}/t/file-wrap-to_path.ru
${GEM_LIB}/gems/${DISTNAME}/t/fork-sleep.ru
${GEM_LIB}/gems/${DISTNAME}/t/heartbeat-timeout.ru
+${GEM_LIB}/gems/${DISTNAME}/t/hijack.ru
${GEM_LIB}/gems/${DISTNAME}/t/kgio-pipe-response.ru
${GEM_LIB}/gems/${DISTNAME}/t/large-file-response.ru
${GEM_LIB}/gems/${DISTNAME}/t/my-tap-lib.sh
@@ -297,6 +299,7 @@ ${GEM_LIB}/gems/${DISTNAME}/t/t0500-cram
${GEM_LIB}/gems/${DISTNAME}/t/t0501-cramp-rainsocket.sh
${GEM_LIB}/gems/${DISTNAME}/t/t0600-rack-fiber_pool.sh
${GEM_LIB}/gems/${DISTNAME}/t/t0700-app-deferred.sh
+${GEM_LIB}/gems/${DISTNAME}/t/t0800-rack-hijack.sh
${GEM_LIB}/gems/${DISTNAME}/t/t9000-rack-app-pool.sh
${GEM_LIB}/gems/${DISTNAME}/t/t9000.ru
${GEM_LIB}/gems/${DISTNAME}/t/t9001-sendfile-to-path.sh
Index: www/ruby-raindrops/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-raindrops/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- www/ruby-raindrops/Makefile 15 Jan 2014 02:13:58 -0000 1.10
+++ www/ruby-raindrops/Makefile 19 Jan 2014 18:31:30 -0000
@@ -3,7 +3,7 @@
COMMENT = real-time stats toolkit for Rack HTTP servers
DISTNAME = raindrops-0.10.0
-REVISION = 3
+REVISION = 4
CATEGORIES = www
MAINTAINER = Jeremy Evans <jer...@openbsd.org>
@@ -21,6 +21,9 @@ BUILD_DEPENDS += libatomic_ops-*:devel/b
TEST_DEPENDS = devel/gmake \
www/ruby-unicorn,${MODRUBY_FLAVOR} \
${FULLPKGNAME}:${BUILD_PKGPATH}
+
+post-extract:
+ chmod 644 ${WRKSRC}/{NEWS,ChangeLog}
do-test:
cd ${WRKSRC} && ${SETENV} RUBYOPT=-rubygems \
Index: www/ruby-unicorn/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-unicorn/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- www/ruby-unicorn/Makefile 15 Jan 2014 02:13:58 -0000 1.15
+++ www/ruby-unicorn/Makefile 19 Jan 2014 18:21:22 -0000
@@ -2,8 +2,7 @@
COMMENT = ruby-rack HTTP server for Unix and fast clients
-DISTNAME = unicorn-4.7.0
-REVISION = 1
+DISTNAME = unicorn-4.8.0
CATEGORIES = www
HOMEPAGE = http://unicorn.bogomips.org/
Index: www/ruby-unicorn/distinfo
===================================================================
RCS file: /cvs/ports/www/ruby-unicorn/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- www/ruby-unicorn/distinfo 14 Nov 2013 17:04:37 -0000 1.7
+++ www/ruby-unicorn/distinfo 19 Jan 2014 18:22:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (unicorn-4.7.0.gem) = lAd/SPOxGhPAyXq3REZxqgUcuaCNBjDwb8E/PLc3O1M=
-SIZE (unicorn-4.7.0.gem) = 265728
+SHA256 (unicorn-4.8.0.gem) = i4DQHdw65zKzVGAIJGdr0znG7Doa1mVcYHzmb1M6Fz4=
+SIZE (unicorn-4.8.0.gem) = 269824
