Fix rubygems bundled in ruby193-base.

Check install_root's value is nil before it is empty string.  Reported a
problem from @_ki_nu via Twitter.

Bump PKGREVISION.

6 files changed, 17 insertions, 17 deletions

diff --git a/lang/ruby193-base/Makefile b/lang/ruby193-base/Makefile
index 0ccdbcdf48a..1a9e2f3835c 100644
--- a/lang/ruby193-base/Makefile
+++ b/lang/ruby193-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2014/02/12 23:18:06 tron Exp $
+# $NetBSD: Makefile,v 1.38 2014/02/19 15:50:53 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo
index 8cb93c58535..647964a474a 100644
--- a/lang/ruby193-base/distinfo
+++ b/lang/ruby193-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2013/11/24 15:26:30 taca Exp $
+$NetBSD: distinfo,v 1.30 2014/02/19 15:50:53 taca Exp $
 
 SHA1 (ruby-1.9.3-p484.tar.bz2) = 81dbaf390b16157069d8d1dd5b787db44d5f881c
 RMD160 (ruby-1.9.3-p484.tar.bz2) = 21b4acab12b974d1f99d994a40cdfe3fe8d0be95
@@ -9,7 +9,7 @@ SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5
 SHA1 (patch-ext_dl_extconf.rb) = aed210606893d2b9c463d794df039f06003848e4
 SHA1 (patch-ext_tk_lib_tkextlib_tktable_tktable.rb) = 10c7842daa3c23d57dcd08dc00adf5770af9dad1
 SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8
-SHA1 (patch-lib_rubygems.rb) = 2aed4990a868dc92668a78da7bcff2050ff3dd66
+SHA1 (patch-lib_rubygems.rb) = 4a3b3b1ccc23a2e2ffd9247626f7412ea8b9087f
 SHA1 (patch-lib_rubygems_command.rb) = 916a93372e714b56a741acc15350536194f34c77
 SHA1 (patch-lib_rubygems_command__manager.rb) = 4fabf9a6c8bf5e47a4fb3bb3d398105b4452ec7e
 SHA1 (patch-lib_rubygems_commands_install__command.rb) = ff637f39f3fd76b7550fd7f8c32fe303eec6f8c3
@@ -18,13 +18,13 @@ SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 7d8dd07d332f0e89822d0
 SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = b8e18f1feedb7966e2a5280d6020c6134a7d83a3
 SHA1 (patch-lib_rubygems_config__file.rb) = ed4ff25ea89a2d13ee601c7edfda0902f08fe29c
 SHA1 (patch-lib_rubygems_defaults.rb) = 101a6e653ef3811cdda3ed333b50448c0d3f0d26
-SHA1 (patch-lib_rubygems_dependency__installer.rb) = 9ad04af723c1fa8a7d07b871e0ca2b03cf585e78
+SHA1 (patch-lib_rubygems_dependency__installer.rb) = cff5e6edc86af61c4bd9885475c4ee2ff7f05858
 SHA1 (patch-lib_rubygems_doc__manager.rb) = 4b2d70e5dfaeff1f1b70ff27f1084065dcc742d3
 SHA1 (patch-lib_rubygems_gem__runner.rb) = 03ff2f0b72004ef7e09b5ba9d56752109e4e6b73
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 74f81900c92bc3c7a663a112cccf6ff88b6ae180
-SHA1 (patch-lib_rubygems_installer.rb) = 5832fd6e8a3d26fe8ae5afc9f8a6fea462d56ccf
+SHA1 (patch-lib_rubygems_installer.rb) = fe1c97abaf0b7a3fbecf8327a6d1ccd697cb62cc
 SHA1 (patch-lib_rubygems_specification.rb) = 3da23596f701c1966bc12f2341c82f2f2c646779
-SHA1 (patch-lib_rubygems_uninstaller.rb) = bde19710968f80e56760288d09870a08f3a4ec52
+SHA1 (patch-lib_rubygems_uninstaller.rb) = 038df207f0ad4ef674ff60976fcda969d50c3c4e
 SHA1 (patch-lib_rubygems_version.rb) = 1ebc87bec0af5875dcee6911b75319cb39423202
 SHA1 (patch-man_erb.1) = a8f69ebb02b4d5e1c80b270a3d683c23d8dfbcf1
 SHA1 (patch-man_irb.1) = 58fcccbb5f5f76450715cbf246a018af58d9b57e
diff --git a/lang/ruby193-base/patches/patch-lib_rubygems.rb b/lang/ruby193-base/patches/patch-lib_rubygems.rb
index 7c3a8fb25a9..e4bf6bb1600 100644
--- a/lang/ruby193-base/patches/patch-lib_rubygems.rb
+++ b/lang/ruby193-base/patches/patch-lib_rubygems.rb
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_rubygems.rb,v 1.2 2013/01/31 15:56:14 taca Exp $
+$NetBSD: patch-lib_rubygems.rb,v 1.3 2014/02/19 15:50:53 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
@@ -10,7 +10,7 @@ Add install_root option for pkgsrc's rubygems support.
  
 -  def self.bindir(install_dir=Gem.dir)
 +  def self.bindir(install_dir=Gem.dir, install_root=nil)
-+    unless install_root.nil?
++    unless install_root.nil? or install_empty.nil?
 +      install_dir = install_dir.sub(install_root, "")
 +    end
      # TODO: move to Gem::Dirs
diff --git a/lang/ruby193-base/patches/patch-lib_rubygems_dependency__installer.rb b/lang/ruby193-base/patches/patch-lib_rubygems_dependency__installer.rb
index 3bffaa12c93..7a24816e64c 100644
--- a/lang/ruby193-base/patches/patch-lib_rubygems_dependency__installer.rb
+++ b/lang/ruby193-base/patches/patch-lib_rubygems_dependency__installer.rb
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_rubygems_dependency__installer.rb,v 1.4 2013/07/07 15:01:01 taca Exp $
+$NetBSD: patch-lib_rubygems_dependency__installer.rb,v 1.5 2014/02/19 15:50:53 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
@@ -37,7 +37,7 @@ Add install_root option for pkgsrc's rubygems support.
 -    @cache_dir = options[:cache_dir] || @install_dir
 +    @install_root = options[:install_root]
 +    install_dir = @install_dir
-+    unless @install_root.nil? or @install_root == ""
++    unless @install_root.nil? or @install_empty?
 +      install_dir = File.join(@install_root, @install_dir)
 +    end
 +    @cache_dir = options[:cache_dir] || install_dir
diff --git a/lang/ruby193-base/patches/patch-lib_rubygems_installer.rb b/lang/ruby193-base/patches/patch-lib_rubygems_installer.rb
index 684a2eeca2b..56534d8096b 100644
--- a/lang/ruby193-base/patches/patch-lib_rubygems_installer.rb
+++ b/lang/ruby193-base/patches/patch-lib_rubygems_installer.rb
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_rubygems_installer.rb,v 1.2 2013/07/07 15:01:01 taca Exp $
+$NetBSD: patch-lib_rubygems_installer.rb,v 1.3 2014/02/19 15:50:53 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
@@ -36,7 +36,7 @@ Add install_root option for pkgsrc's rubygems support.
 -    bindir = @bin_dir || Gem.bindir(gem_home)
 +    bindir = @bin_dir ? @bin_dir : (Gem.bindir @gem_home, @install_root)
 +
-+    unless @install_root.nil? or @install_root == ""
++    unless @install_root.nil? or @install_root.empty?
 +      bindir = File.join(@install_root, bindir)
 +    end
  
@@ -55,7 +55,7 @@ Add install_root option for pkgsrc's rubygems support.
      @security_policy     = options[:security_policy]
      @wrappers            = options[:wrappers]
 +    install_root         = options[:install_root]
-+    unless install_root.nil? or install_root == ""
++    unless install_root.nil? or install_root.empty?
 +      @install_root = File.expand_path install_root
 +      @gem_home = File.join(@install_root, @gem_home)
 +    end
diff --git a/lang/ruby193-base/patches/patch-lib_rubygems_uninstaller.rb b/lang/ruby193-base/patches/patch-lib_rubygems_uninstaller.rb
index df9383cb2d7..3655a5847ea 100644
--- a/lang/ruby193-base/patches/patch-lib_rubygems_uninstaller.rb
+++ b/lang/ruby193-base/patches/patch-lib_rubygems_uninstaller.rb
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_rubygems_uninstaller.rb,v 1.1.1.1 2011/11/08 16:10:51 taca Exp $
+$NetBSD: patch-lib_rubygems_uninstaller.rb,v 1.2 2014/02/19 15:50:53 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
@@ -9,7 +9,7 @@ Add install_root option for pkgsrc's rubygems support.
      @bin_dir           = options[:bin_dir]
      @format_executable = options[:format_executable]
 +    install_root = options[:install_root]
-+    unless install_root.nil? or install_root == ""
++    unless install_root.nil? or install_root.empty?
 +      @install_root = File.expand_path install_root
 +      @gem_home = File.join(@install_root, @gem_home)
 +    end
@@ -23,7 +23,7 @@ Add install_root option for pkgsrc's rubygems support.
 -      bin_dir = @bin_dir || Gem.bindir(spec.base_dir)
 +      bin_dir = @bin_dir || (Gem.bindir @gem_home, @install_root)
 +
-+      unless @install_root.nil? or @install_root == ""
++      unless @install_root.nil? or @install_root.empty?
 +        bindir = File.join(@install_root, bindir)
 +      end