From 0092448c5e05183bbe50a524f292bfde22ff54ee Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 7 May 2014 17:48:43 +0000
Subject: [PATCH] Update to 6.9.1 Disable CURL options by default it is not
 clang+libc+++boost friendly Switch default wx to wx 3.0 Add missing
 depencencies Allow to parallel build

---
 multimedia/mkvtoolnix/Makefile  | 18 ++++++++----------
 multimedia/mkvtoolnix/distinfo  |  4 ++--
 multimedia/mkvtoolnix/pkg-plist |  1 +
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index f027dfa1f8a7..315a2d13a9a4 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mkvtoolnix
-PORTVERSION=	6.7.0
-PORTREVISION=	1
+PORTVERSION=	6.9.1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		CRITICAL
@@ -16,14 +15,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libogg.so:${PORTSDIR}/audio/libogg \
-		libboost_regex.so:${PORTSDIR}/devel/boost-libs \
 		libebml.so:${PORTSDIR}/textproc/libebml \
+		libboost_regex.so:${PORTSDIR}/devel/boost-libs \
 		libmatroska.so:${PORTSDIR}/multimedia/libmatroska
 
-USES=		pkgconfig gettext iconv compiler:c++11-lib
-USE_XZ=		yes
+USES=		pkgconfig gettext iconv compiler:c++11-lib tar:xz
 GNU_CONFIGURE=	yes
-USE_RAKE=	yes
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -36,12 +33,13 @@ CONFIGURE_ARGS=	--disable-qt \
 		--with-boost-regex=boost_regex
 
 OPTIONS_DEFINE=	WXGTK FLAC CURL
-OPTIONS_DEFAULT=WXGTK FLAC CURL
+OPTIONS_DEFAULT=WXGTK FLAC 
 
 BROKEN_sparc64=	Does not install on sparc64
 
 OPTIONS_SUB=	yes
-WXGTK_USE=	WX=2.8+
+WXGTK_USES=	desktop-file-utils shared-mime-info
+WXGTK_USE=	wx=3.0
 WXGTK_CONFIGURE_ENABLE=	gui
 WX_UNICODE=	yes
 WX_CONF_ARGS=	absolute
@@ -56,9 +54,9 @@ MAKE_ENV+=	V=1
 .endif
 
 do-build:
-	@(cd ${WRKSRC}/; unset PREFIX; ${RAKE_BIN})
+	@(cd ${WRKSRC}/; unset PREFIX; ./drake ${_MAKE_JOBS})
 
 do-install:
-	@(cd ${WRKSRC}/; unset PREFIX;  ${RAKE_BIN} ${MAKE_ARGS} install)
+	@(cd ${WRKSRC}/; unset PREFIX;  ./drake ${_MAKE_JOBS} ${MAKE_ARGS} install)
 
 .include <bsd.port.mk>
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 2a58fb92c8db..2729da686f5d 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mkvtoolnix-6.7.0.tar.xz) = 82207c6ece01e76d51edcf6a330c9f0dc75e3bf4201fead3023c98bd7f323785
-SIZE (mkvtoolnix-6.7.0.tar.xz) = 5119236
+SHA256 (mkvtoolnix-6.9.1.tar.xz) = a874afcf61c4d6235c789be07417dfebe992b68aaf4858920f9f3ac0d88b81e7
+SIZE (mkvtoolnix-6.9.1.tar.xz) = 5198388
diff --git a/multimedia/mkvtoolnix/pkg-plist b/multimedia/mkvtoolnix/pkg-plist
index 79fbefabc877..72cc232886bd 100644
--- a/multimedia/mkvtoolnix/pkg-plist
+++ b/multimedia/mkvtoolnix/pkg-plist
@@ -200,6 +200,7 @@ 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/tr/LC_MESSAGES/mkvtoolnix.mo
 share/locale/uk/LC_MESSAGES/mkvtoolnix.mo