update to gems 0.9.4

This commit is contained in:
jcs 2007-05-30 23:34:36 +00:00
parent 17639bd9fd
commit 492dbe1d7d
5 changed files with 1486 additions and 135 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.5 2007/05/03 11:28:48 msf Exp $
# $OpenBSD: Makefile,v 1.6 2007/05/30 23:34:36 jcs Exp $
COMMENT= "package management framework for the Ruby language"
V= 0.9.0
V= 0.9.4
DISTNAME= rubygems-$V
PKGNAME= ruby-gems-$Vp0
PKGNAME= ruby-gems-$V
CATEGORIES= devel
HOMEPAGE= http://docs.rubygems.org/
@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://rubyforge.org/frs/download.php/11289/
MASTER_SITES= http://rubyforge.org/frs/download.php/20989/
EXTRACT_SUFX= .tgz
MODULES= lang/ruby

View File

@ -1,5 +1,5 @@
MD5 (rubygems-0.9.0.tgz) = XUluH0Fbi0Azq4Z/AdEWHw==
RMD160 (rubygems-0.9.0.tgz) = fSpOwaYV9gjnXGjuNG2VfvuzTtE=
SHA1 (rubygems-0.9.0.tgz) = kNIZPpu5Hbv7uBznSavNgn47a1M=
SHA256 (rubygems-0.9.0.tgz) = bpC6/17JUZOf/OxWm54YKeRtpWzTILHeHI4vW+go/vA=
SIZE (rubygems-0.9.0.tgz) = 174321
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

View File

@ -1,115 +0,0 @@
$OpenBSD: patch-lib_rubygems_installer_rb,v 1.1 2006/10/19 00:53:55 bernd Exp $
Backport from rubygems subversion repository. Fixes building of native
extensions. (i.e. ruby-postgresql)
---
r1062 | jimweirich | 2006-08-10 20:15:28 +0200 (Thu, 10 Aug 2006) | 2 lines
Installed Tilman Sauerbeck's patch to fix C builds in gems.
---
--- lib/rubygems/installer.rb.orig Wed Jun 7 05:39:54 2006
+++ lib/rubygems/installer.rb Wed Oct 18 19:36:51 2006
@@ -292,9 +292,12 @@ TEXT
say "Building native extensions. This could take a while..."
start_dir = Dir.pwd
dest_path = File.join(directory, spec.require_paths[0])
+ ran_rake = false # only run rake once
- results = []
spec.extensions.each do |extension|
+ break if ran_rake
+ results = []
+
case extension
when /extconf/ then
builder = ExtExtConfBuilder
@@ -302,6 +305,7 @@ TEXT
builder = ExtConfigureBuilder
when /rakefile/i then
builder = ExtRakeBuilder
+ ran_rake = true
else
builder = nil
results = ["No builder for extension '#{extension}'"]
@@ -310,7 +314,7 @@ TEXT
begin
err = false
Dir.chdir File.join(directory, File.dirname(extension))
- results = builder.build(extension, directory, dest_path)
+ results = builder.build(extension, directory, dest_path, results)
rescue => ex
err = true
end
@@ -551,29 +555,27 @@ TEXT
end # class Uninstaller
class ExtConfigureBuilder
- def self.build(extension, directory, dest_path)
- results = []
+ def self.build(extension, directory, dest_path, results)
unless File.exist?('Makefile') then
cmd = "sh ./configure --prefix=#{dest_path}"
results << cmd
results << `#{cmd}`
end
- results.push(*ExtExtConfBuilder.make(dest_path))
+ ExtExtConfBuilder.make(dest_path, results)
results
end
end
class ExtExtConfBuilder
- def self.build(extension, directory, dest_path)
- results = ["#{Gem.ruby} #{File.basename(extension)} #{ARGV.join(" ")}"]
+ def self.build(extension, directory, dest_path, results)
+ results << "#{Gem.ruby} #{File.basename(extension)} #{ARGV.join(" ")}"
results << `#{Gem.ruby} #{File.basename(extension)} #{ARGV.join(" ")}`
- results.push(*make(dest_path))
+ make(dest_path, results)
results
end
- def self.make(dest_path)
- results = []
+ def self.make(dest_path, results)
raise unless File.exist?('Makefile')
mf = File.read('Makefile')
mf = mf.gsub(/^RUBYARCHDIR\s*=\s*\$[^$]*/, "RUBYARCHDIR = #{dest_path}")
@@ -585,27 +587,25 @@ TEXT
make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
end
- ['', 'install', 'clean'].each do |target|
+ ['', 'install'].each do |target|
results << "#{make_program} #{target}".strip
results << `#{make_program} #{target}`
- end
- results
+ raise unless $?.exitstatus.zero?
+ end
end
end
class ExtRakeBuilder
- def ExtRakeBuilder.build(ext, directory, dest_path)
+ def ExtRakeBuilder.build(ext, directory, dest_path, results)
make_program = ENV['rake'] || 'rake'
make_program += " RUBYARCHDIR=#{dest_path} RUBYLIBDIR=#{dest_path}"
- results = []
+ results << "#{make_program} extension".strip
+ results << `#{make_program} extension`
- ['', 'install', 'clean'].each do |target|
- results << "#{make_program} #{target}".strip
- results << `#{make_program} #{target}`
- end
+ raise unless $?.exitstatus.zero?
results
end

View File

@ -1,10 +1,9 @@
$OpenBSD: patch-post-install_rb,v 1.1 2006/10/19 00:53:55 bernd Exp $
--- post-install.rb.orig Fri Sep 1 09:36:29 2006
+++ post-install.rb Fri Sep 1 09:36:36 2006
@@ -77,6 +77,5 @@ def install_sources
end
$OpenBSD: patch-post-install_rb,v 1.2 2007/05/30 23:34:36 jcs Exp $
--- post-install.rb.orig Sat May 26 10:46:51 2007
+++ post-install.rb Sat May 26 10:46:53 2007
@@ -117,5 +117,4 @@ install_sources
remove_old_rdoc
install_rdoc
install_windows_batch_files
-remove_stubs
install_sources

File diff suppressed because it is too large Load Diff