An update to mkvtoolnix 4.0.0.
Tested on amd64/i386.
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 17 Apr 2010 13:14:01 -0000 1.21
+++ Makefile 27 Jun 2010 01:55:18 -0000
@@ -2,8 +2,7 @@
COMMENT = create, alter and inspect Matroska files
-DISTNAME = mkvtoolnix-3.2.0
-PKGNAME = ${DISTNAME}p0
+DISTNAME = mkvtoolnix-4.0.0
CATEGORIES = multimedia x11
HOMEPAGE = http://www.bunkus.org/videotools/mkvtoolnix/
@@ -22,13 +21,12 @@ MASTER_SITES = ${HOMEPAGE}/sources/
EXTRACT_SUFX = .tar.bz2
-MODULES += converters/libiconv
-MODULES += devel/gettext
+MODULES = devel/gettext
LIB_DEPENDS = FLAC.>=7::audio/flac \
bz2.>=10::archivers/bzip2 \
lzo2::archivers/lzo2 \
- matroska:libmatroska->=0.8.1:multimedia/libmatroska \
+ matroska.>=1::multimedia/libmatroska \
vorbis.>=5::audio/libvorbis \
magic.>=1::devel/libmagic \
boost_system-mt.>=1.1,boost_regex-mt.>=1.1,boost_filesystem-mt.>=1.1::devel/boost
@@ -80,7 +78,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/doc/guide/en/mkvmerge-gui.*
${PREFIX}/share/mkvtoolnix
${INSTALL_DATA} ${WRKSRC}/doc/guide/en/images/*.gif
${PREFIX}/share/mkvtoolnix/images
.endif
-.for l in de ja zh_CN zh_TW
+.for l in de ja nl ru uk zh_CN zh_TW
${INSTALL_DATA_DIR} ${PREFIX}/share/locale/$l/LC_MESSAGES
${INSTALL_DATA} ${WRKSRC}/po/$l.mo
${PREFIX}/share/locale/$l/LC_MESSAGES/mkvtoolnix.mo
.endfor
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo 5 Apr 2010 20:27:03 -0000 1.14
+++ distinfo 27 Jun 2010 01:55:18 -0000
@@ -1,5 +1,5 @@
-MD5 (mkvtoolnix-3.2.0.tar.bz2) = m/MSgMsHhwdx5p3gKH3HaQ==
-RMD160 (mkvtoolnix-3.2.0.tar.bz2) = 1N2EPd+7dBM5CA27cpk47t8lBdg=
-SHA1 (mkvtoolnix-3.2.0.tar.bz2) = 5dITdALvZzHuAZpHJSe3eTXTAbE=
-SHA256 (mkvtoolnix-3.2.0.tar.bz2) =
KyRwU/SMy48ro+Fl03Ucgvft5JSCJDg86bYvK3unRqo=
-SIZE (mkvtoolnix-3.2.0.tar.bz2) = 1384155
+MD5 (mkvtoolnix-4.0.0.tar.bz2) = Q06yS5xJqZrDhr0sTFJVOA==
+RMD160 (mkvtoolnix-4.0.0.tar.bz2) = RE2KyocaOagm9uBLqFF54lltmqc=
+SHA1 (mkvtoolnix-4.0.0.tar.bz2) = 7p8vjiXoxrNJBcmBpoZpEhChtcw=
+SHA256 (mkvtoolnix-4.0.0.tar.bz2) =
uB9jf+k54uCVO8L6sBxy+ZpP5VSkodT7Ct3n06UUy/s=
+SIZE (mkvtoolnix-4.0.0.tar.bz2) = 1605839
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/patches/patch-configure,v
retrieving revision 1.10
diff -u -p -r1.10 patch-configure
--- patches/patch-configure 17 Apr 2010 13:14:03 -0000 1.10
+++ patches/patch-configure 27 Jun 2010 01:55:18 -0000
@@ -1,16 +1,16 @@
$OpenBSD: patch-configure,v 1.10 2010/04/17 13:14:03 benoit Exp $
---- configure.orig Fri Feb 12 16:44:54 2010
-+++ configure Fri Apr 9 22:14:08 2010
-@@ -5008,7 +5008,7 @@
- OPTIMIZATION_CFLAGS=""
- else
- DEBUG_CFLAGS=""
-- OPTIMIZATION_CFLAGS="-O3"
-+ OPTIMIZATION_CFLAGS=""
- fi
- # Check whether --enable-profiling was given.
- if test "${enable_profiling+set}" = set; then :
-@@ -9001,7 +9001,7 @@
+--- configure.orig Sat Jun 5 08:26:22 2010
++++ configure Sat Jun 26 20:44:09 2010
+@@ -5043,7 +5043,7 @@ fi
+
+
+ DEBUG_CFLAGS=""
+-OPTIMIZATION_CFLAGS="-O3"
++OPTIMIZATION_CFLAGS=""
+ PROFILING_CFLAGS=""
+ PROFILING_LIBS=""
+
+@@ -9139,7 +9139,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_gettext" >&5
$as_echo "$ac_cv_lib_intl_gettext" >&6; }
if test "x$ac_cv_lib_intl_gettext" = x""yes; then :
@@ -19,12 +19,3 @@ $OpenBSD: patch-configure,v 1.10 2010/04
gettext_found=yes
else
gettext_found=no
-@@ -9073,7 +9073,7 @@
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking the mmg guide translation
languages to install" >&5
- $as_echo_n "checking the mmg guide translation languages to install... " >&6;
}
--GUIDE_TRANSLATIONS="`find $srcdir/doc/guide -maxdepth 1 -type d -printf
'%f\n' | sed -e 1d | tr '\n' ' '`"
-+GUIDE_TRANSLATIONS="`find $srcdir/doc/guide -maxdepth 1 -type d -print | sed
-e 1d -e 's:.*/::' | tr '\n' ' '`"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUIDE_TRANSLATIONS" >&5
- $as_echo "$GUIDE_TRANSLATIONS" >&6; }
-
Index: patches/patch-src_common_common_cpp
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/patches/patch-src_common_common_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_common_common_cpp
--- patches/patch-src_common_common_cpp 5 Apr 2010 20:27:09 -0000 1.2
+++ patches/patch-src_common_common_cpp 27 Jun 2010 01:55:18 -0000
@@ -1,12 +1,11 @@
$OpenBSD: patch-src_common_common_cpp,v 1.2 2010/04/05 20:27:09 benoit Exp $
---- src/common/common.cpp.orig Fri Feb 12 16:43:41 2010
-+++ src/common/common.cpp Sun Apr 4 20:34:51 2010
-@@ -13,6 +13,8 @@
+--- src/common/common.cpp.orig Sat Jun 5 08:24:39 2010
++++ src/common/common.cpp Sat Jun 26 20:42:11 2010
+@@ -14,6 +14,7 @@
+ #include "common/common_pch.h"
- #include "common/os.h"
-
-+#include <unistd.h>
-+
- #include <boost/regex.hpp>
#include <stdlib.h>
- #include <string>
++#include <unistd.h>
+ #ifdef SYS_WINDOWS
+ # include <windows.h>
+ #endif
Index: patches/patch-src_common_dts_cpp
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/patches/patch-src_common_dts_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_common_dts_cpp
--- patches/patch-src_common_dts_cpp 9 Jun 2009 20:30:18 -0000 1.1
+++ patches/patch-src_common_dts_cpp 27 Jun 2010 01:55:18 -0000
@@ -1,10 +1,10 @@
---- src/common/dts.cpp.orig Sat May 23 09:10:12 2009
-+++ src/common/dts.cpp Sat May 23 09:10:35 2009
+--- src/common/dts.cpp.orig Sat Jun 5 08:24:39 2010
++++ src/common/dts.cpp Sat Jun 26 20:39:53 2010
@@ -14,6 +14,7 @@
#include <string.h>
#include <stdio.h>
+#include <unistd.h>
- #include "common/bit_cursor.h"
- #include "common/common.h"
+ #include "common/common_pch.h"
+
Index: patches/patch-src_common_random_cpp
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/patches/patch-src_common_random_cpp,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_common_random_cpp
--- patches/patch-src_common_random_cpp 23 Dec 2009 12:11:32 -0000 1.3
+++ patches/patch-src_common_random_cpp 27 Jun 2010 01:55:18 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_common_random_cpp,v 1.3 2009/12/23 12:11:32 benoit Exp $
---- src/common/random.cpp.orig Thu Aug 13 12:32:50 2009
-+++ src/common/random.cpp Thu Sep 10 12:08:56 2009
-@@ -98,7 +98,7 @@
+--- src/common/random.cpp.orig Sat Jun 5 08:24:39 2010
++++ src/common/random.cpp Sat Jun 26 20:39:53 2010
+@@ -98,7 +98,7 @@ random_c::generate_bytes(void *destination,
try {
if (!m_tried_dev_urandom) {
m_tried_dev_urandom = true;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 17 Apr 2010 13:14:05 -0000 1.6
+++ pkg/PLIST 27 Jun 2010 01:55:18 -0000
@@ -19,6 +19,9 @@ man/zh_CN.po/mkvmerge.1
man/zh_CN.po/mkvpropedit.1
share/locale/de/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/uk/LC_MESSAGES/mkvtoolnix.mo
share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo
share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
!%%no_x11%%
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.