Update ruby21 to 2.1.2.

Quote from release announce:

This release contains a fix for a regression of Hash#reject in Ruby 2.1.1,
support for build with Readline-6.3 (see Bug #9578), an updated bundled
version of libyaml with psych, and some bug fixes.

For details, please refer ChangeLog.

8 files changed, 23 insertions, 91 deletions

diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index a8a8163a8cb..e69e02d2d19 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.120 2014/05/21 03:14:45 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.121 2014/05/21 03:19:57 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -215,7 +215,7 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/}
 RUBY18_VERSION=		1.8.7
 RUBY193_VERSION=	1.9.3
 RUBY200_VERSION=	2.0.0
-RUBY21_VERSION=		2.1.1
+RUBY21_VERSION=		2.1.2
 
 # patch
 RUBY18_PATCHLEVEL=	pl374
diff --git a/lang/ruby21-base/Makefile b/lang/ruby21-base/Makefile
index 964576156a1..aa28e79c55b 100644
--- a/lang/ruby21-base/Makefile
+++ b/lang/ruby21-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2014/03/30 17:15:01 taca Exp $
+# $NetBSD: Makefile,v 1.4 2014/05/21 03:19:57 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
-PKGREVISION=	2
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
diff --git a/lang/ruby21-base/PLIST b/lang/ruby21-base/PLIST
index 87f4470accc..57d970f36d4 100644
--- a/lang/ruby21-base/PLIST
+++ b/lang/ruby21-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/03/14 19:40:47 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/05/21 03:19:57 taca Exp $
 bin/erb${RUBY_SUFFIX}
 bin/gem${RUBY_SUFFIX}
 bin/irb${RUBY_SUFFIX}
@@ -921,15 +921,15 @@ ${RUBY_ARCHLIB}/zlib.${RUBY_DLEXT}
 ${GEM_HOME}/gems/rake-10.1.0/bin/rake
 ${GEM_HOME}/gems/rdoc-4.1.0/bin/rdoc
 ${GEM_HOME}/gems/rdoc-4.1.0/bin/ri
-${GEM_HOME}/gems/test-unit-2.1.1.0/bin/testrb
+${GEM_HOME}/gems/test-unit-2.1.2.0/bin/testrb
 ${GEM_HOME}/specifications/default/bigdecimal-1.2.4.gemspec
 ${GEM_HOME}/specifications/default/io-console-0.4.2.gemspec
 ${GEM_HOME}/specifications/default/json-1.8.1.gemspec
 ${GEM_HOME}/specifications/default/minitest-4.7.5.gemspec
-${GEM_HOME}/specifications/default/psych-2.0.3.gemspec
+${GEM_HOME}/specifications/default/psych-2.0.5.gemspec
 ${GEM_HOME}/specifications/default/rake-10.1.0.gemspec
 ${GEM_HOME}/specifications/default/rdoc-4.1.0.gemspec
-${GEM_HOME}/specifications/default/test-unit-2.1.1.0.gemspec
+${GEM_HOME}/specifications/default/test-unit-2.1.2.0.gemspec
 man/man1/erb${RUBY_SUFFIX}.1
 man/man1/irb${RUBY_SUFFIX}.1
 man/man1/rake${RUBY_SUFFIX}.1
diff --git a/lang/ruby21-base/distinfo b/lang/ruby21-base/distinfo
index 51cac0b65fb..1c3e5ab2ae5 100644
--- a/lang/ruby21-base/distinfo
+++ b/lang/ruby21-base/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.5 2014/03/30 17:15:01 taca Exp $
+$NetBSD: distinfo,v 1.6 2014/05/21 03:19:57 taca Exp $
 
-SHA1 (ruby-2.1.1.tar.bz2) = a7fd539f64864bc00fc64444d2d814df6c19fd4a
-RMD160 (ruby-2.1.1.tar.bz2) = b200bb8d1542f79306c5cd0760781ec9dc759998
-Size (ruby-2.1.1.tar.bz2) = 11990697 bytes
-SHA1 (patch-configure) = c7ba92b1a142c1b52dc732f8a0a2a0d2803f5dd5
+SHA1 (ruby-2.1.2.tar.bz2) = 29a615966c7feb6554be736e7dcd590c770ee692
+RMD160 (ruby-2.1.2.tar.bz2) = 0bae9f1f62c0df44840355a880eb1907892f2b38
+Size (ruby-2.1.2.tar.bz2) = 11976939 bytes
+SHA1 (patch-configure) = 40da4aec83fcb9cf026d2b458ff3beb6dcf7776a
 SHA1 (patch-ext_dl_extconf.rb) = f6c71db3c3076216c9b5db92692c7c8dad012af0
-SHA1 (patch-ext_readline_extconf.rb) = 6db3292f19a2df9e3623bc89c8c2430e12290532
-SHA1 (patch-ext_readline_readline.c) = 364d3d641fa19ec4ed4e1d25ae0f55b73896a2c4
 SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051
 SHA1 (patch-lib_rubygems.rb) = 9d27fa8c96f285461fbb08df7491a0a48ed612e1
 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e
@@ -26,5 +24,4 @@ SHA1 (patch-man_ri.1) = af855135020f18c361cc55af676adc75e26bf4d3
 SHA1 (patch-man_ruby.1) = 5bc1e2e7c4c640659e33d0131d0982ce4e0d9fe0
 SHA1 (patch-template_verconf.h.in) = 1f4c0676d1335a9fc32ccf8cbfa41678dde96dcd
 SHA1 (patch-test_rubygems_test__gem.rb) = 4d8cc50c2782e29eefea0ea6deedf295a7f09bc2
-SHA1 (patch-thread__pthread.c) = c812869041e7b05c68cc72e1bbc06561397d6591
 SHA1 (patch-tool_rbinstall.rb) = 845e5136dc2b5e3c41aeb833890e786544d6f5d5
diff --git a/lang/ruby21-base/patches/patch-configure b/lang/ruby21-base/patches/patch-configure
index eab934eae15..ca9c2b7dcff 100644
--- a/lang/ruby21-base/patches/patch-configure
+++ b/lang/ruby21-base/patches/patch-configure
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.1 2014/03/14 19:40:47 taca Exp $
+$NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
 
 * Adding Interix and MirBSD support.
 * Ignore doxygen.
 
---- configure.orig	2013-12-20 12:22:22.000000000 +0000
+--- configure.orig	2014-05-08 15:52:19.000000000 +0000
 +++ configure
-@@ -8430,6 +8430,10 @@ esac
+@@ -8571,6 +8571,10 @@ esac
  		ac_cv_func_isinf=yes
  		ac_cv_func_isnan=yes
  		 ;; #(
@@ -16,7 +16,7 @@ $NetBSD: patch-configure,v 1.1 2014/03/14 19:40:47 taca Exp $
    nacl) :
  
    LIBS="-lm $LIBS"
-@@ -16063,6 +16067,8 @@ else
+@@ -16204,6 +16208,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -25,7 +25,7 @@ $NetBSD: patch-configure,v 1.1 2014/03/14 19:40:47 taca Exp $
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -19811,7 +19817,9 @@ esac ;; #(
+@@ -20007,7 +20013,9 @@ esac ;; #(
    interix*) :
      	: ${LDSHARED='$(CC) -shared'}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -35,7 +35,7 @@ $NetBSD: patch-configure,v 1.1 2014/03/14 19:40:47 taca Exp $
  			rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
-@@ -20797,7 +20805,7 @@ esac
+@@ -21008,7 +21016,7 @@ esac
    freebsd*|dragonfly*) :
  
  	SOLIBS='$(LIBS)'
@@ -44,7 +44,7 @@ $NetBSD: patch-configure,v 1.1 2014/03/14 19:40:47 taca Exp $
  	if test "$rb_cv_binary_elf" != "yes" ; then
  	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
  	    LIBRUBY_ALIASES=''
-@@ -20876,7 +20884,12 @@ esac
+@@ -21087,7 +21095,12 @@ esac
  	 ;; #(
    interix*) :
  
@@ -58,7 +58,7 @@ $NetBSD: patch-configure,v 1.1 2014/03/14 19:40:47 taca Exp $
  	 ;; #(
    mingw*|cygwin*|mswin*) :
  
-@@ -21034,7 +21047,7 @@ esac
+@@ -21245,7 +21258,7 @@ esac
  esac
  if test "$enable_rpath" = yes; then
      test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
@@ -67,7 +67,7 @@ $NetBSD: patch-configure,v 1.1 2014/03/14 19:40:47 taca Exp $
      test "x$cross_compiling" = xyes || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS -L${libprefix}"
      LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
      LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
-@@ -21210,11 +21223,7 @@ if test "$install_doc" != no; then
+@@ -21421,11 +21434,7 @@ if test "$install_doc" != no; then
      else
  	RDOCTARGET="nodoc"
      fi
@@ -80,7 +80,7 @@ $NetBSD: patch-configure,v 1.1 2014/03/14 19:40:47 taca Exp $
  else
      RDOCTARGET="nodoc"
      CAPITARGET="nodoc"
-@@ -21799,7 +21808,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; t
+@@ -22010,7 +22019,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; t
  elif test -z "${ruby_version}"; then
      as_fn_error $? "No ruby version, No place for bundled libraries" "$LINENO" 5
  else
@@ -89,7 +89,7 @@ $NetBSD: patch-configure,v 1.1 2014/03/14 19:40:47 taca Exp $
  fi
  
  
-@@ -23305,17 +23314,7 @@ which seems to be undefined.  Please mak
+@@ -23516,17 +23525,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
      {
diff --git a/lang/ruby21-base/patches/patch-ext_readline_extconf.rb b/lang/ruby21-base/patches/patch-ext_readline_extconf.rb
deleted file mode 100644
index 2cc35c0291d..00000000000
--- a/lang/ruby21-base/patches/patch-ext_readline_extconf.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ext_readline_extconf.rb,v 1.1 2014/03/30 00:18:09 taca Exp $
-
-* Handle rl_hook_func_t old/new GNU readline and editline(3).
-
---- ext/readline/extconf.rb.orig	2013-07-22 00:37:10.000000000 +0000
-+++ ext/readline/extconf.rb
-@@ -19,6 +19,10 @@ def readline.have_func(func)
-   return super(func, headers)
- end
- 
-+def readline.have_type(type)
-+  return super(type, headers)
-+end
-+
- dir_config('curses')
- dir_config('ncurses')
- dir_config('termcap')
-@@ -93,5 +97,12 @@ readline.have_func("remove_history")
- readline.have_func("clear_history")
- readline.have_func("rl_redisplay")
- readline.have_func("rl_insert_text")
-+unless readline.have_type("rl_hook_func_t")
-+  # rl_hook_func_t is available since readline-4.2 (2001).
-+  # Function is removed at readline-6.3 (2014).
-+  # However, editline (NetBSD 6.1.3, 2014) doesn't have rl_hook_func_t.
-+  $defs << "-Drl_hook_func_t=Function"
-+end
-+
- readline.have_func("rl_delete_text")
- create_makefile("readline")
diff --git a/lang/ruby21-base/patches/patch-ext_readline_readline.c b/lang/ruby21-base/patches/patch-ext_readline_readline.c
deleted file mode 100644
index 4ecc67e2716..00000000000
--- a/lang/ruby21-base/patches/patch-ext_readline_readline.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ext_readline_readline.c,v 1.1 2014/03/29 01:23:58 taca Exp $
-
-* Don't use legacy type of readline.
-
---- ext/readline/readline.c.orig	2013-10-29 03:09:00.000000000 +0000
-+++ ext/readline/readline.c
-@@ -1974,7 +1974,7 @@ Init_readline()
- 
-     rl_attempted_completion_function = readline_attempted_completion_function;
- #if defined(HAVE_RL_PRE_INPUT_HOOK)
--    rl_pre_input_hook = (Function *)readline_pre_input_hook;
-+    rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook;
- #endif
- #ifdef HAVE_RL_CATCH_SIGNALS
-     rl_catch_signals = 0;
diff --git a/lang/ruby21-base/patches/patch-thread__pthread.c b/lang/ruby21-base/patches/patch-thread__pthread.c
deleted file mode 100644
index 694f259450e..00000000000
--- a/lang/ruby21-base/patches/patch-thread__pthread.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-thread__pthread.c,v 1.1 2014/03/14 19:40:47 taca Exp $
-
-Correct usage of pthread_setname_np() on NetBSD.
-
---- thread_pthread.c.orig	2014-02-22 07:17:22.000000000 +0000
-+++ thread_pthread.c
-@@ -1424,8 +1424,12 @@ timer_thread_sleep(rb_global_vm_lock_t* 
- #if defined(__linux__) && defined(PR_SET_NAME)
- # define SET_THREAD_NAME(name) prctl(PR_SET_NAME, name)
- #elif defined(HAVE_PTHREAD_SETNAME_NP)
-+#ifdef __NetBSD__
-+# define SET_THREAD_NAME(name) pthread_setname_np(pthread_self(), "%s", ((name)))
-+#else
- /* pthread_setname_np() on Darwin does not have target thread argument */
- # define SET_THREAD_NAME(name) pthread_setname_np(name)
-+#endif
- #else
- # define SET_THREAD_NAME(name) (void)0
- #endif