* Make --install-root change same as ruby193-base.

* Don't generate .require_paths. It was only needed with Ruby 1.9.1 which
  had never supported by pkgsrc.
* Bump PKGREVISION.

8 files changed, 40 insertions, 78 deletions

diff --git a/misc/rubygems/Makefile b/misc/rubygems/Makefile
index ad6195a4d64..65f0ff47f49 100644
--- a/misc/rubygems/Makefile
+++ b/misc/rubygems/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2011/09/04 17:05:13 taca Exp $
+# $NetBSD: Makefile,v 1.42 2011/11/08 15:26:12 taca Exp $
 
 DISTNAME=	rubygems-1.8.10
+PKGREVISION=	1
 CATEGORIES=	misc ruby
 MASTER_SITES=	http://production.cf.rubygems.org/rubygems/ \
 		http://rubyforge.org/frs/download.php/75309/
diff --git a/misc/rubygems/distinfo b/misc/rubygems/distinfo
index 9626ffde4cb..1279a519161 100644
--- a/misc/rubygems/distinfo
+++ b/misc/rubygems/distinfo
@@ -1,20 +1,19 @@
-$NetBSD: distinfo,v 1.31 2011/09/04 17:05:13 taca Exp $
+$NetBSD: distinfo,v 1.32 2011/11/08 15:26:12 taca Exp $
 
 SHA1 (rubygems-1.8.10.tgz) = d2e8c5d9f7a69ef2c6a98097ff192f238b0ce11f
 RMD160 (rubygems-1.8.10.tgz) = 2c7dc4bc5459a0b2cf771c9398f750cfe0dbcbf5
 Size (rubygems-1.8.10.tgz) = 249683 bytes
 SHA1 (patch-aa) = cd7fde36ce3d67a5d96a3280d9f11b3c5b78a820
-SHA1 (patch-ab) = 00c16e5c0a82a26062e6d9d9b7a2d275f8537ab4
-SHA1 (patch-ac) = 7c3e254d120bcb9fb90895a7119eb18920508948
-SHA1 (patch-ad) = 6df1c96bee978425fdc7189af4e8389963b34782
-SHA1 (patch-af) = 0a9f3f4b2b323c9e5578a9080e45cf930b511bd1
+SHA1 (patch-ab) = d2917ec23a41293049bdf901c809423126a6161d
+SHA1 (patch-ac) = 7814fd204106f67e04ee9d278666b9ba30da3478
+SHA1 (patch-ad) = 79c1a0750925862598545a992380ef7dfd8803a1
+SHA1 (patch-af) = 4a138fb8c91189e4b39a12882a05f066100f08c4
 SHA1 (patch-ag) = fe209f86dd68bfb8de7084b7a64e22a4dd6240f9
-SHA1 (patch-ah) = ef4fc236d7f1686d86104823a8c2a11ba6f89e35
+SHA1 (patch-ah) = cc3fc04696ea66670625d107872bb7c2e19b6114
 SHA1 (patch-aj) = 3b77a675470ea3702b9870843d2bb39bb6a83f3e
 SHA1 (patch-al) = beeff0531ff4bd23c0796b1e28805ae6fe2202b0
 SHA1 (patch-am) = 374b16a77a3471958e0fcf7a60633658f9e9d559
 SHA1 (patch-an) = a4de56fc44a4c7556486268344d44640538db108
 SHA1 (patch-ao) = b78557ffaa2df6c251ad7bfce760574e0ef3157a
 SHA1 (patch-ap) = eaf2bf2fc7cc71139df7ce2677c3ec9fa95d1081
-SHA1 (patch-lib_rubygems_require__paths__builder.rb) = 4c59ff6c4389fdb69308f0ab67e50d47420de099
 SHA1 (patch-test_rubygems_test__gem.rb) = 8bad451e8054fe954c13d28e542509b8adae2764
diff --git a/misc/rubygems/patches/patch-ab b/misc/rubygems/patches/patch-ab
index 49b72f6eedd..009d8fef8e3 100644
--- a/misc/rubygems/patches/patch-ab
+++ b/misc/rubygems/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.13 2011/08/12 15:50:44 taca Exp $
+$NetBSD: patch-ab,v 1.14 2011/11/08 15:26:12 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
---- lib/rubygems/dependency_installer.rb.orig	2011-05-18 23:36:37.000000000 +0000
+--- lib/rubygems/dependency_installer.rb.orig	2011-08-26 00:30:44.000000000 +0000
 +++ lib/rubygems/dependency_installer.rb
 @@ -38,6 +38,7 @@ class Gem::DependencyInstaller
    # :format_executable:: See Gem::Installer#initialize.
@@ -12,7 +12,7 @@ Add install_root option for pkgsrc's rubygems support.
    # :prerelease:: Allow prerelease versions.  See #install.
    # :security_policy:: See Gem::Installer::new and Gem::Security.
    # :user_install:: See Gem::Installer.new
-@@ -45,11 +46,15 @@ class Gem::DependencyInstaller
+@@ -45,11 +46,14 @@ class Gem::DependencyInstaller
  
    def initialize(options = {})
      if options[:install_dir] then
@@ -26,11 +26,10 @@ Add install_root option for pkgsrc's rubygems support.
        Gem::Specification.dirs = @gem_home
        Gem.ensure_gem_subdirectories @gem_home
 -      options[:install_dir] = @gem_home # FIX: because we suck and reuse below
-+#     options[:install_dir] = @gem_home # FIX: because we suck and reuse below
      end
  
      options = DEFAULT_OPTIONS.merge options
-@@ -69,7 +74,12 @@ class Gem::DependencyInstaller
+@@ -69,7 +73,12 @@ class Gem::DependencyInstaller
      @installed_gems = []
  
      @install_dir = options[:install_dir] || Gem.dir
@@ -44,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
-@@ -290,6 +300,7 @@ class Gem::DependencyInstaller
+@@ -290,6 +299,7 @@ class Gem::DependencyInstaller
                                  :format_executable   => @format_executable,
                                  :ignore_dependencies => @ignore_dependencies,
                                  :install_dir         => @install_dir,
diff --git a/misc/rubygems/patches/patch-ac b/misc/rubygems/patches/patch-ac
index 045dbd9c59a..22d81bf2742 100644
--- a/misc/rubygems/patches/patch-ac
+++ b/misc/rubygems/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.6 2011/08/12 15:50:44 taca Exp $
+$NetBSD: patch-ac,v 1.7 2011/11/08 15:26:12 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
---- lib/rubygems/install_update_options.rb.orig	2011-05-18 22:23:53.000000000 +0000
+--- lib/rubygems/install_update_options.rb.orig	2011-08-26 00:30:44.000000000 +0000
 +++ lib/rubygems/install_update_options.rb
-@@ -44,6 +44,12 @@ module Gem::InstallUpdateOptions
-       options[:bin_dir] = File.expand_path(value)
+@@ -32,6 +32,12 @@ module Gem::InstallUpdateOptions
+       value
      end
  
 +    add_option(:"Install/Update", '-B', '--install-root DIR',
@@ -14,6 +14,6 @@ Add install_root option for pkgsrc's rubygems support.
 +      Gem.ensure_gem_subdirectories File.join options[:install_root], Gem.dir
 +    end
 +
-     add_option(:"Install/Update", '-d', '--[no-]rdoc',
-                'Generate RDoc documentation for the gem on',
-                'install') do |value, options|
+     add_option(:"Install/Update", '-i', '--install-dir DIR',
+                'Gem repository directory to get installed',
+                'gems') do |value, options|
diff --git a/misc/rubygems/patches/patch-ad b/misc/rubygems/patches/patch-ad
index 1f6500347ab..26061e9e55c 100644
--- a/misc/rubygems/patches/patch-ad
+++ b/misc/rubygems/patches/patch-ad
@@ -1,22 +1,10 @@
-$NetBSD: patch-ad,v 1.9 2011/08/12 15:50:44 taca Exp $
+$NetBSD: patch-ad,v 1.10 2011/11/08 15:26:12 taca Exp $
 
 * Add install_root option for pkgsrc's rubygems support.
-* Disable Gem::QUICKLOADER_SUCKAGE while Ruby 1.9.2's rubygems generates
-  .require_paths file.
 
---- lib/rubygems/installer.rb.orig	2011-05-31 21:55:13.000000000 +0000
+--- lib/rubygems/installer.rb.orig	2011-08-26 00:30:44.000000000 +0000
 +++ lib/rubygems/installer.rb
-@@ -39,7 +39,8 @@ class Gem::Installer
- 
-   include Gem::UserInteraction
- 
--  include Gem::RequirePathsBuilder if Gem::QUICKLOADER_SUCKAGE
-+  # For gem based package compatibility, generate .require_paths file.
-+  include Gem::RequirePathsBuilder # if Gem::QUICKLOADER_SUCKAGE
- 
-   attr_reader :gem
- 
-@@ -85,6 +86,9 @@ class Gem::Installer
+@@ -85,6 +85,9 @@ class Gem::Installer
    #          for a signed-gems-only policy.
    # :ignore_dependencies:: Don't raise if a dependency is missing.
    # :install_dir:: The directory to install the gem into.
@@ -26,17 +14,7 @@ $NetBSD: patch-ad,v 1.9 2011/08/12 15:50:44 taca Exp $
    # :format_executable:: Format the executable the same as the ruby executable.
    #                      If your ruby is ruby18, foo_exec will be installed as
    #                      foo_exec18.
-@@ -195,7 +199,8 @@ class Gem::Installer
-     generate_bin
-     write_spec
- 
--    write_require_paths_file_if_needed if Gem::QUICKLOADER_SUCKAGE
-+    # For gem based package compatibility, generate .require_paths file.
-+    write_require_paths_file_if_needed # if Gem::QUICKLOADER_SUCKAGE
- 
-     cache_file = spec.cache_file
-     FileUtils.cp gem, cache_file unless File.exist? cache_file
-@@ -283,7 +288,11 @@ class Gem::Installer
+@@ -283,7 +286,11 @@ class Gem::Installer
      # If the user has asked for the gem to be installed in a directory that is
      # the system gem directory, then use the system bin directory, else create
      # (or use) a new bin dir under the gem_home.
@@ -49,7 +27,7 @@ $NetBSD: patch-ad,v 1.9 2011/08/12 15:50:44 taca Exp $
  
      Dir.mkdir bindir unless File.exist? bindir
      raise Gem::FilePermissionError.new(bindir) unless File.writable? bindir
-@@ -416,6 +425,7 @@ class Gem::Installer
+@@ -416,6 +423,7 @@ class Gem::Installer
        :exec_format  => false,
        :force        => false,
        :install_dir  => Gem.dir,
@@ -57,7 +35,7 @@ $NetBSD: patch-ad,v 1.9 2011/08/12 15:50:44 taca Exp $
      }.merge options
  
      @env_shebang         = options[:env_shebang]
-@@ -427,6 +437,11 @@ class Gem::Installer
+@@ -427,6 +435,11 @@ class Gem::Installer
      @wrappers            = options[:wrappers]
      @bin_dir             = options[:bin_dir]
      @development         = options[:development]
diff --git a/misc/rubygems/patches/patch-af b/misc/rubygems/patches/patch-af
index d892b326021..132783c151c 100644
--- a/misc/rubygems/patches/patch-af
+++ b/misc/rubygems/patches/patch-af
@@ -1,11 +1,11 @@
-$NetBSD: patch-af,v 1.5 2011/03/23 14:35:05 taca Exp $
+$NetBSD: patch-af,v 1.6 2011/11/08 15:26:12 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
---- lib/rubygems/commands/uninstall_command.rb.orig	2011-03-04 00:01:24.000000000 +0000
+--- lib/rubygems/commands/uninstall_command.rb.orig	2011-08-27 00:43:50.000000000 +0000
 +++ lib/rubygems/commands/uninstall_command.rb
-@@ -54,6 +54,11 @@ class Gem::Commands::UninstallCommand < 
-       options[:format_executable] = value
+@@ -21,6 +21,11 @@ class Gem::Commands::UninstallCommand < 
+       options[:all] = value
      end
  
 +    add_option('-B', '--install-root DIR',
@@ -13,6 +13,6 @@ Add install_root option for pkgsrc's rubygems support.
 +      options[:install_root] = File.expand_path(value)
 +    end
 +
-     add_version_option
-     add_platform_option
-   end
+     add_option('-I', '--[no-]ignore-dependencies',
+                'Ignore dependency requirements while',
+                'uninstalling') do |value, options|
diff --git a/misc/rubygems/patches/patch-ah b/misc/rubygems/patches/patch-ah
index de496c02cb5..cd6f61bd386 100644
--- a/misc/rubygems/patches/patch-ah
+++ b/misc/rubygems/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.9 2011/08/12 15:50:44 taca Exp $
+$NetBSD: patch-ah,v 1.10 2011/11/08 15:26:12 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
---- lib/rubygems.rb.orig	2011-05-31 21:55:13.000000000 +0000
+--- lib/rubygems.rb.orig	2011-08-27 00:43:50.000000000 +0000
 +++ lib/rubygems.rb
-@@ -329,7 +329,10 @@ module Gem
+@@ -327,7 +327,10 @@ module Gem
    ##
    # The path where gem executables are to be installed.
  
@@ -16,7 +16,7 @@ Add install_root option for pkgsrc's rubygems support.
      # TODO: move to Gem::Dirs
      return File.join install_dir, 'bin' unless
        install_dir.to_s == Gem.default_dir.to_s
-@@ -616,12 +619,12 @@ module Gem
+@@ -619,12 +622,12 @@ module Gem
    ##
    # The index to insert activated gem paths into the $LOAD_PATH.
    #
@@ -31,12 +31,11 @@ Add install_root option for pkgsrc's rubygems support.
  
      if QUICKLOADER_SUCKAGE then
        $LOAD_PATH.each_with_index do |path, i|
-@@ -774,7 +777,7 @@ module Gem
-   def self.prefix
+@@ -799,6 +802,7 @@ module Gem
      prefix = File.dirname RUBYGEMS_DIR
  
--    if prefix != File.expand_path(ConfigMap[:sitelibdir]) and
-+    if prefix != File.expand_path(ConfigMap[:vendorlibdir]) and
+     if prefix != File.expand_path(ConfigMap[:sitelibdir]) and
++       prefix != File.expand_path(ConfigMap[:vendorlibdir]) and
         prefix != File.expand_path(ConfigMap[:libdir]) and
         'lib' == File.basename(RUBYGEMS_DIR) then
        prefix
diff --git a/misc/rubygems/patches/patch-lib_rubygems_require__paths__builder.rb b/misc/rubygems/patches/patch-lib_rubygems_require__paths__builder.rb
deleted file mode 100644
index 8a715982bc2..00000000000
--- a/misc/rubygems/patches/patch-lib_rubygems_require__paths__builder.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-lib_rubygems_require__paths__builder.rb,v 1.2 2011/08/12 15:50:44 taca Exp $
-
-Compatibility with ruby19-base's gem.
-
---- lib/rubygems/require_paths_builder.rb.orig	2011-05-18 22:23:53.000000000 +0000
-+++ lib/rubygems/require_paths_builder.rb
-@@ -14,5 +14,5 @@ module Gem::RequirePathsBuilder
-       file.puts spec.bindir if spec.bindir
-     end
-   end
--end if Gem::QUICKLOADER_SUCKAGE
--
-+end # if Gem::QUICKLOADER_SUCKAGE
-+    # it could be enabled after 1.9.x's rubygem updated.