[52840] trunk/dports/ruby/rb-rubygems

[blb at macports.org]

Revision: 52840
          http://trac.macports.org/changeset/52840
Author:   blb at macports.org
Date:     2009-06-23 23:20:26 -0700 (Tue, 23 Jun 2009)
Log Message:
-----------
ruby/rb-rubygems - version update to 1.3.4

Modified Paths:
--------------
    trunk/dports/ruby/rb-rubygems/Portfile

Added Paths:
-----------
    trunk/dports/ruby/rb-rubygems/files/patch-lib_rubygems_commands_setup_command.rb.diff

Removed Paths:
-------------
    trunk/dports/ruby/rb-rubygems/files/patch-setup.rb.diff

Modified: trunk/dports/ruby/rb-rubygems/Portfile
===================================================================
--- trunk/dports/ruby/rb-rubygems/Portfile	2009-06-24 04:53:26 UTC (rev 52839)
+++ trunk/dports/ruby/rb-rubygems/Portfile	2009-06-24 06:20:26 UTC (rev 52840)
@@ -1,15 +1,15 @@
-# $Id: Portfile 37986 2008-07-01 23:01:59Z mr_bond at macports.org $
+# $Id$
 
 PortSystem		1.0
 PortGroup		ruby 1.0
 
 name			rb-rubygems
 categories		ruby devel
-version			1.3.1
+version			1.3.4
 #revision		0
 
 homepage		http://www.rubygems.org
-master_sites		http://rubyforge.org/frs/download.php/45905/
+master_sites		http://rubyforge.org/frs/download.php/57643/
 
 
 distname                rubygems-${version}
@@ -20,10 +20,12 @@
 long_description	RubyGems is the Ruby standard for publishing and \
 					managing third party libraries.
 
-checksums		sha1	a21ae466146bffb28ece05cddbdced0b908ca74f \
+checksums		md5     b17b398503253bf36a101c58f02a226f \
+			sha1    b973b4748c0bc08f9a62b3312bde935dda2eac6f \
+			rmd160  451797299921cac9997fc93a85601d6f28f17cf5
 
 
-patchfiles		patch-setup.rb.diff
+patchfiles		patch-lib_rubygems_commands_setup_command.rb.diff
 
 
 extract.suffix		.tgz

Added: trunk/dports/ruby/rb-rubygems/files/patch-lib_rubygems_commands_setup_command.rb.diff
===================================================================
--- trunk/dports/ruby/rb-rubygems/files/patch-lib_rubygems_commands_setup_command.rb.diff	                        (rev 0)
+++ trunk/dports/ruby/rb-rubygems/files/patch-lib_rubygems_commands_setup_command.rb.diff	2009-06-24 06:20:26 UTC (rev 52840)
@@ -0,0 +1,23 @@
+--- lib/rubygems/commands/setup_command.rb.orig	2009-05-27 16:51:56.000000000 -0600
++++ lib/rubygems/commands/setup_command.rb	2009-06-24 00:04:37.000000000 -0600
+@@ -259,20 +259,8 @@
+       lib_dir = Gem::ConfigMap[site_or_vendor]
+       bin_dir = Gem::ConfigMap[:bindir]
+     else
+-      # Apple installed RubyGems into libdir, and RubyGems <= 1.1.0 gets
+-      # confused about installation location, so switch back to
+-      # sitelibdir/vendorlibdir.
+-      if defined?(APPLE_GEM_HOME) and
+-        # just in case Apple and RubyGems don't get this patched up proper.
+-        (prefix == Gem::ConfigMap[:libdir] or
+-         # this one is important
+-         prefix == File.join(Gem::ConfigMap[:libdir], 'ruby')) then
+          lib_dir = Gem::ConfigMap[site_or_vendor]
+          bin_dir = Gem::ConfigMap[:bindir]
+-      else
+-        lib_dir = File.join prefix, 'lib'
+-        bin_dir = File.join prefix, 'bin'
+-      end
+     end
+ 
+     unless install_destdir.empty? then

Deleted: trunk/dports/ruby/rb-rubygems/files/patch-setup.rb.diff
===================================================================
--- trunk/dports/ruby/rb-rubygems/files/patch-setup.rb.diff	2009-06-24 04:53:26 UTC (rev 52839)
+++ trunk/dports/ruby/rb-rubygems/files/patch-setup.rb.diff	2009-06-24 06:20:26 UTC (rev 52840)
@@ -1,38 +0,0 @@
---- setup.rb.orig       2008-10-22 00:52:26.000000000 +0200
-+++ setup.rb    2008-10-22 00:52:30.000000000 +0200
-@@ -121,19 +121,8 @@
-   lib_dir = Gem::ConfigMap[site_or_vendor]
-   bin_dir = Gem::ConfigMap[:bindir]
- else
--  # Apple installed RubyGems into libdir, and RubyGems <= 1.1.0 gets confused
--  # about installation location, so switch back to sitelibdir/vendorlibdir.
--  if defined?(APPLE_GEM_HOME) and
--      # just in case Apple and RubyGems don't get this patched up proper.
--     (prefix == Gem::ConfigMap[:libdir] or
--      # this one is important
--      prefix == File.join(Gem::ConfigMap[:libdir], 'ruby')) then
-     lib_dir = Gem::ConfigMap[site_or_vendor]
-     bin_dir = Gem::ConfigMap[:bindir]
--  else
--    lib_dir = File.join prefix, 'lib'
--    bin_dir = File.join prefix, 'bin'
--  end
- end
- 
- unless install_destdir.empty?
-@@ -141,8 +130,13 @@
-   lib_dir_p = Pathname.new(lib_dir)
-   bin_dir_p = Pathname.new(bin_dir)
- 
--  lib_dir = File.join install_destdir, lib_dir_p.relative_path_from(top_dir)
--  bin_dir = File.join install_destdir, bin_dir_p.relative_path_from(top_dir)
-+  unless prefix.empty?
-+    lib_dir = File.join(install_destdir, prefix, lib_dir_p.relative_path_from(top_dir))
-+    bin_dir = File.join(install_destdir, prefix, bin_dir_p.relative_path_from(top_dir))
-+  else
-+    lib_dir = File.join(install_destdir, lib_dir_p.relative_path_from(top_dir))
-+    bin_dir = File.join(install_destdir, bin_dir_p.relative_path_from(top_dir))
-+  end
- end
- 
- mkdir_p lib_dir
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090623/74eea0e4/attachment-0001.html>