4 files changed, 186 insertions, 181 deletions

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index ade631808e24..8b3dc7c19696 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mkvtoolnix
-PORTVERSION=	6.3.0
+PORTVERSION=	6.4.1
 PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
@@ -14,13 +14,13 @@ COMMENT=	Tools to extract from/get info about/create Matroska media streams
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	vorbis:${PORTSDIR}/audio/libvorbis \
-		ogg:${PORTSDIR}/audio/libogg \
-		boost_regex:${PORTSDIR}/devel/boost-libs \
-		ebml:${PORTSDIR}/textproc/libebml \
-		matroska:${PORTSDIR}/multimedia/libmatroska
+LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libogg.so:${PORTSDIR}/audio/libogg \
+		libboost_regex.so:${PORTSDIR}/devel/boost-libs \
+		libebml.so:${PORTSDIR}/textproc/libebml \
+		libmatroska.so:${PORTSDIR}/multimedia/libmatroska
 
-USES=		pkgconfig gettext iconv
+USES=		pkgconfig gettext iconv compiler:c++11-lib
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 USE_RAKE=	yes
@@ -35,56 +35,30 @@ CONFIGURE_ARGS=	--disable-qt \
 		--with-boost-system=boost_system \
 		--with-boost-regex=boost_regex
 
-MANLANG=	"" ja zh_CN nl uk
-MAN1=		mkvextract.1 mkvinfo.1 mkvmerge.1 mkvpropedit.1
-
 OPTIONS_DEFINE=	WXGTK FLAC CURL
 OPTIONS_DEFAULT=WXGTK FLAC CURL
 
-_CCVERSION=	${CC} --version
-.if !${_CCVERSION:MCLANG} || ${OSVERSION} < 1000054
-USE_GCC=	yes
-.endif
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+BROKEN_sparc64=	Does not install on sparc64
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not install on sparc64
-.endif
-
-.if defined(BATCH)
-MAKE_ENV+=	V=1
-.endif
-
-.if ${PORT_OPTIONS:MWXGTK}
-USE_WX=		2.8+
+OPTIONS_SUB=	yes
+WXGTK_USE=	WX=2.8+
+WXGTK_CONFIGURE_ENABLE=	gui
 WX_UNICODE=	yes
 WX_CONF_ARGS=	absolute
-MAN1+=		mmg.1
-PLIST_SUB+=	GUI=""
-.else
-CONFIGURE_ARGS+=--disable-gui
-PLIST_SUB+=	GUI="@comment "
-.endif
 
-.if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
-CONFIGURE_ARGS+=	--with-flac
-.else
-CONFIGURE_ARGS+=	--without-flac
-.endif
+FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_CONFIGURE_WITH=	flac
 
-.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
-.else
-CONFIGURE_ARGS+=	--without-curl
+CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_CONFIGURE_WITH=	curl
+.if defined(BATCH)
+MAKE_ENV+=	V=1
 .endif
 
 do-build:
 	@(cd ${WRKSRC}/; unset PREFIX; ${RAKE_BIN})
 
 do-install:
-	@(cd ${WRKSRC}/; unset PREFIX;  ${RAKE_BIN} install)
+	@(cd ${WRKSRC}/; unset PREFIX;  ${RAKE_BIN} ${MAKE_ARGS} install)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 88f93517c221..bb92b15ddbb1 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mkvtoolnix-6.3.0.tar.xz) = bc05f07d92190d018e901091a07ed5139f4eec833203af04672e4d3a0c619ba1
-SIZE (mkvtoolnix-6.3.0.tar.xz) = 5123624
+SHA256 (mkvtoolnix-6.4.1.tar.xz) = 76f24d792264a8c5aaa7ec7f3603bed458f03dff4ffe4f67bda8cc6dd908bea3
+SIZE (mkvtoolnix-6.4.1.tar.xz) = 5119860
diff --git a/multimedia/mkvtoolnix/files/patch-lib__libebml__ebml__EbmlBinary.h b/multimedia/mkvtoolnix/files/patch-lib__libebml__ebml__EbmlBinary.h
new file mode 100644
index 000000000000..958f90d1f8c2
--- /dev/null
+++ b/multimedia/mkvtoolnix/files/patch-lib__libebml__ebml__EbmlBinary.h
@@ -0,0 +1,10 @@
+--- ./lib/libebml/ebml/EbmlBinary.h.orig	2013-09-16 22:01:58.000000000 +0200
++++ ./lib/libebml/ebml/EbmlBinary.h	2013-10-09 08:13:47.119105934 +0200
+@@ -41,6 +41,7 @@
+ 
+ #include "EbmlTypes.h"
+ #include "EbmlElement.h"
++#include <stdlib.h>
+ 
+ // ----- Added 10/15/2003 by jcsston from Zen -----
+ #if defined (__BORLANDC__) //Maybe other compilers?
diff --git a/multimedia/mkvtoolnix/pkg-plist b/multimedia/mkvtoolnix/pkg-plist
index 6c4403f7696c..b548dc731236 100644
--- a/multimedia/mkvtoolnix/pkg-plist
+++ b/multimedia/mkvtoolnix/pkg-plist
@@ -2,49 +2,49 @@ bin/mkvextract
 bin/mkvinfo
 bin/mkvmerge
 bin/mkvpropedit
-%%GUI%%bin/mmg
-%%GUI%%share/applications/mkvinfo.desktop
-%%GUI%%share/applications/mkvmergeGUI.desktop
-%%GUI%%share/icons/hicolor/16x16/apps/mkvextract.png
-%%GUI%%share/icons/hicolor/16x16/apps/mkvinfo.png
-%%GUI%%share/icons/hicolor/16x16/apps/mkvmerge.png
-%%GUI%%share/icons/hicolor/16x16/apps/mkvmergeGUI.png
-%%GUI%%share/icons/hicolor/16x16/apps/mkvpropedit.png
-%%GUI%%share/icons/hicolor/24x24/apps/mkvextract.png
-%%GUI%%share/icons/hicolor/24x24/apps/mkvinfo.png
-%%GUI%%share/icons/hicolor/24x24/apps/mkvmerge.png
-%%GUI%%share/icons/hicolor/24x24/apps/mkvmergeGUI.png
-%%GUI%%share/icons/hicolor/24x24/apps/mkvpropedit.png
-%%GUI%%share/icons/hicolor/32x32/apps/mkvextract.png
-%%GUI%%share/icons/hicolor/32x32/apps/mkvinfo.png
-%%GUI%%share/icons/hicolor/32x32/apps/mkvmerge.png
-%%GUI%%share/icons/hicolor/32x32/apps/mkvmergeGUI.png
-%%GUI%%share/icons/hicolor/32x32/apps/mkvpropedit.png
-%%GUI%%share/icons/hicolor/48x48/apps/mkvextract.png
-%%GUI%%share/icons/hicolor/48x48/apps/mkvinfo.png
-%%GUI%%share/icons/hicolor/48x48/apps/mkvmerge.png
-%%GUI%%share/icons/hicolor/48x48/apps/mkvmergeGUI.png
-%%GUI%%share/icons/hicolor/48x48/apps/mkvpropedit.png
-%%GUI%%share/icons/hicolor/64x64/apps/mkvextract.png
-%%GUI%%share/icons/hicolor/64x64/apps/mkvinfo.png
-%%GUI%%share/icons/hicolor/64x64/apps/mkvmerge.png
-%%GUI%%share/icons/hicolor/64x64/apps/mkvmergeGUI.png
-%%GUI%%share/icons/hicolor/64x64/apps/mkvpropedit.png
-%%GUI%%share/icons/hicolor/96x96/apps/mkvextract.png
-%%GUI%%share/icons/hicolor/96x96/apps/mkvinfo.png
-%%GUI%%share/icons/hicolor/96x96/apps/mkvmerge.png
-%%GUI%%share/icons/hicolor/96x96/apps/mkvmergeGUI.png
-%%GUI%%share/icons/hicolor/96x96/apps/mkvpropedit.png
-%%GUI%%share/icons/hicolor/128x128/apps/mkvextract.png
-%%GUI%%share/icons/hicolor/128x128/apps/mkvinfo.png
-%%GUI%%share/icons/hicolor/128x128/apps/mkvmerge.png
-%%GUI%%share/icons/hicolor/128x128/apps/mkvmergeGUI.png
-%%GUI%%share/icons/hicolor/128x128/apps/mkvpropedit.png
-%%GUI%%share/icons/hicolor/256x256/apps/mkvextract.png
-%%GUI%%share/icons/hicolor/256x256/apps/mkvinfo.png
-%%GUI%%share/icons/hicolor/256x256/apps/mkvmerge.png
-%%GUI%%share/icons/hicolor/256x256/apps/mkvmergeGUI.png
-%%GUI%%share/icons/hicolor/256x256/apps/mkvpropedit.png
+%%WXGTK%%bin/mmg
+%%WXGTK%%share/applications/mkvinfo.desktop
+%%WXGTK%%share/applications/mkvmergeWXGTK.desktop
+%%WXGTK%%share/icons/hicolor/16x16/apps/mkvextract.png
+%%WXGTK%%share/icons/hicolor/16x16/apps/mkvinfo.png
+%%WXGTK%%share/icons/hicolor/16x16/apps/mkvmerge.png
+%%WXGTK%%share/icons/hicolor/16x16/apps/mkvmergeWXGTK.png
+%%WXGTK%%share/icons/hicolor/16x16/apps/mkvpropedit.png
+%%WXGTK%%share/icons/hicolor/24x24/apps/mkvextract.png
+%%WXGTK%%share/icons/hicolor/24x24/apps/mkvinfo.png
+%%WXGTK%%share/icons/hicolor/24x24/apps/mkvmerge.png
+%%WXGTK%%share/icons/hicolor/24x24/apps/mkvmergeWXGTK.png
+%%WXGTK%%share/icons/hicolor/24x24/apps/mkvpropedit.png
+%%WXGTK%%share/icons/hicolor/32x32/apps/mkvextract.png
+%%WXGTK%%share/icons/hicolor/32x32/apps/mkvinfo.png
+%%WXGTK%%share/icons/hicolor/32x32/apps/mkvmerge.png
+%%WXGTK%%share/icons/hicolor/32x32/apps/mkvmergeWXGTK.png
+%%WXGTK%%share/icons/hicolor/32x32/apps/mkvpropedit.png
+%%WXGTK%%share/icons/hicolor/48x48/apps/mkvextract.png
+%%WXGTK%%share/icons/hicolor/48x48/apps/mkvinfo.png
+%%WXGTK%%share/icons/hicolor/48x48/apps/mkvmerge.png
+%%WXGTK%%share/icons/hicolor/48x48/apps/mkvmergeWXGTK.png
+%%WXGTK%%share/icons/hicolor/48x48/apps/mkvpropedit.png
+%%WXGTK%%share/icons/hicolor/64x64/apps/mkvextract.png
+%%WXGTK%%share/icons/hicolor/64x64/apps/mkvinfo.png
+%%WXGTK%%share/icons/hicolor/64x64/apps/mkvmerge.png
+%%WXGTK%%share/icons/hicolor/64x64/apps/mkvmergeWXGTK.png
+%%WXGTK%%share/icons/hicolor/64x64/apps/mkvpropedit.png
+%%WXGTK%%share/icons/hicolor/96x96/apps/mkvextract.png
+%%WXGTK%%share/icons/hicolor/96x96/apps/mkvinfo.png
+%%WXGTK%%share/icons/hicolor/96x96/apps/mkvmerge.png
+%%WXGTK%%share/icons/hicolor/96x96/apps/mkvmergeWXGTK.png
+%%WXGTK%%share/icons/hicolor/96x96/apps/mkvpropedit.png
+%%WXGTK%%share/icons/hicolor/128x128/apps/mkvextract.png
+%%WXGTK%%share/icons/hicolor/128x128/apps/mkvinfo.png
+%%WXGTK%%share/icons/hicolor/128x128/apps/mkvmerge.png
+%%WXGTK%%share/icons/hicolor/128x128/apps/mkvmergeWXGTK.png
+%%WXGTK%%share/icons/hicolor/128x128/apps/mkvpropedit.png
+%%WXGTK%%share/icons/hicolor/256x256/apps/mkvextract.png
+%%WXGTK%%share/icons/hicolor/256x256/apps/mkvinfo.png
+%%WXGTK%%share/icons/hicolor/256x256/apps/mkvmerge.png
+%%WXGTK%%share/icons/hicolor/256x256/apps/mkvmergeWXGTK.png
+%%WXGTK%%share/icons/hicolor/256x256/apps/mkvpropedit.png
 share/locale/cs/LC_MESSAGES/mkvtoolnix.mo
 share/locale/de/LC_MESSAGES/mkvtoolnix.mo
 share/locale/es/LC_MESSAGES/mkvtoolnix.mo
@@ -61,100 +61,121 @@ share/locale/tr/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
-%%GUI%%share/mime/packages/mkvtoolnix.xml
-%%GUI%%%%DOCSDIR%%/guide/en/images/addingremovingattachments.gif
-%%GUI%%%%DOCSDIR%%/guide/en/images/addremovefiles.gif
-%%GUI%%%%DOCSDIR%%/guide/en/images/attachmentoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/en/images/audiotrackoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/en/images/chaptereditor.gif
-%%GUI%%%%DOCSDIR%%/guide/en/images/generaltrackoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/en/images/jobmanager.gif
-%%GUI%%%%DOCSDIR%%/guide/en/images/movietitle.gif
-%%GUI%%%%DOCSDIR%%/guide/en/images/muxingwindow.gif
-%%GUI%%%%DOCSDIR%%/guide/en/images/selectmkvmergeexecutable.gif
-%%GUI%%%%DOCSDIR%%/guide/en/images/splitting.gif
-%%GUI%%%%DOCSDIR%%/guide/en/images/textsubtitlestrackoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/en/images/trackselection.gif
-%%GUI%%%%DOCSDIR%%/guide/en/images/videotrackoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/en/mkvmerge-gui.hhc
-%%GUI%%%%DOCSDIR%%/guide/en/mkvmerge-gui.hhk
-%%GUI%%%%DOCSDIR%%/guide/en/mkvmerge-gui.hhp
-%%GUI%%%%DOCSDIR%%/guide/en/mkvmerge-gui.html
-%%GUI%%%%DOCSDIR%%/guide/es/images/addingremovingattachments.gif
-%%GUI%%%%DOCSDIR%%/guide/es/images/addremovefiles.gif
-%%GUI%%%%DOCSDIR%%/guide/es/images/attachmentoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/es/images/audiotrackoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/es/images/chaptereditor.gif
-%%GUI%%%%DOCSDIR%%/guide/es/images/generaltrackoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/es/images/jobmanager.gif
-%%GUI%%%%DOCSDIR%%/guide/es/images/movietitle.gif
-%%GUI%%%%DOCSDIR%%/guide/es/images/muxingwindow.gif
-%%GUI%%%%DOCSDIR%%/guide/es/images/selectmkvmergeexecutable.gif
-%%GUI%%%%DOCSDIR%%/guide/es/images/splitting.gif
-%%GUI%%%%DOCSDIR%%/guide/es/images/textsubtitlestrackoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/es/images/trackselection.gif
-%%GUI%%%%DOCSDIR%%/guide/es/images/videotrackoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/es/mkvmerge-gui.hhc
-%%GUI%%%%DOCSDIR%%/guide/es/mkvmerge-gui.hhk
-%%GUI%%%%DOCSDIR%%/guide/es/mkvmerge-gui.hhp
-%%GUI%%%%DOCSDIR%%/guide/es/mkvmerge-gui.html
-%%GUI%%%%DOCSDIR%%/guide/eu/images/addingremovingattachments.gif
-%%GUI%%%%DOCSDIR%%/guide/eu/images/addremovefiles.gif
-%%GUI%%%%DOCSDIR%%/guide/eu/images/attachmentoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/eu/images/audiotrackoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/eu/images/chaptereditor.gif
-%%GUI%%%%DOCSDIR%%/guide/eu/images/generaltrackoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/eu/images/headereditor.gif
-%%GUI%%%%DOCSDIR%%/guide/eu/images/jobmanager.gif
-%%GUI%%%%DOCSDIR%%/guide/eu/images/movietitle.gif
-%%GUI%%%%DOCSDIR%%/guide/eu/images/muxingwindow.gif
-%%GUI%%%%DOCSDIR%%/guide/eu/images/selectmkvmergeexecutable.gif
-%%GUI%%%%DOCSDIR%%/guide/eu/images/splitting.gif
-%%GUI%%%%DOCSDIR%%/guide/eu/images/textsubtitlestrackoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/eu/images/trackselection.gif
-%%GUI%%%%DOCSDIR%%/guide/eu/images/videotrackoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhc
-%%GUI%%%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhk
-%%GUI%%%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhp
-%%GUI%%%%DOCSDIR%%/guide/eu/mkvmerge-gui.html
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/addingremovingattachments.gif
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/addremovefiles.gif
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/attachmentoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/audiotrackoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/chaptereditor.gif
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/generaltrackoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/jobmanager.gif
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/movietitle.gif
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/muxingwindow.gif
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/selectmkvmergeexecutable.gif
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/splitting.gif
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/textsubtitlestrackoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/trackselection.gif
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/videotrackoptions.gif
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhc
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhk
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhp
-%%GUI%%%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.html
-%%GUI%%%%DOCSDIR%%/guide/nl/mkvmerge-gui.hhc
-%%GUI%%%%DOCSDIR%%/guide/nl/mkvmerge-gui.hhk
-%%GUI%%%%DOCSDIR%%/guide/nl/mkvmerge-gui.hhp
-%%GUI%%%%DOCSDIR%%/guide/nl/mkvmerge-gui.html
+%%WXGTK%%share/mime/packages/mkvtoolnix.xml
+%%WXGTK%%%%DOCSDIR%%/guide/en/images/addingremovingattachments.gif
+%%WXGTK%%%%DOCSDIR%%/guide/en/images/addremovefiles.gif
+%%WXGTK%%%%DOCSDIR%%/guide/en/images/attachmentoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/en/images/audiotrackoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/en/images/chaptereditor.gif
+%%WXGTK%%%%DOCSDIR%%/guide/en/images/generaltrackoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/en/images/jobmanager.gif
+%%WXGTK%%%%DOCSDIR%%/guide/en/images/movietitle.gif
+%%WXGTK%%%%DOCSDIR%%/guide/en/images/muxingwindow.gif
+%%WXGTK%%%%DOCSDIR%%/guide/en/images/selectmkvmergeexecutable.gif
+%%WXGTK%%%%DOCSDIR%%/guide/en/images/splitting.gif
+%%WXGTK%%%%DOCSDIR%%/guide/en/images/textsubtitlestrackoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/en/images/trackselection.gif
+%%WXGTK%%%%DOCSDIR%%/guide/en/images/videotrackoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/en/mkvmerge-gui.hhc
+%%WXGTK%%%%DOCSDIR%%/guide/en/mkvmerge-gui.hhk
+%%WXGTK%%%%DOCSDIR%%/guide/en/mkvmerge-gui.hhp
+%%WXGTK%%%%DOCSDIR%%/guide/en/mkvmerge-gui.html
+%%WXGTK%%%%DOCSDIR%%/guide/es/images/addingremovingattachments.gif
+%%WXGTK%%%%DOCSDIR%%/guide/es/images/addremovefiles.gif
+%%WXGTK%%%%DOCSDIR%%/guide/es/images/attachmentoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/es/images/audiotrackoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/es/images/chaptereditor.gif
+%%WXGTK%%%%DOCSDIR%%/guide/es/images/generaltrackoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/es/images/jobmanager.gif
+%%WXGTK%%%%DOCSDIR%%/guide/es/images/movietitle.gif
+%%WXGTK%%%%DOCSDIR%%/guide/es/images/muxingwindow.gif
+%%WXGTK%%%%DOCSDIR%%/guide/es/images/selectmkvmergeexecutable.gif
+%%WXGTK%%%%DOCSDIR%%/guide/es/images/splitting.gif
+%%WXGTK%%%%DOCSDIR%%/guide/es/images/textsubtitlestrackoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/es/images/trackselection.gif
+%%WXGTK%%%%DOCSDIR%%/guide/es/images/videotrackoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/es/mkvmerge-gui.hhc
+%%WXGTK%%%%DOCSDIR%%/guide/es/mkvmerge-gui.hhk
+%%WXGTK%%%%DOCSDIR%%/guide/es/mkvmerge-gui.hhp
+%%WXGTK%%%%DOCSDIR%%/guide/es/mkvmerge-gui.html
+%%WXGTK%%%%DOCSDIR%%/guide/eu/images/addingremovingattachments.gif
+%%WXGTK%%%%DOCSDIR%%/guide/eu/images/addremovefiles.gif
+%%WXGTK%%%%DOCSDIR%%/guide/eu/images/attachmentoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/eu/images/audiotrackoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/eu/images/chaptereditor.gif
+%%WXGTK%%%%DOCSDIR%%/guide/eu/images/generaltrackoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/eu/images/headereditor.gif
+%%WXGTK%%%%DOCSDIR%%/guide/eu/images/jobmanager.gif
+%%WXGTK%%%%DOCSDIR%%/guide/eu/images/movietitle.gif
+%%WXGTK%%%%DOCSDIR%%/guide/eu/images/muxingwindow.gif
+%%WXGTK%%%%DOCSDIR%%/guide/eu/images/selectmkvmergeexecutable.gif
+%%WXGTK%%%%DOCSDIR%%/guide/eu/images/splitting.gif
+%%WXGTK%%%%DOCSDIR%%/guide/eu/images/textsubtitlestrackoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/eu/images/trackselection.gif
+%%WXGTK%%%%DOCSDIR%%/guide/eu/images/videotrackoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhc
+%%WXGTK%%%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhk
+%%WXGTK%%%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhp
+%%WXGTK%%%%DOCSDIR%%/guide/eu/mkvmerge-gui.html
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/images/addingremovingattachments.gif
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/images/addremovefiles.gif
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/images/attachmentoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/images/audiotrackoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/images/chaptereditor.gif
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/images/generaltrackoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/images/jobmanager.gif
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/images/movietitle.gif
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/images/muxingwindow.gif
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/images/selectmkvmergeexecutable.gif
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/images/splitting.gif
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/images/textsubtitlestrackoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/images/trackselection.gif
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/images/videotrackoptions.gif
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhc
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhk
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhp
+%%WXGTK%%%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.html
+%%WXGTK%%%%DOCSDIR%%/guide/nl/mkvmerge-gui.hhc
+%%WXGTK%%%%DOCSDIR%%/guide/nl/mkvmerge-gui.hhk
+%%WXGTK%%%%DOCSDIR%%/guide/nl/mkvmerge-gui.hhp
+%%WXGTK%%%%DOCSDIR%%/guide/nl/mkvmerge-gui.html
+%%WXGTK%%man/man1/mmg.1.gz
+man/ja/man1/mkvextract.1.gz
+man/ja/man1/mkvinfo.1.gz
+man/ja/man1/mkvmerge.1.gz
+man/ja/man1/mkvpropedit.1.gz
+man/man1/mkvextract.1.gz
+man/man1/mkvinfo.1.gz
+man/man1/mkvmerge.1.gz
+man/man1/mkvpropedit.1.gz
+man/nl/man1/mkvextract.1.gz
+man/nl/man1/mkvinfo.1.gz
+man/nl/man1/mkvmerge.1.gz
+man/nl/man1/mkvpropedit.1.gz
+man/uk/man1/mkvextract.1.gz
+man/uk/man1/mkvinfo.1.gz
+man/uk/man1/mkvmerge.1.gz
+man/uk/man1/mkvpropedit.1.gz
+man/zh_CN/man1/mkvextract.1.gz
+man/zh_CN/man1/mkvinfo.1.gz
+man/zh_CN/man1/mkvmerge.1.gz
+man/zh_CN/man1/mkvpropedit.1.gz
 @dirrmtry man/zh_CN/man1
 @dirrmtry man/zh_CN
 @dirrmtry man/uk/man1
 @dirrmtry man/uk
 @dirrmtry man/nl/man1
 @dirrmtry man/nl
-%%GUI%%@dirrm %%DOCSDIR%%/guide/zh_CN/images
-%%GUI%%@dirrm %%DOCSDIR%%/guide/zh_CN
-%%GUI%%@dirrm %%DOCSDIR%%/guide/eu/images
-%%GUI%%@dirrm %%DOCSDIR%%/guide/eu
-%%GUI%%@dirrm %%DOCSDIR%%/guide/es/images
-%%GUI%%@dirrm %%DOCSDIR%%/guide/es
-%%GUI%%@dirrm %%DOCSDIR%%/guide/en/images
-%%GUI%%@dirrm %%DOCSDIR%%/guide/en
-%%GUI%%@dirrm %%DOCSDIR%%/guide/nl/images
-%%GUI%%@dirrm %%DOCSDIR%%/guide/nl
-%%GUI%%@dirrm %%DOCSDIR%%/guide
-%%GUI%%@dirrm %%DOCSDIR%%
-%%GUI%%@dirrmtry share/applications
+%%WXGTK%%@dirrm %%DOCSDIR%%/guide/zh_CN/images
+%%WXGTK%%@dirrm %%DOCSDIR%%/guide/zh_CN
+%%WXGTK%%@dirrm %%DOCSDIR%%/guide/eu/images
+%%WXGTK%%@dirrm %%DOCSDIR%%/guide/eu
+%%WXGTK%%@dirrm %%DOCSDIR%%/guide/es/images
+%%WXGTK%%@dirrm %%DOCSDIR%%/guide/es
+%%WXGTK%%@dirrm %%DOCSDIR%%/guide/en/images
+%%WXGTK%%@dirrm %%DOCSDIR%%/guide/en
+%%WXGTK%%@dirrm %%DOCSDIR%%/guide/nl/images
+%%WXGTK%%@dirrm %%DOCSDIR%%/guide/nl
+%%WXGTK%%@dirrm %%DOCSDIR%%/guide
+%%WXGTK%%@dirrm %%DOCSDIR%%
+%%WXGTK%%@dirrmtry share/applications