Ticket #43222: patch-mkvtoolnix-7.0.0.diff

File patch-mkvtoolnix-7.0.0.diff, 45.2 KB (added by pixilla (Bradley Giesbrecht), 10 years ago)

mkvtoolnix 7.0.0 mp ruby

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/Portfile

     
    66PortGroup           wxWidgets 1.0
    77
    88name                mkvtoolnix
    9 version             6.3.0
    10 revision            2
     9version             7.0.0
    1110categories          multimedia
    1211maintainers         nomaintainer
    1312license             GPL-2+ LGPL-2.1+
    … …  
    2221                    http://svn.mandriva.com/svn/packages/cooker/mkvtoolnix/releases/${version}/1/SOURCES/
    2322use_xz              yes
    2423
    25 checksums           rmd160  7147271b54cf7ccb1ea9683428f6d9ccd47ae3fb \
    26                     sha256  bc05f07d92190d018e901091a07ed5139f4eec833203af04672e4d3a0c619ba1
     24checksums           rmd160  8e581b26661c2bd1b388b1ad99dfd092f0da0700 \
     25                    sha256  2bbdf060e193d4a7f961f84d28b28d67d859be66e3f2cdf8ee4ae380f8d15725
    2726
    2827wxWidgets.use       wxWidgets-3.0
    29 
     28set version_ruby    2.1
     29set version_ruby_mp [join [split $version_ruby "."] ""]
    3030depends_build       port:pkgconfig \
    3131                    port:libebml \
    3232                    port:libmatroska
    … …  
    4242                    port:libvorbis \
    4343                    port:lzo2 \
    4444                    port:pcre \
    45                     port:ruby \
     45                    port:ruby${version_ruby_mp} \
    4646                    port:zlib
    4747
    4848patch.pre_args      -p1
    49 patchfiles          patch-clang_errors.diff
    50 # Remove when version > 6.3.0 is released
    51 patchfiles-append   patch-df750c2.diff
     49patchfiles          patch-Rakefile.diff \
     50                    patch-doc-Rakefile.diff \
     51                    patch-doc-guide-Rakefile.diff \
     52                    patch-doc-man-Rakefile.diff \
     53                    patch-lib-Rakefile.diff \
     54                    patch-lib-avilib-0.6.10-Rakefile.diff \
     55                    patch-lib-librmff-Rakefile.diff \
     56                    patch-rake.d-format_string_verifier.rb.diff \
     57                    patch-rake.d-gtest.rb.diff \
     58                    patch-rake.d-vendor-drake-0.9.2.0.3.1-bin-drake.diff \
     59                    patch-share-ruby-mkvtoolnix-common.rb.diff \
     60                    patch-share-ruby-mkvtoolnix-merge.rb.diff \
     61                    patch-share-ruby-mkvtoolnix.rb.diff \
     62                    patch-src-Rakefile.diff \
     63                    patch-src-common-Rakefile.diff \
     64                    patch-src-common-chapters-Rakefile.diff \
     65                    patch-src-common-strings-Rakefile.diff \
     66                    patch-src-common-tags-Rakefile.diff \
     67                    patch-src-common-xml-Rakefile.diff \
     68                    patch-src-extract-Rakefile.diff \
     69                    patch-src-info-Rakefile.diff \
     70                    patch-src-input-Rakefile.diff \
     71                    patch-src-merge-Rakefile.diff \
     72                    patch-src-merge-private-Rakefile.diff \
     73                    patch-src-mkvtoolnix-gui-Rakefile.diff \
     74                    patch-src-mkvtoolnix-gui-forms-Rakefile.diff \
     75                    patch-src-mkvtoolnix-gui-job_widget-Rakefile.diff \
     76                    patch-src-mkvtoolnix-gui-main_window-Rakefile.diff \
     77                    patch-src-mkvtoolnix-gui-merge_widget-Rakefile.diff \
     78                    patch-src-mkvtoolnix-gui-util-Rakefile.diff \
     79                    patch-src-mmg-Rakefile.diff \
     80                    patch-src-mmg-header_editor-Rakefile.diff \
     81                    patch-src-mmg-options-Rakefile.diff \
     82                    patch-src-mmg-tabs-Rakefile.diff \
     83                    patch-src-mpegparser-Rakefile.diff \
     84                    patch-src-output-Rakefile.diff \
     85                    patch-src-propedit-Rakefile.diff \
     86                    patch-src-tools-Rakefile.diff \
     87                    patch-src-tools-changelog_to_xml.rb.diff \
     88                    patch-tests-Rakefile.diff \
     89                    patch-tests-run.rb.diff \
     90                    patch-tests-unit-Rakefile.diff \
     91                    patch-tests-unit-common-Rakefile.diff \
     92                    patch-tests-unit-propedit-Rakefile.diff
    5293
    53 
    5494platform darwin {
    5595    if {${os.major} < 13} {
    5696        # TODO: Need to link against static versions of boost and icu for this to work right

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-Rakefile.diff

     
     1--- a/Rakefile  2014-06-11 19:57:12.000000000 -0700
     2+++ b/Rakefile  2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 version = RUBY_VERSION.gsub(/[^0-9\.]+/, "").split(/\./).collect(&:to_i)
     8 version << 0 while version.size < 3

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-clang_errors.diff

     
    1 diff -pur mkvtoolnix-6.3.0.orig/src/common/command_line.cpp mkvtoolnix-6.3.0/src/common/command_line.cpp
    2 --- mkvtoolnix-6.3.0.orig/src/common/command_line.cpp   2013-08-24 18:35:22.000000000 -0400
    3 +++ mkvtoolnix-6.3.0/src/common/command_line.cpp        2013-08-24 18:36:30.000000000 -0400
    4 @@ -285,6 +285,7 @@ handle_common_cli_args(std::vector<std::
    5      } else if ((args[i] == "-h") || (args[i] == "-?") || (args[i] == "--help"))
    6        usage();
    7  
    8 +#if 0
    9  #if defined(HAVE_CURL_EASY_H)
    10      else if (args[i] == "--check-for-updates") {
    11        mtx_release_version_t rel = get_latest_release_version();
    12 @@ -304,6 +305,7 @@ handle_common_cli_args(std::vector<std::
    13        mxexit(rel.current_version < rel.latest_source ? 1 : 0);
    14      }
    15  #endif  // defined(HAVE_CURL_EASY_H)
    16 +#endif
    17  
    18      else
    19        ++i;
    20 diff -pur mkvtoolnix-6.3.0.orig/src/common/version.cpp mkvtoolnix-6.3.0/src/common/version.cpp
    21 --- mkvtoolnix-6.3.0.orig/src/common/version.cpp        2013-08-24 18:35:22.000000000 -0400
    22 +++ mkvtoolnix-6.3.0/src/common/version.cpp     2013-08-24 18:35:43.000000000 -0400
    23 @@ -220,7 +220,7 @@ get_latest_release_version() {
    24      std::stringstream urls;
    25      brng::for_each(release.urls, [&](std::pair<std::string, std::string> const &kv) { urls << " " << kv.first << ":" << kv.second; });
    26      mxdebug(boost::format("update check: current %1% latest source %2% latest winpre %3% URLs%4%\n")
    27 -            % release.current_version.to_string() % release.latest_source.to_string() % release.latest_windows_build.to_string() % urls);
    28 +            % release.current_version.to_string() % release.latest_source.to_string() % release.latest_windows_build.to_string() % urls.str());
    29    }
    30  
    31    return release;

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-df750c2.diff

     
    1 From df750c28b6f7258dd4c3037e1132c81300b8cdfa Mon Sep 17 00:00:00 2001
    2 From: Moritz Bunkus <moritz@bunkus.org>
    3 Date: Sun, 14 Jul 2013 17:25:42 +0200
    4 Subject: [PATCH] Fix compilation with clang/libc++ on FreeBSD
    5 
    6 On FreeBSD the high_resolution_clock is an alias for the steady_clock
    7 -- which doesn't support converting into time_t. As we only need a
    8 precision of seconds for outputting timestamps using system_clock
    9 instead is enough.
    10 ---
    11  src/common/logger.cpp | 6 +++---
    12  1 file changed, 3 insertions(+), 3 deletions(-)
    13 
    14 diff --git a/src/common/logger.cpp b/src/common/logger.cpp
    15 index 7f6e5f2..04251d2 100644
    16 --- a/src/common/logger.cpp
    17 +++ b/src/common/logger.cpp
    18 @@ -20,7 +20,7 @@
    19  
    20  logger_cptr logger_c::s_default_logger;
    21  
    22 -static auto s_program_start_time = std::chrono::high_resolution_clock::now();
    23 +static auto s_program_start_time = std::chrono::system_clock::now();
    24  
    25  logger_c::logger_c(bfs::path const &file_name)
    26    : m_file_name(file_name)
    27 @@ -41,9 +41,9 @@
    28      mm_text_io_c out(new mm_file_io_c(m_file_name.string(), bfs::exists(m_file_name) ? MODE_WRITE : MODE_CREATE));
    29      out.setFilePointer(0, seek_end);
    30  
    31 -    auto now  = std::chrono::high_resolution_clock::now();
    32 +    auto now  = std::chrono::system_clock::now();
    33      auto diff = now - s_program_start_time;
    34 -    auto tnow = std::chrono::high_resolution_clock::to_time_t(now);
    35 +    auto tnow = std::chrono::system_clock::to_time_t(now);
    36  
    37      // 2013-03-02 15:42:32
    38      char timestamp[30];
    39 --
    40 1.8.1.6
    41 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-doc-Rakefile.diff

     
     1--- a/doc/Rakefile      2014-06-11 19:57:11.000000000 -0700
     2+++ b/doc/Rakefile      2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-doc-guide-Rakefile.diff

     
     1--- a/doc/guide/Rakefile        2014-06-11 19:57:11.000000000 -0700
     2+++ b/doc/guide/Rakefile        2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-doc-man-Rakefile.diff

     
     1--- a/doc/man/Rakefile  2014-06-11 19:57:11.000000000 -0700
     2+++ b/doc/man/Rakefile  2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-lib-Rakefile.diff

     
     1--- a/lib/Rakefile      2014-06-11 19:57:11.000000000 -0700
     2+++ b/lib/Rakefile      2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-lib-avilib-0.6.10-Rakefile.diff

     
     1--- a/lib/avilib-0.6.10/Rakefile        2014-06-11 19:57:11.000000000 -0700
     2+++ b/lib/avilib-0.6.10/Rakefile        2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-lib-librmff-Rakefile.diff

     
     1--- a/lib/librmff/Rakefile      2014-06-11 19:57:11.000000000 -0700
     2+++ b/lib/librmff/Rakefile      2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-rake.d-format_string_verifier.rb.diff

     
     1--- a/rake.d/format_string_verifier.rb  2014-06-11 19:57:11.000000000 -0700
     2+++ b/rake.d/format_string_verifier.rb  2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 require 'digest/sha1'
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-rake.d-gtest.rb.diff

     
     1--- a/rake.d/gtest.rb   2014-06-11 19:57:11.000000000 -0700
     2+++ b/rake.d/gtest.rb   2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 $gtest_apps     = %w{common propedit}
     8 $gtest_internal = c(:GTEST_TYPE) == "internal"

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-rake.d-vendor-drake-0.9.2.0.3.1-bin-drake.diff

     
     1--- a/rake.d/vendor/drake-0.9.2.0.3.1/bin/drake 2014-06-11 19:57:11.000000000 -0700
     2+++ b/rake.d/vendor/drake-0.9.2.0.3.1/bin/drake 2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 #--
     8 # Copyright (c) 2003, 2004, 2005, 2006, 2007  Jim Weirich

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-share-ruby-mkvtoolnix-common.rb.diff

     
     1--- a/share/ruby/mkvtoolnix/common.rb   2014-06-11 19:57:12.000000000 -0700
     2+++ b/share/ruby/mkvtoolnix/common.rb   2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 module MKVToolNix
     8   module Common

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-share-ruby-mkvtoolnix-merge.rb.diff

     
     1--- a/share/ruby/mkvtoolnix/merge.rb    2014-06-11 19:57:12.000000000 -0700
     2+++ b/share/ruby/mkvtoolnix/merge.rb    2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 require "pp"
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-share-ruby-mkvtoolnix.rb.diff

     
     1--- a/share/ruby/mkvtoolnix.rb  2014-06-11 19:57:12.000000000 -0700
     2+++ b/share/ruby/mkvtoolnix.rb  2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 require File.absolute_path(File.dirname(__FILE__)) + "/mkvtoolnix/common.rb"
     8 require File.absolute_path(File.dirname(__FILE__)) + "/mkvtoolnix/merge.rb"

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-Rakefile.diff

     
     1--- a/src/Rakefile      2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/Rakefile      2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-common-Rakefile.diff

     
     1--- a/src/common/Rakefile       2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/common/Rakefile       2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-common-chapters-Rakefile.diff

     
     1--- a/src/common/chapters/Rakefile      2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/common/chapters/Rakefile      2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-common-strings-Rakefile.diff

     
     1--- a/src/common/strings/Rakefile       2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/common/strings/Rakefile       2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-common-tags-Rakefile.diff

     
     1--- a/src/common/tags/Rakefile  2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/common/tags/Rakefile  2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-common-xml-Rakefile.diff

     
     1--- a/src/common/xml/Rakefile   2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/common/xml/Rakefile   2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-extract-Rakefile.diff

     
     1--- a/src/extract/Rakefile      2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/extract/Rakefile      2014-06-11 19:58:30.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-info-Rakefile.diff

     
     1--- a/src/info/Rakefile 2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/info/Rakefile 2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-input-Rakefile.diff

     
     1--- a/src/input/Rakefile        2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/input/Rakefile        2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-merge-Rakefile.diff

     
     1--- a/src/merge/Rakefile        2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/merge/Rakefile        2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-merge-private-Rakefile.diff

     
     1--- a/src/merge/private/Rakefile        2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/merge/private/Rakefile        2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-mkvtoolnix-gui-Rakefile.diff

     
     1--- a/src/mkvtoolnix-gui/Rakefile       2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/mkvtoolnix-gui/Rakefile       2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-mkvtoolnix-gui-forms-Rakefile.diff

     
     1--- a/src/mkvtoolnix-gui/forms/Rakefile 2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/mkvtoolnix-gui/forms/Rakefile 2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-mkvtoolnix-gui-job_widget-Rakefile.diff

     
     1--- a/src/mkvtoolnix-gui/job_widget/Rakefile    2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/mkvtoolnix-gui/job_widget/Rakefile    2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-mkvtoolnix-gui-main_window-Rakefile.diff

     
     1--- a/src/mkvtoolnix-gui/main_window/Rakefile   2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/mkvtoolnix-gui/main_window/Rakefile   2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-mkvtoolnix-gui-merge_widget-Rakefile.diff

     
     1--- a/src/mkvtoolnix-gui/merge_widget/Rakefile  2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/mkvtoolnix-gui/merge_widget/Rakefile  2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-mkvtoolnix-gui-util-Rakefile.diff

     
     1--- a/src/mkvtoolnix-gui/util/Rakefile  2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/mkvtoolnix-gui/util/Rakefile  2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-mmg-Rakefile.diff

     
     1--- a/src/mmg/Rakefile  2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/mmg/Rakefile  2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-mmg-header_editor-Rakefile.diff

     
     1--- a/src/mmg/header_editor/Rakefile    2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/mmg/header_editor/Rakefile    2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-mmg-options-Rakefile.diff

     
     1--- a/src/mmg/options/Rakefile  2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/mmg/options/Rakefile  2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-mmg-tabs-Rakefile.diff

     
     1--- a/src/mmg/tabs/Rakefile     2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/mmg/tabs/Rakefile     2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-mpegparser-Rakefile.diff

     
     1--- a/src/mpegparser/Rakefile   2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/mpegparser/Rakefile   2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-output-Rakefile.diff

     
     1--- a/src/output/Rakefile       2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/output/Rakefile       2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-propedit-Rakefile.diff

     
     1--- a/src/propedit/Rakefile     2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/propedit/Rakefile     2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-tools-Rakefile.diff

     
     1--- a/src/tools/Rakefile        2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/tools/Rakefile        2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 $build_tools = true
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-src-tools-changelog_to_xml.rb.diff

     
     1--- a/src/tools/changelog_to_xml.rb     2014-06-11 19:57:12.000000000 -0700
     2+++ b/src/tools/changelog_to_xml.rb     2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 require 'rubygems'
     8 require 'pp'

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-tests-Rakefile.diff

     
     1--- a/tests/Rakefile    2014-06-11 19:57:12.000000000 -0700
     2+++ b/tests/Rakefile    2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 import ['..', '../..', '../../..'].collect { |subdir| FileList[File.dirname(__FILE__) + "/#{subdir}/build-config.in"].to_a }.flatten.compact.first.gsub(/build-config.in/, 'Rakefile')
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-tests-run.rb.diff

     
     1--- a/tests/run.rb      2014-06-11 19:57:12.000000000 -0700
     2+++ b/tests/run.rb      2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 # Ruby 1.9.x introduce "require_relative" for local requires. 1.9.2
     8 # removes "." from $: and forces us to use "require_relative". 1.8.x

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-tests-unit-Rakefile.diff

     
     1--- a/tests/unit/Rakefile       2014-06-11 19:57:13.000000000 -0700
     2+++ b/tests/unit/Rakefile       2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 $run_unit_tests = true
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-tests-unit-common-Rakefile.diff

     
     1--- a/tests/unit/common/Rakefile        2014-06-11 19:57:13.000000000 -0700
     2+++ b/tests/unit/common/Rakefile        2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 $run_unit_tests = true
     8 

  • opt/local/var/macports/sources/svn.macports.org/trunk/dports/multimedia/mkvtoolnix/files/patch-tests-unit-propedit-Rakefile.diff

     
     1--- a/tests/unit/propedit/Rakefile      2014-06-11 19:57:13.000000000 -0700
     2+++ b/tests/unit/propedit/Rakefile      2014-06-11 19:58:31.000000000 -0700
     3@@ -1,4 +1,4 @@
     4-#!/usr/bin/env ruby
     5+#!/usr/bin/env ruby2.1
     6 
     7 $run_unit_tests = true
     8