4 files changed, 49 insertions, 57 deletions

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 140e5e15dd27..5b4baefa6914 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mkvtoolnix
-PORTVERSION=	4.4.0
+PORTVERSION=	4.5.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		CRITICAL
@@ -15,10 +15,10 @@ MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Tools to extract from/get info about/create Matroska media streams
 
 LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
-		ebml.2:${PORTSDIR}/textproc/libebml \
+		ebml.3:${PORTSDIR}/textproc/libebml \
 		expat.6:${PORTSDIR}/textproc/expat2 \
 		lzo2.2:${PORTSDIR}/archivers/lzo2 \
-		matroska.2:${PORTSDIR}/multimedia/libmatroska \
+		matroska.3:${PORTSDIR}/multimedia/libmatroska \
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
 		ogg.7:${PORTSDIR}/audio/libogg \
 		boost_regex.4:${PORTSDIR}/devel/boost-libs
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 671e93d1c7d3..10817ec20de5 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mkvtoolnix-4.4.0.tar.bz2) = d458448f099abd3609fccddf54bd0d1cf8cadf2e966478432fb09116a0aaef2a
-SIZE (mkvtoolnix-4.4.0.tar.bz2) = 1773026
+SHA256 (mkvtoolnix-4.5.0.tar.bz2) = 77e08525f7013c970f8ae60d0840e62ef4376074d926632ef0767f781c3e6a58
+SIZE (mkvtoolnix-4.5.0.tar.bz2) = 2016980
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 8672aeca0da3..000000000000
--- a/multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/common/strings/editing.h.orig	2010-06-07 11:37:20.115133180 +0300
-+++ src/common/strings/editing.h	2010-06-07 11:37:40.477006374 +0300
-@@ -16,6 +16,7 @@
- 
- #include "common/os.h"
- 
-+#include <cstdarg>
- #include <string>
- #include <vector>
- 
diff --git a/multimedia/mkvtoolnix/pkg-plist b/multimedia/mkvtoolnix/pkg-plist
index 4e890d2976c7..65616e74e544 100644
--- a/multimedia/mkvtoolnix/pkg-plist
+++ b/multimedia/mkvtoolnix/pkg-plist
@@ -19,48 +19,50 @@ share/locale/uk/LC_MESSAGES/mkvtoolnix.mo
 share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo
 share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
 %%GUI%%share/mime/packages/mkvtoolnix.xml
-%%DATADIR%%/guide/en/images/addingremovingattachments.gif
-%%DATADIR%%/guide/en/images/addremovefiles.gif
-%%DATADIR%%/guide/en/images/attachmentoptions.gif
-%%DATADIR%%/guide/en/images/audiotrackoptions.gif
-%%DATADIR%%/guide/en/images/chaptereditor.gif
-%%DATADIR%%/guide/en/images/generaltrackoptions.gif
-%%DATADIR%%/guide/en/images/jobmanager.gif
-%%DATADIR%%/guide/en/images/movietitle.gif
-%%DATADIR%%/guide/en/images/muxingwindow.gif
-%%DATADIR%%/guide/en/images/selectmkvmergeexecutable.gif
-%%DATADIR%%/guide/en/images/splitting.gif
-%%DATADIR%%/guide/en/images/textsubtitlestrackoptions.gif
-%%DATADIR%%/guide/en/images/trackselection.gif
-%%DATADIR%%/guide/en/images/videotrackoptions.gif
-%%DATADIR%%/guide/en/mkvmerge-gui.hhc
-%%DATADIR%%/guide/en/mkvmerge-gui.hhk
-%%DATADIR%%/guide/en/mkvmerge-gui.hhp
-%%DATADIR%%/guide/en/mkvmerge-gui.html
-%%DATADIR%%/guide/zh_CN/images/addingremovingattachments.gif
-%%DATADIR%%/guide/zh_CN/images/addremovefiles.gif
-%%DATADIR%%/guide/zh_CN/images/attachmentoptions.gif
-%%DATADIR%%/guide/zh_CN/images/audiotrackoptions.gif
-%%DATADIR%%/guide/zh_CN/images/chaptereditor.gif
-%%DATADIR%%/guide/zh_CN/images/generaltrackoptions.gif
-%%DATADIR%%/guide/zh_CN/images/jobmanager.gif
-%%DATADIR%%/guide/zh_CN/images/movietitle.gif
-%%DATADIR%%/guide/zh_CN/images/muxingwindow.gif
-%%DATADIR%%/guide/zh_CN/images/selectmkvmergeexecutable.gif
-%%DATADIR%%/guide/zh_CN/images/splitting.gif
-%%DATADIR%%/guide/zh_CN/images/textsubtitlestrackoptions.gif
-%%DATADIR%%/guide/zh_CN/images/trackselection.gif
-%%DATADIR%%/guide/zh_CN/images/videotrackoptions.gif
-%%DATADIR%%/guide/zh_CN/mkvmerge-gui.hhc
-%%DATADIR%%/guide/zh_CN/mkvmerge-gui.hhk
-%%DATADIR%%/guide/zh_CN/mkvmerge-gui.hhp
-%%DATADIR%%/guide/zh_CN/mkvmerge-gui.html
+%%DOCSDIR%%/guide/en/images/addingremovingattachments.gif
+%%DOCSDIR%%/guide/en/images/addremovefiles.gif
+%%DOCSDIR%%/guide/en/images/attachmentoptions.gif
+%%DOCSDIR%%/guide/en/images/audiotrackoptions.gif
+%%DOCSDIR%%/guide/en/images/chaptereditor.gif
+%%DOCSDIR%%/guide/en/images/generaltrackoptions.gif
+%%DOCSDIR%%/guide/en/images/jobmanager.gif
+%%DOCSDIR%%/guide/en/images/movietitle.gif
+%%DOCSDIR%%/guide/en/images/muxingwindow.gif
+%%DOCSDIR%%/guide/en/images/selectmkvmergeexecutable.gif
+%%DOCSDIR%%/guide/en/images/splitting.gif
+%%DOCSDIR%%/guide/en/images/textsubtitlestrackoptions.gif
+%%DOCSDIR%%/guide/en/images/trackselection.gif
+%%DOCSDIR%%/guide/en/images/videotrackoptions.gif
+%%DOCSDIR%%/guide/en/mkvmerge-gui.hhc
+%%DOCSDIR%%/guide/en/mkvmerge-gui.hhp
+%%DOCSDIR%%/guide/en/mkvmerge-gui.html
+%%DOCSDIR%%/guide/en/mkvmerge-gui.hhk
+%%DOCSDIR%%/guide/zh_CN
+%%DOCSDIR%%/guide/zh_CN/images
+%%DOCSDIR%%/guide/zh_CN/images/addingremovingattachments.gif
+%%DOCSDIR%%/guide/zh_CN/images/addremovefiles.gif
+%%DOCSDIR%%/guide/zh_CN/images/attachmentoptions.gif
+%%DOCSDIR%%/guide/zh_CN/images/audiotrackoptions.gif
+%%DOCSDIR%%/guide/zh_CN/images/chaptereditor.gif
+%%DOCSDIR%%/guide/zh_CN/images/generaltrackoptions.gif
+%%DOCSDIR%%/guide/zh_CN/images/jobmanager.gif
+%%DOCSDIR%%/guide/zh_CN/images/movietitle.gif
+%%DOCSDIR%%/guide/zh_CN/images/muxingwindow.gif
+%%DOCSDIR%%/guide/zh_CN/images/selectmkvmergeexecutable.gif
+%%DOCSDIR%%/guide/zh_CN/images/splitting.gif
+%%DOCSDIR%%/guide/zh_CN/images/textsubtitlestrackoptions.gif
+%%DOCSDIR%%/guide/zh_CN/images/trackselection.gif
+%%DOCSDIR%%/guide/zh_CN/images/videotrackoptions.gif
+%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhc
+%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhp
+%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.html
+%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhk
 @dirrmtry man/zh_CN/man1
 @dirrmtry man/zh_CN
-@dirrm %%DATADIR%%/guide/zh_CN/images
-@dirrm %%DATADIR%%/guide/zh_CN
-@dirrm %%DATADIR%%/guide/en/images
-@dirrm %%DATADIR%%/guide/en
-@dirrm %%DATADIR%%/guide
-@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%/guide/zh_CN/images
+@dirrm %%DOCSDIR%%/guide/zh_CN
+@dirrm %%DOCSDIR%%/guide/en/images
+@dirrm %%DOCSDIR%%/guide/en
+@dirrm %%DOCSDIR%%/guide
+@dirrm %%DOCSDIR%%
 %%GUI%%@dirrmtry share/applications