Update to 4.4.0. The project has moved from make to rake, therefore use

USE_RUBY and USE_RAKE with special do-build and do-install targets. Also add
a few more mirrors.

4 files changed, 17 insertions, 33 deletions

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 0e65e9e385a..140e5e15dd2 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	mkvtoolnix
-PORTVERSION=	4.2.0
+PORTVERSION=	4.4.0
 CATEGORIES=	multimedia audio
-MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
+MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
+		CRITICAL
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Tools to extract from/get info about/create Matroska media streams
@@ -27,9 +28,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_GMAKE=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
+USE_RAKE=	yes
+USE_RUBY=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
@@ -41,6 +43,7 @@ CONFIGURE_ARGS=	--enable-lzo --enable-bz2 --disable-qt \
 		--with-boost-regex=boost_regex
 MAKE_JOBS_SAFE=	yes
 
+MANLANG=	"" ja zh_CN
 MAN1=		mkvextract.1 mkvinfo.1 mkvmerge.1 mkvpropedit.1
 
 OPTIONS=	WXGTK "build wxGTK2 based GUI" on
@@ -69,4 +72,10 @@ PLIST_SUB+=	GUI="@comment "
 post-patch:
 	@${REINPLACE_CMD} -e 's|"-O3"|""|g' ${WRKSRC}/configure
 
+do-build:
+	@(cd ${WRKSRC}/; ${SETENV} ${MAKE_ENV} ${RAKE_BIN})
+
+do-install:
+	@(cd ${WRKSRC}/; ${SETENV} ${MAKE_ENV} ${RAKE_BIN} install)
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 45fb3a9633d..671e93d1c7d 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,3 +1,2 @@
-MD5 (mkvtoolnix-4.2.0.tar.bz2) = de3e99598d47d0a2226269f79faabbfd
-SHA256 (mkvtoolnix-4.2.0.tar.bz2) = 51880e29debd7a93273681ad4083dc82b6b8ac3674cca2f1b11b4acbefc38b85
-SIZE (mkvtoolnix-4.2.0.tar.bz2) = 1767048
+SHA256 (mkvtoolnix-4.4.0.tar.bz2) = d458448f099abd3609fccddf54bd0d1cf8cadf2e966478432fb09116a0aaef2a
+SIZE (mkvtoolnix-4.4.0.tar.bz2) = 1773026
diff --git a/multimedia/mkvtoolnix/files/patch-Makefile.in b/multimedia/mkvtoolnix/files/patch-Makefile.in
deleted file mode 100644
index c5f67f00588..00000000000
--- a/multimedia/mkvtoolnix/files/patch-Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.in.orig	2010-07-28 14:56:32.000000000 +0200
-+++ Makefile.in	2010-08-05 23:30:34.000000000 +0200
-@@ -190,11 +190,11 @@
- 		-Lsrc/common -Lsrc/input -Lsrc/output -Lsrc/mpegparser
- 
- RUNAR = $(AR) rcu
--LINK = $(CXX) $(LDFLAGS) $(LIBDIRS) $(SYSTEM_LIBDIRS)
--LINKSHARED = $(CXX) $(LDFLAGS) $(LIBDIRS) $(SYSTEM_LIBDIRS) \
-+LINK = $(CXX) $(SYSTEM_LIBDIRS) $(LDFLAGS) $(LIBDIRS)
-+LINKSHARED = $(CXX) $(SYSTEM_LIBDIRS) $(LDFLAGS) $(LIBDIRS) \
- 		-shared -Wl,--export-all
--CXXCOMPILE = $(CXX) $(CXXFLAGS) $(INCLUDES) $(SYSTEM_INCLUDES)
--CCOMPILE = $(CC) $(CFLAGS) $(INCLUDES) $(SYSTEM_INCLUDES)
-+CXXCOMPILE = $(CXX) $(SYSTEM_INCLUDES) $(CXXFLAGS) $(INCLUDES)
-+CCOMPILE = $(CC) $(SYSTEM_INCLUDES) $(CFLAGS) $(INCLUDES)
- RCCOMPILE = $(WINDRES) $(WXWIDGETS_INCLUDES) -Isrc/mmg
- 
- ALL_SOURCES=$(wildcard lib/avilib-0.6.10/*.c) $(wildcard lib/avilib-0.6.10/*.cpp) \
-@@ -251,7 +251,7 @@
- 
- all: $(MANPAGES_DEP) $(TAGSFILE) $(APPLICATIONS) $(TRANSLATIONS_MOS) $(HTMLHELPBOOKS)
- 
--install: install-programs $(TARGET_INSTALL_SHARED) install-mans install-translated-mans install-trans install-guide
-+install: install-programs $(TARGET_INSTALL_SHARED) install-mans install-trans install-guide
- 
- install-programs: $(APPLICATIONS)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
diff --git a/multimedia/mkvtoolnix/pkg-plist b/multimedia/mkvtoolnix/pkg-plist
index 901416d5c94..4e890d2976c 100644
--- a/multimedia/mkvtoolnix/pkg-plist
+++ b/multimedia/mkvtoolnix/pkg-plist
@@ -11,6 +11,7 @@ bin/mkvpropedit
 %%GUI%%share/icons/hicolor/64x64/apps/mkvmergeGUI.png
 share/locale/de/LC_MESSAGES/mkvtoolnix.mo
 share/locale/es/LC_MESSAGES/mkvtoolnix.mo
+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
@@ -54,6 +55,8 @@ share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
 %%DATADIR%%/guide/zh_CN/mkvmerge-gui.hhk
 %%DATADIR%%/guide/zh_CN/mkvmerge-gui.hhp
 %%DATADIR%%/guide/zh_CN/mkvmerge-gui.html
+@dirrmtry man/zh_CN/man1
+@dirrmtry man/zh_CN
 @dirrm %%DATADIR%%/guide/zh_CN/images
 @dirrm %%DATADIR%%/guide/zh_CN
 @dirrm %%DATADIR%%/guide/en/images