Index: branches/2017Q2/multimedia/mkvtoolnix/Makefile
===================================================================
--- branches/2017Q2/multimedia/mkvtoolnix/Makefile	(revision 442515)
+++ branches/2017Q2/multimedia/mkvtoolnix/Makefile	(revision 442516)
@@ -1,71 +1,71 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mkvtoolnix
-PORTVERSION=	11.0.0
+PORTVERSION=	12.0.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		https://mkvtoolnix.download/sources/
 
 MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	Tools to extract from/get info about/create Matroska media streams
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	rake:devel/rubygem-rake \
 		docbook-xsl>=0:textproc/docbook-xsl \
 		xsltproc:textproc/libxslt
 LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 		libogg.so:audio/libogg \
 		libebml.so:textproc/libebml \
 		libboost_regex.so:devel/boost-libs \
 		libpugixml.so:textproc/pugixml \
 		libmatroska.so:multimedia/libmatroska
 
 BROKEN_sparc64=	does not install
 
 USES=		compiler:c++14-lang iconv localbase pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	ac_cv_path_PO4A=no
 CONFIGURE_ARGS=	--with-boost=${LOCALBASE} \
 		--with-boost-filesystem=boost_filesystem \
 		--with-boost-system=boost_system \
 		--with-boost-regex=boost_regex \
 		--with-docbook-xsl-root=${PREFIX}/share/xsl/docbook
 MAKE_ENV=	V=1
 MAKE_CMD=	rake -v
 MAKEFILE=	Rakefile
 ALL_TARGET=	#Empty
 
 OPTIONS_DEFINE=	FLAC NLS QT5 MANTRANS
 OPTIONS_DEFAULT=	FLAC QT5
 OPTIONS_SUB=	yes
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_WITH=	flac
 
 NLS_USES=	gettext
 NLS_CONFIGURE_WITH=	gettext
 
 QT5_DESC=	Build and install GUI application (Qt 5)
 QT5_USES=	desktop-file-utils shared-mime-info
 QT5_USE=	QT5=buildtools_build,concurrent,core,gui,multimedia,network,quick,widgets
 QT5_CONFIGURE_ENABLE=	qt
 QT5_BUILD_DEPENDS=	qmake:devel/qt5-qmake
 
 MANTRANS_DESC=		Build and install manpage translations
 MANTRANS_BUILD_DEPENDS=	po4a:textproc/po4a
 
 post-patch:
 	@${REINPLACE_CMD} -e '/LIBS="-lintl/s,-liconv,$$ICONV_LIBS,' \
 		${WRKSRC}/configure
 
 post-configure-NLS-off:
 # https://github.com/mbunkus/mkvtoolnix/issues/1501
 # Fixed in 8.6.0
 	@${REINPLACE_CMD} -e 's|LIBINTL_LIBS =|#LIBINTL_LIBS =|g' ${WRKSRC}/build-config
 	@${REINPLACE_CMD} -e 's|#define HAVE_LIBINTL_H|//#define HAVE_LIBINTL_H|g' ${WRKSRC}/config.h
 	@${REINPLACE_CMD} -e 's|S["LIBINTL_LIBS"]=|#S["LIBINTL_LIBS"]=|g' ${WRKSRC}/config.status
 
 .include <bsd.port.mk>
Index: branches/2017Q2/multimedia/mkvtoolnix/distinfo
===================================================================
--- branches/2017Q2/multimedia/mkvtoolnix/distinfo	(revision 442515)
+++ branches/2017Q2/multimedia/mkvtoolnix/distinfo	(revision 442516)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492947573
-SHA256 (mkvtoolnix-11.0.0.tar.xz) = bb642e1eb2c402c4f93a962f41a1832c99ee5b782f1596dc20f996e9a4aa426d
-SIZE (mkvtoolnix-11.0.0.tar.xz) = 4471692
+TIMESTAMP = 1496475376
+SHA256 (mkvtoolnix-12.0.0.tar.xz) = 5c2401d1cc36d8a2d57cb791a5a22f3cda69cb0824c6cee35326b35e7f94b536
+SIZE (mkvtoolnix-12.0.0.tar.xz) = 4480308
Index: branches/2017Q2
===================================================================
--- branches/2017Q2	(revision 442515)
+++ branches/2017Q2	(revision 442516)

Property changes on: branches/2017Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r442469