3 files changed, 100 insertions, 19 deletions

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index d3deefcf7985..733b59191b98 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	mkvtoolnix
-# Date created:		Tue Feb 24 02:09:12 UTC 2004
-# Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
+# Created by:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mkvtoolnix
-PORTVERSION=	5.0.1
-PORTREVISION=	2
+PORTVERSION=	5.8.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
 
@@ -17,23 +12,27 @@ COMMENT=	Tools to extract from/get info about/create Matroska media streams
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
-		expat.6:${PORTSDIR}/textproc/expat2 \
-		lzo2.2:${PORTSDIR}/archivers/lzo2 \
-		vorbis.4:${PORTSDIR}/audio/libvorbis \
+LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
+		expat:${PORTSDIR}/textproc/expat2 \
+		lzo2:${PORTSDIR}/archivers/lzo2 \
+		vorbis:${PORTSDIR}/audio/libvorbis \
 		ogg:${PORTSDIR}/audio/libogg \
-		boost_regex.4:${PORTSDIR}/devel/boost-libs \
-		curl.6:${PORTSDIR}/ftp/curl
+		boost_regex:${PORTSDIR}/devel/boost-libs \
+		curl:${PORTSDIR}/ftp/curl \
+		ebml:${PORTSDIR}/textproc/libebml \
+		matroska:${PORTSDIR}/multimedia/libmatroska
 
 USE_BZIP2=	yes
+USE_GCC=	4.6+
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_RAKE=	yes
 USE_RUBY=	yes
+RUBY_NO_RUN_DEPENDS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	ac_cv_path_PO4A=no
+CONFIGURE_ENV+=	ac_cv_path_PO4A=no ZLIB_CFLAGS=-I/usr/include ZLIB_LIBS=-lz
 CONFIGURE_ARGS=	--enable-lzo --enable-bz2 --disable-qt \
 		--with-boost=${LOCALBASE} \
 		--with-boost-filesystem=boost_filesystem \
@@ -41,7 +40,7 @@ CONFIGURE_ARGS=	--enable-lzo --enable-bz2 --disable-qt \
 		--with-boost-regex=boost_regex
 MAKE_JOBS_SAFE=	yes
 
-MANLANG=	"" ja zh_CN nl
+MANLANG=	"" ja zh_CN nl uk
 MAN1=		mkvextract.1 mkvinfo.1 mkvmerge.1 mkvpropedit.1
 
 OPTIONS_DEFINE=	WXGTK
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 85c85862bbf0..6612cc2c10c8 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mkvtoolnix-5.0.1.tar.bz2) = eecc48d17c0583b6b071e710bfe88ae09439bd99bb90c694a2fed0651bb08f19
-SIZE (mkvtoolnix-5.0.1.tar.bz2) = 2155095
+SHA256 (mkvtoolnix-5.8.0.tar.bz2) = 3c9ec7e4c035b82a35850c5ada98a29904edc44a0d1c9b900ed05d56e6274960
+SIZE (mkvtoolnix-5.8.0.tar.bz2) = 4454971
diff --git a/multimedia/mkvtoolnix/pkg-plist b/multimedia/mkvtoolnix/pkg-plist
index 90ce97df0ee9..70363195dce5 100644
--- a/multimedia/mkvtoolnix/pkg-plist
+++ b/multimedia/mkvtoolnix/pkg-plist
@@ -5,17 +5,56 @@ bin/mkvpropedit
 %%GUI%%bin/mmg
 %%GUI%%share/applications/mkvinfo.desktop
 %%GUI%%share/applications/mkvmergeGUI.desktop
+%%GUI%%share/icons/hicolor/16x16/apps/mkvextract.png
+%%GUI%%share/icons/hicolor/16x16/apps/mkvinfo.png
+%%GUI%%share/icons/hicolor/16x16/apps/mkvmerge.png
+%%GUI%%share/icons/hicolor/16x16/apps/mkvmergeGUI.png
+%%GUI%%share/icons/hicolor/16x16/apps/mkvpropedit.png
+%%GUI%%share/icons/hicolor/24x24/apps/mkvextract.png
+%%GUI%%share/icons/hicolor/24x24/apps/mkvinfo.png
+%%GUI%%share/icons/hicolor/24x24/apps/mkvmerge.png
+%%GUI%%share/icons/hicolor/24x24/apps/mkvmergeGUI.png
+%%GUI%%share/icons/hicolor/24x24/apps/mkvpropedit.png
+%%GUI%%share/icons/hicolor/32x32/apps/mkvextract.png
 %%GUI%%share/icons/hicolor/32x32/apps/mkvinfo.png
+%%GUI%%share/icons/hicolor/32x32/apps/mkvmerge.png
 %%GUI%%share/icons/hicolor/32x32/apps/mkvmergeGUI.png
+%%GUI%%share/icons/hicolor/32x32/apps/mkvpropedit.png
+%%GUI%%share/icons/hicolor/48x48/apps/mkvextract.png
+%%GUI%%share/icons/hicolor/48x48/apps/mkvinfo.png
+%%GUI%%share/icons/hicolor/48x48/apps/mkvmerge.png
+%%GUI%%share/icons/hicolor/48x48/apps/mkvmergeGUI.png
+%%GUI%%share/icons/hicolor/48x48/apps/mkvpropedit.png
+%%GUI%%share/icons/hicolor/64x64/apps/mkvextract.png
 %%GUI%%share/icons/hicolor/64x64/apps/mkvinfo.png
+%%GUI%%share/icons/hicolor/64x64/apps/mkvmerge.png
 %%GUI%%share/icons/hicolor/64x64/apps/mkvmergeGUI.png
+%%GUI%%share/icons/hicolor/64x64/apps/mkvpropedit.png
+%%GUI%%share/icons/hicolor/96x96/apps/mkvextract.png
+%%GUI%%share/icons/hicolor/96x96/apps/mkvinfo.png
+%%GUI%%share/icons/hicolor/96x96/apps/mkvmerge.png
+%%GUI%%share/icons/hicolor/96x96/apps/mkvmergeGUI.png
+%%GUI%%share/icons/hicolor/96x96/apps/mkvpropedit.png
+%%GUI%%share/icons/hicolor/128x128/apps/mkvextract.png
+%%GUI%%share/icons/hicolor/128x128/apps/mkvinfo.png
+%%GUI%%share/icons/hicolor/128x128/apps/mkvmerge.png
+%%GUI%%share/icons/hicolor/128x128/apps/mkvmergeGUI.png
+%%GUI%%share/icons/hicolor/128x128/apps/mkvpropedit.png
+%%GUI%%share/icons/hicolor/256x256/apps/mkvextract.png
+%%GUI%%share/icons/hicolor/256x256/apps/mkvinfo.png
+%%GUI%%share/icons/hicolor/256x256/apps/mkvmerge.png
+%%GUI%%share/icons/hicolor/256x256/apps/mkvmergeGUI.png
+%%GUI%%share/icons/hicolor/256x256/apps/mkvpropedit.png
+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/ru/LC_MESSAGES/mkvtoolnix.mo
 share/locale/tr/LC_MESSAGES/mkvtoolnix.mo
 share/locale/uk/LC_MESSAGES/mkvtoolnix.mo
@@ -37,9 +76,46 @@ share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
 %%DOCSDIR%%/guide/en/images/trackselection.gif
 %%DOCSDIR%%/guide/en/images/videotrackoptions.gif
 %%DOCSDIR%%/guide/en/mkvmerge-gui.hhc
+%%DOCSDIR%%/guide/en/mkvmerge-gui.hhk
 %%DOCSDIR%%/guide/en/mkvmerge-gui.hhp
 %%DOCSDIR%%/guide/en/mkvmerge-gui.html
-%%DOCSDIR%%/guide/en/mkvmerge-gui.hhk
+%%DOCSDIR%%/guide/es/images/addingremovingattachments.gif
+%%DOCSDIR%%/guide/es/images/addremovefiles.gif
+%%DOCSDIR%%/guide/es/images/attachmentoptions.gif
+%%DOCSDIR%%/guide/es/images/audiotrackoptions.gif
+%%DOCSDIR%%/guide/es/images/chaptereditor.gif
+%%DOCSDIR%%/guide/es/images/generaltrackoptions.gif
+%%DOCSDIR%%/guide/es/images/jobmanager.gif
+%%DOCSDIR%%/guide/es/images/movietitle.gif
+%%DOCSDIR%%/guide/es/images/muxingwindow.gif
+%%DOCSDIR%%/guide/es/images/selectmkvmergeexecutable.gif
+%%DOCSDIR%%/guide/es/images/splitting.gif
+%%DOCSDIR%%/guide/es/images/textsubtitlestrackoptions.gif
+%%DOCSDIR%%/guide/es/images/trackselection.gif
+%%DOCSDIR%%/guide/es/images/videotrackoptions.gif
+%%DOCSDIR%%/guide/es/mkvmerge-gui.hhc
+%%DOCSDIR%%/guide/es/mkvmerge-gui.hhk
+%%DOCSDIR%%/guide/es/mkvmerge-gui.hhp
+%%DOCSDIR%%/guide/es/mkvmerge-gui.html
+%%DOCSDIR%%/guide/eu/images/addingremovingattachments.gif
+%%DOCSDIR%%/guide/eu/images/addremovefiles.gif
+%%DOCSDIR%%/guide/eu/images/attachmentoptions.gif
+%%DOCSDIR%%/guide/eu/images/audiotrackoptions.gif
+%%DOCSDIR%%/guide/eu/images/chaptereditor.gif
+%%DOCSDIR%%/guide/eu/images/generaltrackoptions.gif
+%%DOCSDIR%%/guide/eu/images/headereditor.gif
+%%DOCSDIR%%/guide/eu/images/jobmanager.gif
+%%DOCSDIR%%/guide/eu/images/movietitle.gif
+%%DOCSDIR%%/guide/eu/images/muxingwindow.gif
+%%DOCSDIR%%/guide/eu/images/selectmkvmergeexecutable.gif
+%%DOCSDIR%%/guide/eu/images/splitting.gif
+%%DOCSDIR%%/guide/eu/images/textsubtitlestrackoptions.gif
+%%DOCSDIR%%/guide/eu/images/trackselection.gif
+%%DOCSDIR%%/guide/eu/images/videotrackoptions.gif
+%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhc
+%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhk
+%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhp
+%%DOCSDIR%%/guide/eu/mkvmerge-gui.html
 %%DOCSDIR%%/guide/zh_CN/images/addingremovingattachments.gif
 %%DOCSDIR%%/guide/zh_CN/images/addremovefiles.gif
 %%DOCSDIR%%/guide/zh_CN/images/attachmentoptions.gif
@@ -55,15 +131,21 @@ share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
 %%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.hhk
 %%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
+@dirrmtry man/uk/man1
+@dirrmtry man/uk
 @dirrmtry man/nl/man1
 @dirrmtry man/nl
 @dirrm %%DOCSDIR%%/guide/zh_CN/images
 @dirrm %%DOCSDIR%%/guide/zh_CN
+@dirrm %%DOCSDIR%%/guide/eu/images
+@dirrm %%DOCSDIR%%/guide/eu
+@dirrm %%DOCSDIR%%/guide/es/images
+@dirrm %%DOCSDIR%%/guide/es
 @dirrm %%DOCSDIR%%/guide/en/images
 @dirrm %%DOCSDIR%%/guide/en
 @dirrm %%DOCSDIR%%/guide