Index: head/multimedia/mkvtoolnix/Makefile
===================================================================
--- head/multimedia/mkvtoolnix/Makefile	(revision 432636)
+++ head/multimedia/mkvtoolnix/Makefile	(revision 432637)
@@ -1,71 +1,64 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mkvtoolnix
-PORTVERSION=	9.7.1
-PORTREVISION=	2
+PORTVERSION=	9.8.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
 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
-USE_RUBY=	yes
-RUBY_NO_RUN_DEPENDS=	yes
 CONFIGURE_ENV+=	ac_cv_path_PO4A=no
-CONFIGURE_ARGS=	--without-curl \
-		--with-boost=${LOCALBASE} \
+CONFIGURE_ARGS=	--with-boost=${LOCALBASE} \
 		--with-boost-filesystem=boost_filesystem \
 		--with-boost-system=boost_system \
 		--with-boost-regex=boost_regex
 MAKE_ENV=	V=1
+MAKE_CMD=	rake -v
+MAKEFILE=	Rakefile
+ALL_TARGET=	#Empty
 
 OPTIONS_DEFINE=	FLAC NLS QT5
 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,network,quick,widgets
 QT5_CONFIGURE_ENABLE=	qt
 
 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
-
-do-build:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV:NPREFIX=*} ./drake ${_MAKE_JOBS})
-
-do-install:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV:NPREFIX=*} \
-		./drake ${_MAKE_JOBS} ${MAKE_ARGS} install)
 
 .include <bsd.port.mk>
Index: head/multimedia/mkvtoolnix/distinfo
===================================================================
--- head/multimedia/mkvtoolnix/distinfo	(revision 432636)
+++ head/multimedia/mkvtoolnix/distinfo	(revision 432637)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482912572
-SHA256 (mkvtoolnix-9.7.1.tar.xz) = b2b8821e2d74df0f765c97f93ddd1dbfb062f3c22b969cfa04d1bb5cb638a88e
-SIZE (mkvtoolnix-9.7.1.tar.xz) = 3824684
+TIMESTAMP = 1485614024
+SHA256 (mkvtoolnix-9.8.0.tar.xz) = 494b2fb9ff83a858d8849baecdd3320456717923bb7a854d31a02a49640228db
+SIZE (mkvtoolnix-9.8.0.tar.xz) = 3790212