4 files changed, 7 insertions, 77 deletions
diff --git a/multimedia/mkvtoolnix/Makefile.dist b/multimedia/mkvtoolnix/Makefile.dist
index 592b79d5305..edfcf5cfb69 100644
--- a/multimedia/mkvtoolnix/Makefile.dist
+++ b/multimedia/mkvtoolnix/Makefile.dist
@@ -1,4 +1,4 @@
-DISTNAME=	mkvtoolnix-0.9.3
+DISTNAME=	mkvtoolnix-0.9.4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index c76bc04af52..90285bcb0b7 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.8 2004/07/22 17:47:18 kristerw Exp $
+$NetBSD: distinfo,v 1.9 2004/07/27 04:27:40 salo Exp $
 
-SHA1 (mkvtoolnix-0.9.3.tar.bz2) = e8bec87e212ee4e691077ba53507e0e11238bf18
-Size (mkvtoolnix-0.9.3.tar.bz2) = 494512 bytes
+SHA1 (mkvtoolnix-0.9.4.tar.bz2) = 8fcd1d27123a572ef58d228eb6212a6be08da1b2
+Size (mkvtoolnix-0.9.4.tar.bz2) = 499321 bytes
 SHA1 (patch-aa) = a7ffe453a5d6c1881b2c62e8e2a5c1f59d82c6c1
-SHA1 (patch-ab) = 453e82e85046f6f08cb49cf0e62597d276f80050
diff --git a/multimedia/mkvtoolnix/patches/patch-ab b/multimedia/mkvtoolnix/patches/patch-ab
deleted file mode 100644
index ba44cb2f6b1..00000000000
--- a/multimedia/mkvtoolnix/patches/patch-ab
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/07/22 17:47:18 kristerw Exp $
-
---- src/mkvinfo.cpp.orig	Sun Jul 18 18:08:45 2004
-+++ src/mkvinfo.cpp	Thu Jul 22 19:32:58 2004
-@@ -134,12 +134,11 @@
- 
- void
- usage() {
-+#ifdef HAVE_WXWINDOWS
-   mxinfo(_(
-     "Usage: mkvinfo [options] inname\n\n"
-     " options:\n"
--#ifdef HAVE_WXWINDOWS
-     "  -g, --gui      Start the GUI (and open inname if it was given).\n"
--#endif
-     "  inname         Use 'inname' as the source.\n"
-     "  -v, --verbose  Increase verbosity. See the man page for a detailed\n"
-     "                 description of what mkvinfo outputs.\n"
-@@ -147,6 +146,18 @@
-     "  -s, --summary  Only show summaries of the contents, not each element.\n"
-     "  -h, --help     Show this help.\n"
-     "  -V, --version  Show version information.\n"));
-+#else
-+  mxinfo(_(
-+    "Usage: mkvinfo [options] inname\n\n"
-+    " options:\n"
-+    "  inname         Use 'inname' as the source.\n"
-+    "  -v, --verbose  Increase verbosity. See the man page for a detailed\n"
-+    "                 description of what mkvinfo outputs.\n"
-+    "  -c, --checksum Calculate and display checksums of frame contents.\n"
-+    "  -s, --summary  Only show summaries of the contents, not each element.\n"
-+    "  -h, --help     Show this help.\n"
-+    "  -V, --version  Show version information.\n"));
-+#endif
- }
- 
- string
-@@ -786,6 +797,10 @@
-             vector<string> &summary) {
-   EbmlMaster *m3;
-   int i3;
-+#if MATROSKA_VERSION >= 2
-+  string strc;
-+#endif
-+  
- 
-   show_element(l3, 3, "Audio track");
- 
-@@ -1393,6 +1408,10 @@
- def_handle(cues) {
-   EbmlMaster *m1, *m2, *m3;
-   int i1, i2, i3;
-+#if MATROSKA_VERSION >= 2
-+  EbmlMaster *m4;
-+  int i4;
-+#endif
- 
-   if (verbose < 2) {
-     show_element(l1, 1, "Cues (subentries will be skipped)");
-@@ -1571,6 +1590,9 @@
-   bool fref_found, bref_found;
-   uint32_t lf_tnum;
-   uint64_t lf_timecode;
-+#if MATROSKA_VERSION >= 2
-+  string strc;
-+#endif
- 
-   show_element(l2, 2, "Block group");
- 
diff --git a/multimedia/mmg/distinfo b/multimedia/mmg/distinfo
index 8ca8e100996..a05045f900b 100644
--- a/multimedia/mmg/distinfo
+++ b/multimedia/mmg/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2004/07/21 00:04:30 salo Exp $
+$NetBSD: distinfo,v 1.6 2004/07/27 04:27:40 salo Exp $
 
-SHA1 (mkvtoolnix-0.9.3.tar.bz2) = e8bec87e212ee4e691077ba53507e0e11238bf18
-Size (mkvtoolnix-0.9.3.tar.bz2) = 494512 bytes
+SHA1 (mkvtoolnix-0.9.4.tar.bz2) = 8fcd1d27123a572ef58d228eb6212a6be08da1b2
+Size (mkvtoolnix-0.9.4.tar.bz2) = 499321 bytes
 SHA1 (patch-aa) = ab3d0fe8735b5fec65316879f9f30f867175b312
 SHA1 (patch-ab) = 43b0aaccc6c18da2a2fca6384ea118239c912795