* Fix a problem of installing gem with Ruby 1.8.7 noted by David Holland.

* Clean up patch files.

Bump PKGREVISION.

7 files changed, 39 insertions, 23 deletions

diff --git a/misc/rubygems/Makefile b/misc/rubygems/Makefile
index b8753f4d62b..dbde094174d 100644
--- a/misc/rubygems/Makefile
+++ b/misc/rubygems/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2013/06/11 14:55:54 taca Exp $
+# $NetBSD: Makefile,v 1.52 2013/06/15 02:12:48 taca Exp $
 
 DISTNAME=	rubygems-2.0.3
+PKGREVISION=	1
 CATEGORIES=	misc ruby
 MASTER_SITES=	http://production.cf.rubygems.org/rubygems/
 EXTRACT_SUFX=	.tgz
diff --git a/misc/rubygems/distinfo b/misc/rubygems/distinfo
index efdbb07b170..dd53500dc3e 100644
--- a/misc/rubygems/distinfo
+++ b/misc/rubygems/distinfo
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.40 2013/06/11 14:55:54 taca Exp $
+$NetBSD: distinfo,v 1.41 2013/06/15 02:12:48 taca Exp $
 
 SHA1 (rubygems-2.0.3.tgz) = 51b2d002874a30ae729bcc48a3a0c5983ffb508b
 RMD160 (rubygems-2.0.3.tgz) = e2abad996a2380ba5f764a55304c3e416b715080
 Size (rubygems-2.0.3.tgz) = 334203 bytes
 SHA1 (patch-aa) = 02958c28dc9da54bf6d9f854335aa8d8e071497b
-SHA1 (patch-ab) = 916311c3b957c173356fbd89e22dcc11f4966703
+SHA1 (patch-ab) = 9339a71c9c45b8990d72075a68a8992a40b8c0d0
 SHA1 (patch-ac) = 1a59a5d2fc090dfcf6d3bd3b9c133f0ce4a1feee
 SHA1 (patch-ad) = de5b5a08035c2da3e8b08bcc5295d3998f13a854
 SHA1 (patch-af) = d96d5dafd830b0c94bf6c191a3274701ebc6d564
 SHA1 (patch-ag) = 5b94252ea03eba04849770bc141dfc58de932389
-SHA1 (patch-ah) = 7552374df9c34fc4fabe4b5340dd7e84491aa949
+SHA1 (patch-ah) = dd50c10662c0a295a8790446f9cd7159d0b498dd
 SHA1 (patch-aj) = 3b77a675470ea3702b9870843d2bb39bb6a83f3e
-SHA1 (patch-am) = 90658b73df4382eab1d6f2d1b21fdcac6ed85891
+SHA1 (patch-am) = 24b664a1c360e90c0874cdad9d107477f86e4fd5
 SHA1 (patch-ao) = 4a8be3bdab5e465814b626d17a5f2811fbfc808c
-SHA1 (patch-test_rubygems_test__gem.rb) = 65b03305af606e72d9bb41a54fce6877240cf383
+SHA1 (patch-lib_rubygems_ext_ext__conf__builder.rb) = c532aee8aa9dbf92c48a643d8da65bebb50a0348
+SHA1 (patch-test_rubygems_test__gem.rb) = 883675c1af0314c66c3d02fb9c012fac768ebb9b
diff --git a/misc/rubygems/patches/patch-ab b/misc/rubygems/patches/patch-ab
index d63bef49391..049da707715 100644
--- a/misc/rubygems/patches/patch-ab
+++ b/misc/rubygems/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.15 2013/06/11 14:55:54 taca Exp $
+$NetBSD: patch-ab,v 1.16 2013/06/15 02:12:48 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
---- lib/rubygems/dependency_installer.rb.orig	2013-02-20 00:27:36.000000000 +0000
+--- lib/rubygems/dependency_installer.rb.orig	2013-03-05 21:25:39.000000000 +0000
 +++ lib/rubygems/dependency_installer.rb
 @@ -50,6 +50,7 @@ class Gem::DependencyInstaller
    # :format_executable:: See Gem::Installer#initialize.
@@ -29,7 +29,7 @@ Add install_root option for pkgsrc's rubygems support.
      end
  
      options = DEFAULT_OPTIONS.merge options
-@@ -91,7 +93,12 @@ class Gem::DependencyInstaller
+@@ -92,7 +94,12 @@ class Gem::DependencyInstaller
      @installed_gems = []
      @toplevel_specs = nil
  
@@ -43,7 +43,7 @@ Add install_root option for pkgsrc's rubygems support.
  
      # Set with any errors that SpecFetcher finds while search through
      # gemspecs for a dep
-@@ -353,6 +360,7 @@ class Gem::DependencyInstaller
+@@ -364,6 +371,7 @@ class Gem::DependencyInstaller
                                  :format_executable   => @format_executable,
                                  :ignore_dependencies => @ignore_dependencies,
                                  :install_dir         => @install_dir,
diff --git a/misc/rubygems/patches/patch-ah b/misc/rubygems/patches/patch-ah
index 649ba311c3b..5a932027e6e 100644
--- a/misc/rubygems/patches/patch-ah
+++ b/misc/rubygems/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.11 2013/06/11 14:55:54 taca Exp $
+$NetBSD: patch-ah,v 1.12 2013/06/15 02:12:48 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
---- lib/rubygems.rb.orig	2013-02-21 22:01:26.000000000 +0000
+--- lib/rubygems.rb.orig	2013-03-12 04:25:22.000000000 +0000
 +++ lib/rubygems.rb
 @@ -286,11 +286,17 @@ module Gem
    ##
@@ -26,7 +26,7 @@ Add install_root option for pkgsrc's rubygems support.
    end
  
    ##
-@@ -538,12 +544,12 @@ module Gem
+@@ -546,12 +552,12 @@ module Gem
    ##
    # The index to insert activated gem paths into the $LOAD_PATH.
    #
@@ -41,7 +41,7 @@ Add install_root option for pkgsrc's rubygems support.
  
      index
    end
-@@ -716,6 +722,7 @@ module Gem
+@@ -724,6 +730,7 @@ module Gem
      prefix = File.dirname RUBYGEMS_DIR
  
      if prefix != File.expand_path(ConfigMap[:sitelibdir]) and
diff --git a/misc/rubygems/patches/patch-am b/misc/rubygems/patches/patch-am
index aeebc21bc03..99906692246 100644
--- a/misc/rubygems/patches/patch-am
+++ b/misc/rubygems/patches/patch-am
@@ -1,10 +1,10 @@
-$NetBSD: patch-am,v 1.4 2013/06/11 14:55:54 taca Exp $
+$NetBSD: patch-am,v 1.5 2013/06/15 02:12:48 taca Exp $
 
 Make sure to setup under DESTDIR.
 
---- lib/rubygems/commands/setup_command.rb.orig	2013-02-12 20:04:54.000000000 +0000
+--- lib/rubygems/commands/setup_command.rb.orig	2013-03-11 20:40:09.000000000 +0000
 +++ lib/rubygems/commands/setup_command.rb
-@@ -143,7 +143,7 @@ By default, this RubyGems will install g
+@@ -145,7 +145,7 @@ By default, this RubyGems will install g
  
      uninstall_old_gemcutter
  
@@ -13,7 +13,7 @@ Make sure to setup under DESTDIR.
  
      say
      if @verbose then
-@@ -160,7 +160,11 @@ By default, this RubyGems will install g
+@@ -162,7 +162,11 @@ By default, this RubyGems will install g
      release_notes = File.join Dir.pwd, 'History.txt'
  
      release_notes = if File.exist? release_notes then
@@ -26,7 +26,7 @@ Make sure to setup under DESTDIR.
                        history = history.sub(/^# coding:.*?^=/m, '')
  
                        text = history.split(HISTORY_HEADER)
-@@ -295,11 +299,15 @@ TEXT
+@@ -306,11 +310,15 @@ TEXT
      end
    end
  
@@ -43,7 +43,7 @@ Make sure to setup under DESTDIR.
      begin
        Gem.ensure_gem_subdirectories Gem.dir
      rescue SystemCallError
-@@ -310,7 +318,7 @@ TEXT
+@@ -321,7 +329,7 @@ TEXT
         (not File.exist? rubygems_doc_dir or
          File.writable? rubygems_doc_dir) then
        say "Removing old RubyGems RDoc and ri" if @verbose
diff --git a/misc/rubygems/patches/patch-lib_rubygems_ext_ext__conf__builder.rb b/misc/rubygems/patches/patch-lib_rubygems_ext_ext__conf__builder.rb
new file mode 100644
index 00000000000..d6cf037df62
--- /dev/null
+++ b/misc/rubygems/patches/patch-lib_rubygems_ext_ext__conf__builder.rb
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_rubygems_ext_ext__conf__builder.rb,v 1.1 2013/06/15 02:12:48 taca Exp $
+
+* Expicitly remove a temporary file.
+
+--- lib/rubygems/ext/ext_conf_builder.rb.orig	2013-03-11 21:05:39.000000000 +0000
++++ lib/rubygems/ext/ext_conf_builder.rb
+@@ -49,6 +49,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ex
+ 
+         results
+       ensure
++        siteconf.close true
+         ENV["RUBYOPT"] = rubyopt
+         ENV["DESTDIR"] = destdir
+       end
diff --git a/misc/rubygems/patches/patch-test_rubygems_test__gem.rb b/misc/rubygems/patches/patch-test_rubygems_test__gem.rb
index 424424320a7..e0267b71c68 100644
--- a/misc/rubygems/patches/patch-test_rubygems_test__gem.rb
+++ b/misc/rubygems/patches/patch-test_rubygems_test__gem.rb
@@ -1,10 +1,10 @@
-$NetBSD: patch-test_rubygems_test__gem.rb,v 1.3 2013/06/11 14:55:54 taca Exp $
+$NetBSD: patch-test_rubygems_test__gem.rb,v 1.4 2013/06/15 02:12:48 taca Exp $
 
 Use vendorlibdir.
 
---- test/rubygems/test_gem.rb.orig	2013-02-12 20:20:45.000000000 +0000
+--- test/rubygems/test_gem.rb.orig	2013-03-11 21:10:40.000000000 +0000
 +++ test/rubygems/test_gem.rb
-@@ -952,12 +952,12 @@ class TestGem < Gem::TestCase
+@@ -964,12 +964,12 @@ class TestGem < Gem::TestCase
    end
  
    def test_self_prefix_sitelibdir