Changes 4.6.0:

* build system: Fixed building the Qt version of mkvinfo's GUI (again).
* mmg: bug fix: If the header editor finds 'language' elements with ISO-639-1
  codes (e.g. "fra" instead of "fre" for "French") then it will map the code to
  the corresponding ISO-639-2 code
* mmg: bug fix: Fixed one of the issues causing mmg to report that it is
  configured to use an unsupported version of mkvmerge when the reported
  version was actually empty.
* mkvmerge: enhancement: HD-DVD subtitles are recognized as being an
  unsupported file format. This makes the error message presented to the user
  a bit clearer.
* build: Boost 1.36.0 or newer is required (up from 1.34.0). Also fixed
  building with v3 of Boost's filesystem library, e.g. with Boost 1.46.0
  Beta 1 or newer.
* mkvpropedit: new feature: Added support for adding, replacing and removing
  tags.
* all: Added a translation for the programs into Turkish by ßouЯock.
* build system: Fixed compilation if configure choses the internal versions of
  libebml and libmatroska while older versions are still installed in a
  location named with "-I..." or "-L..." in CFLAGS/CXXFLAGS/LDFLAGS or with
  configure's "--with-extra-includes" and "--with-extra-libs" options.

4 files changed, 55 insertions, 35 deletions

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 606db8d1917..4833d987844 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2011/02/14 19:12:01 drochner Exp $
+# $NetBSD: Makefile,v 1.32 2011/03/20 13:19:44 adam Exp $
 
-DISTNAME=	mkvtoolnix-4.5.0
+DISTNAME=	mkvtoolnix-4.6.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,37 +12,15 @@ LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake msgfmt
+USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
-USE_LANGUAGES=	c c++
-
+USE_TOOLS+=		gmake msgfmt
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}
 CONFIGURE_ARGS+=	--with-boost_regex=boost_regex
 CONFIGURE_ARGS+=	--with-boost-filesystem=boost_filesystem
 
-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"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-gui
-CONFIGURE_ARGS+=	--disable-wxwidgets
-.endif
-
-INSTALL_ENV+=	SHELL=${SH}
+INSTALL_ENV+=	SHELL=${SH:Q}
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ruby drake
@@ -50,11 +28,17 @@ do-build:
 do-install:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ruby drake install
 
+.include "options.mk"
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
 BUILDLINK_DEPMETHOD.${RUBY_BASE}=	build
 .include "../../lang/ruby/buildlink3.mk"
+.endif
 
 .include "../../archivers/bzip2/buildlink3.mk"
-.include "../../archivers/liblzo/buildlink3.mk"
+.include "../../archivers/lzo/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
@@ -67,5 +51,4 @@ BUILDLINK_DEPMETHOD.${RUBY_BASE}=	build
 .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/PLIST b/multimedia/mkvtoolnix/PLIST
index 3eb268e793f..4bb8b6319de 100644
--- a/multimedia/mkvtoolnix/PLIST
+++ b/multimedia/mkvtoolnix/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2011/02/14 19:12:01 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/03/20 13:19:44 adam Exp $
 bin/mkvextract
 bin/mkvinfo
 bin/mkvmerge
@@ -72,6 +72,7 @@ share/locale/fr/LC_MESSAGES/mkvtoolnix.mo
 share/locale/ja/LC_MESSAGES/mkvtoolnix.mo
 share/locale/nl/LC_MESSAGES/mkvtoolnix.mo
 share/locale/ru/LC_MESSAGES/mkvtoolnix.mo
+share/locale/tr/LC_MESSAGES/mkvtoolnix.mo
 share/locale/uk/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/distinfo b/multimedia/mkvtoolnix/distinfo
index bb3b5ad1890..34cee857b3b 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.28 2011/02/14 19:12:01 drochner Exp $
+$NetBSD: distinfo,v 1.29 2011/03/20 13:19:44 adam Exp $
 
-SHA1 (mkvtoolnix-4.5.0.tar.bz2) = 7e9c14c29f5aaf7043ac2c2db56326970c63242d
-RMD160 (mkvtoolnix-4.5.0.tar.bz2) = 1ac00b89345e3c8cd747e0921d4ae1f715a264c5
-Size (mkvtoolnix-4.5.0.tar.bz2) = 2016980 bytes
+SHA1 (mkvtoolnix-4.6.0.tar.bz2) = 1e46f94a0b50bf3e12c0feab710655e7cf2a9489
+RMD160 (mkvtoolnix-4.6.0.tar.bz2) = d1ebbf181525c832a3ceafd46bea9462df1eebb6
+Size (mkvtoolnix-4.6.0.tar.bz2) = 2032839 bytes
 SHA1 (patch-aa) = f34d52914908e54fef20c857c3fde28aa560ff91
diff --git a/multimedia/mkvtoolnix/options.mk b/multimedia/mkvtoolnix/options.mk
new file mode 100644
index 00000000000..8528d76d1b9
--- /dev/null
+++ b/multimedia/mkvtoolnix/options.mk
@@ -0,0 +1,36 @@
+# $NetBSD: options.mk,v 1.1 2011/03/20 13:19:44 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mkvtoolnix
+PKG_SUPPORTED_OPTIONS=	# empty
+PKG_OPTIONS_OPTIONAL_GROUPS=	gui
+PKG_OPTIONS_GROUP.gui=	wxwidgets
+PKG_SUGGESTED_OPTIONS=	# empty
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		gui
+
+.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mwxwidgets)
+PLIST.gui=		yes
+CONFIGURE_ARGS+=	--enable-gui
+.else
+CONFIGURE_ARGS+=	--disable-gui
+.endif
+
+#.if !empty(PKG_OPTIONS:Mqt)
+#CONFIGURE_ARGS+=	--enable-qt
+#.  include "../../x11/qt4-libs/buildlink3.mk"
+#.  include "../../x11/qt4-tools/buildlink3.mk"
+#.else
+#CONFIGURE_ARGS+=	--disable-qt
+#.endif
+
+.if !empty(PKG_OPTIONS:Mwxwidgets)
+CONFIGURE_ARGS+=	--enable-wxwidgets
+.  include "../../databases/shared-mime-info/mimedb.mk"
+.  include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.  include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.  include "../../x11/wxGTK28/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-wxwidgets
+.endif