keep a copy of the previous mkvtoolnix version -- the current one

develops mysterious C++ problems with older g++ (seen in bulk build,
reported by mrg)

6 files changed, 114 insertions, 1 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index 305d7e8fc23..e0703123534 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.165 2010/06/16 14:14:42 drochner Exp $
+# $NetBSD: Makefile,v 1.166 2010/07/28 09:05:38 drochner Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -89,6 +89,7 @@ SUBDIR+=	ming
 SUBDIR+=	mjpegtools
 SUBDIR+=	mkv2mp4
 SUBDIR+=	mkvtoolnix
+SUBDIR+=	mkvtoolnix-old
 SUBDIR+=	mpeg-lib
 SUBDIR+=	mpeg4ip
 SUBDIR+=	mpeg_encode
diff --git a/multimedia/mkvtoolnix-old/DESCR b/multimedia/mkvtoolnix-old/DESCR
new file mode 100644
index 00000000000..4eb90e0034d
--- /dev/null
+++ b/multimedia/mkvtoolnix-old/DESCR
@@ -0,0 +1,7 @@
+MKVtoolnix is a set of tools to create, alter and inspect Matroska files.
+
+With these tools one can get information about (mkvinfo) Matroska files,
+extract tracks/data from (mkvextract) Matroska files and create (mkvmerge)
+Matroska files from other media files.
+
+This is a mature version known to compile correctly with g++-4.1.
diff --git a/multimedia/mkvtoolnix-old/Makefile b/multimedia/mkvtoolnix-old/Makefile
new file mode 100644
index 00000000000..233c08bfaaf
--- /dev/null
+++ b/multimedia/mkvtoolnix-old/Makefile
@@ -0,0 +1,55 @@
+# $NetBSD: Makefile,v 1.1 2010/07/28 09:05:38 drochner Exp $
+
+DISTNAME=	mkvtoolnix-2.9.8
+PKGREVISION=	3
+CATEGORIES=	multimedia
+MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.bunkus.org/videotools/mkvtoolnix/
+COMMENT=	Matroska tools, old version for build with g++-4.1
+LICENSE=	gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	gmake
+USE_LANGUAGES=	c c++
+
+CONFIGURE_ARGS+=	--with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}
+CONFIGURE_ARGS+=	--with-boost_regex=boost_regex
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mkvtoolnix
+PKG_SUPPORTED_OPTIONS=	mkvtoolnix-gui
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	gui
+
+.if !empty(PKG_OPTIONS:Mmkvtoolnix-gui)
+PLIST.gui=	yes
+CONFIGURE_ARGS+=	--enable-gui
+CONFIGURE_ARGS+=	--enable-wxwidgets
+.   include "../../x11/wxGTK28/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-gui
+CONFIGURE_ARGS+=	--disable-wxwidgets
+.endif
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../archivers/liblzo/buildlink3.mk"
+.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/libebml/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/boost-libs/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-old/PLIST b/multimedia/mkvtoolnix-old/PLIST
new file mode 100644
index 00000000000..88c2889d7a9
--- /dev/null
+++ b/multimedia/mkvtoolnix-old/PLIST
@@ -0,0 +1,31 @@
+@comment $NetBSD: PLIST,v 1.1 2010/07/28 09:05:38 drochner Exp $
+bin/mkvextract
+bin/mkvinfo
+bin/mkvmerge
+${PLIST.gui}bin/mmg
+man/man1/mkvextract.1
+man/man1/mkvinfo.1
+man/man1/mkvmerge.1
+${PLIST.gui}man/man1/mmg.1
+share/mkvtoolnix/images/addingremovingattachments.gif
+share/mkvtoolnix/images/addremovefiles.gif
+share/mkvtoolnix/images/attachmentoptions.gif
+share/mkvtoolnix/images/audiotrackoptions.gif
+share/mkvtoolnix/images/chaptereditor.gif
+share/mkvtoolnix/images/generaltrackoptions.gif
+share/mkvtoolnix/images/jobmanager.gif
+share/mkvtoolnix/images/movietitle.gif
+share/mkvtoolnix/images/muxingwindow.gif
+share/mkvtoolnix/images/selectmkvmergeexecutable.gif
+share/mkvtoolnix/images/splitting.gif
+share/mkvtoolnix/images/textsubtitlestrackoptions.gif
+share/mkvtoolnix/images/trackselection.gif
+share/mkvtoolnix/images/videotrackoptions.gif
+share/mkvtoolnix/mkvmerge-gui.hhc
+share/mkvtoolnix/mkvmerge-gui.hhk
+share/mkvtoolnix/mkvmerge-gui.hhp
+share/mkvtoolnix/mkvmerge-gui.html
+share/locale/de/LC_MESSAGES/mkvtoolnix.mo
+share/locale/ja/LC_MESSAGES/mkvtoolnix.mo
+share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo
+share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
diff --git a/multimedia/mkvtoolnix-old/distinfo b/multimedia/mkvtoolnix-old/distinfo
new file mode 100644
index 00000000000..1f378318607
--- /dev/null
+++ b/multimedia/mkvtoolnix-old/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2010/07/28 09:05:38 drochner Exp $
+
+SHA1 (mkvtoolnix-2.9.8.tar.bz2) = be2b4b427befaad3d842b3ad3d55fb97b93b0468
+RMD160 (mkvtoolnix-2.9.8.tar.bz2) = d0cb8629ad35b29708a0c7777dfe9a4d623a8e10
+Size (mkvtoolnix-2.9.8.tar.bz2) = 1093036 bytes
+SHA1 (patch-aa) = f34d52914908e54fef20c857c3fde28aa560ff91
diff --git a/multimedia/mkvtoolnix-old/patches/patch-aa b/multimedia/mkvtoolnix-old/patches/patch-aa
new file mode 100644
index 00000000000..32eb73b9fe3
--- /dev/null
+++ b/multimedia/mkvtoolnix-old/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2010/07/28 09:05:38 drochner Exp $
+
+--- src/common/os.h.orig	2009-07-01 16:40:03.000000000 +0000
++++ src/common/os.h
+@@ -15,6 +15,8 @@
+ 
+ #include "config.h"
+ 
++#include <stdarg.h>
++
+ // For PRId64 and PRIu64:
+ #define __STDC_FORMAT_MACROS
+