Index: head/Mk/bsd.ruby.mk
===================================================================
--- head/Mk/bsd.ruby.mk
+++ head/Mk/bsd.ruby.mk
@@ -164,8 +164,8 @@
 #
 # Ruby 2.2
 #
-RUBY_RELVERSION=	2.2.6
-RUBY_PORTREVISION=	1
+RUBY_RELVERSION=	2.2.7
+RUBY_PORTREVISION=	0
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	0
 RUBY22=			""	# PLIST_SUB helpers
@@ -174,8 +174,8 @@
 #
 # Ruby 2.3
 #
-RUBY_RELVERSION=	2.3.3
-RUBY_PORTREVISION=	2
+RUBY_RELVERSION=	2.3.4
+RUBY_PORTREVISION=	0
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	0
 RUBY23=			""	# PLIST_SUB helpers
Index: head/lang/ruby22/distinfo
===================================================================
--- head/lang/ruby22/distinfo
+++ head/lang/ruby22/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479231900
-SHA256 (ruby/ruby-2.2.6.tar.xz) = 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339
-SIZE (ruby/ruby-2.2.6.tar.xz) = 10487776
+TIMESTAMP = 1493101494
+SHA256 (ruby/ruby-2.2.7.tar.xz) = 234c8aee6543da9efd67008e6e7ee740d41ed57a52e797f65043c3b5ec3bcb53
+SIZE (ruby/ruby-2.2.7.tar.xz) = 10507528
Index: head/lang/ruby22/files/patch-eval.c
===================================================================
--- head/lang/ruby22/files/patch-eval.c
+++ head/lang/ruby22/files/patch-eval.c
@@ -1,20 +0,0 @@
---- eval.c.orig	2016-11-14 18:37:39 UTC
-+++ eval.c
-@@ -814,7 +814,7 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), V
- {
-     int state;
-     rb_thread_t *th = GET_THREAD();
--    rb_control_frame_t *cfp = th->cfp;
-+    rb_control_frame_t *volatile cfp = th->cfp;
-     volatile VALUE result = Qfalse;
-     volatile VALUE e_info = th->errinfo;
-     va_list args;
-@@ -880,7 +880,7 @@ rb_protect(VALUE (* proc) (VALUE), VALUE
-     volatile VALUE result = Qnil;
-     volatile int status;
-     rb_thread_t *th = GET_THREAD();
--    rb_control_frame_t *cfp = th->cfp;
-+    rb_control_frame_t *volatile cfp = th->cfp;
-     struct rb_vm_protect_tag protect_tag;
-     rb_jmpbuf_t org_jmpbuf;
- 
Index: head/lang/ruby22/files/patch-eval_error.c
===================================================================
--- head/lang/ruby22/files/patch-eval_error.c
+++ head/lang/ruby22/files/patch-eval_error.c
@@ -1,15 +0,0 @@
---- eval_error.c.orig	2016-11-14 18:37:39 UTC
-+++ eval_error.c
-@@ -63,9 +63,9 @@ static void
- error_print(void)
- {
-     volatile VALUE errat = Qundef;
--    rb_thread_t *th = GET_THREAD();
--    VALUE errinfo = th->errinfo;
--    int raised_flag = th->raised_flag;
-+    rb_thread_t *volatile th = GET_THREAD();
-+    volatile VALUE errinfo = th->errinfo;
-+    volatile int raised_flag = th->raised_flag;
-     volatile VALUE eclass = Qundef, e = Qundef;
-     const char *volatile einfo;
-     volatile long elen;
Index: head/lang/ruby22/files/patch-vm_eval.c
===================================================================
--- head/lang/ruby22/files/patch-vm_eval.c
+++ head/lang/ruby22/files/patch-vm_eval.c
@@ -1,31 +0,0 @@
---- vm_eval.c.orig	2016-03-28 17:04:28 UTC
-+++ vm_eval.c
-@@ -1111,7 +1111,7 @@ rb_iterate(VALUE (* it_proc) (VALUE), VA
-     int state;
-     volatile VALUE retval = Qnil;
-     NODE *node = NEW_IFUNC(bl_proc, data2);
--    rb_thread_t *th = GET_THREAD();
-+    rb_thread_t *volatile th = GET_THREAD();
-     rb_control_frame_t *volatile cfp = th->cfp;
- 
-     node->nd_aid = rb_frame_this_func();
-@@ -1239,7 +1239,7 @@ eval_string_with_cref(VALUE self, VALUE 
-     int state;
-     VALUE result = Qundef;
-     VALUE envval;
--    rb_thread_t *th = GET_THREAD();
-+    rb_thread_t *volatile th = GET_THREAD();
-     rb_env_t *env = NULL;
-     rb_block_t block, *base_block;
-     volatile int parse_in_eval;
-@@ -1983,8 +1983,8 @@ rb_catch_protect(VALUE t, rb_block_call_
- {
-     int state;
-     volatile VALUE val = Qnil;		/* OK */
--    rb_thread_t *th = GET_THREAD();
--    rb_control_frame_t *saved_cfp = th->cfp;
-+    rb_thread_t *volatile th = GET_THREAD();
-+    rb_control_frame_t *volatile saved_cfp = th->cfp;
-     volatile VALUE tag = t;
- 
-     TH_PUSH_TAG(th);
Index: head/lang/ruby22/files/patch-vm_trace.c
===================================================================
--- head/lang/ruby22/files/patch-vm_trace.c
+++ head/lang/ruby22/files/patch-vm_trace.c
@@ -1,11 +0,0 @@
---- vm_trace.c.orig	2015-11-08 14:49:09 UTC
-+++ vm_trace.c
-@@ -390,7 +390,7 @@ rb_suppress_tracing(VALUE (*func)(VALUE)
-     volatile int raised;
-     volatile int outer_state;
-     VALUE result = Qnil;
--    rb_thread_t *th = GET_THREAD();
-+    rb_thread_t *volatile th = GET_THREAD();
-     int state;
-     const int tracing = th->trace_arg ? 1 : 0;
-     rb_trace_arg_t dummy_trace_arg;
Index: head/lang/ruby22/pkg-plist
===================================================================
--- head/lang/ruby22/pkg-plist
+++ head/lang/ruby22/pkg-plist
@@ -6725,6 +6725,7 @@
 %%RDOC%%%%RUBY_RIDIR%%/Float/truncate-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/Float/zero%3f-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/FloatDomainError/cdesc-FloatDomainError.ri
+%%RDOC%%%%RUBY_RIDIR%%/Forwardable/_delegator_method-c.ri
 %%RDOC%%%%RUBY_RIDIR%%/Forwardable/cdesc-Forwardable.ri
 %%RDOC%%%%RUBY_RIDIR%%/Forwardable/debug-c.ri
 %%RDOC%%%%RUBY_RIDIR%%/Forwardable/def_delegator-i.ri
@@ -10976,7 +10977,6 @@
 %%RDOC%%%%RUBY_RIDIR%%/OpenStruct/each_pair-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/OpenStruct/eql%3f-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/OpenStruct/hash-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OpenStruct/initialize_copy-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/OpenStruct/inspect-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/OpenStruct/json_create-c.ri
 %%RDOC%%%%RUBY_RIDIR%%/OpenStruct/marshal_dump-i.ri
@@ -11006,69 +11006,6 @@
 %%RDOC%%%%RUBY_RIDIR%%/OpenURI/OpenRead/open-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/OpenURI/OpenRead/read-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/OpenURI/cdesc-OpenURI.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/abort-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/accept-c.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/accept-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/banner-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/base-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/candidate-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/cdesc-OptParse.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/complete-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/def_head_option-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/def_option-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/def_tail_option-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/default_argv-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/define-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/define_head-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/define_tail-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/each_const-c.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/environment-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/getopts-c.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/getopts-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/help-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/inc-c.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/inc-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/load-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/make_switch-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/new-c.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/new-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/notwice-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/on-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/on_head-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/on_tail-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/order%21-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/order-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/parse%21-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/parse-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/permute%21-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/permute-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/program_name-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/reject-c.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/reject-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/release-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/remove-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/search-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/search_const-c.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/separator-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/set_banner-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/set_program_name-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/set_summary_indent-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/set_summary_width-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/show_version-c.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/summarize-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/summary_indent-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/summary_width-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/terminate-c.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/terminate-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/to_a-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/to_s-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/top-c.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/top-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/ver-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/version-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/visit-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/warn-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/OptParse/with-c.ri
 %%RDOC%%%%RUBY_RIDIR%%/OptionParser/AC/_ac_arg_enable-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/OptionParser/AC/_check_ac_args-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/OptionParser/AC/ac_arg_disable-i.ri
@@ -16033,13 +15970,6 @@
 %%RDOC%%%%RUBY_RIDIR%%/SimpleDelegator/__getobj__-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/SimpleDelegator/__setobj__-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/SimpleDelegator/cdesc-SimpleDelegator.ri
-%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/cdesc-SingleForwardable.ri
-%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/def_delegator-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/def_delegators-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/def_single_delegator-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/def_single_delegators-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/delegate-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/single_delegate-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/Singleton/_dump-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/Singleton/_load-c.ri
 %%RDOC%%%%RUBY_RIDIR%%/Singleton/append_features-c.ri
Index: head/lang/ruby23/distinfo
===================================================================
--- head/lang/ruby23/distinfo
+++ head/lang/ruby23/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479773431
-SHA256 (ruby/ruby-2.3.3.tar.xz) = 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc
-SIZE (ruby/ruby-2.3.3.tar.xz) = 11444164
+TIMESTAMP = 1493101646
+SHA256 (ruby/ruby-2.3.4.tar.xz) = 341cd9032e9fd17c452ed8562a8d43f7e45bfe05e411d0d7d627751dd82c578c
+SIZE (ruby/ruby-2.3.4.tar.xz) = 11450108
Index: head/lang/ruby23/files/patch-Makefile.in
===================================================================
--- head/lang/ruby23/files/patch-Makefile.in
+++ head/lang/ruby23/files/patch-Makefile.in
@@ -1,4 +1,4 @@
---- Makefile.in.orig	2015-12-20 01:15:12 UTC
+--- Makefile.in.orig	2016-01-21 07:41:11 UTC
 +++ Makefile.in
 @@ -388,7 +388,7 @@ enc/jis/props.h: enc/jis/props.kwd
  
Index: head/lang/ruby23/files/patch-configure.in
===================================================================
--- head/lang/ruby23/files/patch-configure.in
+++ head/lang/ruby23/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	2015-12-23 05:29:36 UTC
+--- configure.in.orig	2017-03-27 17:59:49 UTC
 +++ configure.in
-@@ -620,7 +620,7 @@ AC_DEFUN([RUBY_DTRACE_AVAILABLE],
+@@ -621,7 +621,7 @@ AC_DEFUN([RUBY_DTRACE_AVAILABLE],
  [AC_CACHE_CHECK(whether dtrace USDT is available, rb_cv_dtrace_available,
  [
      echo "provider conftest{ probe fire(); };" > conftest_provider.d
@@ -9,7 +9,7 @@
        AC_TRY_COMPILE([@%:@include "conftest_provider.h"], [CONFTEST_FIRE();], [
  	# DTrace is available on the system
  	rb_cv_dtrace_available=yes
-@@ -644,13 +644,13 @@ AC_DEFUN([RUBY_DTRACE_POSTPROCESS],
+@@ -645,13 +645,13 @@ AC_DEFUN([RUBY_DTRACE_POSTPROCESS],
        probe fire();
      };
  _PROBES
@@ -25,7 +25,7 @@
  	    :
  	}; then
  	    if cmp -s conftest.o conftest.${ac_objext}.save; then
-@@ -1222,10 +1222,10 @@ main()
+@@ -1260,10 +1260,10 @@ main()
    ],
  [	LIBS="-lm $LIBS"])
  
@@ -40,7 +40,7 @@
  
  dnl Checks for header files.
  AC_HEADER_DIRENT
-@@ -2440,7 +2440,7 @@ AS_IF([test "x$rb_cv_atan2_inf_c99" = xy
+@@ -2513,7 +2513,7 @@ main(int argc, char **argv)
  if test x"$ac_cv_func_clock_gettime" != xyes; then
      # glibc 2.17 moves clock_* functions from librt to the main C library.
      # http://sourceware.org/ml/libc-announce/2012/msg00001.html
@@ -49,7 +49,7 @@
      if test x"$ac_cv_lib_rt_clock_gettime" = xyes; then
  	AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
      fi
-@@ -2847,7 +2847,7 @@ else
+@@ -2920,7 +2920,7 @@ else
  fi
  
  if test x"$enable_pthread" = xyes; then
@@ -58,7 +58,7 @@
  	AC_CHECK_LIB($pthread_lib, pthread_kill,
  		     rb_with_pthread=yes, rb_with_pthread=no)
  	if test "$rb_with_pthread" = "yes"; then break; fi
-@@ -2861,6 +2861,7 @@ if test x"$enable_pthread" = xyes; then
+@@ -2934,6 +2934,7 @@ if test x"$enable_pthread" = xyes; then
  	[c],    [],
  	[root], [],
  	[c_r],  [MAINLIBS="-pthread $MAINLIBS"],
@@ -66,7 +66,7 @@
  	        [AS_CASE(["$target_os"],
  		    [openbsd*|mirbsd*], [LIBS="-pthread $LIBS"],
  		    [LIBS="-l$pthread_lib $LIBS"])])
-@@ -3173,7 +3174,6 @@ if test "$with_dln_a_out" != yes; then
+@@ -3246,7 +3247,6 @@ if test "$with_dln_a_out" != yes; then
  			: ${LDSHARED='$(CC) -shared'}
  			if test "$rb_cv_binary_elf" = yes; then
  			    LDFLAGS="$LDFLAGS -rdynamic"
@@ -74,7 +74,7 @@
  			else
  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
  			fi
-@@ -3657,6 +3657,7 @@ AS_CASE("$enable_shared", [yes], [
+@@ -3730,6 +3730,7 @@ AS_CASE("$enable_shared", [yes], [
      [freebsd*|dragonfly*], [
  	SOLIBS='$(LIBS)'
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
Index: head/lang/ruby23/files/patch-eval.c
===================================================================
--- head/lang/ruby23/files/patch-eval.c
+++ head/lang/ruby23/files/patch-eval.c
@@ -1,20 +0,0 @@
---- eval.c.orig	2016-11-14 17:36:10 UTC
-+++ eval.c
-@@ -804,7 +804,7 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), V
- {
-     int state;
-     rb_thread_t *th = GET_THREAD();
--    rb_control_frame_t *cfp = th->cfp;
-+    rb_control_frame_t *volatile cfp = th->cfp;
-     volatile VALUE result = Qfalse;
-     volatile VALUE e_info = th->errinfo;
-     va_list args;
-@@ -870,7 +870,7 @@ rb_protect(VALUE (* proc) (VALUE), VALUE
-     volatile VALUE result = Qnil;
-     volatile int status;
-     rb_thread_t *th = GET_THREAD();
--    rb_control_frame_t *cfp = th->cfp;
-+    rb_control_frame_t *volatile cfp = th->cfp;
-     struct rb_vm_protect_tag protect_tag;
-     rb_jmpbuf_t org_jmpbuf;
- 
Index: head/lang/ruby23/files/patch-eval_error.c
===================================================================
--- head/lang/ruby23/files/patch-eval_error.c
+++ head/lang/ruby23/files/patch-eval_error.c
@@ -1,15 +0,0 @@
---- eval_error.c.orig	2016-11-14 17:36:10 UTC
-+++ eval_error.c
-@@ -63,9 +63,9 @@ static void
- error_print(void)
- {
-     volatile VALUE errat = Qundef;
--    rb_thread_t *th = GET_THREAD();
--    VALUE errinfo = th->errinfo;
--    int raised_flag = th->raised_flag;
-+    rb_thread_t *volatile th = GET_THREAD();
-+    volatile VALUE errinfo = th->errinfo;
-+    volatile int raised_flag = th->raised_flag;
-     volatile VALUE eclass = Qundef, e = Qundef;
-     const char *volatile einfo;
-     volatile long elen;
Index: head/lang/ruby23/files/patch-lib_mkmf.rb
===================================================================
--- head/lang/ruby23/files/patch-lib_mkmf.rb
+++ head/lang/ruby23/files/patch-lib_mkmf.rb
@@ -1,4 +1,4 @@
---- lib/mkmf.rb.orig	2015-12-16 09:25:48 UTC
+--- lib/mkmf.rb.orig	2016-05-14 17:46:54 UTC
 +++ lib/mkmf.rb
 @@ -235,7 +235,7 @@ module MakeMakefile
    end
Index: head/lang/ruby23/files/patch-thread.c
===================================================================
--- head/lang/ruby23/files/patch-thread.c
+++ head/lang/ruby23/files/patch-thread.c
@@ -1,13 +0,0 @@
---- thread.c.orig	2016-11-05 02:44:06 UTC
-+++ thread.c
-@@ -466,8 +466,8 @@ rb_threadptr_unlock_all_locking_mutexes(
- void
- rb_thread_terminate_all(void)
- {
--    rb_thread_t *th = GET_THREAD(); /* main thread */
--    rb_vm_t *vm = th->vm;
-+    rb_thread_t *volatile th = GET_THREAD(); /* main thread */
-+    rb_vm_t *volatile vm = th->vm;
-     volatile int sleeping = 0;
- 
-     if (vm->main_thread != th) {
Index: head/lang/ruby23/files/patch-tool_rbinstall.rb
===================================================================
--- head/lang/ruby23/files/patch-tool_rbinstall.rb
+++ head/lang/ruby23/files/patch-tool_rbinstall.rb
@@ -1,4 +1,4 @@
---- tool/rbinstall.rb.orig	2015-11-16 06:33:17 UTC
+--- tool/rbinstall.rb.orig	2017-03-27 15:18:38 UTC
 +++ tool/rbinstall.rb
 @@ -322,6 +322,7 @@ bindir = CONFIG["bindir", true]
  libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true]
@@ -17,7 +17,7 @@
      install pc, pkgconfigdir, :mode => $data_mode
    end
  end
-@@ -695,88 +696,6 @@ end
+@@ -695,93 +696,6 @@ end
  
  # :startdoc:
  
@@ -89,7 +89,12 @@
 -  if defined?(Zlib)
 -    Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name)))
 -    gems.each do |gem|
--      Gem.install(gem, Gem::Requirement.default, options)
+-      begin
+-        File.umask(022)
+-        Gem.install(gem, Gem::Requirement.default, options)
+-      ensure
+-        File.umask(0222)
+-      end
 -      gemname = File.basename(gem)
 -      puts "#{" "*30}#{gemname}"
 -    end
Index: head/lang/ruby23/files/patch-vm_eval.c
===================================================================
--- head/lang/ruby23/files/patch-vm_eval.c
+++ head/lang/ruby23/files/patch-vm_eval.c
@@ -1,22 +0,0 @@
---- vm_eval.c.orig	2016-11-16 14:41:20 UTC
-+++ vm_eval.c
-@@ -1272,7 +1272,7 @@ eval_string_with_cref(VALUE self, VALUE 
-     int state;
-     VALUE result = Qundef;
-     VALUE envval;
--    rb_thread_t *th = GET_THREAD();
-+    rb_thread_t *volatile th = GET_THREAD();
-     rb_env_t *env = NULL;
-     rb_block_t block, *base_block;
-     volatile int parse_in_eval;
-@@ -2006,8 +2006,8 @@ rb_catch_protect(VALUE t, rb_block_call_
- {
-     int state;
-     volatile VALUE val = Qnil;		/* OK */
--    rb_thread_t *th = GET_THREAD();
--    rb_control_frame_t *saved_cfp = th->cfp;
-+    rb_thread_t *volatile th = GET_THREAD();
-+    rb_control_frame_t *volatile saved_cfp = th->cfp;
-     volatile VALUE tag = t;
- 
-     TH_PUSH_TAG(th);
Index: head/lang/ruby23/files/patch-vm_trace.c
===================================================================
--- head/lang/ruby23/files/patch-vm_trace.c
+++ head/lang/ruby23/files/patch-vm_trace.c
@@ -1,11 +0,0 @@
---- vm_trace.c.orig	2015-12-14 02:52:14 UTC
-+++ vm_trace.c
-@@ -389,7 +389,7 @@ rb_suppress_tracing(VALUE (*func)(VALUE)
-     volatile int raised;
-     volatile int outer_state;
-     VALUE result = Qnil;
--    rb_thread_t *th = GET_THREAD();
-+    rb_thread_t *volatile th = GET_THREAD();
-     int state;
-     const int tracing = th->trace_arg ? 1 : 0;
-     rb_trace_arg_t dummy_trace_arg;
Index: head/lang/ruby23/pkg-plist
===================================================================
--- head/lang/ruby23/pkg-plist
+++ head/lang/ruby23/pkg-plist
@@ -6816,6 +6816,7 @@
 %%RDOC%%%%RUBY_RIDIR%%/Float/zero%3f-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/FloatDomainError/cdesc-FloatDomainError.ri
 %%RDOC%%%%RUBY_RIDIR%%/Forwardable/cdesc-Forwardable.ri
+%%RDOC%%%%RUBY_RIDIR%%/Forwardable/_delegator_method-c.ri
 %%RDOC%%%%RUBY_RIDIR%%/Forwardable/debug-c.ri
 %%RDOC%%%%RUBY_RIDIR%%/Forwardable/def_delegator-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/Forwardable/def_delegators-i.ri
@@ -16359,13 +16360,6 @@
 %%RDOC%%%%RUBY_RIDIR%%/SimpleDelegator/__getobj__-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/SimpleDelegator/__setobj__-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/SimpleDelegator/cdesc-SimpleDelegator.ri
-%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/cdesc-SingleForwardable.ri
-%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/def_delegator-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/def_delegators-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/def_single_delegator-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/def_single_delegators-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/delegate-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/single_delegate-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/Singleton/_dump-i.ri
 %%RDOC%%%%RUBY_RIDIR%%/Singleton/_load-c.ri
 %%RDOC%%%%RUBY_RIDIR%%/Singleton/append_features-c.ri