Revision: 74637 http://trac.macports.org/changeset/74637 Author: kimuraw@macports.org Date: 2010-12-25 08:53:27 -0800 (Sat, 25 Dec 2010) Log Message: ----------- lang/ruby19: upgrade to 1.9.2-p136 revert r74587 (depends_lib port:readline -> port:readline-5). installation from sourcecode with macports do not violates licenses (#27747). Revision Links: -------------- http://trac.macports.org/changeset/74587 Modified Paths: -------------- trunk/dports/lang/ruby19/Portfile Removed Paths: ------------- trunk/dports/lang/ruby19/files/patch-bug26269.diff Modified: trunk/dports/lang/ruby19/Portfile =================================================================== --- trunk/dports/lang/ruby19/Portfile 2010-12-25 15:07:38 UTC (rev 74636) +++ trunk/dports/lang/ruby19/Portfile 2010-12-25 16:53:27 UTC (rev 74637) @@ -3,8 +3,8 @@ PortSystem 1.0 name ruby19 -version 1.9.2-p0 -revision 4 +version 1.9.2-p136 +revision 0 categories lang ruby maintainers kimuraw openmaintainer @@ -25,18 +25,13 @@ use_bzip2 yes distname ruby-${version} -checksums md5 d8a02cadf57d2571cd4250e248ea7e4b \ - rmd160 dc15937c884b0f93863e9871304bae95e1233e15 \ - sha1 c0fc7e1047f1eac7e554e9818513593b0d398698 +checksums md5 52958d35d1b437f5d9d225690de94c13 \ + rmd160 91fec5fc667035b5d281a55c268b79c71b4c1277 \ + sha1 3f9023d00be44104d2fef485843f123bb6de6c37 use_parallel_build yes -# use port:readline-5, not port:readline (version 6). -# ruby's license is not compatible readline's (GPL-3+). -# -# ruby-1.9.3 will be released under Ruby/BSDL license and -# will become compatible with GPL-3. depends_lib port:libiconv \ - port:readline-5 \ + port:readline \ port:openssl \ port:zlib \ port:ncurses \ @@ -48,15 +43,9 @@ --enable-pthread \ --without-tk \ --with-opt-dir="${prefix}" \ - --with-readline-include=${prefix}/include/readline5 \ - --with-readline-lib=${prefix}/lib/readline5 \ --program-suffix=1.9 \ --with-rubylibprefix=${prefix}/lib/ruby1.9 -# #26969: .ri file with strage path -# patch from http://redmine.ruby-lang.org/issues/show/3759 -patchfiles-append patch-bug26269.diff - # Ignore minor version for archdir, like i686-darwin9. # Port "ruby" does the same. configure.env UNAME_RELEASE=${os.major} @@ -81,6 +70,19 @@ } } +pre-activate { + # Bug #3805 [ruby-core:32165] + # http://redmine.ruby-lang.org/issues/show/3805 + # + # the two gems of "rake", contained in ruby-1.9.2 and installed via gem + # command, might be installed. + # `port activate' fails when the two rake are installed. + set rake_dup_gemspec ${prefix}/lib/ruby1.9/gems/1.9.1/specifications/rake-0.8.7.gemspec + if {[file exists ${rake_dup_gemspec}]} { + delete ${rake_dup_gemspec} + } +} + variant nosuffix description "Don't add the 1.9 program suffix to the executables. Note: that makes the port conflict with ruby (1.8), rb-rubygems, and rb-rake ports." { configure.args-delete --program-suffix=1.9 } Deleted: trunk/dports/lang/ruby19/files/patch-bug26269.diff =================================================================== --- trunk/dports/lang/ruby19/files/patch-bug26269.diff 2010-12-25 15:07:38 UTC (rev 74636) +++ trunk/dports/lang/ruby19/files/patch-bug26269.diff 2010-12-25 16:53:27 UTC (rev 74637) @@ -1,22 +0,0 @@ -Index: lib/rdoc/parser/ruby.rb -=================================================================== ---- lib/rdoc/parser/ruby.rb (revision 29139) -+++ lib/rdoc/parser/ruby.rb (revision 29141) -@@ -526,7 +526,7 @@ - else - break unless @scanner.continue - end -- when TkCOMMENT -+ when TkCOMMENT, TkASSIGN, TkOPASGN - unget_tk(tk) - break - when nil then -@@ -568,7 +568,7 @@ - case name = get_class_specification - when "self", container.name - parse_statements container, SINGLE -- else -+ when /\A[A-Z]/ - other = RDoc::TopLevel.find_class_named name - - unless other then