Update to ruby-gems-1.0.1.
help & testing jcs@, msf@ ok jcs@
This commit is contained in:
bernd
parent
ee98315241
commit
4d7d6446a5
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.11 2007/11/13 17:27:17 bernd Exp $
|
||||
# $OpenBSD: Makefile,v 1.12 2008/01/12 14:51:15 bernd Exp $
|
||||
|
||||
COMMENT= package management framework for the Ruby language
|
||||
|
||||
V= 0.9.4
|
||||
V= 1.0.1
|
||||
DISTNAME= rubygems-$V
|
||||
PKGNAME= ruby-gems-$Vp2
|
||||
PKGNAME= ruby-gems-$V
|
||||
CATEGORIES= devel
|
||||
|
||||
HOMEPAGE= http://docs.rubygems.org/
|
||||
@ -22,6 +22,18 @@ MODULES= lang/ruby
|
||||
|
||||
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}
|
||||
|
||||
REGRESS_DEPENDS=::devel/ruby-rake
|
||||
|
||||
do-configure:
|
||||
do-build:
|
||||
|
||||
do-install:
|
||||
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${RUBY} setup.rb install \
|
||||
--prefix=${PREFIX}
|
||||
do-regress:
|
||||
@cd ${WRKBUILD} && ${LOCALBASE}/bin/rake test
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (rubygems-0.9.4.tgz) = tWgKyqAZyA6kT+h8wuIn2g==
|
||||
RMD160 (rubygems-0.9.4.tgz) = buAttFFz8F5vjFsezVr4MvuGAfg=
|
||||
SHA1 (rubygems-0.9.4.tgz) = kECA024016aWnDzvIoOA64JojSo=
|
||||
SHA256 (rubygems-0.9.4.tgz) = tNR7z+LzsI98O7ZZovTjSj+pwRNbqYrTJydTdTw1Tlw=
|
||||
SIZE (rubygems-0.9.4.tgz) = 204841
|
||||
MD5 (rubygems-1.0.1.tgz) = DVhRCElVwyfuHcnL1jGqXw==
|
||||
RMD160 (rubygems-1.0.1.tgz) = t1/fKqJS+ElySVUCtLkfnm1Mfnw=
|
||||
SHA1 (rubygems-1.0.1.tgz) = IydQ+lmRfqm68DeX/bEKItKeutk=
|
||||
SHA256 (rubygems-1.0.1.tgz) = 9PtVsLNjHAecEPaya6XCv5vJ7AfRniFcakeCTfbfbo8=
|
||||
SIZE (rubygems-1.0.1.tgz) = 246165
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-lib_rubygems_commands_install_command_rb,v 1.1 2008/01/12 14:51:15 bernd Exp $
|
||||
|
||||
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 Fri Dec 21 16:46:28 2007
|
||||
@@ -62,6 +62,7 @@ class Gem::Commands::InstallCommand < Gem::Command
|
||||
:install_dir => options[:install_dir],
|
||||
:security_policy => options[:security_policy],
|
||||
:wrappers => options[:wrappers],
|
||||
+ :skip_dependencies => options[:skip_dependencies]
|
||||
}
|
||||
|
||||
get_all_gem_names.each do |gem_name|
|
||||
@ -0,0 +1,34 @@
|
||||
$OpenBSD: patch-lib_rubygems_dependency_installer_rb,v 1.1 2008/01/12 14:51:15 bernd Exp $
|
||||
|
||||
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 Fri Dec 21 16:47:17 2007
|
||||
@@ -18,7 +18,8 @@ class Gem::DependencyInstaller
|
||||
:format_executable => false, # HACK dup
|
||||
:ignore_dependencies => false,
|
||||
:security_policy => nil, # HACK NoSecurity requires OpenSSL. AlmostNo? Low?
|
||||
- :wrappers => true
|
||||
+ :wrappers => true,
|
||||
+ :skip_dependencies => false
|
||||
}
|
||||
|
||||
##
|
||||
@@ -46,6 +47,7 @@ class Gem::DependencyInstaller
|
||||
@install_dir = options[:install_dir] || Gem.dir
|
||||
@security_policy = options[:security_policy]
|
||||
@wrappers = options[:wrappers]
|
||||
+ @skip_dependencies = options[:skip_dependencies]
|
||||
|
||||
@installed_gems = []
|
||||
|
||||
@@ -231,7 +233,8 @@ class Gem::DependencyInstaller
|
||||
:ignore_dependencies => @ignore_dependencies,
|
||||
:install_dir => @install_dir,
|
||||
:security_policy => @security_policy,
|
||||
- :wrappers => @wrappers
|
||||
+ :wrappers => @wrappers,
|
||||
+ :skip_dependencies => @skip_dependencies
|
||||
|
||||
spec = inst.install
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-lib_rubygems_gem_commands_rb,v 1.1 2007/11/13 16:02:35 bernd Exp $
|
||||
|
||||
This is for GEM_SKIPDEPENDS in ruby.port.mk.
|
||||
|
||||
--- lib/rubygems/gem_commands.rb.orig Thu May 10 21:01:45 2007
|
||||
+++ lib/rubygems/gem_commands.rb Sat Nov 10 20:35:12 2007
|
||||
@@ -164,6 +164,11 @@ module Gem
|
||||
'dependent gems') do |value, options|
|
||||
options[:include_dependencies] = value
|
||||
end
|
||||
+
|
||||
+ add_option('-S', '--skip-dependencies DEPENDENCIES',
|
||||
+ 'Skip the given dependent gems') do |value, options|
|
||||
+ options[:skip_dependencies] = value.split(' ')
|
||||
+ end
|
||||
end
|
||||
|
||||
# Default options for the gem install command.
|
||||
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-lib_rubygems_install_update_options_rb,v 1.1 2008/01/12 14:51:15 bernd Exp $
|
||||
|
||||
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 Fri Dec 21 16:46:28 2007
|
||||
@@ -83,6 +83,11 @@ module Gem::InstallUpdateOptions
|
||||
'foo_exec18') do |value, options|
|
||||
options[:format_executable] = value
|
||||
end
|
||||
+
|
||||
+ add_option(:"Install/Update", '-S', '--skip-dependencies DEPENDENCIES',
|
||||
+ 'Skip the given dependencies') do |value, options|
|
||||
+ options[:skip_dependencies] = value.split(' ')
|
||||
+ end
|
||||
end
|
||||
|
||||
# Default options for the gem install command.
|
||||
@ -1,20 +1,28 @@
|
||||
$OpenBSD: patch-lib_rubygems_installer_rb,v 1.4 2007/11/13 17:27:17 bernd Exp $
|
||||
$OpenBSD: patch-lib_rubygems_installer_rb,v 1.5 2008/01/12 14:51:15 bernd Exp $
|
||||
|
||||
This is for GEM_SKIPDEPENDS in ruby.port.mk.
|
||||
|
||||
--- lib/rubygems/installer.rb.orig Thu May 10 21:01:45 2007
|
||||
+++ lib/rubygems/installer.rb Tue Nov 13 18:08:41 2007
|
||||
@@ -79,7 +79,12 @@ module Gem
|
||||
end
|
||||
unless @options[:ignore_dependencies]
|
||||
spec.dependencies.each do |dep_gem|
|
||||
- ensure_dependency!(spec, dep_gem)
|
||||
+ if @options[:skip_dependencies] &&
|
||||
+ @options[:skip_dependencies].include?(dep_gem.name)
|
||||
+ spec.dependencies.delete(dep_gem)
|
||||
+ else
|
||||
+ ensure_dependency!(spec, dep_gem)
|
||||
+ end
|
||||
end
|
||||
--- lib/rubygems/installer.rb.orig Fri Dec 21 01:43:06 2007
|
||||
+++ lib/rubygems/installer.rb Fri Dec 21 16:46:28 2007
|
||||
@@ -73,6 +73,7 @@ class Gem::Installer
|
||||
@format_executable = options[:format_executable]
|
||||
@security_policy = options[:security_policy]
|
||||
@wrappers = options[:wrappers]
|
||||
+ @skip_dependencies = options[:skip_dependencies]
|
||||
|
||||
begin
|
||||
@format = Gem::Format.from_file_by_path @gem, @security_policy
|
||||
@@ -117,7 +118,12 @@ class Gem::Installer
|
||||
|
||||
unless @ignore_dependencies then
|
||||
@spec.dependencies.each do |dep_gem|
|
||||
- ensure_dependency @spec, dep_gem
|
||||
+ if @skip_dependencies && @skip_dependencies.include?(dep_gem.name)
|
||||
+ say "Skipping '#{dep_gem.name}' dependency."
|
||||
+ @spec.dependencies.delete(dep_gem)
|
||||
+ else
|
||||
+ ensure_dependency @spec, dep_gem
|
||||
+ end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-post-install_rb,v 1.3 2007/06/04 15:22:03 jcs Exp $
|
||||
--- post-install.rb.orig Thu May 10 14:01:45 2007
|
||||
+++ post-install.rb Mon Jun 4 09:36:34 2007
|
||||
@@ -77,7 +77,7 @@ def install_windows_batch_files
|
||||
end
|
||||
|
||||
def install_sources
|
||||
- $: << "lib"
|
||||
+ $:.unshift "lib"
|
||||
require 'rubygems'
|
||||
require 'rubygems/builder'
|
||||
require 'rubygems/installer'
|
||||
@@ -117,5 +117,4 @@ install_sources
|
||||
remove_old_rdoc
|
||||
install_rdoc
|
||||
install_windows_batch_files
|
||||
-remove_stubs
|
||||
|
||||
24
devel/ruby-gems/patches/patch-setup_rb
Normal file
24
devel/ruby-gems/patches/patch-setup_rb
Normal file
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-setup_rb,v 1.1 2008/01/12 14:51:15 bernd Exp $
|
||||
--- setup.rb.orig Fri Dec 21 02:15:55 2007
|
||||
+++ setup.rb Fri Dec 21 16:46:28 2007
|
||||
@@ -72,7 +72,7 @@ else
|
||||
|
||||
raise "invalid --prefix #{prefix.inspect}" if prefix.nil?
|
||||
|
||||
- lib_dir = File.join prefix, 'lib'
|
||||
+ lib_dir = ENV['RUBYLIB']
|
||||
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 = gemfiles.map { |file| File.expand_path file }.uniq
|
||||
+#gemfiles = Dir[File.join("{#{($LOAD_PATH).join(',')}}", '**', '*.rb')]
|
||||
+#gemfiles = gemfiles.map { |file| File.expand_path file }.uniq
|
||||
+gemfiles = []
|
||||
|
||||
puts "...done."
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user