diff options
author | taca <taca> | 2014-02-19 15:47:32 +0000 |
---|---|---|
committer | taca <taca> | 2014-02-19 15:47:32 +0000 |
commit | adc4b2ae680c4445292bbd5a340f4c276c442101 (patch) | |
tree | e8e7a9dd737940816497e233c4f0dd263e9aa32d /misc/rubygems | |
parent | 064718f4519be6a4e99017e8f1cddc9bd5712487 (diff) | |
download | pkgsrc-adc4b2ae680c4445292bbd5a340f4c276c442101.tar.gz |
Check install_root's value is nil before it is empty string.
Reported a problem from @_ki_nu via Twitter.
Bump PKGREVISION.
Diffstat (limited to 'misc/rubygems')
-rw-r--r-- | misc/rubygems/Makefile | 3 | ||||
-rw-r--r-- | misc/rubygems/distinfo | 10 | ||||
-rw-r--r-- | misc/rubygems/patches/patch-ab | 4 | ||||
-rw-r--r-- | misc/rubygems/patches/patch-ad | 4 | ||||
-rw-r--r-- | misc/rubygems/patches/patch-ag | 6 | ||||
-rw-r--r-- | misc/rubygems/patches/patch-ah | 4 |
6 files changed, 16 insertions, 15 deletions
diff --git a/misc/rubygems/Makefile b/misc/rubygems/Makefile index 0a3b247de33..0330333f7dc 100644 --- a/misc/rubygems/Makefile +++ b/misc/rubygems/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.55 2013/09/30 03:12:59 taca Exp $ +# $NetBSD: Makefile,v 1.56 2014/02/19 15:47:32 taca Exp $ DISTNAME= rubygems-2.0.10 +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 d714311008e..882b18a58cd 100644 --- a/misc/rubygems/distinfo +++ b/misc/rubygems/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.44 2013/09/30 03:12:59 taca Exp $ +$NetBSD: distinfo,v 1.45 2014/02/19 15:47:32 taca Exp $ SHA1 (rubygems-2.0.10.tgz) = e4119824649771958038b2347485df85c3a09fc6 RMD160 (rubygems-2.0.10.tgz) = cc6c5adb29464217067eeab6e06bbb1b67d6cf42 Size (rubygems-2.0.10.tgz) = 338280 bytes SHA1 (patch-aa) = ec1af229bb7cf9b36b0b5669b8c6f3d97f7ea15e -SHA1 (patch-ab) = d9fd51322581d0d176479fb6a8f0507ad7cd2b13 +SHA1 (patch-ab) = a960d57b48397fa499c0ee1a91b534eb10574d06 SHA1 (patch-ac) = 1a59a5d2fc090dfcf6d3bd3b9c133f0ce4a1feee -SHA1 (patch-ad) = e44afa7a32095652ef0eea7b146827b60829aee6 +SHA1 (patch-ad) = 40819a75ae0094292417a7c682ed56abd98de1c2 SHA1 (patch-af) = d96d5dafd830b0c94bf6c191a3274701ebc6d564 -SHA1 (patch-ag) = 5b94252ea03eba04849770bc141dfc58de932389 -SHA1 (patch-ah) = de58555d7c7e942aa7925ecd1db94769dc5254a1 +SHA1 (patch-ag) = 1114e30ce7161a6aa98c3ac6c4ee81f1c22a10d8 +SHA1 (patch-ah) = ae9cd39b900793dbb3d22bad88163750e4d120fe SHA1 (patch-aj) = 3b77a675470ea3702b9870843d2bb39bb6a83f3e SHA1 (patch-am) = 9146ece86c0bae61553c916adafb2c108f3f07a9 SHA1 (patch-ao) = 4a8be3bdab5e465814b626d17a5f2811fbfc808c diff --git a/misc/rubygems/patches/patch-ab b/misc/rubygems/patches/patch-ab index 821a4b123f3..69f580f9beb 100644 --- a/misc/rubygems/patches/patch-ab +++ b/misc/rubygems/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.17 2013/09/10 16:33:29 taca Exp $ +$NetBSD: patch-ab,v 1.18 2014/02/19 15:47:32 taca Exp $ Add install_root option for pkgsrc's rubygems support. @@ -35,7 +35,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 -+ if not @install_root.empty? ++ unless @install_root.nil? or @install_root.empty? + install_dir = File.join(@install_root, install_dir) + end + @cache_dir = options[:cache_dir] || install_dir diff --git a/misc/rubygems/patches/patch-ad b/misc/rubygems/patches/patch-ad index ed69cfdb93b..91ba61ed346 100644 --- a/misc/rubygems/patches/patch-ad +++ b/misc/rubygems/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.13 2013/09/10 16:33:29 taca Exp $ +$NetBSD: patch-ad,v 1.14 2014/02/19 15:47:32 taca Exp $ * Add install_root option for pkgsrc's rubygems support. @@ -32,7 +32,7 @@ $NetBSD: patch-ad,v 1.13 2013/09/10 16:33:29 taca Exp $ + install_root = options[:install_root] + @bin_dir = options[:bin_dir] || Gem.bindir(gem_home, install_root) @development = options[:development] -+ 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/misc/rubygems/patches/patch-ag b/misc/rubygems/patches/patch-ag index 13bce550848..ff032d8068b 100644 --- a/misc/rubygems/patches/patch-ag +++ b/misc/rubygems/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.10 2013/06/11 14:55:54 taca Exp $ +$NetBSD: patch-ag,v 1.11 2014/02/19 15:47:32 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 diff --git a/misc/rubygems/patches/patch-ah b/misc/rubygems/patches/patch-ah index 72680a323ad..7f31469f62e 100644 --- a/misc/rubygems/patches/patch-ah +++ b/misc/rubygems/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.13 2013/09/10 16:33:29 taca Exp $ +$NetBSD: patch-ah,v 1.14 2014/02/19 15:47:32 taca Exp $ Add install_root option for pkgsrc's rubygems support. @@ -19,7 +19,7 @@ Add install_root option for pkgsrc's rubygems support. + else + install_dir = File.join install_dir, 'bin' + end -+ unless install_root.nil? ++ unless install_root.nil? or install_root.empty? + install_dir = File.join install_root, install_dir + end + install_dir |