Revision: 70935 http://trac.macports.org/changeset/70935 Author: kimuraw@macports.org Date: 2010-08-26 15:59:54 -0700 (Thu, 26 Aug 2010) Log Message: ----------- ruby/rb19-rcairo: upgrade to 1.8.3, fix install destinaion to "vendor_ruby" Modified Paths: -------------- trunk/dports/ruby/rb19-rcairo/Portfile trunk/dports/ruby/rb19-rcairo/files/patch-extconf.rb.diff Modified: trunk/dports/ruby/rb19-rcairo/Portfile =================================================================== --- trunk/dports/ruby/rb19-rcairo/Portfile 2010-08-26 22:33:28 UTC (rev 70934) +++ trunk/dports/ruby/rb19-rcairo/Portfile 2010-08-26 22:59:54 UTC (rev 70935) @@ -3,23 +3,23 @@ PortSystem 1.0 PortGroup ruby 1.0 -ruby.setup rcairo 1.8.1 extconf.rb \ - {README COPYING GPL samples doc} {} ruby19 +ruby.setup rcairo 1.8.3 extconf.rb \ + {README.rdoc COPYING GPL samples doc} {} ruby19 maintainers kimuraw description Ruby bindings for cairo long_description \ Ruby bindings for Cairo. Cairo is a 2D graphics library \ with support for multiple output devices. categories-append graphics -checksums md5 14efc24f0cbe281b32882d64f1b0d4b9 \ - rmd160 e0e8681e3abd324c33c3e11c0df37f34e470d59c \ - sha1 d5ea5ab624b9e00372cb7009e8cbfdae0e7d8c9a +checksums md5 ddc6470c59c3a2adcda836544b4dc5bd \ + rmd160 813b7efe3bb248bcb00e566fa131975d9b38f1e0 \ + sha1 0b4bbfcb3080feb7afef6f6b12e634eff35f3a80 platforms darwin depends_lib-append path:lib/pkgconfig/cairo.pc:cairo configure.env-append PKG_CONFIG=${prefix}/bin/pkg-config configure.args-append --vendor -# patch-extconf.rb.diff: fix wrong location of cairo.bundle with ruby-1.9.2 +# patch-extconf.rb.diff: fix do not pass --vendor to ext/cario/extconf.rb patchfiles patch-extconf.rb.diff homepage http://cairographics.org/rcairo/ Modified: trunk/dports/ruby/rb19-rcairo/files/patch-extconf.rb.diff =================================================================== --- trunk/dports/ruby/rb19-rcairo/files/patch-extconf.rb.diff 2010-08-26 22:33:28 UTC (rev 70934) +++ trunk/dports/ruby/rb19-rcairo/files/patch-extconf.rb.diff 2010-08-26 22:59:54 UTC (rev 70935) @@ -1,25 +1,12 @@ -diff --git extconf.rb extconf.rb -index e7428c0..f178191 100755 ---- extconf.rb -+++ extconf.rb -@@ -97,6 +97,7 @@ makefile = File.read("Makefile") - File.open("Makefile", "w") do |f| - objs = [] - co = nil -+ dllib = nil - makefile.each_line do |line| - if wine - line.gsub!(/\s+gcc\b/, " i586-mingw32msvc-gcc") -@@ -106,9 +107,11 @@ File.open("Makefile", "w") do |f| +--- extconf.rb.orig 2010-08-26 21:57:21.000000000 +0900 ++++ extconf.rb 2010-08-27 07:57:25.000000000 +0900 +@@ -13,7 +13,8 @@ + RbConfig::CONFIG["EXEEXT"]) - case line - when /^DLLIB\s*=\s*/ -- dllib = $POSTMATCH -+ dllib = $POSTMATCH.chomp - f.puts("DLLIB = #{ext_dir_name}/#{dllib}") - f.puts("IMPLIB = #{ext_dir_name}/libruby-#{dllib.gsub(/\..+?$/, '.lib')}") -+ when /(\$\(RUBYARCHDIR\)\/)\$\(DLLIB\)/ -+ f.puts("#{$PREMATCH}#{$1}#{dllib}#{$POSTMATCH}") - when /^(SRCS)\s*=\s*/ - name = $1 - vars = $POSTMATCH.split.collect {|var| "$(srcdir)/#{var}"}.join(" ") + Dir.chdir(ext_dir.to_s) do +- system(ruby, "extconf.rb") ++ $stderr.puts ARGV ++ system(ruby, "extconf.rb", *ARGV) + end + + create_makefile("cairo")