[120972] trunk/dports/multimedia/mkvtoolnix
mojca at macports.org
mojca at macports.org
Fri Jun 13 01:01:35 PDT 2014
Revision: 120972
https://trac.macports.org/changeset/120972
Author: mojca at macports.org
Date: 2014-06-13 01:01:35 -0700 (Fri, 13 Jun 2014)
Log Message:
-----------
mkvtoolnix: upgrade to 7.0.0, use ruby21 (#43222)
Modified Paths:
--------------
trunk/dports/multimedia/mkvtoolnix/Portfile
trunk/dports/multimedia/mkvtoolnix/files/patch-clang_errors.diff
Added Paths:
-----------
trunk/dports/multimedia/mkvtoolnix/files/patch-ruby.diff
Removed Paths:
-------------
trunk/dports/multimedia/mkvtoolnix/files/patch-df750c2.diff
Modified: trunk/dports/multimedia/mkvtoolnix/Portfile
===================================================================
--- 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)
@@ -6,8 +6,7 @@
PortGroup wxWidgets 1.0
name mkvtoolnix
-version 6.3.0
-revision 2
+version 7.0.0
categories multimedia
maintainers nomaintainer
license GPL-2+ LGPL-2.1+
@@ -22,14 +21,18 @@
http://svn.mandriva.com/svn/packages/cooker/mkvtoolnix/releases/${version}/1/SOURCES/
use_xz yes
-checksums rmd160 7147271b54cf7ccb1ea9683428f6d9ccd47ae3fb \
- sha256 bc05f07d92190d018e901091a07ed5139f4eec833203af04672e4d3a0c619ba1
+checksums rmd160 8e581b26661c2bd1b388b1ad99dfd092f0da0700 \
+ sha256 2bbdf060e193d4a7f961f84d28b28d67d859be66e3f2cdf8ee4ae380f8d15725
wxWidgets.use wxWidgets-3.0
+set version_ruby 2.1
+set version_ruby_mp [join [split $version_ruby "."] ""]
+
depends_build port:pkgconfig \
port:libebml \
- port:libmatroska
+ port:libmatroska \
+ port:ruby${version_ruby_mp}
depends_lib port:boost \
port:bzip2 \
@@ -45,11 +48,10 @@
port:ruby \
port:zlib
-patch.pre_args -p1
-patchfiles patch-clang_errors.diff
-# Remove when version > 6.3.0 is released
-patchfiles-append patch-df750c2.diff
+depends_run port:ruby${version_ruby_mp}
+patchfiles patch-ruby.diff
+# patch-clang_errors.diff
platform darwin {
if {${os.major} < 13} {
Modified: trunk/dports/multimedia/mkvtoolnix/files/patch-clang_errors.diff
===================================================================
--- 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)
@@ -1,7 +1,6 @@
-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<std::
+--- src/common/command_line.cpp.orig
++++ src/common/command_line.cpp
+@@ -291,6 +291,7 @@ handle_common_cli_args(std::vector<std::string> &args,
} else if ((args[i] == "-h") || (args[i] == "-?") || (args[i] == "--help"))
usage();
@@ -9,7 +8,7 @@
#if defined(HAVE_CURL_EASY_H)
else if (args[i] == "--check-for-updates") {
mtx_release_version_t rel = get_latest_release_version();
-@@ -304,6 +305,7 @@ handle_common_cli_args(std::vector<std::
+@@ -310,6 +311,7 @@ handle_common_cli_args(std::vector<std::string> &args,
mxexit(rel.current_version < rel.latest_source ? 1 : 0);
}
#endif // defined(HAVE_CURL_EASY_H)
@@ -17,10 +16,9 @@
else
++i;
-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() {
+--- src/common/version.cpp.orig
++++ src/common/version.cpp
+@@ -228,7 +228,7 @@ get_latest_release_version() {
std::stringstream urls;
brng::for_each(release.urls, [&](std::pair<std::string, std::string> const &kv) { urls << " " << kv.first << ":" << kv.second; });
mxdebug(boost::format("update check: current %1% latest source %2% latest winpre %3% URLs%4%\n")
Deleted: trunk/dports/multimedia/mkvtoolnix/files/patch-df750c2.diff
===================================================================
--- 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)
@@ -1,41 +0,0 @@
-From df750c28b6f7258dd4c3037e1132c81300b8cdfa Mon Sep 17 00:00:00 2001
-From: Moritz Bunkus <moritz at bunkus.org>
-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 &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
-
Added: trunk/dports/multimedia/mkvtoolnix/files/patch-ruby.diff
===================================================================
--- 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)
@@ -0,0 +1,352 @@
+--- Rakefile.orig
++++ Rakefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby2.1
+
+ version = RUBY_VERSION.gsub(/[^0-9\.]+/, "").split(/\./).collect(&:to_i)
+ version << 0 while version.size < 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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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) == "internal"
+--- 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 "pp"
+
+--- 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__)) + "/mkvtoolnix/common.rb"
+ require File.absolute_path(File.dirname(__FILE__)) + "/mkvtoolnix/merge.rb"
+--- 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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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__) + "/#{subdir}/build-config.in"].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 "require_relative" for local requires. 1.9.2
+ # removes "." from $: and forces us to use "require_relative". 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
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140613/34c3604b/attachment.html>
More information about the macports-changes
mailing list