Update to 4.7.4

5 files changed, 25 insertions, 114 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 34d6f96158b9..4d3df3f41af9 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mc
-PORTVERSION=	4.7.2
-PORTREVISION=	2
+PORTVERSION=	4.7.4
+PORTREVISION=	0
 CATEGORIES=	misc shells
 MASTER_SITES=	http://www.midnight-commander.org/downloads/ \
 		${MASTER_SITE_SUNSITE}
diff --git a/misc/mc/distinfo b/misc/mc/distinfo
index 4cfd309ef54a..d0010b6236c1 100644
--- a/misc/mc/distinfo
+++ b/misc/mc/distinfo
@@ -1,3 +1,3 @@
-MD5 (mc-4.7.2.tar.lzma) = 8e0c477b0c55123942b4b60827a44058
-SHA256 (mc-4.7.2.tar.lzma) = e0884aa1454d57b629db549449b4b4eef9376ec39c414e355c8dea4983f784b0
-SIZE (mc-4.7.2.tar.lzma) = 2100210
+MD5 (mc-4.7.4.tar.lzma) = 9932eaef64b7501c01f06faa888e8998
+SHA256 (mc-4.7.4.tar.lzma) = 41140edb4effbfd5a86d241acd7a76a21c8ba26db99eab7b07a1ff69169dabf4
+SIZE (mc-4.7.4.tar.lzma) = 2070397
diff --git a/misc/mc/files/patch-src-diffviewer-ydiff.c b/misc/mc/files/patch-src-diffviewer-ydiff.c
deleted file mode 100644
index fce48bbfef69..000000000000
--- a/misc/mc/files/patch-src-diffviewer-ydiff.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/diffviewer/ydiff.c.orig	2010-05-05 21:33:16.000000000 +0300
-+++ src/diffviewer/ydiff.c	2010-05-06 11:33:06.000000000 +0300
-@@ -31,6 +31,7 @@
- #include <stdlib.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/wait.h>
- 
- #include "lib/global.h"
- #include "lib/tty/tty.h"
diff --git a/misc/mc/files/patch-src-ext.c b/misc/mc/files/patch-src-ext.c
deleted file mode 100644
index 0ea1adbdd10f..000000000000
--- a/misc/mc/files/patch-src-ext.c
+++ /dev/null
@@ -1,96 +0,0 @@
-From 0c551c6ed29922b1827a2adceac58e04ae2f37ce Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Wed, 19 May 2010 10:54:22 +0400
-Subject: [PATCH 1/1] Fixed build with --disable-charset option. Minor optimization.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- src/ext.c |   20 ++++++++++++++++----
- 1 files changed, 16 insertions(+), 4 deletions(-)
-
-index 81661c5..89f216d 100644
---- src/ext.c.orig
-+++ src/ext.c
-@@ -48,8 +48,10 @@
- #include "execute.h"
- #include "history.h"
- #include "layout.h"
-+#ifdef HAVE_CHARSET
- #include "charsets.h"		/* get_codepage_index */
- #include "selcodepage.h"	/* do_set_codepage */
-+#endif
- #include "ext.h"
- 
- /* If set, we execute the file command to check the file type */
-@@ -370,6 +372,7 @@ get_file_type_local (const char *filename, char *buf, int buflen)
-     return ret;
- }
- 
-+#ifdef HAVE_CHARSET
- /*
-  * Run the "enca" command on the local file.
-  * Return 1 if the data is valid, 0 otherwise, -1 for fatal errors.
-@@ -392,6 +395,7 @@ get_file_encoding_local (const char *filename, char *buf, int buflen)
- 
-     return ret;
- }
-+#endif /* HAVE_CHARSET */
- 
- /*
-  * Invoke the "file" command on the file and match its output against PTR.
-@@ -416,7 +420,10 @@ regex_check_type (const char *filename, const char *ptr, int *have_type)
-     if (*have_type == 0) {
- 	char *realname;		/* name used with "file" */
- 	char *localfile;
-+
-+#ifdef HAVE_CHARSET
- 	int got_encoding_data;
-+#endif /* HAVE_CHARSET */
- 
- 	/* Don't repeate even unsuccessful checks */
- 	*have_type = 1;
-@@ -427,12 +434,11 @@ regex_check_type (const char *filename, const char *ptr, int *have_type)
- 
- 	realname = localfile;
- 
-+#ifdef HAVE_CHARSET
- 	got_encoding_data = is_autodetect_codeset_enabled
- 		? get_file_encoding_local (localfile, encoding_id, sizeof (encoding_id))
- 		: 0;
- 
--	mc_ungetlocalcopy (filename, localfile, 0);
--
- 	if (got_encoding_data > 0) {
- 	    char *pp;
- 	    int cp_id;
-@@ -447,19 +453,25 @@ regex_check_type (const char *filename, const char *ptr, int *have_type)
- 
- 	    do_set_codepage (cp_id);
- 	}
-+#endif /* HAVE_CHARSET */
-+
-+	mc_ungetlocalcopy (filename, localfile, 0);
- 
- 	got_data = get_file_type_local (localfile, content_string, sizeof (content_string));
- 
- 	if (got_data > 0) {
- 	    char *pp;
-+	    size_t real_len;
- 
- 	    pp = strchr (content_string, '\n');
- 	    if (pp != NULL)
- 		*pp = '\0';
- 
--	    if (strncmp (content_string, realname, strlen (realname)) == 0) {
-+	    real_len = strlen (realname);
-+
-+	    if (strncmp (content_string, realname, real_len) == 0) {
- 		/* Skip "realname: " */
--		content_shift = strlen (realname);
-+		content_shift = real_len;
- 		if (content_string[content_shift] == ':') {
- 		    /* Solaris' file prints tab(s) after ':' */
- 		    for (content_shift++;
--- 
-1.6.5.GIT
-
diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist
index e9030c8f1104..288e9cf1a730 100644
--- a/misc/mc/pkg-plist
+++ b/misc/mc/pkg-plist
@@ -49,13 +49,28 @@ libexec/mc/extfs.d/ulha
 libexec/mc/extfs.d/urar
 libexec/mc/extfs.d/uzip
 libexec/mc/extfs.d/uzoo
+libexec/mc/fish/README.fish
+libexec/mc/fish/append
+libexec/mc/fish/chmod
+libexec/mc/fish/chown
+libexec/mc/fish/fexists
+libexec/mc/fish/get
+libexec/mc/fish/hardlink
+libexec/mc/fish/info
+libexec/mc/fish/ln
+libexec/mc/fish/ls
+libexec/mc/fish/mkdir
+libexec/mc/fish/mv
+libexec/mc/fish/rmdir
+libexec/mc/fish/send
+libexec/mc/fish/unlink
 libexec/mc/mc-wrapper.csh
 libexec/mc/mc-wrapper.sh
 libexec/mc/mc.csh
 libexec/mc/mc.sh
 %%NLS%%share/locale/az/LC_MESSAGES/mc.mo
-%%NLS%%share/locale/be-tarask/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/be/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/be@tarask/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/mc.mo
@@ -66,6 +81,7 @@ libexec/mc/mc.sh
 %%NLS%%share/locale/eu/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/mc.mo
 %%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/it/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/mc.mo
@@ -187,8 +203,9 @@ libexec/mc/mc.sh
 %%EDITOR%%@dirrm %%DATADIR%%/syntax
 @dirrm %%DATADIR%%/skins
 @dirrm %%DATADIR%%
-%%NLS%%@dirrmtry share/locale/be-tarask/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/be-tarask
+%%NLS%%@dirrm share/locale/be@tarask/LC_MESSAGES
+%%NLS%%@dirrm share/locale/be@tarask
+@dirrm libexec/mc/fish
 @dirrm libexec/mc/extfs.d
 @dirrm libexec/mc
 @dirrm etc/mc