- Update to 2.4.2

PR:		ports/131107
Submitted by:	lwhsu

3 files changed, 39 insertions, 33 deletions

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index f674e2a14e24..7351fde76317 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mkvtoolnix
-PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTVERSION=	2.4.2
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
 
@@ -21,7 +20,8 @@ LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
 		matroska.0:${PORTSDIR}/multimedia/libmatroska \
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
 		ogg.5:${PORTSDIR}/audio/libogg \
-		pcrecpp.0:${PORTSDIR}/devel/pcre
+		pcrecpp.0:${PORTSDIR}/devel/pcre \
+		boost_regex:${PORTSDIR}/devel/boost
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -32,41 +32,23 @@ LDFLAGS=	-L${LOCALBASE}/lib -lmagic -lz
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-lzo --enable-bz2 --disable-qt
 
-MAN1=		base64tool.1 mkvextract.1 mkvinfo.1 mkvmerge.1
-PLIST_FILES=	bin/base64tool bin/mkvextract bin/mkvinfo bin/mkvmerge
-
-# data files
-FILES_DATA=	\
-		mkvmerge-gui.hhc \
-		mkvmerge-gui.hhk \
-		mkvmerge-gui.hhp \
-		mkvmerge-gui.html
-IMAGES_DATA=	\
-		addingremovingattachments.gif \
-		addremovefiles.gif \
-		attachmentoptions.gif \
-		audiotrackoptions.gif \
-		chaptereditor.gif \
-		generaltrackoptions.gif \
-		jobmanager.gif \
-		movietitle.gif \
-		muxingwindow.gif \
-		selectmkvmergeexecutable.gif \
-		splitting.gif \
-		textsubtitlestrackoptions.gif \
-		trackselection.gif \
-		videotrackoptions.gif
-PLIST_FILES+=	${FILES_DATA:S|^|%%DATADIR%%/|} ${IMAGES_DATA:S|^|%%DATADIR%%/images/|}
-PLIST_DIRS+=	%%DATADIR%%/images %%DATADIR%%
+MAN1=		mkvextract.1 mkvinfo.1 mkvmerge.1
 
 .ifndef(WITHOUT_WXGTK)
 USE_WX=		yes
 WX_UNICODE=	yes
 WX_CONF_ARGS=	absolute
 MAN1+=		mmg.1
-PLIST_FILES+=	bin/mmg
+PLIST_SUB+=	GUI=""
+.else
+PLIST_SUB+=	GUI="@comment "
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -e \
+		's|BOOSTLIBDIR/libboost_regex\*\.{so,a,dylib}\*|BOOSTLIBDIR/libboost_regex.so|' \
+		${WRKSRC}/configure
+
 pre-configure::
 .ifndef(WITHOUT_WXGTK)
 	@${ECHO_MSG} "===>"
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 8bd27e7161e9..8b8aa44fc7a3 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,3 +1,3 @@
-MD5 (mkvtoolnix-2.2.0.tar.bz2) = 57397800c6be11db0b62e7285c8dab82
-SHA256 (mkvtoolnix-2.2.0.tar.bz2) = 707ec8acb736f5664c933628d5f44bba1c18af9cca6967a4a01a55ea4c64e777
-SIZE (mkvtoolnix-2.2.0.tar.bz2) = 768803
+MD5 (mkvtoolnix-2.4.2.tar.bz2) = 050bc9019cfa10e243f17b5e84f5a05f
+SHA256 (mkvtoolnix-2.4.2.tar.bz2) = 7d129b7cad4bf5487e77a74c16fb62865b46f742fd3f408f178f0c0c6758c564
+SIZE (mkvtoolnix-2.4.2.tar.bz2) = 850307
diff --git a/multimedia/mkvtoolnix/pkg-plist b/multimedia/mkvtoolnix/pkg-plist
new file mode 100644
index 000000000000..93198c5bee78
--- /dev/null
+++ b/multimedia/mkvtoolnix/pkg-plist
@@ -0,0 +1,24 @@
+bin/mkvextract
+bin/mkvinfo
+bin/mkvmerge
+%%GUI%%bin/mmg
+%%DATADIR%%/images/addingremovingattachments.gif
+%%DATADIR%%/images/addremovefiles.gif
+%%DATADIR%%/images/attachmentoptions.gif
+%%DATADIR%%/images/audiotrackoptions.gif
+%%DATADIR%%/images/chaptereditor.gif
+%%DATADIR%%/images/generaltrackoptions.gif
+%%DATADIR%%/images/jobmanager.gif
+%%DATADIR%%/images/movietitle.gif
+%%DATADIR%%/images/muxingwindow.gif
+%%DATADIR%%/images/selectmkvmergeexecutable.gif
+%%DATADIR%%/images/splitting.gif
+%%DATADIR%%/images/textsubtitlestrackoptions.gif
+%%DATADIR%%/images/trackselection.gif
+%%DATADIR%%/images/videotrackoptions.gif
+%%DATADIR%%/mkvmerge-gui.hhc
+%%DATADIR%%/mkvmerge-gui.hhk
+%%DATADIR%%/mkvmerge-gui.hhp
+%%DATADIR%%/mkvmerge-gui.html
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%