From 8465c74b823767ed992c15bceff197c279b3dcbd Mon Sep 17 00:00:00 2001 From: salo Date: Sun, 11 Dec 2005 18:06:22 +0000 Subject: Sync with mkvtoolnix 1.6.5 --- multimedia/mmg/Makefile | 19 +++++++------------ multimedia/mmg/PLIST | 38 +++++++++++++++++++------------------- multimedia/mmg/distinfo | 10 +++++----- multimedia/mmg/patches/patch-ab | 24 ++++++++++++------------ 4 files changed, 43 insertions(+), 48 deletions(-) (limited to 'multimedia') diff --git a/multimedia/mmg/Makefile b/multimedia/mmg/Makefile index 35fa6c7fbe7..8cdf23688da 100644 --- a/multimedia/mmg/Makefile +++ b/multimedia/mmg/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:43 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/11 18:06:22 salo Exp $ # .include "../../multimedia/mkvtoolnix/Makefile.dist" PKGNAME= ${DISTNAME:S/mkvtoolnix/mmg/} -PKGREVISION= 1 MAINTAINER= salo@NetBSD.org HOMEPAGE= http://www.bunkus.org/videotools/mkvtoolnix/doc/mkvmerge-gui.html @@ -17,28 +16,24 @@ USE_LANGUAGES= c++ BUILD_TARGET= src/mmg/mmg -SUBST_CLASSES+= man help +CONFIGURE_ARGS+= --datadir=${PREFIX}/share/doc +SUBST_CLASSES+= man SUBST_STAGE.man= pre-configure SUBST_FILES.man= doc/mmg.1 -SUBST_SED.man= 's,(doc/,(${PREFIX}/share/doc/html/mmg/,g' +SUBST_SED.man= 's,(doc/,(${PREFIX}/share/doc/mmg/,g' SUBST_MESSAGE.man= "Fixing paths in manual page." -SUBST_STAGE.help= pre-configure -SUBST_FILES.help= src/mmg/mmg.cpp -SUBST_SED.help= 's,@HELPDIR@,${PREFIX}/share/doc/html/mmg,' -SUBST_MESSAGE.help= "Fixing path to help data." - INSTALLATION_DIRS= bin man/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/mmg/mmg ${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/doc/mmg.1 ${PREFIX}/man/man1/ - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/mmg/images/ + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mmg/images/ ${INSTALL_DATA} ${WRKSRC}/doc/images/*.gif \ - ${PREFIX}/share/doc/html/mmg/images/ + ${PREFIX}/share/doc/mmg/images/ ${INSTALL_DATA} ${WRKSRC}/doc/mkvmerge-gui.* \ - ${PREFIX}/share/doc/html/mmg/ + ${PREFIX}/share/doc/mmg/ .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/libebml/buildlink3.mk" diff --git a/multimedia/mmg/PLIST b/multimedia/mmg/PLIST index ae11fadce09..0a7dcc6f220 100644 --- a/multimedia/mmg/PLIST +++ b/multimedia/mmg/PLIST @@ -1,21 +1,21 @@ -@comment $NetBSD: PLIST,v 1.3 2005/03/23 16:58:39 salo Exp $ +@comment $NetBSD: PLIST,v 1.4 2005/12/11 18:06:23 salo Exp $ bin/mmg man/man1/mmg.1 -share/doc/html/mmg/images/addingremovingattachments.gif -share/doc/html/mmg/images/addremovefiles.gif -share/doc/html/mmg/images/attachmentoptions.gif -share/doc/html/mmg/images/audiotrackoptions.gif -share/doc/html/mmg/images/chaptereditor.gif -share/doc/html/mmg/images/jobmanager.gif -share/doc/html/mmg/images/movietitle.gif -share/doc/html/mmg/images/muxingwindow.gif -share/doc/html/mmg/images/selectmkvmergeexecutable.gif -share/doc/html/mmg/images/splitting.gif -share/doc/html/mmg/images/textsubtitlestrackoptions.gif -share/doc/html/mmg/images/trackselection.gif -share/doc/html/mmg/images/videotrackoptions.gif -share/doc/html/mmg/mkvmerge-gui.hhc -share/doc/html/mmg/mkvmerge-gui.hhp -share/doc/html/mmg/mkvmerge-gui.html -@dirrm share/doc/html/mmg/images -@dirrm share/doc/html/mmg +share/doc/mmg/images/addingremovingattachments.gif +share/doc/mmg/images/addremovefiles.gif +share/doc/mmg/images/attachmentoptions.gif +share/doc/mmg/images/audiotrackoptions.gif +share/doc/mmg/images/chaptereditor.gif +share/doc/mmg/images/jobmanager.gif +share/doc/mmg/images/movietitle.gif +share/doc/mmg/images/muxingwindow.gif +share/doc/mmg/images/selectmkvmergeexecutable.gif +share/doc/mmg/images/splitting.gif +share/doc/mmg/images/textsubtitlestrackoptions.gif +share/doc/mmg/images/trackselection.gif +share/doc/mmg/images/videotrackoptions.gif +share/doc/mmg/mkvmerge-gui.hhc +share/doc/mmg/mkvmerge-gui.hhp +share/doc/mmg/mkvmerge-gui.html +@dirrm share/doc/mmg/images +@dirrm share/doc/mmg diff --git a/multimedia/mmg/distinfo b/multimedia/mmg/distinfo index bb0d0c9938c..eba43313a4b 100644 --- a/multimedia/mmg/distinfo +++ b/multimedia/mmg/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.16 2005/04/18 01:32:50 salo Exp $ +$NetBSD: distinfo,v 1.17 2005/12/11 18:06:23 salo Exp $ -SHA1 (mkvtoolnix-1.4.2.tar.bz2) = a5a01a0fc2f73d718fbf9c51138364d70460703f -RMD160 (mkvtoolnix-1.4.2.tar.bz2) = 3d998b0d1997fc9732ffd64b9a31c17e4a38930c -Size (mkvtoolnix-1.4.2.tar.bz2) = 638250 bytes +SHA1 (mkvtoolnix-1.6.5.tar.bz2) = 2f6104e1a078c91172aef6ba00fb5a3656f8eeb3 +RMD160 (mkvtoolnix-1.6.5.tar.bz2) = 356e1d8628abf669f069e691f9b155bc595553bc +Size (mkvtoolnix-1.6.5.tar.bz2) = 650413 bytes SHA1 (patch-aa) = 19177b4a75ed8a27b746e2d1825c23fe59f95a77 -SHA1 (patch-ab) = 0d25c873351f183059ac2434ddf1d7129844c27d +SHA1 (patch-ab) = 99f08611648f523dec37197487921b092fba556e diff --git a/multimedia/mmg/patches/patch-ab b/multimedia/mmg/patches/patch-ab index 71951945d69..56cfdbc50e1 100644 --- a/multimedia/mmg/patches/patch-ab +++ b/multimedia/mmg/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.2 2005/03/23 16:58:39 salo Exp $ +$NetBSD: patch-ab,v 1.3 2005/12/11 18:06:23 salo Exp $ ---- src/mmg/mmg.cpp.orig 2005-03-02 22:34:35.000000000 +0100 -+++ src/mmg/mmg.cpp 2005-03-23 17:27:01.000000000 +0100 -@@ -1153,7 +1153,7 @@ - wxConfigBase *cfg; - bool first; - -- help_path = wxGetCwd(); -+ help_path = "@HELPDIR@"; - cfg = wxConfigBase::Get(); - cfg->SetPath(wxT("/GUI")); - if (!cfg->Read(wxT("help_path"), &help_path)) +--- Makefile.in.orig 2005-09-08 19:32:08.000000000 +0200 ++++ Makefile.in 2005-12-11 18:47:21.000000000 +0100 +@@ -25,7 +25,7 @@ + man1dir = $(mandir)/man1 + includedir = @includedir@ + oldincludedir = /usr/include +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/mmg + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = . -- cgit v1.2.3