Updated to version 0.9.3.

Changes:

- add patch to fix compilation when MATROSKA_VERSION is set to 2 or bigger.
  Patch sent to Moritz Bunkus and it's fixed in svn repo.

- take MAINTAINERSHIP

0.9.3:
======
- mmg: bug fix: The 'default track' checkbox was broken.

- mkvmerge: bug fix: Using '--cues ...:all' was broken for audio tracks
                     that use lacing.
            bug fix: The latest OpenDML AVI files generated by mencoder
                     were not read correctly. Only the first RIFF chunk
                     was processed.
	    bug fix: The default track feature did not work correctly
                     with the new --track-order.
            new feature: When using a CUE sheet as a chapter file
                     mkvmerge will automatically convert some of the
                     entries to tags.
            new feature: Added support for TTA lossless audio files.

            If the user does not specify a --language for a track 'und'
            ('undefined') will now be used instead of 'eng'. The user
            can use the new option '--default-language' to change that.

4 files changed, 43 insertions, 6 deletions

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 034148e244d..e471442f714 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2004/05/08 18:09:20 salo Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/21 00:04:30 salo Exp $
 #
 
 .include "../../multimedia/mkvtoolnix/Makefile.dist"
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	salo@NetBSD.org
 HOMEPAGE=	http://www.bunkus.org/videotools/mkvtoolnix/
 COMMENT=	Set of tools to create, alter and inspect Matroska files
 
diff --git a/multimedia/mkvtoolnix/Makefile.dist b/multimedia/mkvtoolnix/Makefile.dist
index aedbdc9c1a7..592b79d5305 100644
--- a/multimedia/mkvtoolnix/Makefile.dist
+++ b/multimedia/mkvtoolnix/Makefile.dist
@@ -1,4 +1,4 @@
-DISTNAME=	mkvtoolnix-0.9.2
+DISTNAME=	mkvtoolnix-0.9.3
 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 13ef0d91e8b..90e8af3246f 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2004/07/05 01:05:51 salo Exp $
+$NetBSD: distinfo,v 1.7 2004/07/21 00:04:30 salo Exp $
 
-SHA1 (mkvtoolnix-0.9.2.tar.bz2) = e3a021ee990656af926d921bab4df55648ce111a
-Size (mkvtoolnix-0.9.2.tar.bz2) = 481348 bytes
+SHA1 (mkvtoolnix-0.9.3.tar.bz2) = e8bec87e212ee4e691077ba53507e0e11238bf18
+Size (mkvtoolnix-0.9.3.tar.bz2) = 494512 bytes
 SHA1 (patch-aa) = a7ffe453a5d6c1881b2c62e8e2a5c1f59d82c6c1
+SHA1 (patch-ab) = 0d02fbb4c53d140b3c9c7b16b063f2d3a63fe7d2
diff --git a/multimedia/mkvtoolnix/patches/patch-ab b/multimedia/mkvtoolnix/patches/patch-ab
new file mode 100644
index 00000000000..c9165a2c1cb
--- /dev/null
+++ b/multimedia/mkvtoolnix/patches/patch-ab
@@ -0,0 +1,36 @@
+$NetBSD: patch-ab,v 1.1 2004/07/21 00:04:30 salo Exp $
+
+--- src/mkvinfo.cpp.orig	2004-07-18 18:08:45.000000000 +0200
++++ src/mkvinfo.cpp	2004-07-21 01:08:15.000000000 +0200
+@@ -786,6 +786,10 @@
+             vector<string> &summary) {
+   EbmlMaster *m3;
+   int i3;
++#if MATROSKA_VERSION >= 2
++  string strc;
++#endif
++  
+ 
+   show_element(l3, 3, "Audio track");
+ 
+@@ -1393,6 +1397,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 +1579,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");
+