- Update Ruby 1.9 to p290

- Make Ruby 1.9 the default Ruby

2 files changed, 61 insertions, 2 deletions

diff --git a/lang/ruby19/files/patch-common.mk b/lang/ruby19/files/patch-common.mk
index 34b50f736d56..a068f6d240f3 100644
--- a/lang/ruby19/files/patch-common.mk
+++ b/lang/ruby19/files/patch-common.mk
@@ -1,5 +1,14 @@
---- common.mk.orig	2010-10-10 16:40:15.000000000 -0700
-+++ common.mk	2010-10-10 16:40:42.000000000 -0700
+--- common.mk.orig	2011-05-17 21:19:20.689620679 -0400
++++ common.mk	2011-05-17 21:19:28.688621223 -0400
+@@ -96,7 +96,7 @@
+ 
+ GOLFOBJS      = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
+ 
+-PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb
++PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb
+ PRELUDES      = prelude.c miniprelude.c
+ GOLFPRELUDES = golf_prelude.c
+ 
 @@ -256,7 +256,7 @@
  install-capi: capi pre-install-capi do-install-capi post-install-capi
  pre-install-capi:: install-prereq
@@ -9,3 +18,11 @@
  post-install-capi::
  	@$(NULLCMD)
  
+@@ -738,7 +738,6 @@
+ 	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
+ 
+ prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) \
+-	   $(srcdir)/lib/rubygems/defaults.rb $(srcdir)/lib/rubygems/custom_require.rb \
+ 	   $(PRELUDE_SCRIPTS) $(PREP)
+ 	$(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@
+ 
diff --git a/lang/ruby19/files/patch-tools-rbinstall-rb b/lang/ruby19/files/patch-tools-rbinstall-rb
new file mode 100644
index 000000000000..61b5bc01dcfa
--- /dev/null
+++ b/lang/ruby19/files/patch-tools-rbinstall-rb
@@ -0,0 +1,42 @@
+--- 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