Attachment 103512 Details for Bug 143441 – file.diff

[patch] file.diff

file.diff (text/plain), 6.41 KB, created by tkato432 on 2010-02-01 18:10:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2010-02-01 18:10:02 UTC

Size: 6.41 KB

patch

obsolete

>diff -urN /usr/ports/multimedia/mkvtoolnix/Makefile multimedia/mkvtoolnix/Makefile
>--- /usr/ports/multimedia/mkvtoolnix/Makefile	2009-12-22 22:54:29.000000000 +0900
>+++ multimedia/mkvtoolnix/Makefile	2010-02-01 23:43:43.000000000 +0900
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	mkvtoolnix
>-PORTVERSION=	3.0.0
>+PORTVERSION=	3.1.0
> CATEGORIES=	multimedia audio
> MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
> 
>@@ -29,9 +29,12 @@
> GNU_CONFIGURE=	yes
> CPPFLAGS=	-I${LOCALBASE}/include
> LDFLAGS=	-L${LOCALBASE}/lib
>-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
>+		ac_cv_path_PO4A=no
> CONFIGURE_ARGS=	--enable-lzo --enable-bz2 --disable-qt \
> 		--with-boost=${LOCALBASE} \
>+		--with-boost-filesystem=boost_filesystem \
>+		--with-boost-system=boost_system \
> 		--with-boost-regex=boost_regex
> MAKE_JOBS_SAFE=	yes
> 
>@@ -54,6 +57,7 @@
> MAN1+=		mmg.1
> PLIST_SUB+=	GUI=""
> .else
>+CONFIGURE_ARGS+=--disable-gui
> PLIST_SUB+=	GUI="@comment "
> .endif
> 
>diff -urN /usr/ports/multimedia/mkvtoolnix/distinfo multimedia/mkvtoolnix/distinfo
>--- /usr/ports/multimedia/mkvtoolnix/distinfo	2009-12-22 22:54:29.000000000 +0900
>+++ multimedia/mkvtoolnix/distinfo	2010-01-20 23:29:19.000000000 +0900
>@@ -1,3 +1,3 @@
>-MD5 (mkvtoolnix-3.0.0.tar.bz2) = 2e9373edd5a5523313d8f5bea3ee8f8e
>-SHA256 (mkvtoolnix-3.0.0.tar.bz2) = 6450de85d63c657230363ab82ce1f5423427a6a0073e7fd18bff4f48f3b8b5a8
>-SIZE (mkvtoolnix-3.0.0.tar.bz2) = 1117727
>+MD5 (mkvtoolnix-3.1.0.tar.bz2) = 9441ab0b72f34cd8d5492598a65e1dd5
>+SHA256 (mkvtoolnix-3.1.0.tar.bz2) = 872fa40b8cb084fcbfd16b0a0e24a58488a0d42f80988cd512daa659d94eb4a9
>+SIZE (mkvtoolnix-3.1.0.tar.bz2) = 1364401
>diff -urN /usr/ports/multimedia/mkvtoolnix/files/patch-Makefile.in multimedia/mkvtoolnix/files/patch-Makefile.in
>--- /usr/ports/multimedia/mkvtoolnix/files/patch-Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ multimedia/mkvtoolnix/files/patch-Makefile.in	2010-01-21 16:44:44.000000000 +0900
>@@ -0,0 +1,36 @@
>+--- Makefile.in.orig	2010-01-19 20:05:55.000000000 +0900
>++++ Makefile.in	2010-01-21 16:43:29.000000000 +0900
>+@@ -176,7 +176,7 @@
>+ MANPAGES_TRANSLATIONS_POS = @MANPAGES_TRANSLATIONS_POS@
>+ MANPAGES_TRANSLATED = @MANPAGES_TRANSLATED@
>+ 
>+-GUIDE_TRANSLATIONS = @GUIDE_TRANSLATIONS@
>++GUIDE_TRANSLATIONS = en zh_CN
>+ 
>+ HTMLHELPBOOKS = mkvmerge-gui-book
>+ 
>+@@ -185,11 +185,11 @@
>+ 		-Lsrc/common -Lsrc/input -Lsrc/output -Lsrc/mpegparser
>+ 
>+ RUNAR = $(AR) rcu
>+-LINK = $(CXX) $(LDFLAGS) $(LIBDIRS) $(SYSTEM_LIBDIRS)
>+-LINKSHARED = $(CXX) $(LDFLAGS) $(LIBDIRS) $(SYSTEM_LIBDIRS) \
>++LINK = $(CXX) $(SYSTEM_LIBDIRS) $(LIBDIRS) $(LDFLAGS)
>++LINKSHARED = $(CXX) $(SYSTEM_LIBDIRS) $(LIBDIRS) $(LDFLAGS) \
>+ 		-shared -Wl,--export-all
>+-CXXCOMPILE = $(CXX) $(CXXFLAGS) $(INCLUDES) $(SYSTEM_INCLUDES)
>+-CCOMPILE = $(CC) $(CFLAGS) $(INCLUDES) $(SYSTEM_INCLUDES)
>++CXXCOMPILE = $(CXX) $(SYSTEM_INCLUDES) $(INCLUDES) $(CXXFLAGS)
>++CCOMPILE = $(CC) $(SYSTEM_INCLUDES) $(INCLUDES) $(CFLAGS)
>+ RCCOMPILE = $(WINDRES) $(WXWIDGETS_INCLUDES) -Isrc/mmg
>+ 
>+ ALL_SOURCES=$(wildcard lib/avilib-0.6.10/*.c) $(wildcard lib/avilib-0.6.10/*.cpp) \
>+@@ -242,7 +242,7 @@
>+ 
>+ all: $(MANPAGES_DEP) $(TAGSFILE) $(APPLICATIONS) $(TRANSLATIONS_MOS) $(HTMLHELPBOOKS)
>+ 
>+-install: install-programs install-mans install-translated-mans install-trans install-guide
>++install: install-programs install-mans install-trans install-guide
>+ 
>+ install-programs: $(APPLICATIONS)
>+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
>diff -urN /usr/ports/multimedia/mkvtoolnix/pkg-plist multimedia/mkvtoolnix/pkg-plist
>--- /usr/ports/multimedia/mkvtoolnix/pkg-plist	2009-12-22 22:54:29.000000000 +0900
>+++ multimedia/mkvtoolnix/pkg-plist	2010-01-21 16:40:54.000000000 +0900
>@@ -7,23 +7,45 @@
> share/locale/ja/LC_MESSAGES/mkvtoolnix.mo
> share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo
> share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
>-%%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
>+%%DATADIR%%/guide/en/images/addingremovingattachments.gif
>+%%DATADIR%%/guide/en/images/addremovefiles.gif
>+%%DATADIR%%/guide/en/images/attachmentoptions.gif
>+%%DATADIR%%/guide/en/images/audiotrackoptions.gif
>+%%DATADIR%%/guide/en/images/chaptereditor.gif
>+%%DATADIR%%/guide/en/images/generaltrackoptions.gif
>+%%DATADIR%%/guide/en/images/jobmanager.gif
>+%%DATADIR%%/guide/en/images/movietitle.gif
>+%%DATADIR%%/guide/en/images/muxingwindow.gif
>+%%DATADIR%%/guide/en/images/selectmkvmergeexecutable.gif
>+%%DATADIR%%/guide/en/images/splitting.gif
>+%%DATADIR%%/guide/en/images/textsubtitlestrackoptions.gif
>+%%DATADIR%%/guide/en/images/trackselection.gif
>+%%DATADIR%%/guide/en/images/videotrackoptions.gif
>+%%DATADIR%%/guide/en/mkvmerge-gui.hhc
>+%%DATADIR%%/guide/en/mkvmerge-gui.hhk
>+%%DATADIR%%/guide/en/mkvmerge-gui.hhp
>+%%DATADIR%%/guide/en/mkvmerge-gui.html
>+%%DATADIR%%/guide/zh_CN/images/addingremovingattachments.gif
>+%%DATADIR%%/guide/zh_CN/images/addremovefiles.gif
>+%%DATADIR%%/guide/zh_CN/images/attachmentoptions.gif
>+%%DATADIR%%/guide/zh_CN/images/audiotrackoptions.gif
>+%%DATADIR%%/guide/zh_CN/images/chaptereditor.gif
>+%%DATADIR%%/guide/zh_CN/images/generaltrackoptions.gif
>+%%DATADIR%%/guide/zh_CN/images/jobmanager.gif
>+%%DATADIR%%/guide/zh_CN/images/movietitle.gif
>+%%DATADIR%%/guide/zh_CN/images/muxingwindow.gif
>+%%DATADIR%%/guide/zh_CN/images/selectmkvmergeexecutable.gif
>+%%DATADIR%%/guide/zh_CN/images/splitting.gif
>+%%DATADIR%%/guide/zh_CN/images/textsubtitlestrackoptions.gif
>+%%DATADIR%%/guide/zh_CN/images/trackselection.gif
>+%%DATADIR%%/guide/zh_CN/images/videotrackoptions.gif
>+%%DATADIR%%/guide/zh_CN/mkvmerge-gui.hhc
>+%%DATADIR%%/guide/zh_CN/mkvmerge-gui.hhk
>+%%DATADIR%%/guide/zh_CN/mkvmerge-gui.hhp
>+%%DATADIR%%/guide/zh_CN/mkvmerge-gui.html
>+@dirrm %%DATADIR%%/guide/zh_CN/images
>+@dirrm %%DATADIR%%/guide/zh_CN
>+@dirrm %%DATADIR%%/guide/en/images
>+@dirrm %%DATADIR%%/guide/en
>+@dirrm %%DATADIR%%/guide
> @dirrm %%DATADIR%%

Actions: View | Diff

Attachments on bug 143441: 103512