[82060] trunk/dports/ruby/rb-cocoa

[kimuraw at macports.org]

Revision: 82060
          http://trac.macports.org/changeset/82060
Author:   kimuraw at macports.org
Date:     2011-08-06 23:50:57 -0700 (Sat, 06 Aug 2011)
Log Message:
-----------
ruby/rb-cocoa: fix #30563, build failure on Lion.

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

Added Paths:
-----------
    trunk/dports/ruby/rb-cocoa/files/patch-install.rb.diff

Modified: trunk/dports/ruby/rb-cocoa/Portfile
===================================================================
--- trunk/dports/ruby/rb-cocoa/Portfile	2011-08-07 06:45:54 UTC (rev 82059)
+++ trunk/dports/ruby/rb-cocoa/Portfile	2011-08-07 06:50:57 UTC (rev 82060)
@@ -4,7 +4,7 @@
 PortGroup		ruby 1.0
 
 ruby.setup		{cocoa rubycocoa} 1.0.1 install.rb {ChangeLog ReadMe.html ReadMe.ja.html}
-revision		0
+revision		1
 maintainers		kimuraw
 description		Ruby bindings for writing cocoa programs
 long_description	RubyCocoa is a Ruby library for using Cocoa Objects \
@@ -24,7 +24,9 @@
 platforms		darwin
 
 # fix #16928: allow non Mac OS X's make, like gmake
-patchfiles-append	patch-ext-rubycocoa-extconf.rb.in.diff
+# fix #30563: build failure on Lion
+patchfiles-append	patch-ext-rubycocoa-extconf.rb.in.diff \
+					patch-install.rb.diff
 
 configure.args		--install-prefix=${destroot}${prefix} \
 					--install-root=${destroot} \

Added: trunk/dports/ruby/rb-cocoa/files/patch-install.rb.diff
===================================================================
--- trunk/dports/ruby/rb-cocoa/files/patch-install.rb.diff	                        (rev 0)
+++ trunk/dports/ruby/rb-cocoa/files/patch-install.rb.diff	2011-08-07 06:50:57 UTC (rev 82060)
@@ -0,0 +1,14 @@
+--- install.rb.orig	2009-09-21 00:15:47.000000000 +0900
++++ install.rb	2011-08-07 15:23:54.000000000 +0900
+@@ -649,8 +649,10 @@
+       sys_version = `uname -r`.to_f
+       if sys_version < 8.0 
+         xcode_version = 0 # <= Xcode 1.5 on MacOS X 10.3
++      elsif sys_version >= 11.0
++        xcode_version = 620 # Lion uses Xcode 4.1 or later
+       elsif /DevToolsCore-(\d+)/.match(`#{buildcommand} -version`)
+-        xcode_version = $1.to_i
++        xcode_version = $1.to_i # Xcode 2.x or 3.x
+       else
+         xcode_version = 0 # unknown
+       end
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110806/e7653e42/attachment.html>