- Update 1.3.4

- While here, use RF macro

Sponsored by:   RideCharge Inc

6 files changed, 58 insertions, 45 deletions

diff --git a/devel/ruby-gems/Makefile b/devel/ruby-gems/Makefile
index 4b5e317380e8..81d1fadcb0fc 100644
--- a/devel/ruby-gems/Makefile
+++ b/devel/ruby-gems/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	gems
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.4
 CATEGORIES=	devel ruby
-MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITES=	RF
 MASTER_SITE_SUBDIR=	ruby${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby${PORTNAME}-${PORTVERSION}
diff --git a/devel/ruby-gems/distinfo b/devel/ruby-gems/distinfo
index c014d185d7e1..955bee26b41d 100644
--- a/devel/ruby-gems/distinfo
+++ b/devel/ruby-gems/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/rubygems-1.3.1.tgz) = a04ee6f6897077c5b75f5fd1e134c5a9
-SHA256 (ruby/rubygems-1.3.1.tgz) = 361f02e9e3bf1b6625f0e2146553b12c3003d36336cacba51410740f544a8d3b
-SIZE (ruby/rubygems-1.3.1.tgz) = 263748
+MD5 (ruby/rubygems-1.3.4.tgz) = b17b398503253bf36a101c58f02a226f
+SHA256 (ruby/rubygems-1.3.4.tgz) = 1eb4b0a24ed589c40c2b2c3583bd39c52e841afedd55958cc191b3e31adfbbfc
+SIZE (ruby/rubygems-1.3.4.tgz) = 293275
diff --git a/devel/ruby-gems/files/patch-lib__rubygems__commands__setup_command.rb b/devel/ruby-gems/files/patch-lib__rubygems__commands__setup_command.rb
new file mode 100644
index 000000000000..e58d32ce9eab
--- /dev/null
+++ b/devel/ruby-gems/files/patch-lib__rubygems__commands__setup_command.rb
@@ -0,0 +1,44 @@
+--- ./lib/rubygems/commands/setup_command.rb.orig	2009-05-27 18:51:56.000000000 -0400
++++ ./lib/rubygems/commands/setup_command.rb	2009-06-12 00:50:43.889103829 -0400
+@@ -115,6 +115,8 @@
+ 
+     install_rdoc
+ 
++    install_sources
++
+     say
+     say "-" * 78
+     say
+@@ -144,6 +146,23 @@
+     end
+   end
+ 
++  def install_sources
++    say "Installing sources"
++
++    $: << "lib"
++   require 'rubygems'
++   require 'rubygems/builder'
++   require 'rubygems/installer'
++   require 'rubygems/config_file'
++
++    Dir.chdir("pkgs/sources") do
++        load "sources.gemspec"
++        spec = Gem.sources_spec
++        gem_file = Gem::Builder.new(spec).build
++        Gem::Installer.new(gem_file).install
++    end
++  end
++
+   def install_executables(bin_dir)
+     say "Installing gem executable"
+ 
+@@ -152,8 +171,6 @@
+     Dir.chdir 'bin' do
+       bin_files = Dir['*']
+ 
+-      bin_files.delete 'update_rubygems'
+-
+       bin_files.each do |bin_file|
+         bin_file_formatted = if options[:format_executable] then
+                                Gem.default_exec_format % bin_file
diff --git a/devel/ruby-gems/files/patch-lib-rubygems-installer.rb b/devel/ruby-gems/files/patch-lib__rubygems__installer.rb
index f627c9d8f2b6..5952f86e5329 100644
--- a/devel/ruby-gems/files/patch-lib-rubygems-installer.rb
+++ b/devel/ruby-gems/files/patch-lib__rubygems__installer.rb
@@ -1,11 +1,11 @@
---- lib/rubygems/installer.rb.orig	2007-12-21 08:43:06.000000000 +0800
-+++ lib/rubygems/installer.rb	2007-12-27 09:04:59.000000000 +0800
-@@ -134,7 +134,7 @@
+--- ./lib/rubygems/installer.rb.orig	2009-05-07 20:49:03.000000000 -0400
++++ ./lib/rubygems/installer.rb	2009-06-12 00:49:09.432934400 -0400
+@@ -219,8 +219,6 @@
      build_extensions
      write_spec
  
 -    write_require_paths_file_if_needed
-+    # write_require_paths_file_if_needed
- 
+-
      # HACK remove?  Isn't this done in multiple places?
      cached_gem = File.join @gem_home, "cache", @gem.split(/\//).pop
+     unless File.exist? cached_gem then
diff --git a/devel/ruby-gems/files/patch-setup.rb b/devel/ruby-gems/files/patch-setup.rb
deleted file mode 100644
index 5240dad720e8..000000000000
--- a/devel/ruby-gems/files/patch-setup.rb
+++ /dev/null
@@ -1,35 +0,0 @@
---- setup.rb~	2008-06-22 08:51:11.000000000 +0900
-+++ setup.rb	2008-07-03 17:39:54.000000000 +0900
-@@ -158,7 +158,7 @@
- Dir.chdir 'bin' do
-   bin_files = Dir['*']
- 
--  bin_files.delete 'update_rubygems'
-+#  bin_files.delete 'update_rubygems'
- 
-   bin_files.each do |bin_file|
-     bin_file_formatted = if format_executable then
-@@ -299,6 +299,23 @@
-   puts "Set the GEM_HOME environment variable if you want RDoc generated"
- end
- 
-+# Install sources
-+
-+def install_sources
-+  $: << "lib"
-+  require 'rubygems'
-+  require 'rubygems/builder'
-+  require 'rubygems/installer'
-+  require 'rubygems/config_file'
-+  Dir.chdir("pkgs/sources") do
-+    load "sources.gemspec"
-+    spec = Gem.sources_spec
-+    gem_file = Gem::Builder.new(spec).build
-+    Gem::Installer.new(gem_file).install
-+  end
-+end
-+install_sources
-+
- puts
- puts "-" * 78
- puts
diff --git a/devel/ruby-gems/pkg-plist b/devel/ruby-gems/pkg-plist
index 8391947eb56d..a643b9f82c99 100644
--- a/devel/ruby-gems/pkg-plist
+++ b/devel/ruby-gems/pkg-plist
@@ -6,6 +6,7 @@ lib/ruby/gems/%%RUBY_VER%%/cache/sources-0.0.2.gem
 lib/ruby/gems/%%RUBY_VER%%/gems/sources-0.0.2/lib/sources.rb
 lib/ruby/gems/%%RUBY_VER%%/specifications/sources-0.0.2.gemspec
 %%RUBY_SITELIBDIR%%/rbconfig/datadir.rb
+%%RUBY_SITELIBDIR%%/gauntlet_rubygems.rb
 %%RUBY_SITELIBDIR%%/rubygems.rb
 %%RUBY_SITELIBDIR%%/rubygems/builder.rb
 %%RUBY_SITELIBDIR%%/rubygems/command.rb
@@ -29,6 +30,7 @@ lib/ruby/gems/%%RUBY_VER%%/specifications/sources-0.0.2.gemspec
 %%RUBY_SITELIBDIR%%/rubygems/commands/query_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/rdoc_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/search_command.rb
+%%RUBY_SITELIBDIR%%/rubygems/commands/setup_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/server_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/sources_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/specification_command.rb
@@ -64,6 +66,7 @@ lib/ruby/gems/%%RUBY_VER%%/specifications/sources-0.0.2.gemspec
 %%RUBY_SITELIBDIR%%/rubygems/local_remote_options.rb
 %%RUBY_SITELIBDIR%%/rubygems/old_format.rb
 %%RUBY_SITELIBDIR%%/rubygems/package.rb
+%%RUBY_SITELIBDIR%%/rubygems/package_task.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/f_sync_dir.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/tar_header.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/tar_input.rb
@@ -84,6 +87,7 @@ lib/ruby/gems/%%RUBY_VER%%/specifications/sources-0.0.2.gemspec
 %%RUBY_SITELIBDIR%%/rubygems/spec_fetcher.rb
 %%RUBY_SITELIBDIR%%/rubygems/specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/test_utilities.rb
+%%RUBY_SITELIBDIR%%/rubygems/text.rb
 %%RUBY_SITELIBDIR%%/rubygems/timer.rb
 %%RUBY_SITELIBDIR%%/rubygems/uninstaller.rb
 %%RUBY_SITELIBDIR%%/rubygems/user_interaction.rb