- Update to 3.4.0

- Use += for setting CPPFLAGS and LDFLAGS [1]
- Fix build with gcc44 [1]

PR:		146675 147640 147643
Submitted by:	Ports Fury
		Andriy Gapon <avg@icyb.net.ua> [1]

6 files changed, 18 insertions, 27 deletions

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 1999ca632c22..0018d9ef1a9c 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mkvtoolnix
-PORTVERSION=	3.3.0
-PORTREVISION=	2
+PORTVERSION=	3.4.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
 
@@ -28,8 +27,8 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		ac_cv_path_PO4A=no
 CONFIGURE_ARGS=	--enable-lzo --enable-bz2 --disable-qt \
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 11602473b9d8..d120d438552a 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,3 +1,3 @@
-MD5 (mkvtoolnix-3.3.0.tar.bz2) = a002b6537e4515b6a0b26f42e8a2eb9a
-SHA256 (mkvtoolnix-3.3.0.tar.bz2) = a24fb6fbcd6779f02f8146ee448abfc6dab9ac23ed15b685b37e6a71e340a5f4
-SIZE (mkvtoolnix-3.3.0.tar.bz2) = 1369940
+MD5 (mkvtoolnix-3.4.0.tar.bz2) = 9d9e27adb8dbe42be9636070766e1b64
+SHA256 (mkvtoolnix-3.4.0.tar.bz2) = 6e259a1b34e4cdd5fe61dbde12dfddde792609708c6a325ad3f27cb750ac1e12
+SIZE (mkvtoolnix-3.4.0.tar.bz2) = 1484414
diff --git a/multimedia/mkvtoolnix/files/patch-Makefile.in b/multimedia/mkvtoolnix/files/patch-Makefile.in
index 7e3b39c2f46c..9d51180e3546 100644
--- a/multimedia/mkvtoolnix/files/patch-Makefile.in
+++ b/multimedia/mkvtoolnix/files/patch-Makefile.in
@@ -1,14 +1,5 @@
 --- Makefile.in.orig	2010-01-19 20:05:55.000000000 +0900
 +++ Makefile.in	2010-01-21 16:43:29.000000000 +0900
-@@ -176,7 +176,7 @@
- MANPAGES_TRANSLATIONS_POS = @MANPAGES_TRANSLATIONS_POS@
- MANPAGES_TRANSLATED = @MANPAGES_TRANSLATED@
- 
--GUIDE_TRANSLATIONS = @GUIDE_TRANSLATIONS@
-+GUIDE_TRANSLATIONS = en zh_CN
- 
- HTMLHELPBOOKS = mkvmerge-gui-book
- 
 @@ -185,11 +185,11 @@
  		-Lsrc/common -Lsrc/input -Lsrc/output -Lsrc/mpegparser
  
diff --git a/multimedia/mkvtoolnix/files/patch-handle_deps b/multimedia/mkvtoolnix/files/patch-handle_deps
deleted file mode 100644
index cd0b1b9e60ab..000000000000
--- a/multimedia/mkvtoolnix/files/patch-handle_deps
+++ /dev/null
@@ -1,11 +0,0 @@
---- handle_deps.orig	2010-03-24 22:48:35.000000000 +0900
-+++ handle_deps	2010-03-27 02:43:11.000000000 +0900
-@@ -3,7 +3,7 @@
- obj="$1"
- exitcode="$2"
- 
--dep="`echo "$obj" | sed -e 's:\.\(o\|gch\)$:.d:'`"
-+dep="`echo "$obj" | sed -E -e 's:\.(o|gch)$:.d:'`"
- test -f "$dep" || exit $exitcode
- 
- test -f .deps && rm -f .deps
diff --git a/multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h b/multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h
new file mode 100644
index 000000000000..8672aeca0da3
--- /dev/null
+++ b/multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h
@@ -0,0 +1,10 @@
+--- src/common/strings/editing.h.orig	2010-06-07 11:37:20.115133180 +0300
++++ src/common/strings/editing.h	2010-06-07 11:37:40.477006374 +0300
+@@ -16,6 +16,7 @@
+ 
+ #include "common/os.h"
+ 
++#include <cstdarg>
+ #include <string>
+ #include <vector>
+ 
diff --git a/multimedia/mkvtoolnix/pkg-plist b/multimedia/mkvtoolnix/pkg-plist
index 977530aac37c..018b8a8bf2a4 100644
--- a/multimedia/mkvtoolnix/pkg-plist
+++ b/multimedia/mkvtoolnix/pkg-plist
@@ -5,6 +5,8 @@ bin/mkvpropedit
 %%GUI%%bin/mmg
 share/locale/de/LC_MESSAGES/mkvtoolnix.mo
 share/locale/ja/LC_MESSAGES/mkvtoolnix.mo
+share/locale/ru/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
 %%DATADIR%%/guide/en/images/addingremovingattachments.gif