[49788] users/kimuraw/ruby_select

[kimuraw at macports.org]

Revision: 49788
          http://trac.macports.org/changeset/49788
Author:   kimuraw at macports.org
Date:     2009-04-18 01:31:46 -0700 (Sat, 18 Apr 2009)
Log Message:
-----------
2009-04-18  kimura wataru <kimuraw>

	* lang/ruby/Portfile, lang/ruby/files/patch-rdoc_sysdir.diff:
	- use ${prefix}/share/ri/1.8/system1.8.7/ for rdoc sysdir

Modified Paths:
--------------
    users/kimuraw/ruby_select/ChangeLog
    users/kimuraw/ruby_select/lang/ruby/Portfile

Added Paths:
-----------
    users/kimuraw/ruby_select/lang/ruby/files/patch-rdoc_sysdir.diff

Modified: users/kimuraw/ruby_select/ChangeLog
===================================================================
--- users/kimuraw/ruby_select/ChangeLog	2009-04-18 06:46:31 UTC (rev 49787)
+++ users/kimuraw/ruby_select/ChangeLog	2009-04-18 08:31:46 UTC (rev 49788)
@@ -1,5 +1,8 @@
 2009-04-18  kimura wataru <kimuraw>
 
+	* lang/ruby/Portfile, lang/ruby/files/patch-rdoc_sysdir.diff:
+	- use ${prefix}/share/ri/1.8/system1.8.7/ for rdoc sysdir
+
 	* lang/ruby/Portfile:
 	- rename bin/* -> bin/*18
 	- use lib/ruby/1.8.7, not lib/ruby/1.8

Modified: users/kimuraw/ruby_select/lang/ruby/Portfile
===================================================================
--- users/kimuraw/ruby_select/lang/ruby/Portfile	2009-04-18 06:46:31 UTC (rev 49787)
+++ users/kimuraw/ruby_select/lang/ruby/Portfile	2009-04-18 08:31:46 UTC (rev 49788)
@@ -46,6 +46,9 @@
 # http://chopine.be/lrz/ruby-osx-patches/ignore-gsetcontext.diff
 patchfiles-append patch-node.h.diff
 
+# change rdoc "system" path to "system1.8.7"
+patchfiles-append patch-rdoc_sysdir.diff
+
 use_autoconf	yes
 autoconf.cmd	autoreconf
 autoconf.args	-fvi
@@ -93,7 +96,6 @@
 	file rename ${destroot}${prefix}/share/man/man1/ruby.1 \
 		${destroot}${prefix}/share/man/man1/ruby${suffix}.1
     # TODO: remove libruby.dylib, rename libruby-static.a
-    # TODO: ri documents directory
 }
 
 # create symlink for ruby18 and ,...
@@ -101,7 +103,10 @@
 post-activate {
 	set suffix 18
 	foreach cmd {ruby erb irb rdoc ri testrb} {
-		file link -symbolic ${prefix}/bin/${cmd} ${prefix}/bin/${cmd}${suffix}
+		if {![file exists ${prefix}/bin/${cmd}]} {
+			file link -symbolic ${prefix}/bin/${cmd} \
+				${prefix}/bin/${cmd}${suffix}
+		}
 	}
 }
 

Added: users/kimuraw/ruby_select/lang/ruby/files/patch-rdoc_sysdir.diff
===================================================================
--- users/kimuraw/ruby_select/lang/ruby/files/patch-rdoc_sysdir.diff	                        (rev 0)
+++ users/kimuraw/ruby_select/lang/ruby/files/patch-rdoc_sysdir.diff	2009-04-18 08:31:46 UTC (rev 49788)
@@ -0,0 +1,22 @@
+--- instruby.rb.orig	2008-05-29 20:23:36.000000000 +0900
++++ instruby.rb	2009-04-18 17:09:09.000000000 +0900
+@@ -272,7 +272,7 @@
+   if $rdocdir
+     puts "installing rdoc"
+ 
+-    ridatadir = File.join(CONFIG['datadir'], 'ri/$(MAJOR).$(MINOR)/system')
++    ridatadir = File.join(CONFIG['datadir'], 'ri/$(MAJOR).$(MINOR)/system$(MAJOR).$(MINOR).$(TEENY)')
+     Config.expand(ridatadir)
+     makedirs [ridatadir]
+     install_recursive($rdocdir, ridatadir, :mode => $data_mode)
+--- lib/rdoc/ri/ri_paths.rb.orig	2007-12-24 16:22:01.000000000 +0900
++++ lib/rdoc/ri/ri_paths.rb	2009-04-18 16:26:43.000000000 +0900
+@@ -29,7 +29,7 @@
+     version = Config::CONFIG['ruby_version']
+ 
+     base    = File.join(Config::CONFIG['datadir'], "ri", version)
+-    SYSDIR  = File.join(base, "system")
++    SYSDIR  = File.join(base, "system" + RUBY_VERSION)
+     SITEDIR = File.join(base, "site")
+     homedir = ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH']
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090418/3900108b/attachment.html>