Date: Mon, 10 Dec 2012 19:44:51 GMT From: Rainer Hurling <rhurlin@gwdg.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/174338: [patch] multimedia/mkvtoolsnix: update to 5.9.0 Message-ID: <201212101944.qBAJipVn033483@red.freebsd.org> Resent-Message-ID: <201212101950.qBAJo1gi098684@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174338 >Category: ports >Synopsis: [patch] multimedia/mkvtoolsnix: update to 5.9.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Dec 10 19:50:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Rainer Hurling >Release: 10.0-CURRENT (amd64) >Organization: >Environment: FreeBSD xxx.xxx.xxx 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r244047: Sun Dec 9 16:52:54 CET 2012 xxx@xxx.xxx.xxx:/usr/obj/usr/src/sys/XXX amd64 >Description: The patch updates the port from 5.8.0 to 5.9.0. Also integrated is the patch from Oliver Fromme submitted with PR ports/161546. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -Naur mkvtoolnix.orig/Makefile mkvtoolnix/Makefile --- mkvtoolnix.orig/Makefile 2012-11-14 17:18:56.000000000 +0100 +++ mkvtoolnix/Makefile 2012-12-10 19:24:43.000000000 +0100 @@ -2,7 +2,7 @@ # $FreeBSD: head/multimedia/mkvtoolnix/Makefile 307420 2012-11-14 15:36:14Z bapt $ PORTNAME= mkvtoolnix -PORTVERSION= 5.8.0 +PORTVERSION= 5.9.0 CATEGORIES= multimedia audio MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ @@ -12,13 +12,10 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \ - expat:${PORTSDIR}/textproc/expat2 \ - lzo2:${PORTSDIR}/archivers/lzo2 \ +LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \ vorbis:${PORTSDIR}/audio/libvorbis \ ogg:${PORTSDIR}/audio/libogg \ boost_regex:${PORTSDIR}/devel/boost-libs \ - curl:${PORTSDIR}/ftp/curl \ ebml:${PORTSDIR}/textproc/libebml \ matroska:${PORTSDIR}/multimedia/libmatroska @@ -34,7 +31,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= ac_cv_path_PO4A=no ZLIB_CFLAGS=-I/usr/include ZLIB_LIBS=-lz -CONFIGURE_ARGS= --enable-lzo --enable-bz2 --disable-qt \ +CONFIGURE_ARGS= --enable-bz2 --disable-qt \ --with-boost=${LOCALBASE} \ --with-boost-filesystem=boost_filesystem \ --with-boost-system=boost_system \ @@ -44,8 +41,10 @@ MANLANG= "" ja zh_CN nl uk MAN1= mkvextract.1 mkvinfo.1 mkvmerge.1 mkvpropedit.1 -OPTIONS_DEFINE= WXGTK -OPTIONS_DEFAULT= WXGTK +OPTIONS_DEFINE= WXGTK LZO FLAC CURL +OPTIONS_DEFAULT= WXGTK LZO FLAC CURL +NO_OPTIONS_SORT= yes +LZO_DESC= lzo compression support .include <bsd.port.pre.mk> @@ -64,10 +63,37 @@ MAN1+= mmg.1 PLIST_SUB+= GUI="" .else -CONFIGURE_ARGS+=--disable-gui +CONFIGURE_ARGS+= --disable-gui PLIST_SUB+= GUI="@comment " .endif +.if ${PORT_OPTIONS:MLZO} +LIB_DEPENDS+= lzo2:${PORTSDIR}/archivers/lzo2 +CONFIGURE_ARGS+= --enable-lzo +PLIST_SUB+= LZO2="" +.else +CONFIGURE_ARGS+= --disable-lzo +PLIST_SUB+= LZO2="@comment " +.endif + +.if ${PORT_OPTIONS:MFLAC} +LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac +CONFIGURE_ARGS+= --with-flac +PLIST_SUB+= FLAC="" +.else +CONFIGURE_ARGS+= --without-flac +PLIST_SUB+= FLAC="@comment " +.endif + +.if ${PORT_OPTIONS:MCURL} +LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +PLIST_SUB+= CURL="" +.else +# --without-curl and --disable-curl don't work, but this one does: +CONFIGURE_ARGS+= --with-curl-config=/dev/null +PLIST_SUB+= CURL="@comment " +.endif + do-build: @(cd ${WRKSRC}/; unset PREFIX; ${RAKE_BIN}) diff -Naur mkvtoolnix.orig/distinfo mkvtoolnix/distinfo --- mkvtoolnix.orig/distinfo 2012-09-28 13:55:18.000000000 +0200 +++ mkvtoolnix/distinfo 2012-12-10 16:57:39.000000000 +0100 @@ -1,2 +1,2 @@ -SHA256 (mkvtoolnix-5.8.0.tar.bz2) = 3c9ec7e4c035b82a35850c5ada98a29904edc44a0d1c9b900ed05d56e6274960 -SIZE (mkvtoolnix-5.8.0.tar.bz2) = 4454971 +SHA256 (mkvtoolnix-5.9.0.tar.bz2) = d913f531331c3332d2fb334c872ea19bfea7293dfedc4bf33ae7162e4efcbde1 +SIZE (mkvtoolnix-5.9.0.tar.bz2) = 4493517 diff -Naur mkvtoolnix.orig/pkg-plist mkvtoolnix/pkg-plist --- mkvtoolnix.orig/pkg-plist 2012-09-28 13:55:18.000000000 +0200 +++ mkvtoolnix/pkg-plist 2012-12-10 18:45:21.000000000 +0100 @@ -5,6 +5,79 @@ %%GUI%%bin/mmg %%GUI%%share/applications/mkvinfo.desktop %%GUI%%share/applications/mkvmergeGUI.desktop +%%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%%share/icons/hicolor/16x16/apps/mkvextract.png %%GUI%%share/icons/hicolor/16x16/apps/mkvinfo.png %%GUI%%share/icons/hicolor/16x16/apps/mkvmerge.png @@ -61,93 +134,40 @@ share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo %%GUI%%share/mime/packages/mkvtoolnix.xml -%%DOCSDIR%%/guide/en/images/addingremovingattachments.gif -%%DOCSDIR%%/guide/en/images/addremovefiles.gif -%%DOCSDIR%%/guide/en/images/attachmentoptions.gif -%%DOCSDIR%%/guide/en/images/audiotrackoptions.gif -%%DOCSDIR%%/guide/en/images/chaptereditor.gif -%%DOCSDIR%%/guide/en/images/generaltrackoptions.gif -%%DOCSDIR%%/guide/en/images/jobmanager.gif -%%DOCSDIR%%/guide/en/images/movietitle.gif -%%DOCSDIR%%/guide/en/images/muxingwindow.gif -%%DOCSDIR%%/guide/en/images/selectmkvmergeexecutable.gif -%%DOCSDIR%%/guide/en/images/splitting.gif -%%DOCSDIR%%/guide/en/images/textsubtitlestrackoptions.gif -%%DOCSDIR%%/guide/en/images/trackselection.gif -%%DOCSDIR%%/guide/en/images/videotrackoptions.gif -%%DOCSDIR%%/guide/en/mkvmerge-gui.hhc -%%DOCSDIR%%/guide/en/mkvmerge-gui.hhk -%%DOCSDIR%%/guide/en/mkvmerge-gui.hhp -%%DOCSDIR%%/guide/en/mkvmerge-gui.html -%%DOCSDIR%%/guide/es/images/addingremovingattachments.gif -%%DOCSDIR%%/guide/es/images/addremovefiles.gif -%%DOCSDIR%%/guide/es/images/attachmentoptions.gif -%%DOCSDIR%%/guide/es/images/audiotrackoptions.gif -%%DOCSDIR%%/guide/es/images/chaptereditor.gif -%%DOCSDIR%%/guide/es/images/generaltrackoptions.gif -%%DOCSDIR%%/guide/es/images/jobmanager.gif -%%DOCSDIR%%/guide/es/images/movietitle.gif -%%DOCSDIR%%/guide/es/images/muxingwindow.gif -%%DOCSDIR%%/guide/es/images/selectmkvmergeexecutable.gif -%%DOCSDIR%%/guide/es/images/splitting.gif -%%DOCSDIR%%/guide/es/images/textsubtitlestrackoptions.gif -%%DOCSDIR%%/guide/es/images/trackselection.gif -%%DOCSDIR%%/guide/es/images/videotrackoptions.gif -%%DOCSDIR%%/guide/es/mkvmerge-gui.hhc -%%DOCSDIR%%/guide/es/mkvmerge-gui.hhk -%%DOCSDIR%%/guide/es/mkvmerge-gui.hhp -%%DOCSDIR%%/guide/es/mkvmerge-gui.html -%%DOCSDIR%%/guide/eu/images/addingremovingattachments.gif -%%DOCSDIR%%/guide/eu/images/addremovefiles.gif -%%DOCSDIR%%/guide/eu/images/attachmentoptions.gif -%%DOCSDIR%%/guide/eu/images/audiotrackoptions.gif -%%DOCSDIR%%/guide/eu/images/chaptereditor.gif -%%DOCSDIR%%/guide/eu/images/generaltrackoptions.gif -%%DOCSDIR%%/guide/eu/images/headereditor.gif -%%DOCSDIR%%/guide/eu/images/jobmanager.gif -%%DOCSDIR%%/guide/eu/images/movietitle.gif -%%DOCSDIR%%/guide/eu/images/muxingwindow.gif -%%DOCSDIR%%/guide/eu/images/selectmkvmergeexecutable.gif -%%DOCSDIR%%/guide/eu/images/splitting.gif -%%DOCSDIR%%/guide/eu/images/textsubtitlestrackoptions.gif -%%DOCSDIR%%/guide/eu/images/trackselection.gif -%%DOCSDIR%%/guide/eu/images/videotrackoptions.gif -%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhc -%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhk -%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhp -%%DOCSDIR%%/guide/eu/mkvmerge-gui.html -%%DOCSDIR%%/guide/zh_CN/images/addingremovingattachments.gif -%%DOCSDIR%%/guide/zh_CN/images/addremovefiles.gif -%%DOCSDIR%%/guide/zh_CN/images/attachmentoptions.gif -%%DOCSDIR%%/guide/zh_CN/images/audiotrackoptions.gif -%%DOCSDIR%%/guide/zh_CN/images/chaptereditor.gif -%%DOCSDIR%%/guide/zh_CN/images/generaltrackoptions.gif -%%DOCSDIR%%/guide/zh_CN/images/jobmanager.gif -%%DOCSDIR%%/guide/zh_CN/images/movietitle.gif -%%DOCSDIR%%/guide/zh_CN/images/muxingwindow.gif -%%DOCSDIR%%/guide/zh_CN/images/selectmkvmergeexecutable.gif -%%DOCSDIR%%/guide/zh_CN/images/splitting.gif -%%DOCSDIR%%/guide/zh_CN/images/textsubtitlestrackoptions.gif -%%DOCSDIR%%/guide/zh_CN/images/trackselection.gif -%%DOCSDIR%%/guide/zh_CN/images/videotrackoptions.gif -%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhc -%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhk -%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhp -%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.html +@dirrmtry share/mime/packages +@dirrmtry share/mime +%%GUI%%@dirrmtry share/icons/hicolor/96x96/apps +%%GUI%%@dirrmtry share/icons/hicolor/96x96 +%%GUI%%@dirrmtry share/icons/hicolor/64x64/apps +%%GUI%%@dirrmtry share/icons/hicolor/64x64 +%%GUI%%@dirrmtry share/icons/hicolor/48x48/apps +%%GUI%%@dirrmtry share/icons/hicolor/48x48 +%%GUI%%@dirrmtry share/icons/hicolor/32x32/apps +%%GUI%%@dirrmtry share/icons/hicolor/32x32 +%%GUI%%@dirrmtry share/icons/hicolor/256x256/apps +%%GUI%%@dirrmtry share/icons/hicolor/256x256 +%%GUI%%@dirrmtry share/icons/hicolor/24x24/apps +%%GUI%%@dirrmtry share/icons/hicolor/24x24 +%%GUI%%@dirrmtry share/icons/hicolor/16x16/apps +%%GUI%%@dirrmtry share/icons/hicolor/16x16 +%%GUI%%@dirrmtry share/icons/hicolor/128x128/apps +%%GUI%%@dirrmtry share/icons/hicolor/128x128 +%%GUI%%@dirrmtry share/icons/hicolor +%%GUI%%@dirrmtry share/icons @dirrmtry man/zh_CN/man1 @dirrmtry man/zh_CN @dirrmtry man/uk/man1 @dirrmtry man/uk @dirrmtry man/nl/man1 @dirrmtry man/nl -@dirrm %%DOCSDIR%%/guide/zh_CN/images -@dirrm %%DOCSDIR%%/guide/zh_CN -@dirrm %%DOCSDIR%%/guide/eu/images -@dirrm %%DOCSDIR%%/guide/eu -@dirrm %%DOCSDIR%%/guide/es/images -@dirrm %%DOCSDIR%%/guide/es -@dirrm %%DOCSDIR%%/guide/en/images -@dirrm %%DOCSDIR%%/guide/en -@dirrm %%DOCSDIR%%/guide -@dirrm %%DOCSDIR%% +%%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 +%%GUI%%@dirrm %%DOCSDIR%% %%GUI%%@dirrmtry share/applications >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212101944.qBAJipVn033483>