[109941] trunk/dports/lang

[kimuraw at macports.org]

Revision: 109941
          https://trac.macports.org/changeset/109941
Author:   kimuraw at macports.org
Date:     2013-08-22 05:44:55 -0700 (Thu, 22 Aug 2013)
Log Message:
-----------
lang/ruby19, ruby20: fix +mactk variant not works

ruby19 and ruby20 can not genearte module for Tk.framework.
next release will contain this fix.

see [ruby-list:49520] (ja)
    http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-list/49520

Modified Paths:
--------------
    trunk/dports/lang/ruby19/Portfile
    trunk/dports/lang/ruby20/Portfile

Added Paths:
-----------
    trunk/dports/lang/ruby19/files/patch-ruby-list-49520.diff
    trunk/dports/lang/ruby20/files/patch-ruby-list-49520.diff

Modified: trunk/dports/lang/ruby19/Portfile
===================================================================
--- trunk/dports/lang/ruby19/Portfile	2013-08-22 12:42:53 UTC (rev 109940)
+++ trunk/dports/lang/ruby19/Portfile	2013-08-22 12:44:55 UTC (rev 109941)
@@ -6,7 +6,7 @@
 
 name				ruby19
 version				1.9.3-p448
-revision			0
+revision			1
 
 categories			lang ruby
 maintainers			kimuraw openmaintainer
@@ -52,7 +52,9 @@
 # lib-rubygems-specification.rb: fix 'Invalid gemspec in [... json-1.6.1.gemspec]: invalid date
 #     format in specification: "2011-09-18 00:00:00.000000000Z"'
 #     https://github.com/rubygems/rubygems/pull/196
-patchfiles			patch-lib-rubygems-specification.rb.diff
+# ruby-list:49520: fix mactk variant does not work
+patchfiles			patch-lib-rubygems-specification.rb.diff \
+                    patch-ruby-list-49520.diff
 
 # ruby-1.9.3 supports Xcode-4.2 clang and gcc-4.2.
 # ruby built with llvm-gcc will be broken.

Added: trunk/dports/lang/ruby19/files/patch-ruby-list-49520.diff
===================================================================
--- trunk/dports/lang/ruby19/files/patch-ruby-list-49520.diff	                        (rev 0)
+++ trunk/dports/lang/ruby19/files/patch-ruby-list-49520.diff	2013-08-22 12:44:55 UTC (rev 109941)
@@ -0,0 +1,11 @@
+--- ext/tk/extconf.rb.orig	2013-08-22 00:39:29.000000000 +0900
++++ ext/tk/extconf.rb	2013-08-22 21:19:22.000000000 +0900
+@@ -315,7 +315,7 @@
+   paths.map{|dir| dir.strip.chomp('/')}.each{|dir|
+     next unless File.exist?(File.join(dir, "Tcl.framework", "Headers"))
+     next unless File.directory?(tcldir = File.join(dir, "Tcl.framework"))
+-    next unless File.exist?(File.join(dir, "Tk.framework"), "Headers")
++    next unless File.exist?(File.join(dir, "Tk.framework", "Headers"))
+     next unless File.directory?(tkdir  = File.join(dir, "Tk.framework"))
+     TkLib_Config["tcltk-framework"] = dir
+     return [tcldir, tkdir]

Modified: trunk/dports/lang/ruby20/Portfile
===================================================================
--- trunk/dports/lang/ruby20/Portfile	2013-08-22 12:42:53 UTC (rev 109940)
+++ trunk/dports/lang/ruby20/Portfile	2013-08-22 12:44:55 UTC (rev 109941)
@@ -6,7 +6,7 @@
 
 name                ruby20
 version             2.0.0-p247
-revision            0
+revision            1
 
 categories          lang ruby
 maintainers         kimuraw openmaintainer
@@ -61,7 +61,9 @@
 
 # configure: fix build error at verconf.h. patch from trunk.
 # ext/tk/extconf.rb: fix build error with tk variant
-patchfiles          patch-ext-tk-extconf.rb.diff
+# ruby-list:49520: fix mactk variant does not work
+patchfiles          patch-ext-tk-extconf.rb.diff \
+                    patch-ruby-list-49520.diff
 
 # Add the architecture flag as required
 if {[info exists build_arch] && ${build_arch} != ""} {

Added: trunk/dports/lang/ruby20/files/patch-ruby-list-49520.diff
===================================================================
--- trunk/dports/lang/ruby20/files/patch-ruby-list-49520.diff	                        (rev 0)
+++ trunk/dports/lang/ruby20/files/patch-ruby-list-49520.diff	2013-08-22 12:44:55 UTC (rev 109941)
@@ -0,0 +1,11 @@
+--- ext/tk/extconf.rb.orig	2013-08-22 00:39:29.000000000 +0900
++++ ext/tk/extconf.rb	2013-08-22 21:19:22.000000000 +0900
+@@ -315,7 +315,7 @@
+   paths.map{|dir| dir.strip.chomp('/')}.each{|dir|
+     next unless File.exist?(File.join(dir, "Tcl.framework", "Headers"))
+     next unless File.directory?(tcldir = File.join(dir, "Tcl.framework"))
+-    next unless File.exist?(File.join(dir, "Tk.framework"), "Headers")
++    next unless File.exist?(File.join(dir, "Tk.framework", "Headers"))
+     next unless File.directory?(tkdir  = File.join(dir, "Tk.framework"))
+     TkLib_Config["tcltk-framework"] = dir
+     return [tcldir, tkdir]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130822/e024ebbe/attachment.html>