Update to ruby-gems-1.1.1.

This commit is contained in:
bernd 2008-06-17 22:42:59 +00:00
parent a043f64cd6
commit 1dd1f087e1
8 changed files with 1632 additions and 1588 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.13 2008/06/14 23:46:38 landry Exp $ # $OpenBSD: Makefile,v 1.14 2008/06/17 22:42:59 bernd Exp $
COMMENT= package management framework for the Ruby language COMMENT= package management framework for the Ruby language
V= 1.0.1 V= 1.1.1
DISTNAME= rubygems-$V DISTNAME= rubygems-$V
PKGNAME= ruby-gems-$Vp0 PKGNAME= ruby-gems-$V
CATEGORIES= devel CATEGORIES= devel
HOMEPAGE= http://docs.rubygems.org/ HOMEPAGE= http://docs.rubygems.org/
@ -25,6 +25,8 @@ CONFIGURE_STYLE=ruby setup
MAKE_ENV= GEM_HOME=${PREFIX}/lib/ruby/gems/${MODRUBY_REV} \ MAKE_ENV= GEM_HOME=${PREFIX}/lib/ruby/gems/${MODRUBY_REV} \
RUBYLIB=${PREFIX}/lib/ruby/site_ruby/${MODRUBY_REV} RUBYLIB=${PREFIX}/lib/ruby/site_ruby/${MODRUBY_REV}
SUBST_VARS= DISTNAME
REGRESS_DEPENDS=::devel/ruby-rake REGRESS_DEPENDS=::devel/ruby-rake
do-configure: do-configure:

View File

@ -1,5 +1,5 @@
MD5 (rubygems-1.0.1.tgz) = DVhRCElVwyfuHcnL1jGqXw== MD5 (rubygems-1.1.1.tgz) = GnfFtrKTo8zVJh3BIGQczA==
RMD160 (rubygems-1.0.1.tgz) = t1/fKqJS+ElySVUCtLkfnm1Mfnw= RMD160 (rubygems-1.1.1.tgz) = JktsJmf9dMERtohtoTsyS8OR6qg=
SHA1 (rubygems-1.0.1.tgz) = IydQ+lmRfqm68DeX/bEKItKeutk= SHA1 (rubygems-1.1.1.tgz) = 4erRH6KSj7S3hxwX/RGGGYyXwRo=
SHA256 (rubygems-1.0.1.tgz) = 9PtVsLNjHAecEPaya6XCv5vJ7AfRniFcakeCTfbfbo8= SHA256 (rubygems-1.1.1.tgz) = KxzoLIYp5Fg8j+sSSM/dEiByBvF0pKrCrDC20GtmZOE=
SIZE (rubygems-1.0.1.tgz) = 246165 SIZE (rubygems-1.1.1.tgz) = 423308

View File

@ -1,14 +1,16 @@
$OpenBSD: patch-lib_rubygems_commands_install_command_rb,v 1.1 2008/01/12 14:51:15 bernd Exp $ $OpenBSD: patch-lib_rubygems_commands_install_command_rb,v 1.2 2008/06/17 22:42:59 bernd Exp $
This is for GEM_SKIPDEPENDS in ruby.port.mk. This is for GEM_SKIPDEPENDS in ruby.port.mk.
--- lib/rubygems/commands/install_command.rb.orig Thu Dec 13 01:43:02 2007 --- lib/rubygems/commands/install_command.rb.orig Sat Apr 19 14:48:07 2008
+++ lib/rubygems/commands/install_command.rb Fri Dec 21 16:46:28 2007 +++ lib/rubygems/commands/install_command.rb Sat Apr 19 14:49:37 2008
@@ -62,6 +62,7 @@ class Gem::Commands::InstallCommand < Gem::Command @@ -62,7 +62,8 @@ class Gem::Commands::InstallCommand < Gem::Command
:install_dir => options[:install_dir], :install_dir => options[:install_dir],
:security_policy => options[:security_policy], :security_policy => options[:security_policy],
:wrappers => options[:wrappers], :wrappers => options[:wrappers],
- :bin_dir => options[:bin_dir]
+ :bin_dir => options[:bin_dir],
+ :skip_dependencies => options[:skip_dependencies] + :skip_dependencies => options[:skip_dependencies]
} }
get_all_gem_names.each do |gem_name| exit_code = 0

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-lib_rubygems_dependency_installer_rb,v 1.1 2008/01/12 14:51:15 bernd Exp $ $OpenBSD: patch-lib_rubygems_dependency_installer_rb,v 1.2 2008/06/17 22:42:59 bernd Exp $
This is for GEM_SKIPDEPENDS in ruby.port.mk. This is for GEM_SKIPDEPENDS in ruby.port.mk.
--- lib/rubygems/dependency_installer.rb.orig Tue Dec 18 04:45:04 2007 --- lib/rubygems/dependency_installer.rb.orig Sat Apr 19 14:49:10 2008
+++ lib/rubygems/dependency_installer.rb Fri Dec 21 16:47:17 2007 +++ lib/rubygems/dependency_installer.rb Sat Apr 19 14:50:57 2008
@@ -18,7 +18,8 @@ class Gem::DependencyInstaller @@ -18,7 +18,8 @@ class Gem::DependencyInstaller
:format_executable => false, # HACK dup :format_executable => false, # HACK dup
:ignore_dependencies => false, :ignore_dependencies => false,
@ -15,19 +15,19 @@ This is for GEM_SKIPDEPENDS in ruby.port.mk.
## ##
@@ -46,6 +47,7 @@ class Gem::DependencyInstaller @@ -46,6 +47,7 @@ class Gem::DependencyInstaller
@install_dir = options[:install_dir] || Gem.dir
@security_policy = options[:security_policy] @security_policy = options[:security_policy]
@wrappers = options[:wrappers] @wrappers = options[:wrappers]
@bin_dir = options[:bin_dir]
+ @skip_dependencies = options[:skip_dependencies] + @skip_dependencies = options[:skip_dependencies]
@installed_gems = [] @installed_gems = []
end
@@ -231,7 +233,8 @@ class Gem::DependencyInstaller @@ -205,7 +207,8 @@ class Gem::DependencyInstaller
:ignore_dependencies => @ignore_dependencies,
:install_dir => @install_dir, :install_dir => @install_dir,
:security_policy => @security_policy, :security_policy => @security_policy,
- :wrappers => @wrappers :wrappers => @wrappers,
+ :wrappers => @wrappers, - :bin_dir => @bin_dir
+ :bin_dir => @bin_dir,
+ :skip_dependencies => @skip_dependencies + :skip_dependencies => @skip_dependencies
spec = inst.install spec = inst.install

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-lib_rubygems_install_update_options_rb,v 1.1 2008/01/12 14:51:15 bernd Exp $ $OpenBSD: patch-lib_rubygems_install_update_options_rb,v 1.2 2008/06/17 22:42:59 bernd Exp $
This is for GEM_SKIPDEPENDS in ruby.port.mk. This is for GEM_SKIPDEPENDS in ruby.port.mk.
--- lib/rubygems/install_update_options.rb.orig Thu Dec 13 00:36:15 2007 --- lib/rubygems/install_update_options.rb.orig Sat Apr 19 14:51:46 2008
+++ lib/rubygems/install_update_options.rb Fri Dec 21 16:46:28 2007 +++ lib/rubygems/install_update_options.rb Sat Apr 19 14:52:29 2008
@@ -83,6 +83,11 @@ module Gem::InstallUpdateOptions @@ -89,6 +89,11 @@ module Gem::InstallUpdateOptions
'foo_exec18') do |value, options| 'foo_exec18') do |value, options|
options[:format_executable] = value options[:format_executable] = value
end end

View File

@ -1,18 +1,18 @@
$OpenBSD: patch-lib_rubygems_installer_rb,v 1.5 2008/01/12 14:51:15 bernd Exp $ $OpenBSD: patch-lib_rubygems_installer_rb,v 1.6 2008/06/17 22:42:59 bernd Exp $
This is for GEM_SKIPDEPENDS in ruby.port.mk. This is for GEM_SKIPDEPENDS in ruby.port.mk.
--- lib/rubygems/installer.rb.orig Fri Dec 21 01:43:06 2007 --- lib/rubygems/installer.rb.orig Sat Apr 19 14:52:49 2008
+++ lib/rubygems/installer.rb Fri Dec 21 16:46:28 2007 +++ lib/rubygems/installer.rb Sat Apr 19 14:53:52 2008
@@ -73,6 +73,7 @@ class Gem::Installer @@ -76,6 +76,7 @@ class Gem::Installer
@format_executable = options[:format_executable]
@security_policy = options[:security_policy] @security_policy = options[:security_policy]
@wrappers = options[:wrappers] @wrappers = options[:wrappers]
@bin_dir = options[:bin_dir]
+ @skip_dependencies = options[:skip_dependencies] + @skip_dependencies = options[:skip_dependencies]
begin begin
@format = Gem::Format.from_file_by_path @gem, @security_policy @format = Gem::Format.from_file_by_path @gem, @security_policy
@@ -117,7 +118,12 @@ class Gem::Installer @@ -120,7 +121,12 @@ class Gem::Installer
unless @ignore_dependencies then unless @ignore_dependencies then
@spec.dependencies.each do |dep_gem| @spec.dependencies.each do |dep_gem|

View File

@ -1,18 +1,18 @@
$OpenBSD: patch-setup_rb,v 1.1 2008/01/12 14:51:15 bernd Exp $ $OpenBSD: patch-setup_rb,v 1.2 2008/06/17 22:42:59 bernd Exp $
--- setup.rb.orig Fri Dec 21 02:15:55 2007 --- setup.rb.orig Sat Apr 19 14:46:21 2008
+++ setup.rb Fri Dec 21 16:46:28 2007 +++ setup.rb Sat Apr 19 14:47:22 2008
@@ -72,7 +72,7 @@ else @@ -94,7 +94,7 @@ else
lib_dir = Gem::ConfigMap[:sitelibdir]
bin_dir = Gem::ConfigMap[:bindir]
else
- lib_dir = File.join prefix, 'lib'
+ lib_dir = ENV['RUBYLIB']
bin_dir = File.join prefix, 'bin'
raise "invalid --prefix #{prefix.inspect}" if prefix.nil? mkdir_p lib_dir
@@ -261,8 +261,9 @@ end
- lib_dir = File.join prefix, 'lib' puts "As of RubyGems 0.8.0, library stubs are no longer needed."
+ lib_dir = ENV['RUBYLIB'] puts "Searching $LOAD_PATH for stubs to optionally delete (may take a while)"
bin_dir = File.join prefix, 'bin'
mkdir_p lib_dir
@@ -235,8 +235,9 @@ puts <<-EOF.gsub(/^ */, '')
Searching $LOAD_PATH for stubs to optionally delete (may take a while)...
EOF
-gemfiles = Dir[File.join("{#{($LOAD_PATH).join(',')}}", '**', '*.rb')] -gemfiles = Dir[File.join("{#{($LOAD_PATH).join(',')}}", '**', '*.rb')]
-gemfiles = gemfiles.map { |file| File.expand_path file }.uniq -gemfiles = gemfiles.map { |file| File.expand_path file }.uniq

File diff suppressed because it is too large Load Diff