Update to 8.2.0

11 files changed, 24 insertions, 41 deletions

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index d44ee9a22754..bc7dfcfdfab3 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mkvtoolnix
-PORTVERSION=	7.9.0
+PORTVERSION=	8.2.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		LOCAL/ehaupt
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libboost_regex.so:${PORTSDIR}/devel/boost-libs \
 		libmatroska.so:${PORTSDIR}/multimedia/libmatroska
 
-USES=		pkgconfig gettext iconv compiler:c++11-lib tar:xz
+USES=		compiler:c++11-lib gettext iconv pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=	yes
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 1539868d280e..f0bda5de3991 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mkvtoolnix-7.9.0.tar.xz) = 39788fa57d9cebd6ea3be9db58dbf8a10fd7c96ad8fa4f79bdf4dadca77bba4a
-SIZE (mkvtoolnix-7.9.0.tar.xz) = 5628608
+SHA256 (mkvtoolnix-8.2.0.tar.xz) = eb6d3d7a0254bb4326dccc9983418801783198cdf4a259f31261dab4e843a5c4
+SIZE (mkvtoolnix-8.2.0.tar.xz) = 5856988
diff --git a/multimedia/mkvtoolnix/files/patch-Rakefile b/multimedia/mkvtoolnix/files/patch-Rakefile
deleted file mode 100644
index 2ace3b997e3a..000000000000
--- a/multimedia/mkvtoolnix/files/patch-Rakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Rakefile.orig	2015-02-28 23:10:13.000000000 +0100
-+++ Rakefile	2015-03-24 04:56:05.797612497 +0100
-@@ -51,7 +51,7 @@
-   $application_subdirs     =  { "mmg" => "mmg/", "mkvtoolnix-gui" => "mkvtoolnix-gui/" }
-   $applications            =  $programs.collect { |name| "src/#{$application_subdirs[name]}#{name}" + c(:EXEEXT) }
-   $manpages                =  $programs.collect { |name| "doc/man/#{name}.1" }
--  $manpages                << "doc/man/mkvtoolnix-gui.1" if !$build_mkvtoolnix_gui
-+  $manpages                << "doc/man/mkvtoolnix-gui.1" if $build_mkvtoolnix_gui
- 
-   $system_includes         = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Isrc"
-   $system_libdirs          = "-Llib/avilib-0.6.10 -Llib/librmff -Lsrc/common"
diff --git a/multimedia/mkvtoolnix/files/patch-lib__libebml__ebml__EbmlBinary.h b/multimedia/mkvtoolnix/files/patch-lib__libebml__ebml__EbmlBinary.h
index 958f90d1f8c2..394782263623 100644
--- a/multimedia/mkvtoolnix/files/patch-lib__libebml__ebml__EbmlBinary.h
+++ b/multimedia/mkvtoolnix/files/patch-lib__libebml__ebml__EbmlBinary.h
@@ -1,5 +1,5 @@
---- ./lib/libebml/ebml/EbmlBinary.h.orig	2013-09-16 22:01:58.000000000 +0200
-+++ ./lib/libebml/ebml/EbmlBinary.h	2013-10-09 08:13:47.119105934 +0200
+--- lib/libebml/ebml/EbmlBinary.h.orig	2015-07-18 11:39:43 UTC
++++ lib/libebml/ebml/EbmlBinary.h
 @@ -41,6 +41,7 @@
  
  #include "EbmlTypes.h"
diff --git a/multimedia/mkvtoolnix/files/patch-src-common-timecode.h b/multimedia/mkvtoolnix/files/patch-src-common-timecode.h
index 5552f5fd0b48..6595a0543d68 100644
--- a/multimedia/mkvtoolnix/files/patch-src-common-timecode.h
+++ b/multimedia/mkvtoolnix/files/patch-src-common-timecode.h
@@ -1,6 +1,6 @@
---- src/common/timecode.h.orig	2012-09-22 22:31:07.000000000 +0800
-+++ src/common/timecode.h	2012-09-22 22:31:19.000000000 +0800
-@@ -139,7 +139,7 @@
+--- src/common/timecode.h.orig	2015-07-18 11:39:41 UTC
++++ src/common/timecode.h
+@@ -147,7 +147,7 @@ public:
    }
  
    basic_timecode_c<T> abs() const {
@@ -8,4 +8,4 @@
 +    return basic_timecode_c<T>{(T)std::abs(m_timecode), m_valid};
    }
  
-   // comparison
+   basic_timecode_c<T> value_or_min() const {
diff --git a/multimedia/mkvtoolnix/files/patch-src_common_common.cpp b/multimedia/mkvtoolnix/files/patch-src_common_common.cpp
index e6d039fc3ce5..ce1f7566d87e 100644
--- a/multimedia/mkvtoolnix/files/patch-src_common_common.cpp
+++ b/multimedia/mkvtoolnix/files/patch-src_common_common.cpp
@@ -1,6 +1,6 @@
---- src/common/common.cpp.orig	2015-06-08 16:28:17.092399114 +0200
-+++ src/common/common.cpp	2015-06-08 16:28:32.292398239 +0200
-@@ -30,6 +30,10 @@
+--- src/common/common.cpp.orig	2015-07-18 11:39:41 UTC
++++ src/common/common.cpp
+@@ -33,6 +33,10 @@
  #include "common/strings/editing.h"
  #include "common/translation.h"
  
diff --git a/multimedia/mkvtoolnix/files/patch-src_common_dts.cpp b/multimedia/mkvtoolnix/files/patch-src_common_dts.cpp
index 44e81e4b7ea9..e94f57502a32 100644
--- a/multimedia/mkvtoolnix/files/patch-src_common_dts.cpp
+++ b/multimedia/mkvtoolnix/files/patch-src_common_dts.cpp
@@ -1,6 +1,6 @@
---- src/common/dts.cpp.orig	2015-06-08 14:19:36 UTC
+--- src/common/dts.cpp.orig	2015-07-18 11:39:41 UTC
 +++ src/common/dts.cpp
-@@ -19,6 +19,10 @@
+@@ -23,6 +23,10 @@
  #include "common/endian.h"
  #include "common/math.h"
  
diff --git a/multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h b/multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h
deleted file mode 100644
index 1e7adc8becb3..000000000000
--- a/multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/common/strings/editing.h.orig	2015-06-08 16:25:26.833411779 +0200
-+++ src/common/strings/editing.h	2015-06-08 16:25:45.153412704 +0200
-@@ -43,7 +43,6 @@
- extern const std::string empty_string;
- 
- int get_arg_len(const char *fmt, ...);
--int get_varg_len(const char *fmt, va_list ap);
- 
- size_t utf8_strlen(const std::string &s);
- 
diff --git a/multimedia/mkvtoolnix/files/patch-src_input_r__dts.cpp b/multimedia/mkvtoolnix/files/patch-src_input_r__dts.cpp
index 5c1bd1422252..4127dc03611b 100644
--- a/multimedia/mkvtoolnix/files/patch-src_input_r__dts.cpp
+++ b/multimedia/mkvtoolnix/files/patch-src_input_r__dts.cpp
@@ -1,6 +1,6 @@
---- src/input/r_dts.cpp.orig	2015-06-08 14:20:03 UTC
+--- src/input/r_dts.cpp.orig	2015-07-18 11:39:41 UTC
 +++ src/input/r_dts.cpp
-@@ -23,6 +23,10 @@
+@@ -27,6 +27,10 @@
  #include "merge/input_x.h"
  #include "output/p_dts.h"
  
diff --git a/multimedia/mkvtoolnix/files/patch-src_input_r__wav.cpp b/multimedia/mkvtoolnix/files/patch-src_input_r__wav.cpp
index 7a329e95ef08..d5c862fcc7f7 100644
--- a/multimedia/mkvtoolnix/files/patch-src_input_r__wav.cpp
+++ b/multimedia/mkvtoolnix/files/patch-src_input_r__wav.cpp
@@ -1,6 +1,6 @@
---- src/input/r_wav.cpp.orig	2015-06-08 14:20:26 UTC
+--- src/input/r_wav.cpp.orig	2015-07-18 11:39:41 UTC
 +++ src/input/r_wav.cpp
-@@ -29,6 +29,10 @@
+@@ -32,6 +32,10 @@
  #include "output/p_dts.h"
  #include "output/p_pcm.h"
  
diff --git a/multimedia/mkvtoolnix/pkg-plist b/multimedia/mkvtoolnix/pkg-plist
index e4794c222794..8fae6575847b 100644
--- a/multimedia/mkvtoolnix/pkg-plist
+++ b/multimedia/mkvtoolnix/pkg-plist
@@ -124,7 +124,6 @@
 %%WXGTK%%man/zh_CN/man1/mmg.1.gz
 %%WXGTK%%share/applications/mkvinfo.desktop
 %%WXGTK%%share/applications/mkvmergeGUI.desktop
-%%WXGTK%%share/applications/mkvtoolnix-gui.desktop
 %%WXGTK%%share/icons/hicolor/128x128/apps/mkvextract.png
 %%WXGTK%%share/icons/hicolor/128x128/apps/mkvinfo.png
 %%WXGTK%%share/icons/hicolor/128x128/apps/mkvmerge.png
@@ -190,6 +189,11 @@ bin/mkvextract
 bin/mkvinfo
 bin/mkvmerge
 bin/mkvpropedit
+man/es/man1/mkvextract.1.gz
+man/es/man1/mkvinfo.1.gz
+man/es/man1/mkvmerge.1.gz
+man/es/man1/mkvpropedit.1.gz
+man/es/man1/mmg.1.gz
 man/ja/man1/mkvextract.1.gz
 man/ja/man1/mkvinfo.1.gz
 man/ja/man1/mkvmerge.1.gz