multimedia/mkvtoolnix: Update to upstream release 60.0.0

Details:
- Major features, bug fixes and build system changes in 59.0.0 and
  60.0.0, see https://mkvtoolnix.download/doc/NEWS.md , a.o:
  - QT5 is now required for the non-gui version as well, subsequently
    the QT5 OPTION has been renamed to GUI.
  - Since QT5 support on FreeBSD 11 is limited, this will no longer
    build on FreeBSD 11 and is marked BROKEN.

4 files changed, 86 insertions, 89 deletions

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 36632ffb4a4f..c611f2702663 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,8 +1,7 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 
 PORTNAME=	mkvtoolnix
-PORTVERSION=	58.0.0
-PORTREVISION=	1
+PORTVERSION=	60.0.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	https://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		https://mkvtoolnix.download/sources/
@@ -14,6 +13,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_sparc64=	does not install
+BROKEN_FreeBSD_11=	requires non-building qt5 libs even in the non-GUI builds
 
 BUILD_DEPENDS=	rake:devel/rubygem-rake \
 		docbook-xsl>=0:textproc/docbook-xsl \
@@ -24,9 +24,11 @@ LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 		libboost_regex.so:devel/boost-libs \
 		libpugixml.so:textproc/pugixml \
 		libmatroska.so:multimedia/libmatroska \
-		libpcre2-8.so:devel/pcre2
+		libcmark.so:textproc/cmark \
+		libgmp.so:math/gmp
 
-USES=		compiler:c++17-lang iconv localbase pkgconfig tar:xz
+USES=		compiler:c++17-lang iconv localbase pkgconfig qmake:no_env qt:5 tar:xz
+USE_QT=		buildtools_build concurrent core linguisttools_build multimedia
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	ac_cv_path_PO4A=no
@@ -41,14 +43,15 @@ MAKE_CMD=	rake -v
 MAKEFILE=	Rakefile
 ALL_TARGET=	#Empty
 
-OPTIONS_DEFINE=	DVDREAD FLAC NLS QT5 MANTRANS
-OPTIONS_DEFAULT=	FLAC QT5
-OPTIONS_SUB=	yes
+BINARY_ALIAS=	qmake=${QMAKE} \
+		lconvert=${LCONVERT} \
+		moc=${MOC} \
+		rcc=${RCC} \
+		uic=${UIC}
 
-.if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mssl=*}
-# Blocked by net/qt5-network: cannot use QT5 with default OpenSSL
-OPTIONS_EXCLUDE_FreeBSD_11+=	QT5
-.endif
+OPTIONS_DEFINE=	DVDREAD FLAC GUI NLS MANTRANS
+OPTIONS_DEFAULT=	FLAC GUI
+OPTIONS_SUB=	yes
 
 DVDREAD_DESC=		Support reading DVD chapters via libdvdread
 DVDREAD_LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
@@ -60,16 +63,9 @@ 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 qt:5 shared-mime-info qmake:no_env
-QT5_USE=	QT=buildtools_build,concurrent,core,dbus,declarative,gui,linguisttools_build,multimedia,network,widgets
-QT5_CONFIGURE_ENABLE=	qt
-QT5_LIB_DEPENDS=	libcmark.so:textproc/cmark
-QT5_BINARY_ALIAS=	qmake=${QMAKE} \
-			lconvert=${LCONVERT} \
-			moc=${MOC} \
-			rcc=${RCC} \
-			uic=${UIC}
+GUI_DESC=	Build and install GUI application (Qt 5)
+GUI_USES=	desktop-file-utils shared-mime-info
+GUI_USE=	QT=dbus,declarative,gui,network,widgets
 
 MANTRANS_DESC=		Build and install manpage translations
 MANTRANS_BUILD_DEPENDS=	po4a:textproc/po4a
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index e10662c0ace9..09e6135a9eb8 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623661545
-SHA256 (mkvtoolnix-58.0.0.tar.xz) = 1af727fa203e2bd8c54a005f28b635c96a4b80aa4ee8d23b4def0b6800ca6e38
-SIZE (mkvtoolnix-58.0.0.tar.xz) = 7651964
+TIMESTAMP = 1628354659
+SHA256 (mkvtoolnix-60.0.0.tar.xz) = a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
+SIZE (mkvtoolnix-60.0.0.tar.xz) = 7657960
diff --git a/multimedia/mkvtoolnix/files/patch-configure b/multimedia/mkvtoolnix/files/patch-configure
index 8fcf23c686ec..7f6ec08da407 100644
--- a/multimedia/mkvtoolnix/files/patch-configure
+++ b/multimedia/mkvtoolnix/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2021-01-30 15:09:20 UTC
+--- configure.orig	2021-07-31 12:27:46 UTC
 +++ configure
-@@ -8886,13 +8886,9 @@ fi
+@@ -8969,14 +8969,10 @@ fi
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fmt" >&5
  printf "%s\n" "$ac_cv_fmt" >&6; }
  
@@ -11,7 +11,8 @@
 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using the internal version of fmt" >&5
  printf "%s\n" "$as_me: Using the internal version of fmt" >&6;}
    FMT_INTERNAL=yes
+   ac_cv_fmt_v8=yes
 -fi
  
- 
+ if test $ac_cv_fmt_v8 = yes; then
  
diff --git a/multimedia/mkvtoolnix/pkg-plist b/multimedia/mkvtoolnix/pkg-plist
index 42ff5fb86adb..4391341cb13b 100644
--- a/multimedia/mkvtoolnix/pkg-plist
+++ b/multimedia/mkvtoolnix/pkg-plist
@@ -2,123 +2,123 @@ bin/mkvextract
 bin/mkvinfo
 bin/mkvmerge
 bin/mkvpropedit
-%%QT5%%bin/mkvtoolnix-gui
+%%GUI%%bin/mkvtoolnix-gui
 %%MANTRANS%%man/bg/man1/mkvextract.1.gz
 %%MANTRANS%%man/bg/man1/mkvinfo.1.gz
 %%MANTRANS%%man/bg/man1/mkvmerge.1.gz
 %%MANTRANS%%man/bg/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%QT5%%man/bg/man1/mkvtoolnix-gui.1.gz
+%%MANTRANS%%%%GUI%%man/bg/man1/mkvtoolnix-gui.1.gz
 %%MANTRANS%%man/ca/man1/mkvextract.1.gz
 %%MANTRANS%%man/ca/man1/mkvinfo.1.gz
 %%MANTRANS%%man/ca/man1/mkvmerge.1.gz
 %%MANTRANS%%man/ca/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%QT5%%man/ca/man1/mkvtoolnix-gui.1.gz
+%%MANTRANS%%%%GUI%%man/ca/man1/mkvtoolnix-gui.1.gz
 %%MANTRANS%%man/de/man1/mkvextract.1.gz
 %%MANTRANS%%man/de/man1/mkvinfo.1.gz
 %%MANTRANS%%man/de/man1/mkvmerge.1.gz
 %%MANTRANS%%man/de/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%QT5%%man/de/man1/mkvtoolnix-gui.1.gz
+%%MANTRANS%%%%GUI%%man/de/man1/mkvtoolnix-gui.1.gz
 %%MANTRANS%%man/es/man1/mkvextract.1.gz
 %%MANTRANS%%man/es/man1/mkvinfo.1.gz
 %%MANTRANS%%man/es/man1/mkvmerge.1.gz
 %%MANTRANS%%man/es/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%QT5%%man/es/man1/mkvtoolnix-gui.1.gz
+%%MANTRANS%%%%GUI%%man/es/man1/mkvtoolnix-gui.1.gz
 %%MANTRANS%%man/fr/man1/mkvextract.1.gz
 %%MANTRANS%%man/fr/man1/mkvinfo.1.gz
 %%MANTRANS%%man/fr/man1/mkvmerge.1.gz
 %%MANTRANS%%man/fr/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%QT5%%man/fr/man1/mkvtoolnix-gui.1.gz
+%%MANTRANS%%%%GUI%%man/fr/man1/mkvtoolnix-gui.1.gz
 %%MANTRANS%%man/it/man1/mkvextract.1.gz
 %%MANTRANS%%man/it/man1/mkvinfo.1.gz
 %%MANTRANS%%man/it/man1/mkvmerge.1.gz
 %%MANTRANS%%man/it/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%QT5%%man/it/man1/mkvtoolnix-gui.1.gz
+%%MANTRANS%%%%GUI%%man/it/man1/mkvtoolnix-gui.1.gz
 %%MANTRANS%%man/ja/man1/mkvextract.1.gz
 %%MANTRANS%%man/ja/man1/mkvinfo.1.gz
 %%MANTRANS%%man/ja/man1/mkvmerge.1.gz
 %%MANTRANS%%man/ja/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%QT5%%man/ja/man1/mkvtoolnix-gui.1.gz
+%%MANTRANS%%%%GUI%%man/ja/man1/mkvtoolnix-gui.1.gz
 %%MANTRANS%%man/ko/man1/mkvextract.1.gz
 %%MANTRANS%%man/ko/man1/mkvinfo.1.gz
 %%MANTRANS%%man/ko/man1/mkvmerge.1.gz
 %%MANTRANS%%man/ko/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%QT5%%man/ko/man1/mkvtoolnix-gui.1.gz
+%%MANTRANS%%%%GUI%%man/ko/man1/mkvtoolnix-gui.1.gz
 %%MANTRANS%%man/ru/man1/mkvextract.1.gz
 %%MANTRANS%%man/ru/man1/mkvinfo.1.gz
 %%MANTRANS%%man/ru/man1/mkvmerge.1.gz
 %%MANTRANS%%man/ru/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%QT5%%man/ru/man1/mkvtoolnix-gui.1.gz
+%%MANTRANS%%%%GUI%%man/ru/man1/mkvtoolnix-gui.1.gz
 %%MANTRANS%%man/zh_TW/man1/mkvextract.1.gz
 %%MANTRANS%%man/zh_TW/man1/mkvinfo.1.gz
 %%MANTRANS%%man/zh_TW/man1/mkvmerge.1.gz
 %%MANTRANS%%man/zh_TW/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%QT5%%man/zh_TW/man1/mkvtoolnix-gui.1.gz
+%%MANTRANS%%%%GUI%%man/zh_TW/man1/mkvtoolnix-gui.1.gz
 man/man1/mkvextract.1.gz
 man/man1/mkvinfo.1.gz
 man/man1/mkvmerge.1.gz
 man/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%QT5%%man/man1/mkvtoolnix-gui.1.gz
+%%MANTRANS%%%%GUI%%man/man1/mkvtoolnix-gui.1.gz
 %%MANTRANS%%man/nl/man1/mkvextract.1.gz
 %%MANTRANS%%man/nl/man1/mkvinfo.1.gz
 %%MANTRANS%%man/nl/man1/mkvmerge.1.gz
 %%MANTRANS%%man/nl/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%QT5%%man/nl/man1/mkvtoolnix-gui.1.gz
+%%MANTRANS%%%%GUI%%man/nl/man1/mkvtoolnix-gui.1.gz
 %%MANTRANS%%man/pl/man1/mkvextract.1.gz
 %%MANTRANS%%man/pl/man1/mkvinfo.1.gz
 %%MANTRANS%%man/pl/man1/mkvmerge.1.gz
 %%MANTRANS%%man/pl/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%QT5%%man/pl/man1/mkvtoolnix-gui.1.gz
+%%MANTRANS%%%%GUI%%man/pl/man1/mkvtoolnix-gui.1.gz
 %%MANTRANS%%man/uk/man1/mkvextract.1.gz
 %%MANTRANS%%man/uk/man1/mkvinfo.1.gz
 %%MANTRANS%%man/uk/man1/mkvmerge.1.gz
 %%MANTRANS%%man/uk/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%QT5%%man/uk/man1/mkvtoolnix-gui.1.gz
+%%MANTRANS%%%%GUI%%man/uk/man1/mkvtoolnix-gui.1.gz
 %%MANTRANS%%man/zh_CN/man1/mkvextract.1.gz
 %%MANTRANS%%man/zh_CN/man1/mkvinfo.1.gz
 %%MANTRANS%%man/zh_CN/man1/mkvmerge.1.gz
 %%MANTRANS%%man/zh_CN/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%QT5%%man/zh_CN/man1/mkvtoolnix-gui.1.gz
-%%QT5%%share/applications/org.bunkus.mkvtoolnix-gui.desktop
-%%QT5%%share/icons/hicolor/128x128/apps/mkvextract.png
-%%QT5%%share/icons/hicolor/128x128/apps/mkvinfo.png
-%%QT5%%share/icons/hicolor/128x128/apps/mkvmerge.png
-%%QT5%%share/icons/hicolor/128x128/apps/mkvpropedit.png
-%%QT5%%share/icons/hicolor/128x128/apps/mkvtoolnix-gui.png
-%%QT5%%share/icons/hicolor/16x16/apps/mkvextract.png
-%%QT5%%share/icons/hicolor/16x16/apps/mkvinfo.png
-%%QT5%%share/icons/hicolor/16x16/apps/mkvmerge.png
-%%QT5%%share/icons/hicolor/16x16/apps/mkvpropedit.png
-%%QT5%%share/icons/hicolor/16x16/apps/mkvtoolnix-gui.png
-%%QT5%%share/icons/hicolor/24x24/apps/mkvextract.png
-%%QT5%%share/icons/hicolor/24x24/apps/mkvinfo.png
-%%QT5%%share/icons/hicolor/24x24/apps/mkvmerge.png
-%%QT5%%share/icons/hicolor/24x24/apps/mkvpropedit.png
-%%QT5%%share/icons/hicolor/24x24/apps/mkvtoolnix-gui.png
-%%QT5%%share/icons/hicolor/256x256/apps/mkvextract.png
-%%QT5%%share/icons/hicolor/256x256/apps/mkvinfo.png
-%%QT5%%share/icons/hicolor/256x256/apps/mkvmerge.png
-%%QT5%%share/icons/hicolor/256x256/apps/mkvpropedit.png
-%%QT5%%share/icons/hicolor/256x256/apps/mkvtoolnix-gui.png
-%%QT5%%share/icons/hicolor/32x32/apps/mkvextract.png
-%%QT5%%share/icons/hicolor/32x32/apps/mkvinfo.png
-%%QT5%%share/icons/hicolor/32x32/apps/mkvmerge.png
-%%QT5%%share/icons/hicolor/32x32/apps/mkvpropedit.png
-%%QT5%%share/icons/hicolor/32x32/apps/mkvtoolnix-gui.png
-%%QT5%%share/icons/hicolor/48x48/apps/mkvextract.png
-%%QT5%%share/icons/hicolor/48x48/apps/mkvinfo.png
-%%QT5%%share/icons/hicolor/48x48/apps/mkvmerge.png
-%%QT5%%share/icons/hicolor/48x48/apps/mkvpropedit.png
-%%QT5%%share/icons/hicolor/48x48/apps/mkvtoolnix-gui.png
-%%QT5%%share/icons/hicolor/64x64/apps/mkvextract.png
-%%QT5%%share/icons/hicolor/64x64/apps/mkvinfo.png
-%%QT5%%share/icons/hicolor/64x64/apps/mkvmerge.png
-%%QT5%%share/icons/hicolor/64x64/apps/mkvpropedit.png
-%%QT5%%share/icons/hicolor/64x64/apps/mkvtoolnix-gui.png
-%%QT5%%share/icons/hicolor/96x96/apps/mkvextract.png
-%%QT5%%share/icons/hicolor/96x96/apps/mkvinfo.png
-%%QT5%%share/icons/hicolor/96x96/apps/mkvmerge.png
-%%QT5%%share/icons/hicolor/96x96/apps/mkvpropedit.png
-%%QT5%%share/icons/hicolor/96x96/apps/mkvtoolnix-gui.png
+%%MANTRANS%%%%GUI%%man/zh_CN/man1/mkvtoolnix-gui.1.gz
+%%GUI%%share/applications/org.bunkus.mkvtoolnix-gui.desktop
+%%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/mkvpropedit.png
+%%GUI%%share/icons/hicolor/128x128/apps/mkvtoolnix-gui.png
+%%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/mkvpropedit.png
+%%GUI%%share/icons/hicolor/16x16/apps/mkvtoolnix-gui.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/mkvpropedit.png
+%%GUI%%share/icons/hicolor/24x24/apps/mkvtoolnix-gui.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/mkvpropedit.png
+%%GUI%%share/icons/hicolor/256x256/apps/mkvtoolnix-gui.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/mkvpropedit.png
+%%GUI%%share/icons/hicolor/32x32/apps/mkvtoolnix-gui.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/mkvpropedit.png
+%%GUI%%share/icons/hicolor/48x48/apps/mkvtoolnix-gui.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/mkvpropedit.png
+%%GUI%%share/icons/hicolor/64x64/apps/mkvtoolnix-gui.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/mkvpropedit.png
+%%GUI%%share/icons/hicolor/96x96/apps/mkvtoolnix-gui.png
 %%NLS%%share/locale/bg/LC_MESSAGES/mkvtoolnix.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/mkvtoolnix.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/mkvtoolnix.mo
@@ -143,8 +143,8 @@ man/man1/mkvpropedit.1.gz
 %%NLS%%share/locale/uk/LC_MESSAGES/mkvtoolnix.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
-%%QT5%%share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml
-%%QT5%%share/mime/packages/org.bunkus.mkvtoolnix-gui.xml
-%%QT5%%%%DATADIR%%/sounds/finished-1.ogg
-%%QT5%%%%DATADIR%%/sounds/finished-2.ogg
-%%QT5%%%%DATADIR%%/sounds/finished-3.ogg
+%%GUI%%share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml
+%%GUI%%share/mime/packages/org.bunkus.mkvtoolnix-gui.xml
+%%GUI%%%%DATADIR%%/sounds/finished-1.ogg
+%%GUI%%%%DATADIR%%/sounds/finished-2.ogg
+%%GUI%%%%DATADIR%%/sounds/finished-3.ogg