Update to mkvtoolnix-7.9.0.

from brad (maintainer) with a few tweaks

multimedia/mkvtoolnix/Makefile

@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.32 2013/04/11 20:26:10 brad Exp $
+# $OpenBSD: Makefile,v 1.33 2015/05/27 21:18:48 ajacoutot Exp $
 
 COMMENT=	create, alter and inspect Matroska files
 
-DISTNAME=	mkvtoolnix-4.0.0
+DISTNAME=	mkvtoolnix-7.9.0
-REVISION=	3
 CATEGORIES=	multimedia x11
 MASTER_SITES=	${HOMEPAGE}/sources/
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 HOMEPAGE =	http://www.bunkus.org/videotools/mkvtoolnix/
 
@@ -16,64 +15,65 @@ MAINTAINER=	Brad Smith <brad@comstyle.com>
 PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	FLAC boost_filesystem-mt boost_regex-mt boost_system-mt \
-		bz2 c ebml expat lzo2 m magic matroska ogg pthread \
+		c ebml m magic matroska ogg pthread vorbis z
-		stdc++ vorbis z
 
-MODULES=	devel/gettext
+MODULES=	devel/gettext \
+		lang/ruby \
+		gcc4
 
-LIB_DEPENDS=	archivers/bzip2 \
+MODRUBY_RUNDEP=	No
-		archivers/lzo2 \
+
-		audio/flac \
+MODGCC4_ARCHS=	*
+MODGCC4_LANGS=	c++
+
+BUILD_DEPENDS=	devel/ruby-rake
+LIB_DEPENDS=	audio/flac \
+		audio/libogg \
 		audio/libvorbis \
 		devel/boost \
 		devel/libmagic \
-		multimedia/libmatroska
+		multimedia/libmatroska>=1.4.2 \
+		textproc/libebml>=1.3.1
 
-MAKE_FLAGS+=	V=1
+MAKE_ENV+=	V=1
 
 USE_GROFF=	Yes
-USE_GMAKE=	Yes
+CONFIGURE_STYLE= autoconf
-CONFIGURE_STYLE= gnu
+AUTOCONF_VERSION= 2.69
-CONFIGURE_ARGS=	--with-boost-filesystem=boost_filesystem-mt \
+CONFIGURE_ARGS=	--disable-optimization \
+		--disable-wxwidgets \
+		--with-boost-date-time=boost_date_time-mt \
+		--with-boost-filesystem=boost_filesystem-mt \
 		--with-boost-libdir=${LOCALBASE}/lib \
-		--with-boost-regex=boost_regex-mt
+		--with-boost-regex=boost_regex-mt \
+		--with-boost-system=boost_system-mt \
+		--without-curl
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
+		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt5"
 
 FLAVORS=	no_x11
 FLAVOR?=
 
 .if ${FLAVOR:Mno_x11}
-CONFIGURE_ARGS+= --disable-gui --disable-wxwidgets
+CONFIGURE_ARGS+= --disable-gui
 .else
-LIB_DEPENDS+=	x11/wxWidgets>=2.8.10
+MODULES+=	x11/qt5
-WANTLIB+=	wx_base wx_base_net wx_base_odbc wx_base_xml wx_gtk2_adv \
+WANTLIB+=	Qt5Core Qt5Gui Qt5Widgets
-		wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid wx_gtk2_html \
+RUN_DEPENDS+=	devel/desktop-file-utils \
-		wx_gtk2_qa wx_gtk2_xrc wx_gtk2_richtext
+		misc/shared-mime-info \
+		x11/gtk+3,-guic
 .endif
 
-NO_TEST=    Yes
+NO_TEST=	Yes
+
+do-build:
+	@cd ${WRKSRC} && \
+		env -i ${MAKE_ENV} ${RUBY} ./drake -j${MAKE_JOBS} \
+		${MAKE_FLAGS}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/man/ja.po
+	@cd ${WRKSRC} && \
-	${INSTALL_DATA_DIR} ${PREFIX}/man/zh_CN.po
+		env -i ${MAKE_ENV} ${RUBY} ./drake \
-	${INSTALL_DATA_DIR} ${PREFIX}/man/man1
+		DESTDIR=${WRKINST} install
-.for i in mkvextract mkvinfo mkvmerge mkvpropedit
-	${INSTALL_PROGRAM} ${WRKBUILD}/src/$i ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/doc/man/$i.1 ${PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/doc/man/ja/$i.1 ${PREFIX}/man/ja.po
-	${INSTALL_DATA} ${WRKSRC}/doc/man/zh_CN/$i.1 ${PREFIX}/man/zh_CN.po	
-.endfor
-.if !${FLAVOR:Mno_x11}
-	${INSTALL_PROGRAM} ${WRKBUILD}/src/mmg/mmg ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/doc/man/mmg.1 ${PREFIX}/man/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/mkvtoolnix/images
-	${INSTALL_DATA} ${WRKSRC}/doc/guide/en/mkvmerge-gui.* ${PREFIX}/share/mkvtoolnix
-	${INSTALL_DATA} ${WRKSRC}/doc/guide/en/images/*.gif ${PREFIX}/share/mkvtoolnix/images
-.endif
-.for l in de ja nl ru uk zh_CN zh_TW
-	${INSTALL_DATA_DIR} ${PREFIX}/share/locale/$l/LC_MESSAGES
-	${INSTALL_DATA} ${WRKSRC}/po/$l.mo ${PREFIX}/share/locale/$l/LC_MESSAGES/mkvtoolnix.mo
-.endfor
 
 .include <bsd.port.mk>

multimedia/mkvtoolnix/distinfo

@@ -1,2 +1,2 @@
-SHA256 (mkvtoolnix-4.0.0.tar.bz2) = uB9jf+k54uCVO8L6sBxy+ZpP5VSkodT7Ct3n06UUy/s=
+SHA256 (mkvtoolnix-7.9.0.tar.xz) = OXiPpX2c69bqO+nbWNv4oQ/XyWrY+k95vfTa3Kd7uko=
-SIZE (mkvtoolnix-4.0.0.tar.bz2) = 1605839
+SIZE (mkvtoolnix-7.9.0.tar.xz) = 5628608

multimedia/mkvtoolnix/patches/patch-Rakefile

@@ -0,0 +1,37 @@
+$OpenBSD: patch-Rakefile,v 1.1 2015/05/27 21:18:48 ajacoutot Exp $
+
+build system: install desktop files and icons if Qt is enabled
+
+--- Rakefile.orig	Sun May 10 05:04:26 2015
++++ Rakefile	Wed May 27 03:12:35 2015
+@@ -56,7 +56,7 @@ def setup_globals
+   $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 -Isrc"
+   $system_libdirs          = "-Llib/avilib-0.6.10 -Llib/librmff -Lsrc/common"
+@@ -563,7 +563,8 @@ end
+ # Installation tasks
+ desc "Install all applications and support files"
+ targets  = [ "install:programs", "install:manpages", "install:translations:manpages", "install:translations:applications" ]
+-targets += [ "install:translations:guides", "install:shared" ] if c?(:USE_WXWIDGETS)
++targets += [ "install:translations:guides" ] if c?(:USE_WXWIDGETS)
++targets += [ "install:shared" ]              if c?(:USE_WXWIDGETS) || c?(:USE_QT)
+ task :install => targets
+ 
+ namespace :install do
+@@ -579,8 +580,10 @@ namespace :install do
+ 
+   task :shared do
+     install_dir :desktopdir, :mimepackagesdir
+-    install_data :desktopdir, FileList[ "#{$top_srcdir}/share/desktop/*.desktop" ]
+     install_data :mimepackagesdir, FileList[ "#{$top_srcdir}/share/mime/*.xml" ]
++    install_data :desktopdir, "#{$top_srcdir}/share/desktop/mkvinfo.desktop"
++    install_data :desktopdir, "#{$top_srcdir}/share/desktop/mkvmergeGUI.desktop"    if c?(:USE_WXWIDGETS)
++    install_data :desktopdir, "#{$top_srcdir}/share/desktop/mkvtoolnix-gui.desktop" if c?(:USE_QT)
+ 
+     wanted_apps     = %w{mkvmerge mkvtoolnix-gui mkvinfo mkvextract mkvpropedit}.collect { |e| "#{e}.png" }.to_hash_by
+     wanted_dirs     = %w{16x16 24x24 32x32 48x48 64x64 96x96 128x128 256x256}.to_hash_by

multimedia/mkvtoolnix/patches/patch-ac_qt5_m4

@@ -0,0 +1,31 @@
+$OpenBSD: patch-ac_qt5_m4,v 1.1 2015/05/27 21:18:48 ajacoutot Exp $
+
+Workaround for OpenBSD's pkg-config.
+
+--- ac/qt5.m4.orig	Mon May 25 03:46:47 2015
++++ ac/qt5.m4	Mon May 25 03:48:53 2015
+@@ -124,13 +124,12 @@ if test x"$enable_qt" = "xyes" -a \
+   fi
+ 
+   if test $ok = 1; then
+-    with_qt_pkg_config_modules="`echo "$with_qt_pkg_config_modules" | sed -e 's/ /,/g'`"
+     if test x"$with_qt_pkg_config_modules" != x ; then
+-      with_qt_pkg_config_modules="$with_qt_pkg_config_modules,"
++      with_qt_pkg_config_modules="$with_qt_pkg_config_modules"
+     fi
+-    with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5Core,Qt5Gui,Qt5Widgets"
++    with_qt_pkg_config_modules="$with_qt_pkg_config_modules Qt5Core Qt5Gui Qt5Widgets"
+     PKG_CHECK_EXISTS([$with_qt_pkg_config_modules],,[ok=0])
+-    PKG_CHECK_EXISTS([Qt5PlatformSupport],[with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5PlatformSupport"])
++    PKG_CHECK_EXISTS([Qt5PlatformSupport],[with_qt_pkg_config_modules="$with_qt_pkg_config_modules Qt5PlatformSupport"])
+ 
+     if test $ok = 0; then
+       AC_MSG_RESULT(no: not found by pkg-config)
+@@ -139,7 +138,6 @@ if test x"$enable_qt" = "xyes" -a \
+ 
+   if test $ok = 1; then
+     dnl Try compiling and linking an application.
+-    with_qt_pkg_config_modules="`echo "$with_qt_pkg_config_modules" | sed -e 's/,/ /g'`"
+     QT_CFLAGS="`$PKG_CONFIG --cflags $with_qt_pkg_config_modules $QT_PKG_CONFIG_STATIC`"
+     QT_LIBS="`$PKG_CONFIG --libs $with_qt_pkg_config_modules $QT_PKG_CONFIG_STATIC`"
+ 

multimedia/mkvtoolnix/patches/patch-configure

@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.12 2013/04/11 20:26:10 brad Exp $
---- configure.orig	Sat Jun  5 08:26:22 2010
-+++ configure	Mon Apr  8 20:20:19 2013
-@@ -5043,7 +5043,7 @@ fi
- 
- 
- DEBUG_CFLAGS=""
--OPTIMIZATION_CFLAGS="-O3"
-+OPTIMIZATION_CFLAGS=""
- PROFILING_CFLAGS=""
- PROFILING_LIBS=""
- 

multimedia/mkvtoolnix/patches/patch-rake_d_helpers_rb

@@ -0,0 +1,15 @@
+$OpenBSD: patch-rake_d_helpers_rb,v 1.1 2015/05/27 21:18:48 ajacoutot Exp $
+
+build system: force UTF-8 string encoding when reading source files
+
+--- rake.d/helpers.rb.orig	Tue May 26 14:14:05 2015
++++ rake.d/helpers.rb	Tue May 26 14:14:37 2015
+@@ -237,7 +237,7 @@ def remove_files_by_patters patterns
+ end
+ 
+ def read_files *file_names
+-  Hash[ *file_names.flatten.collect { |file_name| [ file_name, IO.readlines(file_name) ] }.flatten(1) ]
++  Hash[ *file_names.flatten.collect { |file_name| [ file_name, IO.readlines(file_name).collect { |line| line.force_encoding "UTF-8" } ] }.flatten(1) ]
+ end
+ 
+ class Rake::Task

multimedia/mkvtoolnix/patches/patch-src_common_common_cpp

@@ -1,11 +1,14 @@
-$OpenBSD: patch-src_common_common_cpp,v 1.3 2010/07/17 22:52:53 benoit Exp $
+$OpenBSD: patch-src_common_common_cpp,v 1.4 2015/05/27 21:18:48 ajacoutot Exp $
---- src/common/common.cpp.orig	Sat Jun  5 08:24:39 2010
+--- src/common/common.cpp.orig	Wed May 27 12:08:22 2015
-+++ src/common/common.cpp	Sat Jun 26 20:42:11 2010
++++ src/common/common.cpp	Wed May 27 12:09:26 2015
-@@ -14,6 +14,7 @@
+@@ -13,6 +13,10 @@
+ 
  #include "common/common_pch.h"
  
- #include <stdlib.h>
++#ifdef HAVE_UNISTD_H
 +#include <unistd.h>
++#endif
++
  #ifdef SYS_WINDOWS
  # include <windows.h>
  #endif

multimedia/mkvtoolnix/patches/patch-src_common_dts_cpp

@@ -1,10 +1,14 @@
---- src/common/dts.cpp.orig	Sat Jun  5 08:24:39 2010
+$OpenBSD: patch-src_common_dts_cpp,v 1.3 2015/05/27 21:18:48 ajacoutot Exp $
-+++ src/common/dts.cpp	Sat Jun 26 20:39:53 2010
+--- src/common/dts.cpp.orig	Wed May 27 03:27:16 2015
-@@ -14,6 +14,7 @@
++++ src/common/dts.cpp	Wed May 27 03:28:00 2015
- 
+@@ -14,6 +14,10 @@
- #include <string.h>
- #include <stdio.h>
-+#include <unistd.h>
  
  #include "common/common_pch.h"
  
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
+ #include "common/bit_cursor.h"
+ #include "common/dts.h"
+ #include "common/endian.h"

multimedia/mkvtoolnix/patches/patch-src_common_mm_multi_file_io_cpp

@@ -1,29 +0,0 @@
-$OpenBSD: patch-src_common_mm_multi_file_io_cpp,v 1.1 2013/03/08 01:32:25 brad Exp $
-
-adapt patch from https://github.com/mbunkus/mkvtoolnix/blob/master/src/common/mm_multi_file_io.cpp
-
---- src/common/mm_multi_file_io.cpp.orig	Thu Nov 22 14:26:26 2012
-+++ src/common/mm_multi_file_io.cpp	Thu Nov 22 14:31:59 2012
-@@ -155,14 +155,17 @@ mm_multi_file_io_c::create_verbose_identification_info
- 
- void
- mm_multi_file_io_c::display_other_file_info() {
--  std::vector<std::string> file_names;
-+  std::stringstream out;
- 
-   foreach(const mm_multi_file_io_c::file_t &file, m_files)
--    if (file.m_file_name != m_files.front().m_file_name)
--      file_names.push_back(file.m_file_name.leaf());
-+    if (file.m_file_name != m_files.front().m_file_name) {
-+      if (!out.str().empty())
-+        out << ", ";
-+      out << file.m_file_name.filename();
-+    }
- 
--  if (!file_names.empty())
--    mxinfo(boost::format(Y("'%1%': Processing the following files as well: %2%\n")) % m_display_file_name % join(", ", file_names));
-+  if (!out.str().empty())
-+    mxinfo(boost::format(Y("'%1%': Processing the following files as well: %2%\n")) % m_display_file_name % out.str());
- }
- 
- struct path_sorter_t {

multimedia/mkvtoolnix/patches/patch-src_common_strings_editing_cpp

@@ -0,0 +1,35 @@
+$OpenBSD: patch-src_common_strings_editing_cpp,v 1.1 2015/05/27 21:18:48 ajacoutot Exp $
+
+common: remove unused functions & declarations
+
+--- src/common/strings/editing.cpp.orig	Tue May 26 16:22:52 2015
++++ src/common/strings/editing.cpp	Tue May 26 16:23:09 2015
+@@ -214,28 +214,3 @@ std::string
+ get_displayable_string(std::string const &src) {
+   return get_displayable_string(src.c_str(), src.length());
+ }
+-
+-size_t
+-utf8_strlen(const std::string &s) {
+-  size_t length = 0;
+-  size_t index  = 0;
+-
+-  while (s.length() > index) {
+-    unsigned char c  = s[index];
+-    size_t num_bytes = ((c & 0x80) == 0x00) ?  1
+-                     : ((c & 0xe0) == 0xc0) ?  2
+-                     : ((c & 0xf0) == 0xe0) ?  3
+-                     : ((c & 0xf8) == 0xf0) ?  4
+-                     : ((c & 0xfc) == 0xf8) ?  5
+-                     : ((c & 0xfe) == 0xfc) ?  6
+-                     :                        99;
+-
+-    if (99 == num_bytes)
+-      mxerror(boost::format(Y("utf8_strlen(): Invalid UTF-8 char. First byte: 0x%|1$02x|")) % static_cast<unsigned int>(c));
+-
+-    ++length;
+-    index += num_bytes;
+-  }
+-
+-  return length;
+-}

multimedia/mkvtoolnix/patches/patch-src_common_strings_editing_h

@@ -1,11 +1,16 @@
-$OpenBSD: patch-src_common_strings_editing_h,v 1.1 2009/06/09 20:30:18 benoit Exp $
+$OpenBSD: patch-src_common_strings_editing_h,v 1.2 2015/05/27 21:18:48 ajacoutot Exp $
---- src/common/strings/editing.h.orig	Mon Jun  8 17:24:34 2009
+
-+++ src/common/strings/editing.h	Mon Jun  8 17:24:50 2009
+common: remove unused functions & declarations
-@@ -15,6 +15,7 @@
+
- #define __MTX_COMMON_STRINGS_H
+--- src/common/strings/editing.h.orig	Tue May 26 15:29:24 2015
++++ src/common/strings/editing.h	Tue May 26 16:23:36 2015
+@@ -42,9 +42,4 @@ std::string get_displayable_string(std::string const &
  
- #include "common/os.h"
+ extern const std::string empty_string;
-+#include <stdarg.h>
  
- #include <string>
+-int get_arg_len(const char *fmt, ...);
- #include <vector>
+-int get_varg_len(const char *fmt, va_list ap);
+-
+-size_t utf8_strlen(const std::string &s);
+-
+ #endif  // MTX_COMMON_STRINGS_EDITING_H

multimedia/mkvtoolnix/patches/patch-src_input_r_dts_cpp

@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_input_r_dts_cpp,v 1.1 2015/05/27 21:18:48 ajacoutot Exp $
+--- src/input/r_dts.cpp.orig	Wed May 27 03:28:45 2015
++++ src/input/r_dts.cpp	Wed May 27 03:29:18 2015
+@@ -14,6 +14,10 @@
+ 
+ #include "common/common_pch.h"
+ 
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
+ #include "common/codec.h"
+ #include "common/debugging.h"
+ #include "common/dts.h"

multimedia/mkvtoolnix/patches/patch-src_input_r_wav_cpp

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_input_r_wav_cpp,v 1.1 2015/05/27 21:18:48 ajacoutot Exp $
+--- src/input/r_wav.cpp.orig	Wed May 27 03:28:35 2015
++++ src/input/r_wav.cpp	Wed May 27 03:29:05 2015
+@@ -16,6 +16,9 @@
+ #include "common/common_pch.h"
+ 
+ #include <algorithm>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ 
+ #include "avilib.h"
+ #include "common/ac3.h"

multimedia/mkvtoolnix/patches/patch-src_mmg_options_mmg_cpp

@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_mmg_options_mmg_cpp,v 1.1 2009/12/23 12:11:32 benoit Exp $
---- src/mmg/options/mmg.cpp.orig	Thu Aug 13 12:32:50 2009
-+++ src/mmg/options/mmg.cpp	Tue Sep 29 13:34:18 2009
-@@ -32,6 +32,10 @@
- #include "common/wx.h"
- #include "mmg/mmg_dialog.h"
- #include "mmg/mmg.h"
-+#include "mmg/options/chapters.h"
-+#include "mmg/options/dialog.h"
-+#include "mmg/options/languages.h"
-+#include "mmg/options/mkvmerge.h"
- #include "mmg/options/mmg.h"
- 
- struct locale_sorter_t {

multimedia/mkvtoolnix/patches/patch-src_propedit_propedit_cpp

@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_propedit_propedit_cpp,v 1.1 2010/04/05 20:27:09 benoit Exp $
---- src/propedit/propedit.cpp.orig	Sun Apr  4 21:33:04 2010
-+++ src/propedit/propedit.cpp	Sun Apr  4 21:33:27 2010
-@@ -10,6 +10,9 @@
- 
- #include "common/os.h"
- 
-+#include <unistd.h>
-+#include <boost/limits.hpp>
-+ 
- #include <matroska/KaxInfo.h>
- #include <matroska/KaxTracks.h>
- 

multimedia/mkvtoolnix/pkg/PFRAG.no-no_x11

@@ -1,23 +1,57 @@
-@comment $OpenBSD: PFRAG.no-no_x11,v 1.3 2010/04/17 13:14:05 benoit Exp $
+@comment $OpenBSD: PFRAG.no-no_x11,v 1.4 2015/05/27 21:18:48 ajacoutot Exp $
-@bin bin/mmg
+@bin bin/mkvtoolnix-gui
-@man man/man1/mmg.1
+@man man/de/man1/mkvtoolnix-gui.1
-share/mkvtoolnix/
+@man man/ja/man1/mkvtoolnix-gui.1
-share/mkvtoolnix/images/
+@man man/man1/mkvtoolnix-gui.1
-share/mkvtoolnix/images/addingremovingattachments.gif
+@man man/nl/man1/mkvtoolnix-gui.1
-share/mkvtoolnix/images/addremovefiles.gif
+@man man/uk/man1/mkvtoolnix-gui.1
-share/mkvtoolnix/images/attachmentoptions.gif
+@man man/zh_CN/man1/mkvtoolnix-gui.1
-share/mkvtoolnix/images/audiotrackoptions.gif
+share/applications/mkvinfo.desktop
-share/mkvtoolnix/images/chaptereditor.gif
+share/applications/mkvtoolnix-gui.desktop
-share/mkvtoolnix/images/generaltrackoptions.gif
+share/icons/hicolor/128x128/apps/mkvextract.png
-share/mkvtoolnix/images/jobmanager.gif
+share/icons/hicolor/128x128/apps/mkvinfo.png
-share/mkvtoolnix/images/movietitle.gif
+share/icons/hicolor/128x128/apps/mkvmerge.png
-share/mkvtoolnix/images/muxingwindow.gif
+share/icons/hicolor/128x128/apps/mkvpropedit.png
-share/mkvtoolnix/images/selectmkvmergeexecutable.gif
+share/icons/hicolor/128x128/apps/mkvtoolnix-gui.png
-share/mkvtoolnix/images/splitting.gif
+share/icons/hicolor/16x16/apps/mkvextract.png
-share/mkvtoolnix/images/textsubtitlestrackoptions.gif
+share/icons/hicolor/16x16/apps/mkvinfo.png
-share/mkvtoolnix/images/trackselection.gif
+share/icons/hicolor/16x16/apps/mkvmerge.png
-share/mkvtoolnix/images/videotrackoptions.gif
+share/icons/hicolor/16x16/apps/mkvpropedit.png
-share/mkvtoolnix/mkvmerge-gui.hhc
+share/icons/hicolor/16x16/apps/mkvtoolnix-gui.png
-share/mkvtoolnix/mkvmerge-gui.hhk
+share/icons/hicolor/24x24/apps/mkvextract.png
-share/mkvtoolnix/mkvmerge-gui.hhp
+share/icons/hicolor/24x24/apps/mkvinfo.png
-share/mkvtoolnix/mkvmerge-gui.html
+share/icons/hicolor/24x24/apps/mkvmerge.png
+share/icons/hicolor/24x24/apps/mkvpropedit.png
+share/icons/hicolor/24x24/apps/mkvtoolnix-gui.png
+share/icons/hicolor/256x256/apps/mkvextract.png
+share/icons/hicolor/256x256/apps/mkvinfo.png
+share/icons/hicolor/256x256/apps/mkvmerge.png
+share/icons/hicolor/256x256/apps/mkvpropedit.png
+share/icons/hicolor/256x256/apps/mkvtoolnix-gui.png
+share/icons/hicolor/32x32/apps/mkvextract.png
+share/icons/hicolor/32x32/apps/mkvinfo.png
+share/icons/hicolor/32x32/apps/mkvmerge.png
+share/icons/hicolor/32x32/apps/mkvpropedit.png
+share/icons/hicolor/32x32/apps/mkvtoolnix-gui.png
+share/icons/hicolor/48x48/apps/mkvextract.png
+share/icons/hicolor/48x48/apps/mkvinfo.png
+share/icons/hicolor/48x48/apps/mkvmerge.png
+share/icons/hicolor/48x48/apps/mkvpropedit.png
+share/icons/hicolor/48x48/apps/mkvtoolnix-gui.png
+share/icons/hicolor/64x64/apps/mkvextract.png
+share/icons/hicolor/64x64/apps/mkvinfo.png
+share/icons/hicolor/64x64/apps/mkvmerge.png
+share/icons/hicolor/64x64/apps/mkvpropedit.png
+share/icons/hicolor/64x64/apps/mkvtoolnix-gui.png
+share/icons/hicolor/96x96/apps/mkvextract.png
+share/icons/hicolor/96x96/apps/mkvinfo.png
+share/icons/hicolor/96x96/apps/mkvmerge.png
+share/icons/hicolor/96x96/apps/mkvpropedit.png
+share/icons/hicolor/96x96/apps/mkvtoolnix-gui.png
+share/mime/packages/mkvtoolnix.xml
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/update-mime-database %D/share/mime
+@unexec-delete %D/bin/update-mime-database %D/share/mime
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database

multimedia/mkvtoolnix/pkg/PLIST

@@ -1,26 +1,59 @@
-@comment $OpenBSD: PLIST,v 1.7 2010/07/17 22:52:55 benoit Exp $
+@comment $OpenBSD: PLIST,v 1.8 2015/05/27 21:18:48 ajacoutot Exp $
 @bin bin/mkvextract
 @bin bin/mkvinfo
 @bin bin/mkvmerge
 @bin bin/mkvpropedit
-man/ja.po/
+man/de/
-man/ja.po/mkvextract.1
+man/de/man1/
-man/ja.po/mkvinfo.1
+@man man/de/man1/mkvextract.1
-man/ja.po/mkvmerge.1
+@man man/de/man1/mkvinfo.1
-man/ja.po/mkvpropedit.1
+@man man/de/man1/mkvmerge.1
+@man man/de/man1/mkvpropedit.1
+man/ja/
+man/ja/man1/
+@man man/ja/man1/mkvextract.1
+@man man/ja/man1/mkvinfo.1
+@man man/ja/man1/mkvmerge.1
+@man man/ja/man1/mkvpropedit.1
 @man man/man1/mkvextract.1
 @man man/man1/mkvinfo.1
 @man man/man1/mkvmerge.1
 @man man/man1/mkvpropedit.1
-man/zh_CN.po/
+man/nl/
-man/zh_CN.po/mkvextract.1
+man/nl/man1/
-man/zh_CN.po/mkvinfo.1
+@man man/nl/man1/mkvextract.1
-man/zh_CN.po/mkvmerge.1
+@man man/nl/man1/mkvinfo.1
-man/zh_CN.po/mkvpropedit.1
+@man man/nl/man1/mkvmerge.1
+@man man/nl/man1/mkvpropedit.1
+man/uk/
+man/uk/man1/
+@man man/uk/man1/mkvextract.1
+@man man/uk/man1/mkvinfo.1
+@man man/uk/man1/mkvmerge.1
+@man man/uk/man1/mkvpropedit.1
+man/zh_CN/
+man/zh_CN/man1/
+@man man/zh_CN/man1/mkvextract.1
+@man man/zh_CN/man1/mkvinfo.1
+@man man/zh_CN/man1/mkvmerge.1
+@man man/zh_CN/man1/mkvpropedit.1
+share/locale/ca/LC_MESSAGES/mkvtoolnix.mo
+share/locale/cs/LC_MESSAGES/mkvtoolnix.mo
 share/locale/de/LC_MESSAGES/mkvtoolnix.mo
+share/locale/es/LC_MESSAGES/mkvtoolnix.mo
+share/locale/eu/LC_MESSAGES/mkvtoolnix.mo
+share/locale/fr/LC_MESSAGES/mkvtoolnix.mo
+share/locale/it/LC_MESSAGES/mkvtoolnix.mo
 share/locale/ja/LC_MESSAGES/mkvtoolnix.mo
+share/locale/lt/LC_MESSAGES/mkvtoolnix.mo
 share/locale/nl/LC_MESSAGES/mkvtoolnix.mo
+share/locale/pl/LC_MESSAGES/mkvtoolnix.mo
+share/locale/pt/LC_MESSAGES/mkvtoolnix.mo
+share/locale/pt_BR/LC_MESSAGES/mkvtoolnix.mo
 share/locale/ru/LC_MESSAGES/mkvtoolnix.mo
+share/locale/sr/LC_MESSAGES/mkvtoolnix.mo
+share/locale/sv/LC_MESSAGES/mkvtoolnix.mo
+share/locale/tr/LC_MESSAGES/mkvtoolnix.mo
 share/locale/uk/LC_MESSAGES/mkvtoolnix.mo
 share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo
 share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo