- Update to 2.4.2

PR:		ports/131107
Submitted by:	lwhsu

1 files changed, 12 insertions, 30 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} "===>"