Changeset 99341

Timestamp:

Nov 3, 2012, 2:28:01 AM (11 years ago)

Author:

jmr@…

Message:

rb-rubygems: fix bypassing destroot

Location:

trunk/dports/ruby/rb-rubygems

Files:

• Portfile (modified) (1 diff)
• files/patch-lib_rubygems_commands_setup_command.rb.diff (modified) (1 diff)

trunk/dports/ruby/rb-rubygems/Portfile

@@ -62 +62 @@
     default_variants +ruby
 }
+
+# clean up mess from previous portfile that bypassed the destroot
+pre-activate {
+    set docpath "${prefix}/lib/ruby/gems/1.8/doc/rubygems-1.3.7"
+    set adocfile "${docpath}/rdoc/classes/Gem/Builder.html"
+    if {[file exists $adocfile] && [registry_file_registered $adocfile] == "0"} {
+        delete $docpath
+    }
+}

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

@@ -1 @@
---- 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/rubygems/commands/setup_command.rb.orig 2010-04-20 16:47:36.000000000 +1000
++++ lib/rubygems/commands/setup_command.rb      2012-11-02 20:34:53.000000000 +1100
+@@ -230,7 +230,7 @@
+   end
+ 
+   def install_rdoc
+-    gem_doc_dir = File.join Gem.dir, 'doc'
++    gem_doc_dir = File.join options[:destdir], Gem.dir, 'doc'
+     rubygems_name = "rubygems-#{Gem::VERSION}"
+     rubygems_doc_dir = File.join gem_doc_dir, rubygems_name
+ 
+@@ -270,20 +270,8 @@
        lib_dir = Gem::ConfigMap[site_or_vendor]
        bin_dir = Gem::ConfigMap[:bindir]