Update mkvtoolnix to 9.4.0:

- restrict GUI option to Qt.
- disable compiler optimisation override
- new features:
  - support for Apple ProRes videos in MOV/MP4 files
  - much improves MPEG TS support
  - support WebVTT subtitles
  - output of Big Endian PCM to WAV supported
  - ${TOOL}_OPTIONS can be used for passing additional arguments to
    individual programs via environment
  - support for core-less DTS streams consisting solely of XLL extension
    sub-streams
  - time codes computation for AAC, AC-3, DTS, MP3 and TrueHD packets
    was rewritten
  - support TrueHD tracks inside MPEG TS by keeping (additional) AC-3
    audio track
  - support MPEG-H p2/HEVC video in MP4 container
  - support for AAC in LOAS/LATM multiplex if read from MPEG transport
    streams or raw LOAS/LATM AAC files
  - support for h.265/HEVC from MPEG TS and elementary streams
  - support for teletext subtitles from MPEG TS
  - faster format detection for text subtitle formats
  - support for DTS audio streams in MP4
  - support for VP9 from IVF and WebM files
  - support for Opus
  - support for reading ALAC from CAF and MP4 files
- 5 years of various bug fixes and GUI improvements.

6 files changed, 130 insertions, 91 deletions

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index bb37126854a..8d9177243a6 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.80 2016/08/03 10:23:12 adam Exp $
+# $NetBSD: Makefile,v 1.81 2016/09/08 16:18:01 joerg Exp $
 
-DISTNAME=	mkvtoolnix-5.0.1
-PKGREVISION=	28
+DISTNAME=	mkvtoolnix-9.4.0
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	https://mkvtoolnix.download/sources/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.bunkus.org/videotools/mkvtoolnix/
+HOMEPAGE=	http://mkvtoolnix.download/
 COMMENT=	Set of tools to create, alter and inspect Matroska files
 LICENSE=	gnu-gpl-v2
 
@@ -17,10 +16,12 @@ USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--without-curl --disable-precompiled-headers
 CONFIGURE_ARGS+=	--with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}
 CONFIGURE_ARGS+=	--with-boost_regex=boost_regex
 CONFIGURE_ARGS+=	--with-boost-system=boost_system
 CONFIGURE_ARGS+=	--with-boost-filesystem=boost_filesystem
+CONFIGURE_ARGS+=	--disable-optimization
 
 REPLACE_LOCALEDIR_PATTERNS=	build-config.in
 
diff --git a/multimedia/mkvtoolnix/PLIST b/multimedia/mkvtoolnix/PLIST
index bab64490c58..bd31eac3306 100644
--- a/multimedia/mkvtoolnix/PLIST
+++ b/multimedia/mkvtoolnix/PLIST
@@ -1,81 +1,67 @@
-@comment $NetBSD: PLIST,v 1.6 2011/10/07 19:09:55 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/09/08 16:18:01 joerg Exp $
 bin/mkvextract
 bin/mkvinfo
 bin/mkvmerge
 bin/mkvpropedit
-${PLIST.gui}bin/mmg
+man/ca/man1/mkvextract.1
+man/ca/man1/mkvinfo.1
+man/ca/man1/mkvmerge.1
+man/ca/man1/mkvpropedit.1
+man/de/man1/mkvextract.1
+man/de/man1/mkvinfo.1
+man/de/man1/mkvmerge.1
+man/de/man1/mkvpropedit.1
+man/es/man1/mkvextract.1
+man/es/man1/mkvinfo.1
+man/es/man1/mkvmerge.1
+man/es/man1/mkvpropedit.1
 man/ja/man1/mkvextract.1
 man/ja/man1/mkvinfo.1
 man/ja/man1/mkvmerge.1
 man/ja/man1/mkvpropedit.1
-${PLIST.gui}man/ja/man1/mmg.1
+man/ko/man1/mkvextract.1
+man/ko/man1/mkvinfo.1
+man/ko/man1/mkvmerge.1
+man/ko/man1/mkvpropedit.1
 man/man1/mkvextract.1
 man/man1/mkvinfo.1
 man/man1/mkvmerge.1
 man/man1/mkvpropedit.1
-${PLIST.gui}man/man1/mmg.1
 man/nl/man1/mkvextract.1
 man/nl/man1/mkvinfo.1
 man/nl/man1/mkvmerge.1
 man/nl/man1/mkvpropedit.1
-${PLIST.gui}man/nl/man1/mmg.1
+man/pl/man1/mkvextract.1
+man/pl/man1/mkvinfo.1
+man/pl/man1/mkvmerge.1
+man/pl/man1/mkvpropedit.1
+man/uk/man1/mkvextract.1
+man/uk/man1/mkvinfo.1
+man/uk/man1/mkvmerge.1
+man/uk/man1/mkvpropedit.1
 man/zh_CN/man1/mkvextract.1
 man/zh_CN/man1/mkvinfo.1
 man/zh_CN/man1/mkvmerge.1
 man/zh_CN/man1/mkvpropedit.1
-${PLIST.gui}man/zh_CN/man1/mmg.1
-${PLIST.gui}share/applications/mkvinfo.desktop
-${PLIST.gui}share/applications/mkvmergeGUI.desktop
-share/doc/mkvtoolnix/guide/en/images/addingremovingattachments.gif
-share/doc/mkvtoolnix/guide/en/images/addremovefiles.gif
-share/doc/mkvtoolnix/guide/en/images/attachmentoptions.gif
-share/doc/mkvtoolnix/guide/en/images/audiotrackoptions.gif
-share/doc/mkvtoolnix/guide/en/images/chaptereditor.gif
-share/doc/mkvtoolnix/guide/en/images/generaltrackoptions.gif
-share/doc/mkvtoolnix/guide/en/images/jobmanager.gif
-share/doc/mkvtoolnix/guide/en/images/movietitle.gif
-share/doc/mkvtoolnix/guide/en/images/muxingwindow.gif
-share/doc/mkvtoolnix/guide/en/images/selectmkvmergeexecutable.gif
-share/doc/mkvtoolnix/guide/en/images/splitting.gif
-share/doc/mkvtoolnix/guide/en/images/textsubtitlestrackoptions.gif
-share/doc/mkvtoolnix/guide/en/images/trackselection.gif
-share/doc/mkvtoolnix/guide/en/images/videotrackoptions.gif
-share/doc/mkvtoolnix/guide/en/mkvmerge-gui.hhc
-share/doc/mkvtoolnix/guide/en/mkvmerge-gui.hhk
-share/doc/mkvtoolnix/guide/en/mkvmerge-gui.hhp
-share/doc/mkvtoolnix/guide/en/mkvmerge-gui.html
-share/doc/mkvtoolnix/guide/zh_CN/images/addingremovingattachments.gif
-share/doc/mkvtoolnix/guide/zh_CN/images/addremovefiles.gif
-share/doc/mkvtoolnix/guide/zh_CN/images/attachmentoptions.gif
-share/doc/mkvtoolnix/guide/zh_CN/images/audiotrackoptions.gif
-share/doc/mkvtoolnix/guide/zh_CN/images/chaptereditor.gif
-share/doc/mkvtoolnix/guide/zh_CN/images/generaltrackoptions.gif
-share/doc/mkvtoolnix/guide/zh_CN/images/jobmanager.gif
-share/doc/mkvtoolnix/guide/zh_CN/images/movietitle.gif
-share/doc/mkvtoolnix/guide/zh_CN/images/muxingwindow.gif
-share/doc/mkvtoolnix/guide/zh_CN/images/selectmkvmergeexecutable.gif
-share/doc/mkvtoolnix/guide/zh_CN/images/splitting.gif
-share/doc/mkvtoolnix/guide/zh_CN/images/textsubtitlestrackoptions.gif
-share/doc/mkvtoolnix/guide/zh_CN/images/trackselection.gif
-share/doc/mkvtoolnix/guide/zh_CN/images/videotrackoptions.gif
-share/doc/mkvtoolnix/guide/zh_CN/mkvmerge-gui.hhc
-share/doc/mkvtoolnix/guide/zh_CN/mkvmerge-gui.hhk
-share/doc/mkvtoolnix/guide/zh_CN/mkvmerge-gui.hhp
-share/doc/mkvtoolnix/guide/zh_CN/mkvmerge-gui.html
-${PLIST.gui}share/icons/hicolor/32x32/apps/mkvinfo.png
-${PLIST.gui}share/icons/hicolor/32x32/apps/mkvmergeGUI.png
-${PLIST.gui}share/icons/hicolor/64x64/apps/mkvinfo.png
-${PLIST.gui}share/icons/hicolor/64x64/apps/mkvmergeGUI.png
+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/ko/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_RS/LC_MESSAGES/mkvtoolnix.mo
+share/locale/sr_RS@latin/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
-${PLIST.gui}share/mime/packages/mkvtoolnix.xml
diff --git a/multimedia/mkvtoolnix/PLIST.gui b/multimedia/mkvtoolnix/PLIST.gui
new file mode 100644
index 00000000000..cf209fba34e
--- /dev/null
+++ b/multimedia/mkvtoolnix/PLIST.gui
@@ -0,0 +1,55 @@
+@comment $NetBSD: PLIST.gui,v 1.1 2016/09/08 16:18:01 joerg Exp $
+bin/mkvtoolnix-gui
+man/ca/man1/mkvtoolnix-gui.1
+man/de/man1/mkvtoolnix-gui.1
+man/es/man1/mkvtoolnix-gui.1
+man/ja/man1/mkvtoolnix-gui.1
+man/ko/man1/mkvtoolnix-gui.1
+man/man1/mkvtoolnix-gui.1
+man/nl/man1/mkvtoolnix-gui.1
+man/pl/man1/mkvtoolnix-gui.1
+man/uk/man1/mkvtoolnix-gui.1
+man/zh_CN/man1/mkvtoolnix-gui.1
+share/applications/mkvinfo.desktop
+share/applications/mkvtoolnix-gui.desktop
+share/icons/hicolor/128x128/apps/mkvextract.png
+share/icons/hicolor/128x128/apps/mkvinfo.png
+share/icons/hicolor/128x128/apps/mkvmerge.png
+share/icons/hicolor/128x128/apps/mkvpropedit.png
+share/icons/hicolor/128x128/apps/mkvtoolnix-gui.png
+share/icons/hicolor/16x16/apps/mkvextract.png
+share/icons/hicolor/16x16/apps/mkvinfo.png
+share/icons/hicolor/16x16/apps/mkvmerge.png
+share/icons/hicolor/16x16/apps/mkvpropedit.png
+share/icons/hicolor/16x16/apps/mkvtoolnix-gui.png
+share/icons/hicolor/24x24/apps/mkvextract.png
+share/icons/hicolor/24x24/apps/mkvinfo.png
+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
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index b36acd04ba4..fdb75d376ec 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.37 2016/03/28 03:45:31 taca Exp $
+$NetBSD: distinfo,v 1.38 2016/09/08 16:18:01 joerg Exp $
 
-SHA1 (mkvtoolnix-5.0.1.tar.bz2) = 900211d47ba6cbeb4188bb45a492a2b9edf08ed2
-RMD160 (mkvtoolnix-5.0.1.tar.bz2) = 3c6220a1ff304a18e4d7125d6981966c3e9d368e
-SHA512 (mkvtoolnix-5.0.1.tar.bz2) = 5ac0077bdef7426fc4f978bae5965f868dcc5b5a78982580a441b55390f900babd8863a215e5bfddbf0c93087c36d93e5a6cb473e1d9b156622b85f8baec8e91
-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-src_common_common.cpp) = 04955bcef7fdc825bd97aed62211ad91b7a58c30
-SHA1 (patch-src_common_terminal.cpp) = 7bb0178f1fe58ce50feed7c8fc5974ba1172fa13
+SHA1 (mkvtoolnix-9.4.0.tar.xz) = 0d3627756d5f47e58c517c497a2b219eebf34b3f
+RMD160 (mkvtoolnix-9.4.0.tar.xz) = ad6070cbf207b83eb93bdc69e4af887e2d1ae5b4
+SHA512 (mkvtoolnix-9.4.0.tar.xz) = d4dc70ea048fdad5c4bb01d31ba8d8d8078332a07c8ce12e95f84d61e3e068334903723bd1b0029c04db65e180de445126f58aad28569330422e87cdbb0ba785
+Size (mkvtoolnix-9.4.0.tar.xz) = 3765696 bytes
+SHA1 (patch-configure) = 47b07a3a6c3d90ac2f219c99d8232cb9eca61135
diff --git a/multimedia/mkvtoolnix/options.mk b/multimedia/mkvtoolnix/options.mk
index 8528d76d1b9..c8579506673 100644
--- a/multimedia/mkvtoolnix/options.mk
+++ b/multimedia/mkvtoolnix/options.mk
@@ -1,36 +1,19 @@
-# $NetBSD: options.mk,v 1.1 2011/03/20 13:19:44 adam Exp $
+# $NetBSD: options.mk,v 1.2 2016/09/08 16:18:01 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mkvtoolnix
-PKG_SUPPORTED_OPTIONS=	# empty
-PKG_OPTIONS_OPTIONAL_GROUPS=	gui
-PKG_OPTIONS_GROUP.gui=	wxwidgets
+PKG_SUPPORTED_OPTIONS=	gui
 PKG_SUGGESTED_OPTIONS=	# empty
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		gui
+PLIST_SRC=		${PLIST_SRC_DFLT}
 
-.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mwxwidgets)
-PLIST.gui=		yes
-CONFIGURE_ARGS+=	--enable-gui
+.if !empty(PKG_OPTIONS:Mgui)
+PLIST_SRC+=		PLIST.gui
+CONFIGURE_ARGS+=	--enable-qt MOC=${QTDIR}/bin/moc
+CONFIGURE_ARGS+=	UIC=${QTDIR}/bin/uic RCC=${QTDIR}/bin/rcc
+USE_TOOLS+=		pkg-config
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--disable-gui
-.endif
-
-#.if !empty(PKG_OPTIONS:Mqt)
-#CONFIGURE_ARGS+=	--enable-qt
-#.  include "../../x11/qt4-libs/buildlink3.mk"
-#.  include "../../x11/qt4-tools/buildlink3.mk"
-#.else
-#CONFIGURE_ARGS+=	--disable-qt
-#.endif
-
-.if !empty(PKG_OPTIONS:Mwxwidgets)
-CONFIGURE_ARGS+=	--enable-wxwidgets
-.  include "../../databases/shared-mime-info/mimedb.mk"
-.  include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.  include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.  include "../../x11/wxGTK28/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-wxwidgets
+CONFIGURE_ARGS+=	--disable-qt
 .endif
diff --git a/multimedia/mkvtoolnix/patches/patch-configure b/multimedia/mkvtoolnix/patches/patch-configure
new file mode 100644
index 00000000000..d8a9b728cd0
--- /dev/null
+++ b/multimedia/mkvtoolnix/patches/patch-configure
@@ -0,0 +1,17 @@
+$NetBSD: patch-configure,v 1.1 2016/09/08 16:18:01 joerg Exp $
+
+Bogus conditional is failing when using external Boost after the test
+actually passed.
+
+--- configure.orig	2016-08-27 21:03:55.775361937 +0000
++++ configure
+@@ -10043,9 +10038,6 @@ fi
+       if test "x$ax_lib" = "x"; then
+         as_fn_error $? "Could not find a version of the library!" "$LINENO" 5
+       fi
+-      if test "x$link_date_time" != "xyes"; then
+-        as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5
+-      fi
+     fi
+ 
+     CPPFLAGS="$CPPFLAGS_SAVED"