Updated to version 1.4.1

Changes:

- added help file

1.4.1:
======
- bugfixes

1.4.0:
======
- support for MPEG-1 and MPEG-2 video read from PS and ES streams,
- support for AVC (aka h.264) video from MP4 files,
- support for concatenating files,
- support for the new elements needed for menus,
- support for WAVPACK4 lossless and lossy audio,
- support for extracting VobSubs and
- added an online help to mmg accessible by pressing F1

5 files changed, 5 insertions, 51 deletions

diff --git a/multimedia/mkvtoolnix/Makefile.dist b/multimedia/mkvtoolnix/Makefile.dist
index ca0389cf963..db7f1010db1 100644
--- a/multimedia/mkvtoolnix/Makefile.dist
+++ b/multimedia/mkvtoolnix/Makefile.dist
@@ -1,4 +1,4 @@
-DISTNAME=	mkvtoolnix-1.0.2
+DISTNAME=	mkvtoolnix-1.4.1
 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 b426ad7e71c..3e40d9936b2 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.17 2005/02/24 11:24:03 agc Exp $
+$NetBSD: distinfo,v 1.18 2005/03/23 16:58:39 salo Exp $
 
-SHA1 (mkvtoolnix-1.0.2.tar.bz2) = a590d575ade3b6952b3f3864ce99045ad1c0bd56
-RMD160 (mkvtoolnix-1.0.2.tar.bz2) = a37d6c04be77b6f848aa129276c2dbb8faa339a1
-Size (mkvtoolnix-1.0.2.tar.bz2) = 529778 bytes
-SHA1 (patch-aa) = 104355ded3f3e1050070135d8c25db0d772b27f7
-SHA1 (patch-ab) = 74bbf8f9a092446af43253b9f7658890adf507d0
-SHA1 (patch-ac) = 0bef3efaed92455b784585b8c7195325043509de
+SHA1 (mkvtoolnix-1.4.1.tar.bz2) = 1a48bb993aeb54449ae136a4d7a8bf1d35fefb8e
+RMD160 (mkvtoolnix-1.4.1.tar.bz2) = 85a4ba138b17c8c43a9a5e6677b67d11decdf4ea
+Size (mkvtoolnix-1.4.1.tar.bz2) = 633834 bytes
diff --git a/multimedia/mkvtoolnix/patches/patch-aa b/multimedia/mkvtoolnix/patches/patch-aa
deleted file mode 100644
index 23c54f32466..00000000000
--- a/multimedia/mkvtoolnix/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/01/29 23:25:11 kristerw Exp $
-
---- src/common/aac_common.h.orig	Sat Jan 29 23:33:01 2005
-+++ src/common/aac_common.h	Sat Jan 29 23:33:23 2005
-@@ -57,7 +57,7 @@
- int MTX_DLL_API create_aac_data(unsigned char *data, int profile,
-                                 int channels, int sample_rate,
-                                 int output_sample_rate, bool sbr);
--bool MTX_DLL_API parse_aac_codec_id(const string &codec_id, int &id,
-+bool MTX_DLL_API parse_aac_codec_id(const char *codec_id, int &id,
-                                     int &profile);
- 
- #endif // __AACCOMMON_H
diff --git a/multimedia/mkvtoolnix/patches/patch-ab b/multimedia/mkvtoolnix/patches/patch-ab
deleted file mode 100644
index 2daa21a1fbe..00000000000
--- a/multimedia/mkvtoolnix/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/01/29 23:25:11 kristerw Exp $
-
---- src/common/aac_common.cpp.orig	Sat Jan 29 23:27:27 2005
-+++ src/common/aac_common.cpp	Sat Jan 29 23:32:45 2005
-@@ -232,10 +232,10 @@
- }
- 
- bool
--parse_aac_codec_id(const string &codec_id,
-+parse_aac_codec_id(const char *codec_id,
-                    int &id,
-                    int &profile) {
--  if (codec_id.size() < strlen(MKV_A_AAC_2LC))
-+  if (strlen(codec_id) < strlen(MKV_A_AAC_2LC))
-     return false;
- 
-   if (codec_id[10] == '2')
diff --git a/multimedia/mkvtoolnix/patches/patch-ac b/multimedia/mkvtoolnix/patches/patch-ac
deleted file mode 100644
index de189bb777f..00000000000
--- a/multimedia/mkvtoolnix/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/01/29 23:25:11 kristerw Exp $
-
---- src/input/r_matroska.cpp.orig	Sat Jan 29 23:33:37 2005
-+++ src/input/r_matroska.cpp	Sat Jan 29 23:34:16 2005
-@@ -1668,7 +1668,7 @@
-           id = 0;
-           profile = 0;
-           if (t->a_formattag == FOURCC('M', 'P', '4', 'A')) {
--            if (!parse_aac_codec_id(string(t->codec_id), id, profile))
-+            if (!parse_aac_codec_id(t->codec_id, id, profile))
-               mxerror(FMT_TID "Malformed codec id '%s'.\n", ti->fname,
-                       (int64_t)t->tnum, t->codec_id);
-           } else {