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

[mr_bond at macports.org]

Revision: 41061
          http://trac.macports.org/changeset/41061
Author:   mr_bond at macports.org
Date:     2008-10-21 16:05:47 -0700 (Tue, 21 Oct 2008)
Log Message:
-----------
ruby/rb-rubygems: Bumped version up to 1.3.0
  - patched setup.rb, --destdir and --prefix combination not working, added some enchancements so I can skip renaming/ruby sub-processes in macports

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

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

Modified: trunk/dports/ruby/rb-rubygems/Portfile
===================================================================
--- trunk/dports/ruby/rb-rubygems/Portfile	2008-10-21 21:22:22 UTC (rev 41060)
+++ trunk/dports/ruby/rb-rubygems/Portfile	2008-10-21 23:05:47 UTC (rev 41061)
@@ -1,16 +1,17 @@
-# $Id$
+# $Id: Portfile 37986 2008-07-01 23:01:59Z mr_bond at macports.org $
 
 PortSystem		1.0
 PortGroup		ruby 1.0
 
 name			rb-rubygems
 categories		ruby devel
-version			1.2.0
+version			1.3.0
 #revision		0
 
 homepage		http://www.rubygems.org
-master_sites		http://rubyforge.org/frs/download.php/38646/
+master_sites		http://rubyforge.org/frs/download.php/43985/
 
+
 distname                rubygems-${version}
 dist_subdir             ruby
 
@@ -19,11 +20,13 @@
 long_description	RubyGems is the Ruby standard for publishing and \
 					managing third party libraries.
 
-checksums		md5 	b77a4234360735174d1692e6fc598402 \
-			sha1	89f8e35f03e1e8057cc8e237f2df025642653dde \
-			rmd160	c66444cc3f372f7170ba1d8ef3c456052acb2bde
+checksums		md5 	63d3dfc038710eaf532b6a133225115a \
+			sha1	399f55d7d6b57fa575b6b7f61264eded79be6b6f \
+			rmd160	0c2df006483e05479a2f829367f0a6c9dbc341cb
 
+patchfiles		patch-setup.rb.diff
 
+
 extract.suffix		.tgz
 platforms		darwin
 
@@ -31,7 +34,7 @@
 build { }
 
 destroot.cmd	${ruby.bin} setup.rb
-destroot.args	--prefix=${prefix} --destdir=${destroot}
+destroot.args	--prefix=${prefix} --destdir=${destroot} --vendor
 destroot.env
 
 set gems_libdir ${destroot}${prefix}/lib/ruby/gems/${ruby.version}
@@ -41,13 +44,4 @@
         ${gems_libdir}/specifications
 
 
-post-destroot {
-	file mkdir ${destroot}${ruby.lib}
-	file rename ${destroot}${prefix}/lib/rubygems ${destroot}${ruby.lib}
-	file rename ${destroot}${prefix}/lib/rbconfig ${destroot}${ruby.lib}
-	file rename ${destroot}${prefix}/lib/rubygems.rb ${destroot}${ruby.lib}
-	file rename ${destroot}${prefix}/lib/ubygems.rb ${destroot}${ruby.lib}
-}
-
 depends_lib     port:ruby
-

Added: trunk/dports/ruby/rb-rubygems/files/patch-setup.rb.diff
===================================================================
--- trunk/dports/ruby/rb-rubygems/files/patch-setup.rb.diff	                        (rev 0)
+++ trunk/dports/ruby/rb-rubygems/files/patch-setup.rb.diff	2008-10-21 23:05:47 UTC (rev 41061)
@@ -0,0 +1,38 @@
+--- 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/20081021/306ae38f/attachment.html>