5 files changed, 90 insertions, 68 deletions
diff --git a/lang/ruby19/files/patch-configure.in b/lang/ruby19/files/patch-configure.in
index f69b63b53571..5cfbc5cb5bd4 100644
--- a/lang/ruby19/files/patch-configure.in
+++ b/lang/ruby19/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	2010-10-09 03:00:14.000000000 -0700
-+++ configure.in	2010-10-09 03:07:18.000000000 -0700
-@@ -959,11 +959,11 @@
+--- configure.in.orig	2011-10-09 06:17:20.000000000 -0700
++++ configure.in	2011-11-04 00:52:17.000000000 -0700
+@@ -1112,11 +1112,11 @@
  [superux*], [	ac_cv_func_setitimer=no
  		],
  [	LIBS="-lm $LIBS"])
@@ -17,7 +17,7 @@
  if test "${enable_win95}" = maybe; then
      AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no])
  fi
-@@ -1576,7 +1576,7 @@
+@@ -1808,7 +1808,7 @@
  fi
  
  if test x"$enable_pthread" = xyes; then
@@ -26,7 +26,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
-@@ -1590,6 +1590,7 @@
+@@ -1822,6 +1822,7 @@
  	[c],    [],
  	[root], [],
  	[c_r],  [MAINLIBS="-pthread $MAINLIBS"],
@@ -34,13 +34,3 @@
  	        [LIBS="-l$pthread_lib $LIBS"])
      else
  	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
-@@ -1600,7 +1601,8 @@
- 	thr_stksegment pthread_stackseg_np pthread_getthrds_np)
-     if test x"$ac_cv_func_nanosleep" = xno; then
-        AC_CHECK_LIB(rt, nanosleep)
--       if test x"$ac_cv_lib_rt_nanosleep" = xyes; then
-+       AC_SEARCH_LIBS(nanosleep, rt)
-+       if test x"$ac_cv_search_nanosleep" != xno; then
-            AC_DEFINE(HAVE_NANOSLEEP)
-        fi
-     fi
diff --git a/lang/ruby19/files/patch-cont.c b/lang/ruby19/files/patch-cont.c
new file mode 100644
index 000000000000..3a18d265e3a8
--- /dev/null
+++ b/lang/ruby19/files/patch-cont.c
@@ -0,0 +1,11 @@
+--- cont.c.orig	2011-11-18 03:37:32.000000000 -0800
++++ cont.c	2011-11-18 03:38:22.000000000 -0800
+@@ -15,7 +15,7 @@
+ #include "gc.h"
+ #include "eval_intern.h"
+ 
+-#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) || defined(HAVE_SETCONTEXT)) && !defined(__NetBSD__) && !defined(sun) && !defined(FIBER_USE_NATIVE)
++#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) || defined(HAVE_SETCONTEXT)) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(sun) && !defined(FIBER_USE_NATIVE)
+ #define FIBER_USE_NATIVE 1
+ 
+ /* FIBER_USE_NATIVE enables Fiber performance improvement using system
diff --git a/lang/ruby19/files/patch-thread_pthread.c b/lang/ruby19/files/patch-thread_pthread.c
deleted file mode 100644
index b2a7d60a3dc6..000000000000
--- a/lang/ruby19/files/patch-thread_pthread.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- thread_pthread.c.orig	2010-10-10 03:11:47.000000000 -0700
-+++ thread_pthread.c	2010-10-10 03:13:05.000000000 -0700
-@@ -809,7 +809,7 @@
- 	int err;
- 
- 	pthread_attr_init(&attr);
--#ifdef PTHREAD_STACK_MIN
-+#if defined(PTHREAD_STACK_MIN) && !defined(__FreeBSD__)
- 	pthread_attr_setstacksize(&attr,
- 				  PTHREAD_STACK_MIN + (THREAD_DEBUG ? BUFSIZ : 0));
- #endif
diff --git a/lang/ruby19/files/patch-tool_rbinstall.rb b/lang/ruby19/files/patch-tool_rbinstall.rb
new file mode 100644
index 000000000000..292ba43ef19a
--- /dev/null
+++ b/lang/ruby19/files/patch-tool_rbinstall.rb
@@ -0,0 +1,74 @@
+--- tool/rbinstall.rb.orig	2011-07-30 07:19:11.000000000 -0700
++++ tool/rbinstall.rb	2011-11-19 00:08:56.000000000 -0800
+@@ -292,6 +292,7 @@
+ 
+ bindir = CONFIG["bindir"]
+ libdir = CONFIG["libdir"]
++libdatadir = CONFIG["prefix"] + "/" + "libdata"
+ archhdrdir = rubyhdrdir = CONFIG["rubyhdrdir"]
+ archhdrdir += "/" + CONFIG["arch"]
+ rubylibdir = CONFIG["rubylibdir"]
+@@ -349,7 +350,7 @@
+ install?(:local, :arch, :data) do
+   pc = CONFIG["ruby_pc"]
+   if pc and File.file?(pc) and File.size?(pc)
+-    prepare "pkgconfig data", pkgconfigdir = File.join(libdir, "pkgconfig")
++    prepare "pkgconfig data", pkgconfigdir = File.join(libdatadir, "pkgconfig")
+     install pc, pkgconfigdir, :mode => $data_mode
+   end
+ end
+@@ -531,54 +532,6 @@
+   end
+ end
+ 
+-install?(:ext, :comm, :gem) do
+-  $:.unshift(File.join(srcdir, "lib"))
+-  require("rubygems.rb")
+-  gem_dir = Gem.default_dir
+-  directories = Gem.ensure_gem_subdirectories(gem_dir)
+-  prepare "default gems", gem_dir, directories
+-
+-  spec_dir = File.join(gem_dir, directories.grep(/^spec/)[0])
+-  File.foreach(File.join(srcdir, "defs/default_gems")) do |line|
+-    line.chomp!
+-    line.sub!(/\s*#.*/, '')
+-    next if line.empty?
+-    words = []
+-    line.scan(/\G\s*([^\[\]\s]+|\[([^\[\]]*)\])/) do
+-      words << ($2 ? $2.split : $1)
+-    end
+-    name, src, execs = *words
+-    next unless name and src
+-    execs ||= []
+-    src = File.join(srcdir, src)
+-    version = open(src) {|f| f.find {|s| /^\s*\w*VERSION\s*=(?!=)/ =~ s}} or next
+-    version = version.split(%r"=\s*", 2)[1].strip[/\A([\'\"])(.*?)\1/, 2]
+-    full_name = "#{name}-#{version}"
+-
+-    puts "#{" "*30}#{name} #{version}"
+-    open_for_install(File.join(spec_dir, "#{full_name}.gemspec"), $data_mode) do
+-      <<-GEMSPEC
+-Gem::Specification.new do |s|
+-  s.name = #{name.dump}
+-  s.version = #{version.dump}
+-  s.summary = "This #{name} is bundled with Ruby"
+-  s.executables = #{execs.inspect}
+-end
+-      GEMSPEC
+-    end
+-
+-    unless execs.empty? then
+-      bin_dir = File.join(gem_dir, 'gems', full_name, 'bin')
+-      makedirs(bin_dir)
+-
+-      execs.each do |exec|
+-        exec = File.join(srcdir, 'bin', exec)
+-        install(exec, bin_dir, :mode => $prog_mode)
+-      end
+-    end
+-  end
+-end
+-
+ parse_args()
+ 
+ include FileUtils
diff --git a/lang/ruby19/files/patch-tools-rbinstall-rb b/lang/ruby19/files/patch-tools-rbinstall-rb
deleted file mode 100644
index 61b5bc01dcfa..000000000000
--- a/lang/ruby19/files/patch-tools-rbinstall-rb
+++ /dev/null
@@ -1,42 +0,0 @@
---- tool/rbinstall.rb.orig	2011-03-16 22:17:55.000000000 +0000
-+++ tool/rbinstall.rb	2011-03-16 22:19:20.000000000 +0000
-@@ -491,39 +491,6 @@
-   end
- end
- 
--install?(:ext, :comm, :gem) do
--  directories = []
--  IO.foreach(File.join(srcdir, "lib/rubygems.rb")) do |line|
--    if /^\s*DIRECTORIES\s*=\s*%w\[(.*?)\]/ =~ line
--      directories = $1.split
--      break
--    end
--  end
--  gpath = CONFIG["sitelibdir"].sub(%r'/site_ruby/(?=[^/]+)', '/gems/')
--  prepare "default gems", gpath, directories
--
--  destdir = File.join(gpath, directories.grep(/^spec/)[0])
--  default_gems = [
--    ['rake', 'rake.rb'],
--    ['rdoc', 'rdoc.rb'],
--    ['minitest', 'minitest/unit.rb'],
--  ]
--  default_gems.each do |name, src|
--    src = File.join(srcdir, "lib", src)
--    version = open(src) {|f| f.find {|s| /^\s*\w*VERSION\s*=(?!=)/ =~ s}} or next
--    version = version.split(%r"=\s*", 2)[1].strip[/\A([\'\"])(.*?)\1/, 2]
--    puts "#{" "*30}#{name} #{version}"
--    gemspec = <<-GEMSPEC
--Gem::Specification.new do |s|
--  s.name = #{name.dump}
--  s.version = #{version.dump}
--  s.summary = "This #{name} is bundled with Ruby"
--end
--    GEMSPEC
--    open_for_install(File.join(destdir, "#{name}-#{version}.gemspec"), $data_mode) { gemspec }
--  end
--end
--
- parse_args()
- 
- include FileUtils