* 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.diff -r1.41 -r1.42 pkgsrc/misc/rubygems/Makefile
(taca)
@@ -1,16 +1,17 @@ | @@ -1,16 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.41 2011/09/04 17:05:13 taca Exp $ | 1 | # $NetBSD: Makefile,v 1.42 2011/11/08 15:26:12 taca Exp $ | |
2 | 2 | |||
3 | DISTNAME= rubygems-1.8.10 | 3 | DISTNAME= rubygems-1.8.10 | |
4 | PKGREVISION= 1 | |||
4 | CATEGORIES= misc ruby | 5 | CATEGORIES= misc ruby | |
5 | MASTER_SITES= http://production.cf.rubygems.org/rubygems/ \ | 6 | MASTER_SITES= http://production.cf.rubygems.org/rubygems/ \ | |
6 | http://rubyforge.org/frs/download.php/75309/ | 7 | http://rubyforge.org/frs/download.php/75309/ | |
7 | EXTRACT_SUFX= .tgz | 8 | EXTRACT_SUFX= .tgz | |
8 | 9 | |||
9 | MAINTAINER= taca@NetBSD.org | 10 | MAINTAINER= taca@NetBSD.org | |
10 | HOMEPAGE= http://www.rubygems.org/ | 11 | HOMEPAGE= http://www.rubygems.org/ | |
11 | COMMENT= Ruby standard for publishing and managing third party libraries | 12 | COMMENT= Ruby standard for publishing and managing third party libraries | |
12 | LICENSE= gnu-gpl-v2 OR ruby-license | 13 | LICENSE= gnu-gpl-v2 OR ruby-license | |
13 | 14 | |||
14 | PKG_DESTDIR_SUPPORT= user-destdir | 15 | PKG_DESTDIR_SUPPORT= user-destdir | |
15 | 16 | |||
16 | CONFLICTS+= rubygems-[0-9]* | 17 | CONFLICTS+= rubygems-[0-9]* |
@@ -1,20 +1,19 @@ | @@ -1,20 +1,19 @@ | |||
1 | $NetBSD: distinfo,v 1.31 2011/09/04 17:05:13 taca Exp $ | 1 | $NetBSD: distinfo,v 1.32 2011/11/08 15:26:12 taca Exp $ | |
2 | 2 | |||
3 | SHA1 (rubygems-1.8.10.tgz) = d2e8c5d9f7a69ef2c6a98097ff192f238b0ce11f | 3 | SHA1 (rubygems-1.8.10.tgz) = d2e8c5d9f7a69ef2c6a98097ff192f238b0ce11f | |
4 | RMD160 (rubygems-1.8.10.tgz) = 2c7dc4bc5459a0b2cf771c9398f750cfe0dbcbf5 | 4 | RMD160 (rubygems-1.8.10.tgz) = 2c7dc4bc5459a0b2cf771c9398f750cfe0dbcbf5 | |
5 | Size (rubygems-1.8.10.tgz) = 249683 bytes | 5 | Size (rubygems-1.8.10.tgz) = 249683 bytes | |
6 | SHA1 (patch-aa) = cd7fde36ce3d67a5d96a3280d9f11b3c5b78a820 | 6 | SHA1 (patch-aa) = cd7fde36ce3d67a5d96a3280d9f11b3c5b78a820 | |
7 | SHA1 (patch-ab) = 00c16e5c0a82a26062e6d9d9b7a2d275f8537ab4 | 7 | SHA1 (patch-ab) = d2917ec23a41293049bdf901c809423126a6161d | |
8 | SHA1 (patch-ac) = 7c3e254d120bcb9fb90895a7119eb18920508948 | 8 | SHA1 (patch-ac) = 7814fd204106f67e04ee9d278666b9ba30da3478 | |
9 | SHA1 (patch-ad) = 6df1c96bee978425fdc7189af4e8389963b34782 | 9 | SHA1 (patch-ad) = 79c1a0750925862598545a992380ef7dfd8803a1 | |
10 | SHA1 (patch-af) = 0a9f3f4b2b323c9e5578a9080e45cf930b511bd1 | 10 | SHA1 (patch-af) = 4a138fb8c91189e4b39a12882a05f066100f08c4 | |
11 | SHA1 (patch-ag) = fe209f86dd68bfb8de7084b7a64e22a4dd6240f9 | 11 | SHA1 (patch-ag) = fe209f86dd68bfb8de7084b7a64e22a4dd6240f9 | |
12 | SHA1 (patch-ah) = ef4fc236d7f1686d86104823a8c2a11ba6f89e35 | 12 | SHA1 (patch-ah) = cc3fc04696ea66670625d107872bb7c2e19b6114 | |
13 | SHA1 (patch-aj) = 3b77a675470ea3702b9870843d2bb39bb6a83f3e | 13 | SHA1 (patch-aj) = 3b77a675470ea3702b9870843d2bb39bb6a83f3e | |
14 | SHA1 (patch-al) = beeff0531ff4bd23c0796b1e28805ae6fe2202b0 | 14 | SHA1 (patch-al) = beeff0531ff4bd23c0796b1e28805ae6fe2202b0 | |
15 | SHA1 (patch-am) = 374b16a77a3471958e0fcf7a60633658f9e9d559 | 15 | SHA1 (patch-am) = 374b16a77a3471958e0fcf7a60633658f9e9d559 | |
16 | SHA1 (patch-an) = a4de56fc44a4c7556486268344d44640538db108 | 16 | SHA1 (patch-an) = a4de56fc44a4c7556486268344d44640538db108 | |
17 | SHA1 (patch-ao) = b78557ffaa2df6c251ad7bfce760574e0ef3157a | 17 | SHA1 (patch-ao) = b78557ffaa2df6c251ad7bfce760574e0ef3157a | |
18 | SHA1 (patch-ap) = eaf2bf2fc7cc71139df7ce2677c3ec9fa95d1081 | 18 | SHA1 (patch-ap) = eaf2bf2fc7cc71139df7ce2677c3ec9fa95d1081 | |
19 | SHA1 (patch-lib_rubygems_require__paths__builder.rb) = 4c59ff6c4389fdb69308f0ab67e50d47420de099 | |||
20 | SHA1 (patch-test_rubygems_test__gem.rb) = 8bad451e8054fe954c13d28e542509b8adae2764 | 19 | SHA1 (patch-test_rubygems_test__gem.rb) = 8bad451e8054fe954c13d28e542509b8adae2764 |
@@ -1,54 +1,53 @@ | @@ -1,54 +1,53 @@ | |||
1 | $NetBSD: patch-ab,v 1.13 2011/08/12 15:50:44 taca Exp $ | 1 | $NetBSD: patch-ab,v 1.14 2011/11/08 15:26:12 taca Exp $ | |
2 | 2 | |||
3 | Add install_root option for pkgsrc's rubygems support. | 3 | Add install_root option for pkgsrc's rubygems support. | |
4 | 4 | |||
5 | --- lib/rubygems/dependency_installer.rb.orig 2011-05-18 23:36:37.000000000 +0000 | 5 | --- lib/rubygems/dependency_installer.rb.orig 2011-08-26 00:30:44.000000000 +0000 | |
6 | +++ lib/rubygems/dependency_installer.rb | 6 | +++ lib/rubygems/dependency_installer.rb | |
7 | @@ -38,6 +38,7 @@ class Gem::DependencyInstaller | 7 | @@ -38,6 +38,7 @@ class Gem::DependencyInstaller | |
8 | # :format_executable:: See Gem::Installer#initialize. | 8 | # :format_executable:: See Gem::Installer#initialize. | |
9 | # :ignore_dependencies:: Don't install any dependencies. | 9 | # :ignore_dependencies:: Don't install any dependencies. | |
10 | # :install_dir:: See Gem::Installer#install. | 10 | # :install_dir:: See Gem::Installer#install. | |
11 | + # :install_root: See Gem::Installer#install. | 11 | + # :install_root: See Gem::Installer#install. | |
12 | # :prerelease:: Allow prerelease versions. See #install. | 12 | # :prerelease:: Allow prerelease versions. See #install. | |
13 | # :security_policy:: See Gem::Installer::new and Gem::Security. | 13 | # :security_policy:: See Gem::Installer::new and Gem::Security. | |
14 | # :user_install:: See Gem::Installer.new | 14 | # :user_install:: See Gem::Installer.new | |
15 | @@ -45,11 +46,15 @@ class Gem::DependencyInstaller | 15 | @@ -45,11 +46,14 @@ class Gem::DependencyInstaller | |
16 | 16 | |||
17 | def initialize(options = {}) | 17 | def initialize(options = {}) | |
18 | if options[:install_dir] then | 18 | if options[:install_dir] then | |
19 | - @gem_home = options[:install_dir] | 19 | - @gem_home = options[:install_dir] | |
20 | + if options[:install_root].nil? or options[:install_root] == "" then | 20 | + if options[:install_root].nil? or options[:install_root] == "" then | |
21 | + @gem_home = options[:install_root].dup | 21 | + @gem_home = options[:install_root].dup | |
22 | + else | 22 | + else | |
23 | + @gem_home = options[:install_dir].dup | 23 | + @gem_home = options[:install_dir].dup | |
24 | + end | 24 | + end | |
25 | 25 | |||
26 | Gem::Specification.dirs = @gem_home | 26 | Gem::Specification.dirs = @gem_home | |
27 | Gem.ensure_gem_subdirectories @gem_home | 27 | Gem.ensure_gem_subdirectories @gem_home | |
28 | - options[:install_dir] = @gem_home # FIX: because we suck and reuse below | 28 | - options[:install_dir] = @gem_home # FIX: because we suck and reuse below | |
29 | +# options[:install_dir] = @gem_home # FIX: because we suck and reuse below | |||
30 | end | 29 | end | |
31 | 30 | |||
32 | options = DEFAULT_OPTIONS.merge options | 31 | options = DEFAULT_OPTIONS.merge options | |
33 | @@ -69,7 +74,12 @@ class Gem::DependencyInstaller | 32 | @@ -69,7 +73,12 @@ class Gem::DependencyInstaller | |
34 | @installed_gems = [] | 33 | @installed_gems = [] | |
35 | 34 | |||
36 | @install_dir = options[:install_dir] || Gem.dir | 35 | @install_dir = options[:install_dir] || Gem.dir | |
37 | - @cache_dir = options[:cache_dir] || @install_dir | 36 | - @cache_dir = options[:cache_dir] || @install_dir | |
38 | + @install_root = options[:install_root] | 37 | + @install_root = options[:install_root] | |
39 | + install_dir = @install_dir | 38 | + install_dir = @install_dir | |
40 | + unless @install_root.nil? or @install_root == "" | 39 | + unless @install_root.nil? or @install_root == "" | |
41 | + install_dir = File.join(@install_root, @install_dir) | 40 | + install_dir = File.join(@install_root, @install_dir) | |
42 | + end | 41 | + end | |
43 | + @cache_dir = options[:cache_dir] || install_dir | 42 | + @cache_dir = options[:cache_dir] || install_dir | |
44 | 43 | |||
45 | # Set with any errors that SpecFetcher finds while search through | 44 | # Set with any errors that SpecFetcher finds while search through | |
46 | # gemspecs for a dep | 45 | # gemspecs for a dep | |
47 | @@ -290,6 +300,7 @@ class Gem::DependencyInstaller | 46 | @@ -290,6 +299,7 @@ class Gem::DependencyInstaller | |
48 | :format_executable => @format_executable, | 47 | :format_executable => @format_executable, | |
49 | :ignore_dependencies => @ignore_dependencies, | 48 | :ignore_dependencies => @ignore_dependencies, | |
50 | :install_dir => @install_dir, | 49 | :install_dir => @install_dir, | |
51 | + :install_root => @install_root, | 50 | + :install_root => @install_root, | |
52 | :security_policy => @security_policy, | 51 | :security_policy => @security_policy, | |
53 | :user_install => @user_install, | 52 | :user_install => @user_install, | |
54 | :wrappers => @wrappers | 53 | :wrappers => @wrappers |
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | $NetBSD: patch-ac,v 1.6 2011/08/12 15:50:44 taca Exp $ | 1 | $NetBSD: patch-ac,v 1.7 2011/11/08 15:26:12 taca Exp $ | |
2 | 2 | |||
3 | Add install_root option for pkgsrc's rubygems support. | 3 | Add install_root option for pkgsrc's rubygems support. | |
4 | 4 | |||
5 | --- lib/rubygems/install_update_options.rb.orig 2011-05-18 22:23:53.000000000 +0000 | 5 | --- lib/rubygems/install_update_options.rb.orig 2011-08-26 00:30:44.000000000 +0000 | |
6 | +++ lib/rubygems/install_update_options.rb | 6 | +++ lib/rubygems/install_update_options.rb | |
7 | @@ -44,6 +44,12 @@ module Gem::InstallUpdateOptions | 7 | @@ -32,6 +32,12 @@ module Gem::InstallUpdateOptions | |
8 | options[:bin_dir] = File.expand_path(value) | 8 | value | |
9 | end | 9 | end | |
10 | 10 | |||
11 | + add_option(:"Install/Update", '-B', '--install-root DIR', | 11 | + add_option(:"Install/Update", '-B', '--install-root DIR', | |
12 | + 'Root directory for gem files on install') do |value, options| | 12 | + 'Root directory for gem files on install') do |value, options| | |
13 | + options[:install_root] = File.expand_path(value) | 13 | + options[:install_root] = File.expand_path(value) | |
14 | + Gem.ensure_gem_subdirectories File.join options[:install_root], Gem.dir | 14 | + Gem.ensure_gem_subdirectories File.join options[:install_root], Gem.dir | |
15 | + end | 15 | + end | |
16 | + | 16 | + | |
17 | add_option(:"Install/Update", '-d', '--[no-]rdoc', | 17 | add_option(:"Install/Update", '-i', '--install-dir DIR', | |
18 | 'Generate RDoc documentation for the gem on', | 18 | 'Gem repository directory to get installed', | |
19 | 'install') do |value, options| | 19 | 'gems') do |value, options| |
@@ -1,71 +1,49 @@ | @@ -1,71 +1,49 @@ | |||
1 | $NetBSD: patch-ad,v 1.9 2011/08/12 15:50:44 taca Exp $ | 1 | $NetBSD: patch-ad,v 1.10 2011/11/08 15:26:12 taca Exp $ | |
2 | 2 | |||
3 | * Add install_root option for pkgsrc's rubygems support. | 3 | * Add install_root option for pkgsrc's rubygems support. | |
4 | * Disable Gem::QUICKLOADER_SUCKAGE while Ruby 1.9.2's rubygems generates | |||
5 | .require_paths file. | |||
6 | 4 | |||
7 | --- lib/rubygems/installer.rb.orig 2011-05-31 21:55:13.000000000 +0000 | 5 | --- lib/rubygems/installer.rb.orig 2011-08-26 00:30:44.000000000 +0000 | |
8 | +++ lib/rubygems/installer.rb | 6 | +++ lib/rubygems/installer.rb | |
9 | @@ -39,7 +39,8 @@ class Gem::Installer | 7 | @@ -85,6 +85,9 @@ class Gem::Installer | |
10 | ||||
11 | include Gem::UserInteraction | |||
12 | ||||
13 | - include Gem::RequirePathsBuilder if Gem::QUICKLOADER_SUCKAGE | |||
14 | + # For gem based package compatibility, generate .require_paths file. | |||
15 | + include Gem::RequirePathsBuilder # if Gem::QUICKLOADER_SUCKAGE | |||
16 | ||||
17 | attr_reader :gem | |||
18 | ||||
19 | @@ -85,6 +86,9 @@ class Gem::Installer | |||
20 | # for a signed-gems-only policy. | 8 | # for a signed-gems-only policy. | |
21 | # :ignore_dependencies:: Don't raise if a dependency is missing. | 9 | # :ignore_dependencies:: Don't raise if a dependency is missing. | |
22 | # :install_dir:: The directory to install the gem into. | 10 | # :install_dir:: The directory to install the gem into. | |
23 | + # :install_root:: The directory to use as a buildroot for "destdir"-style | 11 | + # :install_root:: The directory to use as a buildroot for "destdir"-style | |
24 | + # installation. All paths during installation are relative | 12 | + # installation. All paths during installation are relative | |
25 | + # to the buildroot. | 13 | + # to the buildroot. | |
26 | # :format_executable:: Format the executable the same as the ruby executable. | 14 | # :format_executable:: Format the executable the same as the ruby executable. | |
27 | # If your ruby is ruby18, foo_exec will be installed as | 15 | # If your ruby is ruby18, foo_exec will be installed as | |
28 | # foo_exec18. | 16 | # foo_exec18. | |
29 | @@ -195,7 +199,8 @@ class Gem::Installer | 17 | @@ -283,7 +286,11 @@ class Gem::Installer | |
30 | generate_bin | |||
31 | write_spec | |||
32 | ||||
33 | - write_require_paths_file_if_needed if Gem::QUICKLOADER_SUCKAGE | |||
34 | + # For gem based package compatibility, generate .require_paths file. | |||
35 | + write_require_paths_file_if_needed # if Gem::QUICKLOADER_SUCKAGE | |||
36 | ||||
37 | cache_file = spec.cache_file | |||
38 | FileUtils.cp gem, cache_file unless File.exist? cache_file | |||
39 | @@ -283,7 +288,11 @@ class Gem::Installer | |||
40 | # If the user has asked for the gem to be installed in a directory that is | 18 | # If the user has asked for the gem to be installed in a directory that is | |
41 | # the system gem directory, then use the system bin directory, else create | 19 | # the system gem directory, then use the system bin directory, else create | |
42 | # (or use) a new bin dir under the gem_home. | 20 | # (or use) a new bin dir under the gem_home. | |
43 | - bindir = @bin_dir || Gem.bindir(gem_home) | 21 | - bindir = @bin_dir || Gem.bindir(gem_home) | |
44 | + bindir = @bin_dir || (Gem.bindir @gem_home, @install_root) | 22 | + bindir = @bin_dir || (Gem.bindir @gem_home, @install_root) | |
45 | + | 23 | + | |
46 | + unless @install_root.nil? or @install_root == "" | 24 | + unless @install_root.nil? or @install_root == "" | |
47 | + bindir = File.join(@install_root, bindir) | 25 | + bindir = File.join(@install_root, bindir) | |
48 | + end | 26 | + end | |
49 | 27 | |||
50 | Dir.mkdir bindir unless File.exist? bindir | 28 | Dir.mkdir bindir unless File.exist? bindir | |
51 | raise Gem::FilePermissionError.new(bindir) unless File.writable? bindir | 29 | raise Gem::FilePermissionError.new(bindir) unless File.writable? bindir | |
52 | @@ -416,6 +425,7 @@ class Gem::Installer | 30 | @@ -416,6 +423,7 @@ class Gem::Installer | |
53 | :exec_format => false, | 31 | :exec_format => false, | |
54 | :force => false, | 32 | :force => false, | |
55 | :install_dir => Gem.dir, | 33 | :install_dir => Gem.dir, | |
56 | + :install_root => nil, | 34 | + :install_root => nil, | |
57 | }.merge options | 35 | }.merge options | |
58 | 36 | |||
59 | @env_shebang = options[:env_shebang] | 37 | @env_shebang = options[:env_shebang] | |
60 | @@ -427,6 +437,11 @@ class Gem::Installer | 38 | @@ -427,6 +435,11 @@ class Gem::Installer | |
61 | @wrappers = options[:wrappers] | 39 | @wrappers = options[:wrappers] | |
62 | @bin_dir = options[:bin_dir] | 40 | @bin_dir = options[:bin_dir] | |
63 | @development = options[:development] | 41 | @development = options[:development] | |
64 | + install_root = options[:install_root] | 42 | + install_root = options[:install_root] | |
65 | + unless install_root.nil? or install_root == "" | 43 | + unless install_root.nil? or install_root == "" | |
66 | + @install_root = File.expand_path install_root | 44 | + @install_root = File.expand_path install_root | |
67 | + @gem_home = File.join(@install_root, @gem_home) | 45 | + @gem_home = File.join(@install_root, @gem_home) | |
68 | + end | 46 | + end | |
69 | 47 | |||
70 | raise "NOTE: Installer option :source_index is dead" if | 48 | raise "NOTE: Installer option :source_index is dead" if | |
71 | options[:source_index] | 49 | options[:source_index] |
@@ -1,42 +1,41 @@ | @@ -1,42 +1,41 @@ | |||
1 | $NetBSD: patch-ah,v 1.9 2011/08/12 15:50:44 taca Exp $ | 1 | $NetBSD: patch-ah,v 1.10 2011/11/08 15:26:12 taca Exp $ | |
2 | 2 | |||
3 | Add install_root option for pkgsrc's rubygems support. | 3 | Add install_root option for pkgsrc's rubygems support. | |
4 | 4 | |||
5 | --- lib/rubygems.rb.orig 2011-05-31 21:55:13.000000000 +0000 | 5 | --- lib/rubygems.rb.orig 2011-08-27 00:43:50.000000000 +0000 | |
6 | +++ lib/rubygems.rb | 6 | +++ lib/rubygems.rb | |
7 | @@ -329,7 +329,10 @@ module Gem | 7 | @@ -327,7 +327,10 @@ module Gem | |
8 | ## | 8 | ## | |
9 | # The path where gem executables are to be installed. | 9 | # The path where gem executables are to be installed. | |
10 | 10 | |||
11 | - def self.bindir(install_dir=Gem.dir) | 11 | - def self.bindir(install_dir=Gem.dir) | |
12 | + def self.bindir(install_dir=Gem.dir, install_root=nil) | 12 | + def self.bindir(install_dir=Gem.dir, install_root=nil) | |
13 | + unless install_root.nil? | 13 | + unless install_root.nil? | |
14 | + install_dir = install_dir.sub(install_root, "") | 14 | + install_dir = install_dir.sub(install_root, "") | |
15 | + end | 15 | + end | |
16 | # TODO: move to Gem::Dirs | 16 | # TODO: move to Gem::Dirs | |
17 | return File.join install_dir, 'bin' unless | 17 | return File.join install_dir, 'bin' unless | |
18 | install_dir.to_s == Gem.default_dir.to_s | 18 | install_dir.to_s == Gem.default_dir.to_s | |
19 | @@ -616,12 +619,12 @@ module Gem | 19 | @@ -619,12 +622,12 @@ module Gem | |
20 | ## | 20 | ## | |
21 | # The index to insert activated gem paths into the $LOAD_PATH. | 21 | # The index to insert activated gem paths into the $LOAD_PATH. | |
22 | # | 22 | # | |
23 | - # Defaults to the site lib directory unless gem_prelude.rb has loaded paths, | 23 | - # Defaults to the site lib directory unless gem_prelude.rb has loaded paths, | |
24 | + # Defaults to the vendor lib directory unless gem_prelude.rb has loaded paths, | 24 | + # Defaults to the vendor lib directory unless gem_prelude.rb has loaded paths, | |
25 | # then it inserts the activated gem's paths before the gem_prelude.rb paths | 25 | # then it inserts the activated gem's paths before the gem_prelude.rb paths | |
26 | # so you can override the gem_prelude.rb default $LOAD_PATH paths. | 26 | # so you can override the gem_prelude.rb default $LOAD_PATH paths. | |
27 | 27 | |||
28 | def self.load_path_insert_index | 28 | def self.load_path_insert_index | |
29 | - index = $LOAD_PATH.index ConfigMap[:sitelibdir] | 29 | - index = $LOAD_PATH.index ConfigMap[:sitelibdir] | |
30 | + index = $LOAD_PATH.index ConfigMap[:vendorlibdir] | 30 | + index = $LOAD_PATH.index ConfigMap[:vendorlibdir] | |
31 | 31 | |||
32 | if QUICKLOADER_SUCKAGE then | 32 | if QUICKLOADER_SUCKAGE then | |
33 | $LOAD_PATH.each_with_index do |path, i| | 33 | $LOAD_PATH.each_with_index do |path, i| | |
34 | @@ -774,7 +777,7 @@ module Gem | 34 | @@ -799,6 +802,7 @@ module Gem | |
35 | def self.prefix | |||
36 | prefix = File.dirname RUBYGEMS_DIR | 35 | prefix = File.dirname RUBYGEMS_DIR | |
37 | 36 | |||
38 | - if prefix != File.expand_path(ConfigMap[:sitelibdir]) and | 37 | if prefix != File.expand_path(ConfigMap[:sitelibdir]) and | |
39 | + if prefix != File.expand_path(ConfigMap[:vendorlibdir]) and | 38 | + prefix != File.expand_path(ConfigMap[:vendorlibdir]) and | |
40 | prefix != File.expand_path(ConfigMap[:libdir]) and | 39 | prefix != File.expand_path(ConfigMap[:libdir]) and | |
41 | 'lib' == File.basename(RUBYGEMS_DIR) then | 40 | 'lib' == File.basename(RUBYGEMS_DIR) then | |
42 | prefix | 41 | prefix |
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | $NetBSD: patch-af,v 1.5 2011/03/23 14:35:05 taca Exp $ | 1 | $NetBSD: patch-af,v 1.6 2011/11/08 15:26:12 taca Exp $ | |
2 | 2 | |||
3 | Add install_root option for pkgsrc's rubygems support. | 3 | Add install_root option for pkgsrc's rubygems support. | |
4 | 4 | |||
5 | --- lib/rubygems/commands/uninstall_command.rb.orig 2011-03-04 00:01:24.000000000 +0000 | 5 | --- lib/rubygems/commands/uninstall_command.rb.orig 2011-08-27 00:43:50.000000000 +0000 | |
6 | +++ lib/rubygems/commands/uninstall_command.rb | 6 | +++ lib/rubygems/commands/uninstall_command.rb | |
7 | @@ -54,6 +54,11 @@ class Gem::Commands::UninstallCommand < | 7 | @@ -21,6 +21,11 @@ class Gem::Commands::UninstallCommand < | |
8 | options[:format_executable] = value | 8 | options[:all] = value | |
9 | end | 9 | end | |
10 | 10 | |||
11 | + add_option('-B', '--install-root DIR', | 11 | + add_option('-B', '--install-root DIR', | |
12 | + 'Root directory for gem files') do |value, options| | 12 | + 'Root directory for gem files') do |value, options| | |
13 | + options[:install_root] = File.expand_path(value) | 13 | + options[:install_root] = File.expand_path(value) | |
14 | + end | 14 | + end | |
15 | + | 15 | + | |
16 | add_version_option | 16 | add_option('-I', '--[no-]ignore-dependencies', | |
17 | add_platform_option | 17 | 'Ignore dependency requirements while', | |
18 | end | 18 | 'uninstalling') do |value, options| |