Fix build problem on ruby23.

4 files changed, 58 insertions, 1 deletions

diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 4d83116c08b..68ae968c06c 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2015/11/03 23:54:30 agc Exp $
+$NetBSD: distinfo,v 1.36 2016/03/27 15:05:27 taca Exp $
 
 SHA1 (mkvtoolnix-5.0.1.tar.bz2) = 900211d47ba6cbeb4188bb45a492a2b9edf08ed2
 RMD160 (mkvtoolnix-5.0.1.tar.bz2) = 3c6220a1ff304a18e4d7125d6981966c3e9d368e
@@ -6,5 +6,8 @@ SHA512 (mkvtoolnix-5.0.1.tar.bz2) = 5ac0077bdef7426fc4f978bae5965f868dcc5b5a7898
 Size (mkvtoolnix-5.0.1.tar.bz2) = 2155095 bytes
 SHA1 (patch-aa) = f34d52914908e54fef20c857c3fde28aa560ff91
 SHA1 (patch-lib_boost_utf8__codecvt__facet_utf8__codecvt__facet.cpp) = 42e184abf518fd4d77a6b9737abe6bbe20a5ca41
+SHA1 (patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake.rb) = 8806c9f516fbbc575b1ba1f4c44288bfbc846686
+SHA1 (patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_alt__system.rb) = 44b07525151ec716271445f76de2327b7279f266
+SHA1 (patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_contrib_sys.rb) = 6ea4000953717497baf16dd1f11834becc77879a
 SHA1 (patch-src_common_common.cpp) = 04955bcef7fdc825bd97aed62211ad91b7a58c30
 SHA1 (patch-src_common_terminal.cpp) = 7bb0178f1fe58ce50feed7c8fc5974ba1172fa13
diff --git a/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake.rb b/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake.rb
new file mode 100644
index 00000000000..ffd42093e9b
--- /dev/null
+++ b/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake.rb
@@ -0,0 +1,24 @@
+$NetBSD: patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake.rb,v 1.1 2016/03/27 15:05:27 taca Exp $
+
+Avoid to use obsolete module name.
+
+--- rake.d/vendor/drake-0.8.7.0.2.4/lib/rake.rb.orig	2011-10-09 09:48:12.000000000 +0000
++++ rake.d/vendor/drake-0.8.7.0.2.4/lib/rake.rb
+@@ -984,13 +984,13 @@ end
+ # added to the FileUtils utility functions.
+ #
+ module FileUtils
+-  RUBY_EXT = ((Config::CONFIG['ruby_install_name'] =~ /\.(com|cmd|exe|bat|rb|sh)$/) ?
++  RUBY_EXT = ((RbConfig::CONFIG['ruby_install_name'] =~ /\.(com|cmd|exe|bat|rb|sh)$/) ?
+     "" :
+-    Config::CONFIG['EXEEXT'])
++    RbConfig::CONFIG['EXEEXT'])
+   
+   RUBY = File.join(
+-    Config::CONFIG['bindir'],
+-    Config::CONFIG['ruby_install_name'] + RUBY_EXT).
++    RbConfig::CONFIG['bindir'],
++    RbConfig::CONFIG['ruby_install_name'] + RUBY_EXT).
+     sub(/.*\s.*/m, '"\&"')
+ 
+   OPT_TABLE['sh']  = %w(noop verbose)
diff --git a/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_alt__system.rb b/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_alt__system.rb
new file mode 100644
index 00000000000..930e704d5ce
--- /dev/null
+++ b/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_alt__system.rb
@@ -0,0 +1,15 @@
+$NetBSD: patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_alt__system.rb,v 1.1 2016/03/27 15:05:27 taca Exp $
+
+Avoid to use obsolete module name.
+
+--- rake.d/vendor/drake-0.8.7.0.2.4/lib/rake/alt_system.rb.orig	2011-10-09 09:48:12.000000000 +0000
++++ rake.d/vendor/drake-0.8.7.0.2.4/lib/rake/alt_system.rb
+@@ -29,7 +29,7 @@ require 'rbconfig'
+ # for ruby-1.8 and earlier.
+ # 
+ module Rake::AltSystem
+-  WINDOWS = Config::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
++  WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
+ 
+   class << self
+     def define_module_function(name, &block)
diff --git a/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_contrib_sys.rb b/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_contrib_sys.rb
new file mode 100644
index 00000000000..8a5d4d3b546
--- /dev/null
+++ b/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_contrib_sys.rb
@@ -0,0 +1,15 @@
+$NetBSD: patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_contrib_sys.rb,v 1.1 2016/03/27 15:05:27 taca Exp $
+
+Avoid to use obsolete module name.
+
+--- rake.d/vendor/drake-0.8.7.0.2.4/lib/rake/contrib/sys.rb.orig	2011-10-09 09:48:12.000000000 +0000
++++ rake.d/vendor/drake-0.8.7.0.2.4/lib/rake/contrib/sys.rb
+@@ -40,7 +40,7 @@ require 'rbconfig'
+ # in Ruby 1.8.
+ #
+ module Sys
+-  RUBY = Config::CONFIG['ruby_install_name']
++  RUBY = RbConfig::CONFIG['ruby_install_name']
+ 
+   # Install all the files matching +wildcard+ into the +dest_dir+
+   # directory.  The permission mode is set to +mode+.