Update to version 1.7.0

Changes:

- mkvmerge: enhancement: Added support for MIME type detection via
  libmagic (patch by Robert Millan with heavy modifications by
  myself).

- mkvmerge: bug fix: Theora headers were not handled correctly.

- mkvmerge: bug fix: The WavPack reader was broken on 64bit
  systems (e.g. AMD64).

- mkvmerge: bug fix: The Theora timecode handling was broken, and
  Ogg/Theora files were not identified correctly (they showed up as
  "unknown" in mmg).

- mmg: enhancement: The 'adjust timecodes' function accepts
  timecodes like 'XXXXXunit' with 'unit' being 'ms', 'us', 'ns' or
  's'.

- mkvmerge: enhancement: mkvmerge will no longer refuse to
  concatenate files with differing Codec Private contents and only
  issue a warning in such cases.

- mkvmerge: bug fix: Quicktime/MP4 reader: Added support for
  version 1 media headers ('mdhd' atom) with 64bit fields. Fixed the
  duration of the last packet passed downstream. Fixed overflow
  issues during re-scaling from the Quicktime/MP4's time scale to
  nano seconds used by mkvmerge.

- mkvmerge: bug fix: Muxing wasn't working Windows 9x/ME because
  mkvmerge was trying to use Unicode file access functions when
  determining which directories to create. Fixes Anthill bug #177.

- mkvmerge: new feature: Added support for the "Delay:" feature
  and for negative timecodes in VobSub IDX files.

- mmg: new feature: If mmg is set to automatically fill in the
  output file name then it will clear the output file name once all
  input files have been removed.

- mmg: bug fix: Fixed a crash that occured if the user removed an
  attachment and clicked somewhere in the empty space in the
  attachment list. Occured only on Windows.

- mmg: bug fix: Re-added Chinese to the list of popular languages
  (those are listed first in the language drop down boxes).

- mkvmerge: bug fix: The last change to the ISO 639 language
  handling broke the VobSub reader so that it reported the wrong
  language codes. This also caused mmg to not display the correct
  language after adding a VobSub file.

7 files changed, 65 insertions, 24 deletions

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index b31dea73652..3eb21929c54 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:10:17 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/10/08 05:22:19 salo Exp $
 #
 
 .include "../../multimedia/mkvtoolnix/Makefile.dist"
-PKGREVISION=	2
 
 MAINTAINER=	salo@NetBSD.org
 HOMEPAGE=	http://www.bunkus.org/videotools/mkvtoolnix/
@@ -23,6 +22,7 @@ CONFIGURE_ARGS+=	--disable-gui
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../multimedia/libmatroska/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
+.include "../../sysutils/file/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mkvtoolnix/Makefile.dist b/multimedia/mkvtoolnix/Makefile.dist
index 79a32e2995e..30c12491d6e 100644
--- a/multimedia/mkvtoolnix/Makefile.dist
+++ b/multimedia/mkvtoolnix/Makefile.dist
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.dist,v 1.16 2005/12/11 18:05:43 salo Exp $
+# $NetBSD: Makefile.dist,v 1.17 2006/10/08 05:22:19 salo Exp $
 
-DISTNAME=	mkvtoolnix-1.6.5
+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/distinfo b/multimedia/mkvtoolnix/distinfo
index 3b1f207abfd..8dc19181043 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.20 2005/12/11 18:05:43 salo Exp $
+$NetBSD: distinfo,v 1.21 2006/10/08 05:22:19 salo Exp $
 
-SHA1 (mkvtoolnix-1.6.5.tar.bz2) = 2f6104e1a078c91172aef6ba00fb5a3656f8eeb3
-RMD160 (mkvtoolnix-1.6.5.tar.bz2) = 356e1d8628abf669f069e691f9b155bc595553bc
-Size (mkvtoolnix-1.6.5.tar.bz2) = 650413 bytes
+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) = 0a2ecaf091aa0735440a12c1534dc58eeb8ec549
diff --git a/multimedia/mkvtoolnix/patches/patch-ab b/multimedia/mkvtoolnix/patches/patch-ab
new file mode 100644
index 00000000000..ed22642ccbf
--- /dev/null
+++ b/multimedia/mkvtoolnix/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.6 2006/10/08 05:22:19 salo Exp $
+
+--- configure.orig	2006-10-08 03:30:41.000000000 +0000
++++ configure	2006-10-08 03:52:30.000000000 +0000
+@@ -8620,7 +8620,7 @@
+   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 @@
+ 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/Makefile b/multimedia/mmg/Makefile
index 9ab8b4f9738..ed01153cf68 100644
--- a/multimedia/mmg/Makefile
+++ b/multimedia/mmg/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.22 2006/07/22 04:46:17 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2006/10/08 05:22:19 salo Exp $
 #
 
 .include "../../multimedia/mkvtoolnix/Makefile.dist"
 PKGNAME=        ${DISTNAME:S/mkvtoolnix/mmg/}
-PKGREVISION=	3
 
 MAINTAINER=	salo@NetBSD.org
 HOMEPAGE=	http://www.bunkus.org/videotools/mkvtoolnix/doc/mkvmerge-gui.html
 COMMENT=        MKVtoolnix mkvmerge GUI
 
-DEPENDS+=	${DISTNAME}nb2:../../multimedia/mkvtoolnix
+DEPENDS+=	${DISTNAME}:../../multimedia/mkvtoolnix
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
@@ -22,7 +21,7 @@ CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/doc
 SUBST_CLASSES+=		man
 SUBST_STAGE.man=	pre-configure
 SUBST_FILES.man=	doc/mmg.1
-SUBST_SED.man=		's,(doc/,(${PREFIX}/share/doc/mmg/,g'
+SUBST_SED.man=		-e 's,(doc/,(${PREFIX}/share/doc/mmg/,g'
 SUBST_MESSAGE.man=	Fixing paths in manual page.
 
 INSTALLATION_DIRS=	bin man/man1
@@ -40,6 +39,7 @@ do-install:
 .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/wxGTK/buildlink3.mk"
 
diff --git a/multimedia/mmg/distinfo b/multimedia/mmg/distinfo
index eba43313a4b..2e003f1972e 100644
--- a/multimedia/mmg/distinfo
+++ b/multimedia/mmg/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.17 2005/12/11 18:06:23 salo Exp $
+$NetBSD: distinfo,v 1.18 2006/10/08 05:22:19 salo Exp $
 
-SHA1 (mkvtoolnix-1.6.5.tar.bz2) = 2f6104e1a078c91172aef6ba00fb5a3656f8eeb3
-RMD160 (mkvtoolnix-1.6.5.tar.bz2) = 356e1d8628abf669f069e691f9b155bc595553bc
-Size (mkvtoolnix-1.6.5.tar.bz2) = 650413 bytes
-SHA1 (patch-aa) = 19177b4a75ed8a27b746e2d1825c23fe59f95a77
+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
diff --git a/multimedia/mmg/patches/patch-aa b/multimedia/mmg/patches/patch-aa
index b6623622952..13daca5e7c2 100644
--- a/multimedia/mmg/patches/patch-aa
+++ b/multimedia/mmg/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/10/14 17:13:28 salo Exp $
+$NetBSD: patch-aa,v 1.3 2006/10/08 05:22:19 salo Exp $
 
---- configure.orig	2004-10-08 00:20:08.000000000 +0200
-+++ configure	2004-10-14 17:40:18.000000000 +0200
-@@ -5461,7 +5461,7 @@
+--- 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;}
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2004/10/14 17:13:28 salo Exp $
    fi
  
  for ac_header in ogg/ogg.h
-@@ -5617,7 +5617,7 @@
+@@ -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;}
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.2 2004/10/14 17:13:28 salo Exp $
    fi
  
  
-@@ -5697,7 +5697,7 @@
+@@ -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;}
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.2 2004/10/14 17:13:28 salo Exp $
    fi
  
  for ac_header in vorbis/codec.h
-@@ -5853,7 +5853,7 @@
+@@ -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;}
@@ -38,3 +38,21 @@ $NetBSD: patch-aa,v 1.2 2004/10/14 17:13:28 salo Exp $
    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
+ 
+