Updated to version 0.8.9.

Changes:

- explicitly disable wxWindows support
- mark it as using c++
- prepare for mmg import
- delint

0.8.9:
======
- mmg: new feature: mmg will ask for confirmation before overwriting
       a file. This can be turned off on the settings tab.
- mmg: new feature: Implement drag'n'drop of files onto the input,
       attachment and chapter tabs. For the input and attachment tabs
       it works like pressing the 'add' button. On the chapters tab it
       works like calling 'Chapter Editor -> Open'.
- mkvinfo/mmg: Enabled compilation with wxWidgets 2.5 and Unicode
       enabled builds of wxWidgets.
- all: Increased the precision for timecodes in chapter files to
       nanoseconds (optionally, you can still use fewer digits after
       the '.').
- mkvmerge: Fixes for compilation with gcc 3.4.
- mkvmerge: bug fix: Some strings read from RealMedia files were not
       zero-terminated resulting in broken track recognition for some
       files.

4 files changed, 25 insertions, 12 deletions

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index cd77b339f22..034148e244d 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,21 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2004/05/05 15:57:47 salo Exp $
+# $NetBSD: Makefile,v 1.4 2004/05/08 18:09:20 salo Exp $
 #
 
-DISTNAME=	mkvtoolnix-0.8.8
-CATEGORIES=	multimedia
-MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
-EXTRACT_SUFX=	.tar.bz2
+.include "../../multimedia/mkvtoolnix/Makefile.dist"
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.bunkus.org/videotools/mkvtoolnix/
 COMMENT=	Set of tools to create, alter and inspect Matroska files
 
+GNU_CONFIGURE=	yes
 USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-extra-libs=${PREFIX}
-CONFIGURE_ARGS+=	--with-extra-includes=${PREFIX}
+USE_LANGUAGES=	c c++
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/liblzo/buildlink3.mk"
diff --git a/multimedia/mkvtoolnix/Makefile.dist b/multimedia/mkvtoolnix/Makefile.dist
new file mode 100644
index 00000000000..4a185304354
--- /dev/null
+++ b/multimedia/mkvtoolnix/Makefile.dist
@@ -0,0 +1,4 @@
+DISTNAME=	mkvtoolnix-0.8.9
+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 949ad2b510c..51ba808bb02 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2004/05/05 15:57:47 salo Exp $
+$NetBSD: distinfo,v 1.3 2004/05/08 18:09:20 salo Exp $
 
-SHA1 (mkvtoolnix-0.8.8.tar.bz2) = 3714df8c3d159ebbcfd1c6a44a283345084b2b55
-Size (mkvtoolnix-0.8.8.tar.bz2) = 479167 bytes
+SHA1 (mkvtoolnix-0.8.9.tar.bz2) = 0d926648aacd0b7621cca7727ec067d2a34f3c3c
+Size (mkvtoolnix-0.8.9.tar.bz2) = 480502 bytes
+SHA1 (patch-aa) = a7ffe453a5d6c1881b2c62e8e2a5c1f59d82c6c1
diff --git a/multimedia/mkvtoolnix/patches/patch-aa b/multimedia/mkvtoolnix/patches/patch-aa
new file mode 100644
index 00000000000..55aef84265e
--- /dev/null
+++ b/multimedia/mkvtoolnix/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2004/05/08 18:09:20 salo Exp $
+
+--- configure.orig	2004-05-06 19:54:38.000000000 +0200
++++ configure	2004-05-08 19:30:29.000000000 +0200
+@@ -6022,7 +6022,7 @@
+ 
+   echo "$as_me:$LINENO: checking for wxWindows" >&5
+ echo $ECHO_N "checking for wxWindows... $ECHO_C" >&6
+-  if wx-config --cxxflags > /dev/null 2>&1; then
++  if false > /dev/null 2>&1; then
+     wxwversion=`wx-config --version`
+     wxw_ver_req_major=2
+     wxw_ver_req_minor=4