Update mkvtoolnix to 2.9.8.

Too many upstream changes to duplicate here. Upstream change log is at
http://www.bunkus.org/videotools/mkvtoolnix/doc/ChangeLog .

Remove multimedia/mmg.  mmg is now optionally built as part of mkvtoolnix.

20 files changed, 70 insertions, 890 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index 8ea1669e214..5542639c14b 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.157 2009/10/26 20:27:13 tnn Exp $
+# $NetBSD: Makefile,v 1.158 2009/11/23 22:25:16 jakllsch Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -86,7 +86,6 @@ SUBDIR+=	ming
 SUBDIR+=	mjpegtools
 SUBDIR+=	mkv2mp4
 SUBDIR+=	mkvtoolnix
-SUBDIR+=	mmg
 SUBDIR+=	mpeg-lib
 SUBDIR+=	mpeg4ip
 SUBDIR+=	mpeg_encode
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 83bf1f7d19d..1ac35d3b281 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,20 +1,41 @@
-# $NetBSD: Makefile,v 1.15 2007/09/08 20:35:08 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2009/11/23 22:25:16 jakllsch Exp $
 #
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-.include "../../multimedia/mkvtoolnix/Makefile.dist"
-PKGREVISION=	2
+DISTNAME=	mkvtoolnix-2.9.8
+CATEGORIES=	multimedia
+MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	salo@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.bunkus.org/videotools/mkvtoolnix/
 COMMENT=	Set of tools to create, alter and inspect Matroska files
+LICENSE=	gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 
-CONFIGURE_ARGS+=	--disable-gui
+CONFIGURE_ARGS+=	--with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}
+CONFIGURE_ARGS+=	--with-boost_regex=boost_regex
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mkvtoolnix
+PKG_SUPPORTED_OPTIONS=	mkvtoolnix-gui
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	gui
+
+.if !empty(PKG_OPTIONS:Mmkvtoolnix-gui)
+PLIST.gui=	yes
+CONFIGURE_ARGS+= --enable-gui --enable-wxwidgets 
+.   include "../../x11/wxGTK28/buildlink3.mk"
+.else
+PLIST.gui=      no
+CONFIGURE_ARGS+= --disable-gui --disable-wxwidgets
+.endif
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/liblzo/buildlink3.mk"
@@ -23,6 +44,8 @@ CONFIGURE_ARGS+=	--disable-gui
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libebml/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../multimedia/libmatroska/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../sysutils/file/buildlink3.mk"
diff --git a/multimedia/mkvtoolnix/Makefile.dist b/multimedia/mkvtoolnix/Makefile.dist
deleted file mode 100644
index 30c12491d6e..00000000000
--- a/multimedia/mkvtoolnix/Makefile.dist
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.dist,v 1.17 2006/10/08 05:22:19 salo Exp $
-
-DISTNAME=	mkvtoolnix-1.7.0
-CATEGORIES=	multimedia
-MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
-EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/mkvtoolnix/PLIST b/multimedia/mkvtoolnix/PLIST
index 67fefbb7938..f0904803b9f 100644
--- a/multimedia/mkvtoolnix/PLIST
+++ b/multimedia/mkvtoolnix/PLIST
@@ -1,9 +1,31 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/10 12:44:31 salo Exp $
-bin/base64tool
+@comment $NetBSD: PLIST,v 1.2 2009/11/23 22:25:16 jakllsch Exp $
 bin/mkvextract
 bin/mkvinfo
 bin/mkvmerge
-man/man1/base64tool.1
+${PLIST.gui}bin/mmg
 man/man1/mkvextract.1
 man/man1/mkvinfo.1
 man/man1/mkvmerge.1
+${PLIST.gui}man/man1/mmg.1
+share/mkvtoolnix/images/addingremovingattachments.gif
+share/mkvtoolnix/images/addremovefiles.gif
+share/mkvtoolnix/images/attachmentoptions.gif
+share/mkvtoolnix/images/audiotrackoptions.gif
+share/mkvtoolnix/images/chaptereditor.gif
+share/mkvtoolnix/images/generaltrackoptions.gif
+share/mkvtoolnix/images/jobmanager.gif
+share/mkvtoolnix/images/movietitle.gif
+share/mkvtoolnix/images/muxingwindow.gif
+share/mkvtoolnix/images/selectmkvmergeexecutable.gif
+share/mkvtoolnix/images/splitting.gif
+share/mkvtoolnix/images/textsubtitlestrackoptions.gif
+share/mkvtoolnix/images/trackselection.gif
+share/mkvtoolnix/images/videotrackoptions.gif
+share/mkvtoolnix/mkvmerge-gui.hhc
+share/mkvtoolnix/mkvmerge-gui.hhk
+share/mkvtoolnix/mkvmerge-gui.hhp
+share/mkvtoolnix/mkvmerge-gui.html
+share/locale/de/LC_MESSAGES/mkvtoolnix.mo
+share/locale/ja/LC_MESSAGES/mkvtoolnix.mo
+share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo
+share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 3f8578ceb87..9cdb0133aab 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,13 +1,6 @@
-$NetBSD: distinfo,v 1.23 2007/01/13 21:58:24 wiz Exp $
+$NetBSD: distinfo,v 1.24 2009/11/23 22:25:16 jakllsch Exp $
 
-SHA1 (mkvtoolnix-1.7.0.tar.bz2) = c705af2778faac3e5244015646e331e811500b26
-RMD160 (mkvtoolnix-1.7.0.tar.bz2) = 0c90a44f0b6df466a4799ed8fa2f99791059c7fb
-Size (mkvtoolnix-1.7.0.tar.bz2) = 655481 bytes
-SHA1 (patch-aa) = 602bd5b9af024a02bcb6b59714d6aaa0031cbd85
-SHA1 (patch-ab) = df0bd9e6ed99be6d1f3f711b3d43ab605fc6b3d8
-SHA1 (patch-ac) = 8206116fcc72d757ac1456baae00a8254b8e4866
-SHA1 (patch-ad) = 9b57e92c910f84fa7b5eb88456fce6b08a3b0cf0
-SHA1 (patch-ae) = 47b34e89b259121fe731e9d55c404394be1fa1d6
-SHA1 (patch-af) = 402e4520d9b566e3422c983b80e8a005ed83b728
-SHA1 (patch-ag) = b9959a3c541447703fce51292097f3b33b146327
-SHA1 (patch-ah) = 85f638aa8fdc171a096a37ff2d580bfbe738d753
+SHA1 (mkvtoolnix-2.9.8.tar.bz2) = be2b4b427befaad3d842b3ad3d55fb97b93b0468
+RMD160 (mkvtoolnix-2.9.8.tar.bz2) = d0cb8629ad35b29708a0c7777dfe9a4d623a8e10
+Size (mkvtoolnix-2.9.8.tar.bz2) = 1093036 bytes
+SHA1 (patch-aa) = f34d52914908e54fef20c857c3fde28aa560ff91
diff --git a/multimedia/mkvtoolnix/patches/patch-aa b/multimedia/mkvtoolnix/patches/patch-aa
index 604adf77bfb..7d1ff018965 100644
--- a/multimedia/mkvtoolnix/patches/patch-aa
+++ b/multimedia/mkvtoolnix/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2005/12/11 18:05:43 salo Exp $
+$NetBSD: patch-aa,v 1.6 2009/11/23 22:25:16 jakllsch Exp $
 
---- Makefile.in.orig	2005-09-08 17:32:08.000000000 +0000
-+++ Makefile.in	2005-12-11 16:14:31.000000000 +0000
-@@ -137,7 +137,7 @@ HTMLHELPBOOKS = mkvmerge-gui-book
+--- src/common/os.h.orig	2009-07-01 16:40:03.000000000 +0000
++++ src/common/os.h
+@@ -15,6 +15,8 @@
  
- all: $(APPLICATIONS) $(TRANSLATIONS_MOS) $(HTMLHELPBOOKS)
+ #include "config.h"
  
--install: install-programs install-mans install-trans install-guide
-+install: install-programs install-mans install-trans
++#include <stdarg.h>
++
+ // For PRId64 and PRIu64:
+ #define __STDC_FORMAT_MACROS
  
- install-programs: $(APPLICATIONS)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
diff --git a/multimedia/mkvtoolnix/patches/patch-ab b/multimedia/mkvtoolnix/patches/patch-ab
deleted file mode 100644
index 66b77dd251e..00000000000
--- a/multimedia/mkvtoolnix/patches/patch-ab
+++ /dev/null
@@ -1,128 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2007/01/13 21:58:24 wiz Exp $
-
---- configure.orig	2006-04-28 19:53:45.000000000 +0000
-+++ configure
-@@ -6484,9 +6484,9 @@ else
- fi;
- 
-   if test "$with_flac" != "no"; then
--    echo "$as_me:$LINENO: checking for FLAC__seekable_stream_decoder_new in -lFLAC" >&5
--echo $ECHO_N "checking for FLAC__seekable_stream_decoder_new in -lFLAC... $ECHO_C" >&6
--if test "${ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new+set}" = set; then
-+    echo "$as_me:$LINENO: checking for FLAC__stream_decoder_new in -lFLAC" >&5
-+echo $ECHO_N "checking for FLAC__stream_decoder_new in -lFLAC... $ECHO_C" >&6
-+if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -6504,11 +6504,11 @@ extern "C"
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char FLAC__seekable_stream_decoder_new ();
-+char FLAC__stream_decoder_new ();
- int
- main ()
- {
--FLAC__seekable_stream_decoder_new ();
-+FLAC__stream_decoder_new ();
-   ;
-   return 0;
- }
-@@ -6534,20 +6534,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new=yes
-+  ac_cv_lib_FLAC_FLAC__stream_decoder_new=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new=no
-+ac_cv_lib_FLAC_FLAC__stream_decoder_new=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new" >&5
--echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new" >&6
--if test $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&5
-+echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&6
-+if test $ac_cv_lib_FLAC_FLAC__stream_decoder_new = yes; then
-    FLAC_LIBS="-lFLAC -lm"
-                    flac_found=yes
- else
-@@ -6669,9 +6669,9 @@ fi
- 
-   fi
-   if test x"$flac_found" = xyes ; then
--    echo "$as_me:$LINENO: checking for FLAC__seekable_stream_decoder_skip_single_frame in -lFLAC" >&5
--echo $ECHO_N "checking for FLAC__seekable_stream_decoder_skip_single_frame in -lFLAC... $ECHO_C" >&6
--if test "${ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame+set}" = set; then
-+    echo "$as_me:$LINENO: checking for FLAC__stream_decoder_skip_single_frame in -lFLAC" >&5
-+echo $ECHO_N "checking for FLAC__stream_decoder_skip_single_frame in -lFLAC... $ECHO_C" >&6
-+if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -6689,11 +6689,11 @@ extern "C"
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char FLAC__seekable_stream_decoder_skip_single_frame ();
-+char FLAC__stream_decoder_skip_single_frame ();
- int
- main ()
- {
--FLAC__seekable_stream_decoder_skip_single_frame ();
-+FLAC__stream_decoder_skip_single_frame ();
-   ;
-   return 0;
- }
-@@ -6719,20 +6719,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame=yes
-+  ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame=no
-+ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame" >&5
--echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame" >&6
--if test $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame" >&5
-+echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame" >&6
-+if test $ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame = yes; then
-    flac_decoder_skip_found=yes
- else
-    flac_decoder_skip_found=no
-@@ -8620,7 +8620,7 @@ if test "${ac_cv_lib_magic_magic_open+se
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmagic  $LIBS"
-+LIBS="-lmagic -lz $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -8678,7 +8678,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_magic_magic_open" >&5
- echo "${ECHO_T}$ac_cv_lib_magic_magic_open" >&6
- if test $ac_cv_lib_magic_magic_open = yes; then
--   MAGIC_LIBS="-lmagic"
-+   MAGIC_LIBS="-lmagic -lz"
- fi
- 
- 
diff --git a/multimedia/mkvtoolnix/patches/patch-ac b/multimedia/mkvtoolnix/patches/patch-ac
deleted file mode 100644
index 91f713bd48a..00000000000
--- a/multimedia/mkvtoolnix/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/10/31 20:52:36 rillig Exp $
-
---- tests/new_test.orig	2004-08-25 19:23:07.000000000 +0200
-+++ tests/new_test	2006-10-31 21:51:27.000000000 +0100
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--if [ "$1" == "" ]; then
-+if [ "$1" = "" ]; then
-   echo 'Name?'
-   exit 1
- fi
diff --git a/multimedia/mkvtoolnix/patches/patch-ad b/multimedia/mkvtoolnix/patches/patch-ad
deleted file mode 100644
index 80789f90a35..00000000000
--- a/multimedia/mkvtoolnix/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/01/13 21:58:24 wiz Exp $
-
---- configure.in.orig	2006-04-28 14:52:55.000000000 +0000
-+++ configure.in
-@@ -495,8 +495,8 @@ dnl
-               [ with_flac=${withval} ], [ with_flac=yes ])
- 
-   if test "$with_flac" != "no"; then
--    AC_CHECK_LIB(FLAC, FLAC__seekable_stream_decoder_new,
--                 [ FLAC_LIBS="-lFLAC -lm"
-+    AC_CHECK_LIB(FLAC, FLAC__stream_decoder_new,
-+                 [ FLAC_LIBS="-lFLAC $OGG_LIBS -lm"
-                    flac_found=yes ],
-                  [ flac_found=no ],
-                  "-lm")
-@@ -510,7 +510,7 @@ dnl
-                     ])
-   fi
-   if test x"$flac_found" = xyes ; then
--    AC_CHECK_LIB(FLAC, FLAC__seekable_stream_decoder_skip_single_frame,
-+    AC_CHECK_LIB(FLAC, FLAC__stream_decoder_skip_single_frame,
-                  [ flac_decoder_skip_found=yes ],
-                  [ flac_decoder_skip_found=no ],
-                  $FLAC_LIBS)
diff --git a/multimedia/mkvtoolnix/patches/patch-ae b/multimedia/mkvtoolnix/patches/patch-ae
deleted file mode 100644
index 5a263191f3b..00000000000
--- a/multimedia/mkvtoolnix/patches/patch-ae
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/01/13 21:58:24 wiz Exp $
-
---- src/input/flac_common.cpp.orig	2005-09-03 12:32:53.000000000 +0000
-+++ src/input/flac_common.cpp
-@@ -20,6 +20,11 @@
- #include <stdarg.h>
- 
- #include <FLAC/stream_decoder.h>
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
- 
- #include "bit_cursor.h"
- #include "common.h"
-@@ -145,7 +150,11 @@ typedef struct {
- static FLAC__StreamDecoderReadStatus
- flac_read_cb(const FLAC__StreamDecoder *,
-              FLAC__byte buffer[],
-+#ifdef LEGACY_FLAC
-              unsigned *bytes,
-+#else
-+             size_t *bytes,
-+#endif
-              void *client_data) {
-   flac_header_extractor_t *fhe;
-   int num_bytes;
-@@ -210,6 +219,7 @@ flac_decode_headers(unsigned char *mem,
-   decoder = FLAC__stream_decoder_new();
-   if (decoder == NULL)
-     mxerror(FPFX "FLAC__stream_decoder_new() failed.\n");
-+#ifdef LEGACY_FLAC
-   FLAC__stream_decoder_set_client_data(decoder, &fhe);
-   if (!FLAC__stream_decoder_set_read_callback(decoder, flac_read_cb))
-     mxerror(FPFX "Could not set the read callback.\n");
-@@ -219,11 +229,18 @@ flac_decode_headers(unsigned char *mem,
-     mxerror(FPFX "Could not set the metadata callback.\n");
-   if (!FLAC__stream_decoder_set_error_callback(decoder, flac_error_cb))
-     mxerror(FPFX "Could not set the error callback.\n");
-+#endif
-   if (!FLAC__stream_decoder_set_metadata_respond_all(decoder))
-     mxerror(FPFX "Could not set metadata_respond_all.\n");
-+#ifdef LEGACY_FLAC
-   if (FLAC__stream_decoder_init(decoder) !=
-       FLAC__STREAM_DECODER_SEARCH_FOR_METADATA)
-     mxerror(FPFX "Could not initialize the FLAC decoder.\n");
-+#else
-+  if (FLAC__stream_decoder_init_stream(decoder, flac_read_cb, NULL, NULL, NULL, NULL, flac_write_cb, flac_metadata_cb, flac_error_cb, &fhe) !=
-+      FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+    mxerror(FPFX "Could not initialize the FLAC decoder.\n");
-+#endif
-   FLAC__stream_decoder_process_until_end_of_stream(decoder);
- 
-   result = 0;
diff --git a/multimedia/mkvtoolnix/patches/patch-af b/multimedia/mkvtoolnix/patches/patch-af
deleted file mode 100644
index 155fac0805c..00000000000
--- a/multimedia/mkvtoolnix/patches/patch-af
+++ /dev/null
@@ -1,361 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/01/13 21:58:24 wiz Exp $
-
---- src/input/r_flac.cpp.orig	2005-10-12 16:41:09.000000000 +0000
-+++ src/input/r_flac.cpp
-@@ -20,9 +20,6 @@
- #include <string.h>
- #include <ogg/ogg.h>
- #include <vorbis/codec.h>
--#if defined(HAVE_FLAC_FORMAT_H)
--#include <FLAC/seekable_stream_decoder.h>
--#endif
- 
- #include "common.h"
- #include "flac_common.h"
-@@ -36,6 +33,7 @@
- #if defined(HAVE_FLAC_FORMAT_H)
- #define FPFX "flac_reader: "
- 
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderReadStatus
- flac_read_cb(const FLAC__SeekableStreamDecoder *,
-              FLAC__byte buffer[],
-@@ -43,55 +41,123 @@ flac_read_cb(const FLAC__SeekableStreamD
-              void *client_data) {
-   return ((flac_reader_c *)client_data)->read_cb(buffer, bytes);
- }
-+#else
-+static FLAC__StreamDecoderReadStatus
-+flac_read_cb(const FLAC__StreamDecoder *,
-+             FLAC__byte buffer[],
-+             size_t *bytes,
-+             void *client_data) {
-+  return ((flac_reader_c *)client_data)->read_cb(buffer, bytes);
-+}
-+#endif
- 
- static FLAC__StreamDecoderWriteStatus
-+#ifdef LEGACY_FLAC
- flac_write_cb(const FLAC__SeekableStreamDecoder *,
-               const FLAC__Frame *frame,
-               const FLAC__int32 * const data[],
-               void *client_data) {
-   return ((flac_reader_c *)client_data)->write_cb(frame, data);
- }
-+#else
-+flac_write_cb(const FLAC__StreamDecoder *,
-+              const FLAC__Frame *frame,
-+              const FLAC__int32 * const data[],
-+              void *client_data) {
-+  return ((flac_reader_c *)client_data)->write_cb(frame, data);
-+}
-+#endif
- 
- static void
-+#ifdef LEGACY_FLAC
- flac_metadata_cb(const FLAC__SeekableStreamDecoder *,
-                  const FLAC__StreamMetadata *metadata,
-                  void *client_data) {
-   ((flac_reader_c *)client_data)->metadata_cb(metadata);
- }
-+#else
-+flac_metadata_cb(const FLAC__StreamDecoder *,
-+                 const FLAC__StreamMetadata *metadata,
-+                 void *client_data) {
-+  ((flac_reader_c *)client_data)->metadata_cb(metadata);
-+}
-+#endif
- 
- static void
-+#ifdef LEGACY_FLAC
- flac_error_cb(const FLAC__SeekableStreamDecoder *,
-               FLAC__StreamDecoderErrorStatus status,
-               void *client_data) {
-   ((flac_reader_c *)client_data)->error_cb(status);
- }
-+#else
-+flac_error_cb(const FLAC__StreamDecoder *,
-+              FLAC__StreamDecoderErrorStatus status,
-+              void *client_data) {
-+  ((flac_reader_c *)client_data)->error_cb(status);
-+}
-+#endif
- 
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderSeekStatus
- flac_seek_cb(const FLAC__SeekableStreamDecoder *,
-              FLAC__uint64 absolute_byte_offset,
-              void *client_data) {
-   return ((flac_reader_c *)client_data)->seek_cb(absolute_byte_offset);
- }
-+#else
-+static FLAC__StreamDecoderSeekStatus
-+flac_seek_cb(const FLAC__StreamDecoder *,
-+             FLAC__uint64 absolute_byte_offset,
-+             void *client_data) {
-+  return ((flac_reader_c *)client_data)->seek_cb(absolute_byte_offset);
-+}
-+#endif
- 
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderTellStatus
- flac_tell_cb(const FLAC__SeekableStreamDecoder *,
-              FLAC__uint64 *absolute_byte_offset,
-              void *client_data) {
-   return ((flac_reader_c *)client_data)->tell_cb(*absolute_byte_offset);
- }
-+#else
-+static FLAC__StreamDecoderTellStatus
-+flac_tell_cb(const FLAC__StreamDecoder *,
-+             FLAC__uint64 *absolute_byte_offset,
-+             void *client_data) {
-+  return ((flac_reader_c *)client_data)->tell_cb(*absolute_byte_offset);
-+}
-+#endif
- 
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderLengthStatus
- flac_length_cb(const FLAC__SeekableStreamDecoder *,
-                FLAC__uint64 *stream_length,
-                void *client_data) {
-   return ((flac_reader_c *)client_data)->length_cb(*stream_length);
- }
-+#else
-+static FLAC__StreamDecoderLengthStatus
-+flac_length_cb(const FLAC__StreamDecoder *,
-+               FLAC__uint64 *stream_length,
-+               void *client_data) {
-+  return ((flac_reader_c *)client_data)->length_cb(*stream_length);
-+}
-+#endif
- 
- static FLAC__bool
-+#ifdef LEGACY_FLAC
- flac_eof_cb(const FLAC__SeekableStreamDecoder *,
-             void *client_data) {
-   return ((flac_reader_c *)client_data)->eof_cb();
- }
-+#else
-+flac_eof_cb(const FLAC__StreamDecoder *,
-+            void *client_data) {
-+  return ((flac_reader_c *)client_data)->eof_cb();
-+}
-+#endif
- 
- int
- flac_reader_c::probe_file(mm_io_c *io,
-@@ -175,8 +241,13 @@ flac_reader_c::create_packetizer(int64_t
- 
- bool
- flac_reader_c::parse_file() {
-+#ifdef LEGACY_FLAC
-   FLAC__SeekableStreamDecoder *decoder;
-   FLAC__SeekableStreamDecoderState state;
-+#else
-+  FLAC__StreamDecoder *decoder;
-+  FLAC__StreamDecoderState state;
-+#endif
-   flac_block_t block;
-   uint64_t u, old_pos;
-   int result, progress, old_progress;
-@@ -186,9 +257,14 @@ flac_reader_c::parse_file() {
-   metadata_parsed = false;
- 
-   mxinfo("+-> Parsing the FLAC file. This can take a LONG time.\n");
-+#ifdef LEGACY_FLAC
-   decoder = FLAC__seekable_stream_decoder_new();
-+#else
-+  decoder = FLAC__stream_decoder_new();
-+#endif
-   if (decoder == NULL)
-     mxerror(FPFX "FLAC__stream_decoder_new() failed.\n");
-+#ifdef LEGACY_FLAC
-   FLAC__seekable_stream_decoder_set_client_data(decoder, this);
-   if (!FLAC__seekable_stream_decoder_set_read_callback(decoder, flac_read_cb))
-     mxerror(FPFX "Could not set the read callback.\n");
-@@ -218,9 +294,20 @@ flac_reader_c::parse_file() {
-   if (FLAC__seekable_stream_decoder_init(decoder) !=
-       FLAC__SEEKABLE_STREAM_DECODER_OK)
-   mxerror(FPFX "Could not initialize the FLAC decoder.\n");
-+#else
-+  if (!FLAC__stream_decoder_set_metadata_respond_all(decoder))
-+    mxerror(FPFX "Could not set metadata_respond_all.\n");
-+  if (FLAC__stream_decoder_init_stream(decoder, flac_read_cb, flac_seek_cb, flac_tell_cb, flac_length_cb, flac_eof_cb, flac_write_cb, flac_metadata_cb, flac_error_cb, this) !=
-+      FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+  mxerror(FPFX "Could not initialize the FLAC decoder.\n");
-+#endif
- 
-   result =
-+#ifdef LEGACY_FLAC
-     (int)FLAC__seekable_stream_decoder_process_until_end_of_metadata(decoder);
-+#else
-+    (int)FLAC__stream_decoder_process_until_end_of_metadata(decoder);
-+#endif
-   mxverb(2, FPFX "extract->metadata, result: %d, mdp: %d, num blocks: %u\n",
-          result, metadata_parsed, (unsigned int)blocks.size());
- 
-@@ -229,7 +316,11 @@ flac_reader_c::parse_file() {
-             ti.fname.c_str());
- 
-   block.type = FLAC_BLOCK_TYPE_HEADERS;
-+#ifdef LEGACY_FLAC
-   FLAC__seekable_stream_decoder_get_decode_position(decoder, &u);
-+#else
-+  FLAC__stream_decoder_get_decode_position(decoder, &u);
-+#endif
-   block.filepos = 0;
-   block.len = u;
-   old_pos = u;
-@@ -239,12 +330,20 @@ flac_reader_c::parse_file() {
- 
-   old_progress = -5;
- #if defined(HAVE_FLAC_DECODER_SKIP)
-+#ifdef LEGACY_FLAC
-   ok = FLAC__seekable_stream_decoder_skip_single_frame(decoder);
- #else
-+  ok = FLAC__stream_decoder_skip_single_frame(decoder);
-+#endif
-+#else
-   ok = FLAC__seekable_stream_decoder_process_single(decoder);
- #endif
-   while (ok) {
-+#ifdef LEGACY_FLAC
-     state = FLAC__seekable_stream_decoder_get_state(decoder);
-+#else
-+    state = FLAC__stream_decoder_get_state(decoder);
-+#endif
- 
-     progress = (int)(file->getFilePointer() * 100 / file_size);
-     if ((progress - old_progress) >= 5) {
-@@ -252,7 +351,12 @@ flac_reader_c::parse_file() {
-       old_progress = progress;
-     }
- 
--    if (FLAC__seekable_stream_decoder_get_decode_position(decoder, &u) &&
-+    if (
-+#ifdef LEGACY_FLAC
-+        FLAC__seekable_stream_decoder_get_decode_position(decoder, &u) &&
-+#else
-+        FLAC__stream_decoder_get_decode_position(decoder, &u) &&
-+#endif
-         (u != old_pos)) {
-       block.type = FLAC_BLOCK_TYPE_DATA;
-       block.filepos = old_pos;
-@@ -264,16 +368,25 @@ flac_reader_c::parse_file() {
-              block.filepos, block.len);
-     }
- 
-+#ifdef LEGACY_FLAC
-     if ((state == FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM) ||
-         (state == FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR) ||
-         (state == FLAC__SEEKABLE_STREAM_DECODER_MEMORY_ALLOCATION_ERROR) ||
-         (state == FLAC__SEEKABLE_STREAM_DECODER_READ_ERROR) ||
-         (state == FLAC__SEEKABLE_STREAM_DECODER_SEEK_ERROR))
-       break;
-+#else
-+    if (state > FLAC__STREAM_DECODER_READ_FRAME)
-+      break;
-+#endif
- 
- #if defined(HAVE_FLAC_DECODER_SKIP)
-+#ifdef LEGACY_FLAC
-     ok = FLAC__seekable_stream_decoder_skip_single_frame(decoder);
- #else
-+    ok = FLAC__stream_decoder_skip_single_frame(decoder);
-+#endif
-+#else
-     ok = FLAC__seekable_stream_decoder_process_single(decoder);
- #endif
-   }
-@@ -283,8 +396,13 @@ flac_reader_c::parse_file() {
-   if ((blocks.size() == 0) || (blocks[0].type != FLAC_BLOCK_TYPE_HEADERS))
-     mxerror(FPFX "Could not read all header packets.\n");
- 
-+#ifdef LEGACY_FLAC
-   FLAC__seekable_stream_decoder_reset(decoder);
-   FLAC__seekable_stream_decoder_delete(decoder);
-+#else
-+  FLAC__stream_decoder_reset(decoder);
-+  FLAC__stream_decoder_delete(decoder);
-+#endif
- 
-   file->setFilePointer(0);
-   blocks[0].len -= 4;
-@@ -321,15 +439,26 @@ flac_reader_c::read(generic_packetizer_c
-   return FILE_STATUS_MOREDATA;
- }
- 
-+#ifdef LEGACY_FLAC
- FLAC__SeekableStreamDecoderReadStatus
- flac_reader_c::read_cb(FLAC__byte buffer[],
--                       unsigned *bytes) {
-+                       unsigned *bytes)
-+#else
-+FLAC__StreamDecoderReadStatus
-+flac_reader_c::read_cb(FLAC__byte buffer[],
-+                       size_t *bytes)
-+#endif
-+{
-   unsigned bytes_read, wanted_bytes;
- 
-   wanted_bytes = *bytes;
-   bytes_read = file->read((unsigned char *)buffer, wanted_bytes);
-   *bytes = bytes_read;
-+#ifdef LEGACY_FLAC
-   return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK;
-+#else
-+  return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
-+#endif
- }
- 
- FLAC__StreamDecoderWriteStatus
-@@ -372,24 +501,49 @@ flac_reader_c::error_cb(FLAC__StreamDeco
-   mxerror(FPFX "Error parsing the file: %d\n", (int)status);
- }
- 
-+#ifdef LEGACY_FLAC
- FLAC__SeekableStreamDecoderSeekStatus
-+#else
-+FLAC__StreamDecoderSeekStatus
-+#endif
- flac_reader_c::seek_cb(uint64_t new_pos) {
-   file->setFilePointer(new_pos, seek_beginning);
-   if (file->getFilePointer() == new_pos)
-+#ifdef LEGACY_FLAC
-     return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK;
-   return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR;
-+#else
-+    return FLAC__STREAM_DECODER_SEEK_STATUS_OK;
-+  return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
-+#endif
- }
- 
-+#ifdef LEGACY_FLAC
- FLAC__SeekableStreamDecoderTellStatus
-+#else
-+FLAC__StreamDecoderTellStatus
-+#endif
- flac_reader_c::tell_cb(uint64_t &absolute_byte_offset) {
-   absolute_byte_offset = file->getFilePointer();
-+#ifdef LEGACY_FLAC
-   return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK;
-+#else
-+  return FLAC__STREAM_DECODER_TELL_STATUS_OK;
-+#endif
- }
- 
-+#ifdef LEGACY_FLAC
- FLAC__SeekableStreamDecoderLengthStatus
-+#else
-+FLAC__StreamDecoderLengthStatus
-+#endif
- flac_reader_c::length_cb(uint64_t &stream_length) {
-   stream_length = file_size;
-+#ifdef LEGACY_FLAC
-   return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK;
-+#else
-+  return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
-+#endif
- }
- 
- FLAC__bool
diff --git a/multimedia/mkvtoolnix/patches/patch-ag b/multimedia/mkvtoolnix/patches/patch-ag
deleted file mode 100644
index 2766ff39300..00000000000
--- a/multimedia/mkvtoolnix/patches/patch-ag
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2007/01/13 21:58:24 wiz Exp $
-
---- src/input/r_flac.h.orig	2005-02-24 21:05:35.000000000 +0000
-+++ src/input/r_flac.h
-@@ -23,7 +23,17 @@
- #if defined(HAVE_FLAC_FORMAT_H)
- #include <vector>
- 
-+#include <FLAC/export.h>
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+#ifdef LEGACY_FLAC
- #include <FLAC/seekable_stream_decoder.h>
-+#else
-+#include <FLAC/stream_decoder.h>
-+#endif
- 
- #include "p_flac.h"
- 
-@@ -59,20 +69,31 @@ public:
- 
-   static int probe_file(mm_io_c *io, int64_t size);
- 
-+#ifdef LEGACY_FLAC
-   virtual FLAC__SeekableStreamDecoderReadStatus
-   read_cb(FLAC__byte buffer[], unsigned *bytes);
-+#else
-+  virtual FLAC__StreamDecoderReadStatus
-+  read_cb(FLAC__byte buffer[], size_t *bytes);
-+#endif
- 
-   virtual FLAC__StreamDecoderWriteStatus
-   write_cb(const FLAC__Frame *frame, const FLAC__int32 * const data[]);
- 
-   virtual void metadata_cb(const FLAC__StreamMetadata *metadata);
-   virtual void error_cb(FLAC__StreamDecoderErrorStatus status);
-+#ifdef LEGACY_FLAC
-   virtual FLAC__SeekableStreamDecoderSeekStatus
-   seek_cb(uint64_t new_pos);
-   virtual FLAC__SeekableStreamDecoderTellStatus
-   tell_cb(uint64_t &absolute_byte_offset);
-   virtual FLAC__SeekableStreamDecoderLengthStatus
-   length_cb(uint64_t &stream_length);
-+#else
-+  virtual FLAC__StreamDecoderSeekStatus seek_cb(uint64_t new_pos);
-+  virtual FLAC__StreamDecoderTellStatus tell_cb(uint64_t &absolute_byte_offset);
-+  virtual FLAC__StreamDecoderLengthStatus length_cb(uint64_t &stream_length);
-+#endif
-   virtual FLAC__bool eof_cb();
- 
- protected:
diff --git a/multimedia/mkvtoolnix/patches/patch-ah b/multimedia/mkvtoolnix/patches/patch-ah
deleted file mode 100644
index 96563df1ec2..00000000000
--- a/multimedia/mkvtoolnix/patches/patch-ah
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2007/01/13 21:58:24 wiz Exp $
-
---- src/input/r_ogm.cpp.orig	2006-04-28 08:48:49.000000000 +0000
-+++ src/input/r_ogm.cpp
-@@ -23,6 +23,11 @@
- #include <vorbis/codec.h>
- #if defined(HAVE_FLAC_FORMAT_H)
- #include <FLAC/stream_decoder.h>
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
- #endif
- #if defined(SYS_WINDOWS)
- #include <windows.h>
-@@ -102,7 +107,11 @@ extract_vorbis_comments(const memory_cpt
- static FLAC__StreamDecoderReadStatus
- fhe_read_cb(const FLAC__StreamDecoder *decoder,
-             FLAC__byte buffer[],
-+#ifdef LEGACY_FLAC
-             unsigned *bytes,
-+#else
-+            size_t *bytes,
-+#endif
-             void *client_data) {
-   flac_header_extractor_c *fhe;
-   ogg_packet op;
-@@ -193,6 +202,7 @@ flac_header_extractor_c::flac_header_ext
-   decoder = FLAC__stream_decoder_new();
-   if (decoder == NULL)
-     mxerror(FPFX "FLAC__stream_decoder_new() failed.\n");
-+#ifdef LEGACY_FLAC
-   FLAC__stream_decoder_set_client_data(decoder, this);
-   if (!FLAC__stream_decoder_set_read_callback(decoder, fhe_read_cb))
-     mxerror(FPFX "Could not set the read callback.\n");
-@@ -202,10 +212,16 @@ flac_header_extractor_c::flac_header_ext
-     mxerror(FPFX "Could not set the metadata callback.\n");
-   if (!FLAC__stream_decoder_set_error_callback(decoder, fhe_error_cb))
-     mxerror(FPFX "Could not set the error callback.\n");
-+#endif
-   if (!FLAC__stream_decoder_set_metadata_respond_all(decoder))
-     mxerror(FPFX "Could not set metadata_respond_all.\n");
-+#ifdef LEGACY_FLAC
-   if (FLAC__stream_decoder_init(decoder) !=
-       FLAC__STREAM_DECODER_SEARCH_FOR_METADATA)
-+#else
-+  if (FLAC__stream_decoder_init_stream(decoder, fhe_read_cb, NULL, NULL, NULL, NULL, fhe_write_cb, fhe_metadata_cb, fhe_error_cb, this) !=
-+      FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+#endif
-     mxerror(FPFX "Could not initialize the FLAC decoder.\n");
-   ogg_sync_init(&oy);
- }
diff --git a/multimedia/mmg/DESCR b/multimedia/mmg/DESCR
deleted file mode 100644
index f7280b530e7..00000000000
--- a/multimedia/mmg/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-mmg is a GUI for mkvmerge from MKVtoolnix.  mkvmerge is a tool to create
-Matroska files from other media files.
diff --git a/multimedia/mmg/Makefile b/multimedia/mmg/Makefile
deleted file mode 100644
index 8bd1e2a7191..00000000000
--- a/multimedia/mmg/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile,v 1.30 2009/08/26 19:58:06 sno Exp $
-#
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-.include "../../multimedia/mkvtoolnix/Makefile.dist"
-PKGNAME=	${DISTNAME:S/mkvtoolnix/mmg/}
-PKGREVISION=	2
-
-MAINTAINER=	salo@NetBSD.org
-HOMEPAGE=	http://www.bunkus.org/videotools/mkvtoolnix/doc/mkvmerge-gui.html
-COMMENT=	MKVtoolnix mkvmerge GUI
-
-DEPENDS+=	${DISTNAME}{,nb[0-9]*}:../../multimedia/mkvtoolnix
-
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-USE_LANGUAGES=	c c++
-
-BUILD_TARGET=	src/mmg/mmg
-
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/doc
-
-SUBST_CLASSES+=		man
-SUBST_STAGE.man=	pre-configure
-SUBST_FILES.man=	doc/mmg.1
-SUBST_SED.man=		-e 's,(doc/,(${PREFIX}/share/doc/mmg/,g'
-SUBST_MESSAGE.man=	Fixing paths in manual page.
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/mmg/mmg ${DESTDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/doc/mmg.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/mmg/images/
-	${INSTALL_DATA} ${WRKSRC}/doc/images/*.gif \
-		${DESTDIR}${PREFIX}/share/doc/mmg/images/
-	${INSTALL_DATA} ${WRKSRC}/doc/mkvmerge-gui.* \
-		${DESTDIR}${PREFIX}/share/doc/mmg/
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/libebml/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../multimedia/libmatroska/buildlink3.mk"
-.include "../../sysutils/file/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/wxGTK28/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mmg/PLIST b/multimedia/mmg/PLIST
deleted file mode 100644
index aabfbc5bf3f..00000000000
--- a/multimedia/mmg/PLIST
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:08:08 joerg Exp $
-bin/mmg
-man/man1/mmg.1
-share/doc/mmg/images/addingremovingattachments.gif
-share/doc/mmg/images/addremovefiles.gif
-share/doc/mmg/images/attachmentoptions.gif
-share/doc/mmg/images/audiotrackoptions.gif
-share/doc/mmg/images/chaptereditor.gif
-share/doc/mmg/images/jobmanager.gif
-share/doc/mmg/images/movietitle.gif
-share/doc/mmg/images/muxingwindow.gif
-share/doc/mmg/images/selectmkvmergeexecutable.gif
-share/doc/mmg/images/splitting.gif
-share/doc/mmg/images/textsubtitlestrackoptions.gif
-share/doc/mmg/images/trackselection.gif
-share/doc/mmg/images/videotrackoptions.gif
-share/doc/mmg/mkvmerge-gui.hhc
-share/doc/mmg/mkvmerge-gui.hhp
-share/doc/mmg/mkvmerge-gui.html
diff --git a/multimedia/mmg/distinfo b/multimedia/mmg/distinfo
deleted file mode 100644
index da35553346f..00000000000
--- a/multimedia/mmg/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.19 2006/11/12 02:27:57 rillig Exp $
-
-SHA1 (mkvtoolnix-1.7.0.tar.bz2) = c705af2778faac3e5244015646e331e811500b26
-RMD160 (mkvtoolnix-1.7.0.tar.bz2) = 0c90a44f0b6df466a4799ed8fa2f99791059c7fb
-Size (mkvtoolnix-1.7.0.tar.bz2) = 655481 bytes
-SHA1 (patch-aa) = a7e07acb9e9a3245519acedff6d6f41344d07cb2
-SHA1 (patch-ab) = 99f08611648f523dec37197487921b092fba556e
-SHA1 (patch-ac) = 70fae8c7ff5a92f305b9a1b100f843206fc13ad4
diff --git a/multimedia/mmg/patches/patch-aa b/multimedia/mmg/patches/patch-aa
deleted file mode 100644
index 13daca5e7c2..00000000000
--- a/multimedia/mmg/patches/patch-aa
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/10/08 05:22:19 salo Exp $
-
---- configure.orig	2006-04-28 21:53:45.000000000 +0200
-+++ configure	2006-10-08 07:11:50.000000000 +0200
-@@ -6076,7 +6076,7 @@ fi
-   if test "$ogg_found" = "no"; then
-     { { echo "$as_me:$LINENO: error: Could not find the Ogg library" >&5
- echo "$as_me: error: Could not find the Ogg library" >&2;}
--   { (exit 1); exit 1; }; }
-+   { (true); true; }; }
-   fi
- 
- for ac_header in ogg/ogg.h
-@@ -6232,7 +6232,7 @@ done
-   if test "$ogg_found" = "no"; then
-     { { echo "$as_me:$LINENO: error: Could not find the Ogg header files" >&5
- echo "$as_me: error: Could not find the Ogg header files" >&2;}
--   { (exit 1); exit 1; }; }
-+   { (true); true; }; }
-   fi
- 
- 
-@@ -6312,7 +6312,7 @@ fi
-   if test "$vorbis_found" = "no"; then
-     { { echo "$as_me:$LINENO: error: Could not find the Vorbis library" >&5
- echo "$as_me: error: Could not find the Vorbis library" >&2;}
--   { (exit 1); exit 1; }; }
-+   { (true); true; }; }
-   fi
- 
- for ac_header in vorbis/codec.h
-@@ -6468,7 +6468,7 @@ done
-   if test "$vorbis_found" = "no"; then
-     { { echo "$as_me:$LINENO: error: Could not find the Vorbis header files" >&5
- echo "$as_me: error: Could not find the Vorbis header files" >&2;}
--   { (exit 1); exit 1; }; }
-+   { (true); true; }; }
-   fi
- 
- 
-@@ -8620,7 +8620,7 @@ if test "${ac_cv_lib_magic_magic_open+se
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmagic  $LIBS"
-+LIBS="-lmagic -lz $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -8678,7 +8678,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_magic_magic_open" >&5
- echo "${ECHO_T}$ac_cv_lib_magic_magic_open" >&6
- if test $ac_cv_lib_magic_magic_open = yes; then
--   MAGIC_LIBS="-lmagic"
-+   MAGIC_LIBS="-lmagic -lz"
- fi
- 
- 
diff --git a/multimedia/mmg/patches/patch-ab b/multimedia/mmg/patches/patch-ab
deleted file mode 100644
index 56cfdbc50e1..00000000000
--- a/multimedia/mmg/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/12/11 18:06:23 salo Exp $
-
---- Makefile.in.orig	2005-09-08 19:32:08.000000000 +0200
-+++ Makefile.in	2005-12-11 18:47:21.000000000 +0100
-@@ -25,7 +25,7 @@
- man1dir = $(mandir)/man1
- includedir = @includedir@
- oldincludedir = /usr/include
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/mmg
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
diff --git a/multimedia/mmg/patches/patch-ac b/multimedia/mmg/patches/patch-ac
deleted file mode 100644
index 11e6ca9525f..00000000000
--- a/multimedia/mmg/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/11/12 02:28:45 rillig Exp $
-
---- tests/new_test.orig	2004-08-25 19:23:07.000000000 +0200
-+++ tests/new_test	2006-11-12 02:25:41.000000000 +0100
-@@ -1,7 +1,7 @@
- #!/bin/sh
- 
--if [ "$1" == "" ]; then
--  echo 'Name?'
-+if [ $# -eq 0 ]; then
-+  echo 'Name?' 1>&2
-   exit 1
- fi
-