Attachment 118746 Details for Bug 161083 – misc-mc.patch

[patch] misc-mc.patch

misc-mc.patch (text/plain), 6.12 KB, created by Maxim Samsonov on 2011-09-27 22:10:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maxim Samsonov

Created: 2011-09-27 22:10:06 UTC

Size: 6.12 KB

patch

obsolete

>diff --git a/misc/mc/Makefile b/misc/mc/Makefile
>--- a/misc/mc/Makefile
>+++ b/misc/mc/Makefile
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	mc
>-PORTVERSION=	4.7.5
>-PORTREVISION=	1
>+PORTVERSION=	4.7.5.4
> CATEGORIES=	misc shells
> MASTER_SITES=	http://www.midnight-commander.org/downloads/ \
> 		${MASTER_SITE_SUNSITE}
>@@ -29,7 +28,7 @@
> USE_XZ=		yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	ZIP=${LOCALBASE}/bin/zip UNZIP=${LOCALBASE}/bin/unzip
>-USE_AUTOTOOLS=	autoconf automake
>+USE_AUTOTOOLS=	libtool
> 
> OPTIONS=	SLANG		"Build with SLang library" on \
> 		ICONV		"Build with iconv recoding" on \
>diff --git a/misc/mc/distinfo b/misc/mc/distinfo
>--- a/misc/mc/distinfo
>+++ b/misc/mc/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (mc-4.7.5.tar.lzma) = 5e5893e9484e4854a29fa422834e79c9ef007c1672136331ef28bdddbfc1c457
>-SIZE (mc-4.7.5.tar.lzma) = 1922463
>+SHA256 (mc-4.7.5.4.tar.lzma) = dce245d8a057cede09343495e439cf67679c0ab290a7736560cfe437be261d0b
>+SIZE (mc-4.7.5.4.tar.lzma) = 1977571
>diff --git a/misc/mc/files/patch-mc-wrapper b/misc/mc/files/patch-mc-wrapper
>--- a/misc/mc/files/patch-mc-wrapper
>+++ b/misc/mc/files/patch-mc-wrapper
>@@ -1,15 +1,15 @@
>---- contrib/mc-wrapper.csh.in.orig	Wed Nov  6 00:46:12 2002
>-+++ contrib/mc-wrapper.csh.in	Tue Jun 15 03:16:29 2004
>-@@ -14,5 +14,5 @@
>+--- contrib/mc-wrapper.csh.in.orig	2011-02-08 14:46:09.000000000 +0300
>++++ contrib/mc-wrapper.csh.in	2011-09-20 12:34:35.000000000 +0400
>+@@ -16,5 +16,5 @@ if (-r "$MC_PWD_FILE") then
>  	unsetenv MC_PWD
>  endif
>  
> -rm -f "$MC_PWD_FILE"
> +/bin/rm -f "$MC_PWD_FILE"
>  unsetenv MC_PWD_FILE
>---- contrib/mc-wrapper.sh.in.orig	Wed Nov  6 00:46:12 2002
>-+++ contrib/mc-wrapper.sh.in	Tue Jun 15 03:16:29 2004
>-@@ -9,5 +9,5 @@
>+--- contrib/mc-wrapper.sh.in.orig	2011-02-08 14:46:09.000000000 +0300
>++++ contrib/mc-wrapper.sh.in	2011-09-20 12:34:35.000000000 +0400
>+@@ -10,5 +10,5 @@ if test -r "$MC_PWD_FILE"; then
>  	unset MC_PWD
>  fi
>  
>diff --git a/misc/mc/files/patch-src-editor-edit.c b/misc/mc/files/patch-src-editor-edit.c
>deleted file mode 100644
>--- a/misc/mc/files/patch-src-editor-edit.c
>+++ /dev/null
>@@ -1,38 +0,0 @@
>-Index: src/editor/edit.c
>-===================================================================
>---- src/editor/edit.c	(revision bd3025e7a9ec490bc6adabc34cd0392e93ecd050)
>-+++ src/editor/edit.c	(revision 4f4876abb4acb812747d1050c4b3be01da87780a)
>-@@ -2840,8 +2840,5 @@
>-     {
>-         int c, orig_c;
>--        int utf_ch = 0;
>--#ifdef HAVE_CHARSET
>--        int cw = 1;
>--#endif
>-+
>-         if (cols != -10)
>-         {
>-@@ -2851,8 +2848,13 @@
>-                 return p - 1;
>-         }
>-+
>-         orig_c = c = edit_get_byte (edit, p);
>-+
>- #ifdef HAVE_CHARSET
>-         if (edit->utf8)
>-         {
>-+            int utf_ch;
>-+            int cw = 1;
>-+
>-             utf_ch = edit_get_utf (edit, p, &cw);
>-             if (utf8_display)
>-@@ -2866,6 +2868,8 @@
>-                 col -= cw - 1;
>-         }
>-+
>-+        c = convert_to_display_c (c);
>- #endif
>--        c = convert_to_display_c (c);
>-+
>-         if (c == '\t')
>-             col += TAB_SIZE - col % TAB_SIZE;
>diff --git a/misc/mc/files/patch-without-nls b/misc/mc/files/patch-without-nls
>deleted file mode 100644
>--- a/misc/mc/files/patch-without-nls
>+++ /dev/null
>@@ -1,25 +0,0 @@
>---- doc/hints/Makefile.am.orig	2011-03-22 00:02:49.000000000 +0600
>-+++ doc/hints/Makefile.am	2011-03-22 00:03:11.000000000 +0600
>-@@ -1,7 +1,11 @@
>- HINTFILES = \
>--	mc.hint mc.hint.cs mc.hint.es mc.hint.hu mc.hint.it	\
>-+	mc.hint
>-+if USE_NLS
>-+HINTFILES += \
>-+	mc.hint.cs mc.hint.es mc.hint.hu mc.hint.it	\
>- 	mc.hint.nl mc.hint.pl mc.hint.ru mc.hint.sr mc.hint.uk	\
>- 	mc.hint.zh
>-+endif
>- 
>- hintdir = $(pkgdatadir)/hints
>- hint_DATA = $(HINTFILES)
>---- configure.ac.orig	2011-03-21 23:58:52.000000000 +0600
>-+++ configure.ac	2011-03-22 00:01:04.000000000 +0600
>-@@ -504,6 +504,7 @@
>- AM_CONDITIONAL(USE_SCREEN_SLANG, [test x"$with_screen" = xslang])
>- AM_CONDITIONAL(USE_EDIT, [test -n "$use_edit"])
>- AM_CONDITIONAL(USE_DIFF, [test -n "$use_diff"])
>-+AM_CONDITIONAL(USE_NLS, [test x"$USE_NLS" = xyes])
>- AM_CONDITIONAL(CHARSET, [test -n "$have_charset"])
>- AM_CONDITIONAL(CONS_SAVER, [test -n "$cons_saver"])
>- 
>diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist
>--- a/misc/mc/pkg-plist
>+++ b/misc/mc/pkg-plist
>@@ -72,6 +72,7 @@
> %%NLS%%share/locale/da/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/de/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/el/LC_MESSAGES/mc.mo
>+%%NLS%%share/locale/eo/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/es/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/eu/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/fi/LC_MESSAGES/mc.mo
>@@ -79,8 +80,10 @@
> %%NLS%%share/locale/fr/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/gl/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/hu/LC_MESSAGES/mc.mo
>+%%NLS%%share/locale/ia/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/id/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/it/LC_MESSAGES/mc.mo
>+%%NLS%%share/locale/it_IT/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/ja/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/ka/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/ko/LC_MESSAGES/mc.mo
>@@ -98,6 +101,7 @@
> %%NLS%%share/locale/sl/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/sr/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/sv/LC_MESSAGES/mc.mo
>+%%NLS%%share/locale/sv_SE/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/ta/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/tr/LC_MESSAGES/mc.mo
> %%NLS%%share/locale/uk/LC_MESSAGES/mc.mo
>@@ -125,11 +129,13 @@
> %%NLS%%%%DATADIR%%/hints/mc.hint.zh
> %%CHARSETS%%%%DATADIR%%/mc.charsets
> %%DATADIR%%/mc.lib
>+%%DATADIR%%/skins/dark.ini
> %%DATADIR%%/skins/darkfar.ini
> %%DATADIR%%/skins/default.ini
> %%DATADIR%%/skins/double-lines.ini
> %%DATADIR%%/skins/featured.ini
> %%DATADIR%%/skins/gotar.ini
>+%%DATADIR%%/skins/mc46.ini
> %%DATADIR%%/skins/nicedark.ini
> %%EDITOR%%%%DATADIR%%/syntax/PKGBUILD.syntax
> %%EDITOR%%%%DATADIR%%/syntax/Syntax
>@@ -207,8 +213,12 @@
> @dirrm %%DATADIR%%/hints
> @dirrm %%DATADIR%%/help
> @dirrm %%DATADIR%%
>-%%NLS%%@dirrm share/locale/fi_FI/LC_MESSAGES
>-%%NLS%%@dirrm share/locale/fi_FI
>+%%NLS%%@dirrmtry share/locale/sv_SE/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/sv_SE
>+%%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/it_IT
>+%%NLS%%@dirrmtry share/locale/fi_FI/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/fi_FI
> @dirrm libexec/mc/fish
> @dirrm libexec/mc/extfs.d
> @dirrm libexec/mc

Actions: View | Diff

Attachments on bug 161083: 118746