<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[120972] trunk/dports/multimedia/mkvtoolnix</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/120972">120972</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-06-13 01:01:35 -0700 (Fri, 13 Jun 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>mkvtoolnix: upgrade to 7.0.0, use ruby21 (#43222)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediamkvtoolnixPortfile">trunk/dports/multimedia/mkvtoolnix/Portfile</a></li>
<li><a href="#trunkdportsmultimediamkvtoolnixfilespatchclang_errorsdiff">trunk/dports/multimedia/mkvtoolnix/files/patch-clang_errors.diff</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediamkvtoolnixfilespatchrubydiff">trunk/dports/multimedia/mkvtoolnix/files/patch-ruby.diff</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediamkvtoolnixfilespatchdf750c2diff">trunk/dports/multimedia/mkvtoolnix/files/patch-df750c2.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediamkvtoolnixPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mkvtoolnix/Portfile (120971 => 120972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mkvtoolnix/Portfile        2014-06-13 07:10:05 UTC (rev 120971)
+++ trunk/dports/multimedia/mkvtoolnix/Portfile        2014-06-13 08:01:35 UTC (rev 120972)
</span><span class="lines">@@ -6,8 +6,7 @@
</span><span class="cx"> PortGroup           wxWidgets 1.0
</span><span class="cx"> 
</span><span class="cx"> name                mkvtoolnix
</span><del>-version             6.3.0
-revision            2
</del><ins>+version             7.0.0
</ins><span class="cx"> categories          multimedia
</span><span class="cx"> maintainers         nomaintainer
</span><span class="cx"> license             GPL-2+ LGPL-2.1+
</span><span class="lines">@@ -22,14 +21,18 @@
</span><span class="cx">                     http://svn.mandriva.com/svn/packages/cooker/mkvtoolnix/releases/${version}/1/SOURCES/
</span><span class="cx"> use_xz              yes
</span><span class="cx"> 
</span><del>-checksums           rmd160  7147271b54cf7ccb1ea9683428f6d9ccd47ae3fb \
-                    sha256  bc05f07d92190d018e901091a07ed5139f4eec833203af04672e4d3a0c619ba1
</del><ins>+checksums           rmd160  8e581b26661c2bd1b388b1ad99dfd092f0da0700 \
+                    sha256  2bbdf060e193d4a7f961f84d28b28d67d859be66e3f2cdf8ee4ae380f8d15725
</ins><span class="cx"> 
</span><span class="cx"> wxWidgets.use       wxWidgets-3.0
</span><span class="cx"> 
</span><ins>+set version_ruby    2.1
+set version_ruby_mp [join [split $version_ruby &quot;.&quot;] &quot;&quot;]
+
</ins><span class="cx"> depends_build       port:pkgconfig \
</span><span class="cx">                     port:libebml \
</span><del>-                    port:libmatroska
</del><ins>+                    port:libmatroska \
+                    port:ruby${version_ruby_mp}
</ins><span class="cx"> 
</span><span class="cx"> depends_lib         port:boost \
</span><span class="cx">                     port:bzip2 \
</span><span class="lines">@@ -45,11 +48,10 @@
</span><span class="cx">                     port:ruby \
</span><span class="cx">                     port:zlib
</span><span class="cx"> 
</span><del>-patch.pre_args      -p1
-patchfiles          patch-clang_errors.diff
-# Remove when version &gt; 6.3.0 is released
-patchfiles-append   patch-df750c2.diff
</del><ins>+depends_run         port:ruby${version_ruby_mp}
</ins><span class="cx"> 
</span><ins>+patchfiles          patch-ruby.diff
+#                   patch-clang_errors.diff
</ins><span class="cx"> 
</span><span class="cx"> platform darwin {
</span><span class="cx">     if {${os.major} &lt; 13} {
</span></span></pre></div>
<a id="trunkdportsmultimediamkvtoolnixfilespatchclang_errorsdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mkvtoolnix/files/patch-clang_errors.diff (120971 => 120972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mkvtoolnix/files/patch-clang_errors.diff        2014-06-13 07:10:05 UTC (rev 120971)
+++ trunk/dports/multimedia/mkvtoolnix/files/patch-clang_errors.diff        2014-06-13 08:01:35 UTC (rev 120972)
</span><span class="lines">@@ -1,7 +1,6 @@
</span><del>-diff -pur mkvtoolnix-6.3.0.orig/src/common/command_line.cpp mkvtoolnix-6.3.0/src/common/command_line.cpp
---- mkvtoolnix-6.3.0.orig/src/common/command_line.cpp        2013-08-24 18:35:22.000000000 -0400
-+++ mkvtoolnix-6.3.0/src/common/command_line.cpp        2013-08-24 18:36:30.000000000 -0400
-@@ -285,6 +285,7 @@ handle_common_cli_args(std::vector&lt;std::
</del><ins>+--- src/common/command_line.cpp.orig
++++ src/common/command_line.cpp
+@@ -291,6 +291,7 @@ handle_common_cli_args(std::vector&lt;std::string&gt; &amp;args,
</ins><span class="cx">      } else if ((args[i] == &quot;-h&quot;) || (args[i] == &quot;-?&quot;) || (args[i] == &quot;--help&quot;))
</span><span class="cx">        usage();
</span><span class="cx">  
</span><span class="lines">@@ -9,7 +8,7 @@
</span><span class="cx">  #if defined(HAVE_CURL_EASY_H)
</span><span class="cx">      else if (args[i] == &quot;--check-for-updates&quot;) {
</span><span class="cx">        mtx_release_version_t rel = get_latest_release_version();
</span><del>-@@ -304,6 +305,7 @@ handle_common_cli_args(std::vector&lt;std::
</del><ins>+@@ -310,6 +311,7 @@ handle_common_cli_args(std::vector&lt;std::string&gt; &amp;args,
</ins><span class="cx">        mxexit(rel.current_version &lt; rel.latest_source ? 1 : 0);
</span><span class="cx">      }
</span><span class="cx">  #endif  // defined(HAVE_CURL_EASY_H)
</span><span class="lines">@@ -17,10 +16,9 @@
</span><span class="cx">  
</span><span class="cx">      else
</span><span class="cx">        ++i;
</span><del>-diff -pur mkvtoolnix-6.3.0.orig/src/common/version.cpp mkvtoolnix-6.3.0/src/common/version.cpp
---- mkvtoolnix-6.3.0.orig/src/common/version.cpp        2013-08-24 18:35:22.000000000 -0400
-+++ mkvtoolnix-6.3.0/src/common/version.cpp        2013-08-24 18:35:43.000000000 -0400
-@@ -220,7 +220,7 @@ get_latest_release_version() {
</del><ins>+--- src/common/version.cpp.orig
++++ src/common/version.cpp
+@@ -228,7 +228,7 @@ get_latest_release_version() {
</ins><span class="cx">      std::stringstream urls;
</span><span class="cx">      brng::for_each(release.urls, [&amp;](std::pair&lt;std::string, std::string&gt; const &amp;kv) { urls &lt;&lt; &quot; &quot; &lt;&lt; kv.first &lt;&lt; &quot;:&quot; &lt;&lt; kv.second; });
</span><span class="cx">      mxdebug(boost::format(&quot;update check: current %1% latest source %2% latest winpre %3% URLs%4%\n&quot;)
</span></span></pre></div>
<a id="trunkdportsmultimediamkvtoolnixfilespatchdf750c2diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/mkvtoolnix/files/patch-df750c2.diff (120971 => 120972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mkvtoolnix/files/patch-df750c2.diff        2014-06-13 07:10:05 UTC (rev 120971)
+++ trunk/dports/multimedia/mkvtoolnix/files/patch-df750c2.diff        2014-06-13 08:01:35 UTC (rev 120972)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-From df750c28b6f7258dd4c3037e1132c81300b8cdfa Mon Sep 17 00:00:00 2001
-From: Moritz Bunkus &lt;moritz@bunkus.org&gt;
-Date: Sun, 14 Jul 2013 17:25:42 +0200
-Subject: [PATCH] Fix compilation with clang/libc++ on FreeBSD
-
-On FreeBSD the high_resolution_clock is an alias for the steady_clock
--- which doesn't support converting into time_t. As we only need a
-precision of seconds for outputting timestamps using system_clock
-instead is enough.
----
- src/common/logger.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/common/logger.cpp b/src/common/logger.cpp
-index 7f6e5f2..04251d2 100644
---- a/src/common/logger.cpp
-+++ b/src/common/logger.cpp
-@@ -20,7 +20,7 @@

- logger_cptr logger_c::s_default_logger;

--static auto s_program_start_time = std::chrono::high_resolution_clock::now();
-+static auto s_program_start_time = std::chrono::system_clock::now();

- logger_c::logger_c(bfs::path const &amp;file_name)
-   : m_file_name(file_name)
-@@ -41,9 +41,9 @@
-     mm_text_io_c out(new mm_file_io_c(m_file_name.string(), bfs::exists(m_file_name) ? MODE_WRITE : MODE_CREATE));
-     out.setFilePointer(0, seek_end);

--    auto now  = std::chrono::high_resolution_clock::now();
-+    auto now  = std::chrono::system_clock::now();
-     auto diff = now - s_program_start_time;
--    auto tnow = std::chrono::high_resolution_clock::to_time_t(now);
-+    auto tnow = std::chrono::system_clock::to_time_t(now);

-     // 2013-03-02 15:42:32
-     char timestamp[30];
--- 
-1.8.1.6
-
</del></span></pre></div>
<a id="trunkdportsmultimediamkvtoolnixfilespatchrubydiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/mkvtoolnix/files/patch-ruby.diff (0 => 120972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mkvtoolnix/files/patch-ruby.diff                                (rev 0)
+++ trunk/dports/multimedia/mkvtoolnix/files/patch-ruby.diff        2014-06-13 08:01:35 UTC (rev 120972)
</span><span class="lines">@@ -0,0 +1,352 @@
</span><ins>+--- Rakefile.orig
++++ Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ version = RUBY_VERSION.gsub(/[^0-9\.]+/, &quot;&quot;).split(/\./).collect(&amp;:to_i)
+ version &lt;&lt; 0 while version.size &lt; 3
+--- doc/Rakefile.orig
++++ doc/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- doc/guide/Rakefile.orig
++++ doc/guide/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- doc/man/Rakefile.orig
++++ doc/man/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- lib/Rakefile.orig
++++ lib/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- lib/avilib-0.6.10/Rakefile.orig
++++ lib/avilib-0.6.10/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- lib/librmff/Rakefile.orig
++++ lib/librmff/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- rake.d/format_string_verifier.rb.orig
++++ rake.d/format_string_verifier.rb
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ require 'digest/sha1'

+--- rake.d/gtest.rb.orig
++++ rake.d/gtest.rb
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ $gtest_apps     = %w{common propedit}
+ $gtest_internal = c(:GTEST_TYPE) == &quot;internal&quot;
+--- rake.d/vendor/drake-0.9.2.0.3.1/bin/drake.orig
++++ rake.d/vendor/drake-0.9.2.0.3.1/bin/drake
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ #--
+ # Copyright (c) 2003, 2004, 2005, 2006, 2007  Jim Weirich
+--- share/ruby/mkvtoolnix/common.rb.orig
++++ share/ruby/mkvtoolnix/common.rb
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ module MKVToolNix
+   module Common
+--- share/ruby/mkvtoolnix/merge.rb.orig
++++ share/ruby/mkvtoolnix/merge.rb
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ require &quot;pp&quot;

+--- share/ruby/mkvtoolnix.rb.orig
++++ share/ruby/mkvtoolnix.rb
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ require File.absolute_path(File.dirname(__FILE__)) + &quot;/mkvtoolnix/common.rb&quot;
+ require File.absolute_path(File.dirname(__FILE__)) + &quot;/mkvtoolnix/merge.rb&quot;
+--- src/Rakefile.orig
++++ src/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/common/Rakefile.orig
++++ src/common/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/common/chapters/Rakefile.orig
++++ src/common/chapters/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/common/strings/Rakefile.orig
++++ src/common/strings/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/common/tags/Rakefile.orig
++++ src/common/tags/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/common/xml/Rakefile.orig
++++ src/common/xml/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/extract/Rakefile.orig
++++ src/extract/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/info/Rakefile.orig
++++ src/info/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/input/Rakefile.orig
++++ src/input/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/merge/Rakefile.orig
++++ src/merge/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/merge/private/Rakefile.orig
++++ src/merge/private/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/mkvtoolnix-gui/Rakefile.orig
++++ src/mkvtoolnix-gui/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/mkvtoolnix-gui/forms/Rakefile.orig
++++ src/mkvtoolnix-gui/forms/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/mkvtoolnix-gui/job_widget/Rakefile.orig
++++ src/mkvtoolnix-gui/job_widget/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/mkvtoolnix-gui/main_window/Rakefile.orig
++++ src/mkvtoolnix-gui/main_window/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/mkvtoolnix-gui/merge_widget/Rakefile.orig
++++ src/mkvtoolnix-gui/merge_widget/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/mkvtoolnix-gui/util/Rakefile.orig
++++ src/mkvtoolnix-gui/util/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/mmg/Rakefile.orig
++++ src/mmg/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/mmg/header_editor/Rakefile.orig
++++ src/mmg/header_editor/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/mmg/options/Rakefile.orig
++++ src/mmg/options/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/mmg/tabs/Rakefile.orig
++++ src/mmg/tabs/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/mpegparser/Rakefile.orig
++++ src/mpegparser/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/output/Rakefile.orig
++++ src/output/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/propedit/Rakefile.orig
++++ src/propedit/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- src/tools/Rakefile.orig
++++ src/tools/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ $build_tools = true

+--- src/tools/changelog_to_xml.rb.orig
++++ src/tools/changelog_to_xml.rb
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ require 'rubygems'
+ require 'pp'
+--- tests/Rakefile.orig
++++ tests/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + &quot;/#{subdir}/build-config.in&quot;].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')

+--- tests/run.rb.orig
++++ tests/run.rb
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ # Ruby 1.9.x introduce &quot;require_relative&quot; for local requires. 1.9.2
+ # removes &quot;.&quot; from $: and forces us to use &quot;require_relative&quot;. 1.8.x
+--- tests/unit/Rakefile.orig
++++ tests/unit/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ $run_unit_tests = true

+--- tests/unit/common/Rakefile.orig
++++ tests/unit/common/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ $run_unit_tests = true

+--- tests/unit/propedit/Rakefile.orig
++++ tests/unit/propedit/Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1

+ $run_unit_tests = true

</ins></span></pre>
</div>
</div>

</body>
</html>