Update mc to 4.8.22.

Major changes since 4.8.21

Core

  - Support BTRFS's file clone operation (#1983)
  - Find file: show pattern and content in the results window title (#3453)
  - Find file: remember state (empty or not) of Content field (#3924)
  - Improve support IBM i (#3927)
  - Improve handling of hard link creation errors (#3678)
  - Support user-defined prompt in the Fish subshell (#3944)

VFS

  - sftp: preserve atime and mtime (#3917)

Editor

  - man page cleanup (#3918)
  - syntax:
      - PHP - highlight keyword 'null' (#3920)
      - Meson - initial implementation (#3940)

Misc

  - ext.d: use MPV as a fallback for mplayer -identify (#3919)
  - ext.d: improve recognition of MS Office formats (#3929)
  - Code cleanup (#3915)
  - Cleanup hint files

Fixes

  - Won't compile for Apple (#3930)
  - "Cannot create target file" when target has backslash space in the name (#
    3923)
  - Quiet single file overwrite (#3908)
  - Show error message for each not-installed program when view documents in MS
    Word and Excel formats (#3926)
  - Crash when trying some sftp connections (#3937)
  - Crash when return to filemanager from subshell (#3943)

4 files changed, 20 insertions, 16 deletions

diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index 98ef4a05824..c093a11a758 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.112 2018/11/20 08:04:59 maya Exp $
+# $NetBSD: Makefile,v 1.113 2019/01/18 22:28:38 bsiegert Exp $
 
-DISTNAME=	mc-4.8.21
-PKGREVISION=	1
+DISTNAME=	mc-4.8.22
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.midnight-commander.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/mc/PLIST b/sysutils/mc/PLIST
index 89a3d387ed4..b0ba0ad09d1 100644
--- a/sysutils/mc/PLIST
+++ b/sysutils/mc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2018/06/17 08:21:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2019/01/18 22:28:38 bsiegert Exp $
 bin/mc
 bin/mcdiff
 bin/mcedit
@@ -283,6 +283,7 @@ share/mc/syntax/m4.syntax
 share/mc/syntax/mail.syntax
 share/mc/syntax/makefile.syntax
 share/mc/syntax/markdown.syntax
+share/mc/syntax/meson.syntax
 share/mc/syntax/ml.syntax
 share/mc/syntax/named.syntax
 share/mc/syntax/nemerle.syntax
diff --git a/sysutils/mc/distinfo b/sysutils/mc/distinfo
index 7e57fa23a16..67ac8482d10 100644
--- a/sysutils/mc/distinfo
+++ b/sysutils/mc/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.32 2018/06/17 08:21:58 wiz Exp $
+$NetBSD: distinfo,v 1.33 2019/01/18 22:28:38 bsiegert Exp $
 
-SHA1 (mc-4.8.21.tar.bz2) = bb1c3b7107cc0fa877edf669628e7c7a8ffdc962
-RMD160 (mc-4.8.21.tar.bz2) = 9e74eafcce2c59afc25fd17d4caa0ee2ddd1c031
-SHA512 (mc-4.8.21.tar.bz2) = 20799b5936f0cc166869af42b5bf7b737bbccee4adfc24be16d3b4ebd2f911d60d48359a081f69ecd06cf02182aeeab98e8ac352bc219fe3560c4cfe5374451e
-Size (mc-4.8.21.tar.bz2) = 3381888 bytes
+SHA1 (mc-4.8.22.tar.bz2) = ec30588765ecab685f37b825d1b318a35f9f88b5
+RMD160 (mc-4.8.22.tar.bz2) = 870be10c5b8eff5ed6193fe245a1e77308910e0e
+SHA512 (mc-4.8.22.tar.bz2) = 7eb0b3bdc57bd39b76c13297721ac94d3b215675f9a69dfb69ef4c7eb13ccbcb42dd15c7b57fdf3dd92b52dad1152d6d620851683d37e9d6adc3ed88aebc6f2f
+Size (mc-4.8.22.tar.bz2) = 3415985 bytes
 SHA1 (patch-ac) = d01357b685acd8e863510248ed7519ae2821757f
 SHA1 (patch-ad) = 4484b91511cf5bac73f4ae940988d46239e2cd95
 SHA1 (patch-configure) = 8fdc579fb4d8d4c018488b9b160bb24f9a82aa42
-SHA1 (patch-src_subshell_common.c) = 6fc3a92e6116527f7ead9d9515906add0b30ff5e
+SHA1 (patch-src_subshell_common.c) = b6d390da68aa0028d21683b1959340e51f67efd6
 SHA1 (patch-src_vfs_extfs_helpers_Makefile.in) = c5d4735ce9548714731fdb1227e1acac78f11332
diff --git a/sysutils/mc/patches/patch-src_subshell_common.c b/sysutils/mc/patches/patch-src_subshell_common.c
index 7028abbdbf7..ef2ebdf4ecb 100644
--- a/sysutils/mc/patches/patch-src_subshell_common.c
+++ b/sysutils/mc/patches/patch-src_subshell_common.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_subshell_common.c,v 1.1 2016/12/16 00:02:28 joerg Exp $
+$NetBSD: patch-src_subshell_common.c,v 1.2 2019/01/18 22:28:38 bsiegert Exp $
 
 Report error from read since tcsetattr can replace errno.
 Recognize /bin/sh as valid shell and don't complain about it.
 
---- src/subshell/common.c.orig	2016-09-22 18:24:12.000000000 +0000
+--- src/subshell/common.c.orig	2018-12-28 19:35:25.000000000 +0000
 +++ src/subshell/common.c
-@@ -303,6 +303,7 @@ init_subshell_child (const char *pty_nam
+@@ -317,6 +317,7 @@ init_subshell_child (const char *pty_nam
  
      case SHELL_ASH_BUSYBOX:
      case SHELL_DASH:
@@ -13,7 +13,7 @@ Recognize /bin/sh as valid shell and don't complain about it.
          /* Do we have a custom init file ~/.local/share/mc/ashrc? */
          init_file = mc_config_get_full_path ("ashrc");
  
-@@ -496,7 +497,7 @@ static gboolean
+@@ -510,7 +511,7 @@ static gboolean
  feed_subshell (int how, gboolean fail_on_error)
  {
      fd_set read_set;            /* For 'select' */
@@ -22,7 +22,7 @@ Recognize /bin/sh as valid shell and don't complain about it.
      int i;                      /* Loop counter */
  
      struct timeval wtime;       /* Maximum time we wait for the subshell */
-@@ -551,15 +552,16 @@ feed_subshell (int how, gboolean fail_on
+@@ -565,19 +566,20 @@ feed_subshell (int how, gboolean fail_on
              /* for (i=0; i<5; ++i)  * FIXME -- experimental */
          {
              bytes = read (mc_global.tty.subshell_pty, pty_buffer, sizeof (pty_buffer));
@@ -36,9 +36,13 @@ Recognize /bin/sh as valid shell and don't complain about it.
 -            if (bytes <= 0)
 +            if (bytes < 0)
              {
+ #ifdef PTY_ZEROREAD
+                 /* On IBM i, read(1) can return 0 for a non-closed fd */
+                 continue;
+ #else
                  tcsetattr (STDOUT_FILENO, TCSANOW, &shell_mode);
 -                fprintf (stderr, "read (subshell_pty...): %s\r\n", unix_error_string (errno));
 +                fprintf (stderr, "read (subshell_pty...): %s\r\n", unix_error_string (serrno));
                  exit (EXIT_FAILURE);
+ #endif
              }
-