[49812] users/kimuraw/ruby_select

[kimuraw at macports.org]

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

	* lang/ruby186/Portfile,
	  lang/ruby186/files/patch-rdoc_sysdir.diff,
	  lang/ruby186/files/patch-libruby_nosuffix.diff:
	ready for ruby_select.

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

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

Modified: users/kimuraw/ruby_select/ChangeLog
===================================================================
--- users/kimuraw/ruby_select/ChangeLog	2009-04-18 11:02:43 UTC (rev 49811)
+++ users/kimuraw/ruby_select/ChangeLog	2009-04-18 11:24:12 UTC (rev 49812)
@@ -1,5 +1,10 @@
 2009-04-18  kimura wataru <kimuraw>
 
+	* lang/ruby186/Portfile,
+	  lang/ruby186/files/patch-rdoc_sysdir.diff,
+	  lang/ruby186/files/patch-libruby_nosuffix.diff:
+	ready for ruby_select.
+
 	* sysutils/ruby_select:
 	add a new port. ruby_select is a utility program like gcc_select
 	or python_select.

Modified: users/kimuraw/ruby_select/lang/ruby186/Portfile
===================================================================
--- users/kimuraw/ruby_select/lang/ruby186/Portfile	2009-04-18 11:02:43 UTC (rev 49811)
+++ users/kimuraw/ruby_select/lang/ruby186/Portfile	2009-04-18 11:24:12 UTC (rev 49812)
@@ -43,7 +43,7 @@
 				patch-lib-rexml-document.rb.diff \
 				patch-ext_openssl_openssl_missing.h.diff
 
-# change rdoc "system" path to "system1.8.7"
+# change rdoc "system" path to "system1.8.6"
 patchfiles-append patch-rdoc_sysdir.diff
 # linking libruby.dylib not libruby${suffix}.dylib when VENDOR_SPECIFIC = true
 patchfiles-append patch-libruby_nosuffix.diff
@@ -76,7 +76,8 @@
 		xinstall -m 0755 -d ${libdir}
 
 		# special file for installation control of modules
-		xinstall -m 0644 ${filespath}/${type}-specific.rb ${libdir}
+		xinstall -m 0644 ${filespath}/${type}-specific.rb \
+			${destroot}${prefix}/lib/ruby/${ruby_rel}/
 
 		# prevent empty site/vendor directories from being pruned
 		foreach subdir [exec find ${libdir} -type d -empty] {

Added: users/kimuraw/ruby_select/lang/ruby186/files/patch-libruby_nosuffix.diff
===================================================================
--- users/kimuraw/ruby_select/lang/ruby186/files/patch-libruby_nosuffix.diff	                        (rev 0)
+++ users/kimuraw/ruby_select/lang/ruby186/files/patch-libruby_nosuffix.diff	2009-04-18 11:24:12 UTC (rev 49812)
@@ -0,0 +1,10 @@
+--- mkconfig.rb.orig	2009-04-18 19:37:13.000000000 +0900
++++ mkconfig.rb	2009-04-18 19:39:14.000000000 +0900
+@@ -150,6 +150,7 @@
+  	CONFIG["sitedir"] = CONFIG["vendordir"]
+  	CONFIG["sitelibdir"] = CONFIG["vendorlibdir"]
+  	CONFIG["sitearchdir"] = CONFIG["vendorarchdir"]
++ 	CONFIG["RUBY_SO_NAME"] = "ruby"
+   end
+   CONFIG["topdir"] = File.dirname(__FILE__)
+   MAKEFILE_CONFIG = {}

Added: users/kimuraw/ruby_select/lang/ruby186/files/patch-rdoc_sysdir.diff
===================================================================
--- users/kimuraw/ruby_select/lang/ruby186/files/patch-rdoc_sysdir.diff	                        (rev 0)
+++ users/kimuraw/ruby_select/lang/ruby186/files/patch-rdoc_sysdir.diff	2009-04-18 11:24:12 UTC (rev 49812)
@@ -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/ee52db4f/attachment.html>