git: cc6461f3b65d - 2024Q2 - multimedia/mkvtoolnix: Update to upstream release 85.0

The branch 2024Q2 has been updated by riggs:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cc6461f3b65d5d0b14c720bf1077fb0016b619f3

commit cc6461f3b65d5d0b14c720bf1077fb0016b619f3
Author:     Thomas Zander <riggs@FreeBSD.org>
AuthorDate: 2024-06-15 05:48:09 +0000
Commit:     Thomas Zander <riggs@FreeBSD.org>
CommitDate: 2024-06-16 13:09:51 +0000

    multimedia/mkvtoolnix: Update to upstream release 85.0
    
    Details:
    - Bugfix release, see
      https://mkvtoolnix.download/doc/NEWS.md
    
    MFH:            2024Q2
    (cherry picked from commit eeaa3942361cb6b0fe34411bc1792695ce850f20)
---
 multimedia/mkvtoolnix/Makefile                         |  2 +-
 multimedia/mkvtoolnix/distinfo                         |  6 +++---
 multimedia/mkvtoolnix/files/patch-src_common_sorting.h | 11 -----------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index ba0bf5d8d902..552393743618 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	mkvtoolnix
-PORTVERSION=	84.0
+PORTVERSION=	85.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	https://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		https://mkvtoolnix.download/sources/
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 049ca1d64b33..f6299dec4a0d 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714316078
-SHA256 (mkvtoolnix-84.0.tar.xz) = e9176dea435c3b06b4716fb131d53c8f2621977576ccc4aee8ff9050c0d9ea7a
-SIZE (mkvtoolnix-84.0.tar.xz) = 11325260
+TIMESTAMP = 1718430407
+SHA256 (mkvtoolnix-85.0.tar.xz) = 702442c80706c7c770ac04f7b4eed7a57e9e03ead6c5e6e90b9655dd84c8d829
+SIZE (mkvtoolnix-85.0.tar.xz) = 11326932
diff --git a/multimedia/mkvtoolnix/files/patch-src_common_sorting.h b/multimedia/mkvtoolnix/files/patch-src_common_sorting.h
deleted file mode 100644
index ac924ca25017..000000000000
--- a/multimedia/mkvtoolnix/files/patch-src_common_sorting.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/sorting.h.orig	2024-04-28 10:37:21 UTC
-+++ src/common/sorting.h
-@@ -27,7 +27,7 @@ template<  typename Titer
- 
- template<  typename Titer
-          , typename Tcriterion_maker
--         , typename Tcriterion = typename std::result_of< Tcriterion_maker(typename std::iterator_traits<Titer>::value_type) >::type
-+         , typename Tcriterion = typename std::invoke_result< Tcriterion_maker, typename std::iterator_traits<Titer>::value_type >::type
-          , typename Tcomparator = std::less<Tcriterion>
-          >
- void