update to 4.8.33;

- fix HOMEPAGE and SITES based on issues/4570 (from Yury V. Zaytsev)
- drop ksh patches which are now upstreamed

misc/mc/Makefile

@@ -1,10 +1,10 @@
 COMMENT=		free Norton Commander clone with many useful features
 
-DISTNAME=		mc-4.8.31
+DISTNAME=		mc-4.8.33
 CATEGORIES=		misc
 
-HOMEPAGE=		https://www.midnight-commander.org/
+HOMEPAGE=		https://midnight-commander.org/
-SITES=			${HOMEPAGE}downloads/
+SITES=			https://ftp.osuosl.org/pub/midnightcommander/
 MAINTAINER=		Robert Nagy <robert@openbsd.org>
 
 EXTRACT_SUFX=		.tar.xz

misc/mc/distinfo

@@ -1,2 +1,2 @@
-SHA256 (mc-4.8.31.tar.xz) = JBkc+GZ2dbjjH8Sp0YoKZb3AWYwsXE6gkklM0Tq0qxo=
+SHA256 (mc-4.8.33.tar.xz) = yuFJ1C+ETlGF2MgdfbOROo+iFMZfhSIAqdiWtGivFkw=
-SIZE (mc-4.8.31.tar.xz) = 2385632
+SIZE (mc-4.8.33.tar.xz) = 2424476

misc/mc/patches/patch-configure

@@ -1,16 +1,16 @@
 Index: configure
 --- configure.orig
 +++ configure
-@@ -19807,7 +19807,7 @@ then :
+@@ -20307,7 +20307,7 @@ then :
- else $as_nop
+ else case e in #(
- 
+   e)
  	ac_save_LIBS="$LIBS"
 -	LIBS="$LIBS -lslang"
 +	LIBS="$LIBS -lslang -ltermcap"
  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -27349,7 +27349,7 @@ if test -n "$EXT2FS_CFLAGS"; then
+@@ -28124,7 +28124,7 @@ if test -n "$EXT2FS_CFLAGS"; then
    ac_status=$?
    printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; then
@@ -19,21 +19,21 @@ Index: configure
  		      test "x$?" != "x0" && pkg_failed=yes
  else
    pkg_failed=yes
-@@ -27604,7 +27604,7 @@ done
+@@ -28380,7 +28380,7 @@ done
    done
  IFS=$as_save_IFS
  
 -  test -z "$ac_cv_path_ZIP" && ac_cv_path_ZIP="/usr/bin/zip"
 +  ac_cv_path_ZIP="${LOCALBASE}/bin/zip"
    ;;
+ esac ;;
  esac
- fi
+@@ -28427,7 +28427,7 @@ done
-@@ -27650,7 +27650,7 @@ done
    done
  IFS=$as_save_IFS
  
 -  test -z "$ac_cv_path_UNZIP" && ac_cv_path_UNZIP="/usr/bin/unzip"
 +  ac_cv_path_UNZIP="${LOCALBASE}/bin/unzip"
    ;;
+ esac ;;
  esac
- fi

misc/mc/patches/patch-lib_fileloc_h

@@ -1,11 +0,0 @@
-Index: lib/fileloc.h
---- lib/fileloc.h.orig
-+++ lib/fileloc.h
-@@ -52,6 +52,7 @@
- 
- #define MC_BASHRC_FILE          "bashrc"
- #define MC_ZSHRC_FILE           ".zshrc"
-+#define MC_KSHRC_FILE           "kshrc"
- #define MC_ASHRC_FILE           "ashrc"
- #define MC_INPUTRC_FILE         "inputrc"
- #define MC_CONFIG_FILE          "ini"

misc/mc/patches/patch-lib_mcconfig_paths_c

@@ -1,11 +0,0 @@
-Index: lib/mcconfig/paths.c
---- lib/mcconfig/paths.c.orig
-+++ lib/mcconfig/paths.c
-@@ -76,6 +76,7 @@ static const struct
-     { &mc_data_str, MC_SKINS_DIR },
-     { &mc_data_str, VFS_SHELL_PREFIX },
-     { &mc_data_str, MC_ASHRC_FILE },
-+    { &mc_data_str, MC_KSHRC_FILE },
-     { &mc_data_str, MC_BASHRC_FILE },
-     { &mc_data_str, MC_INPUTRC_FILE },
-     { &mc_data_str, MC_ZSHRC_FILE },

misc/mc/patches/patch-lib_shell_c

@@ -1,31 +0,0 @@
-add ksh subshell support, but disabled in last chunk for
-now to avoid a problem with zombies left behind.
-
-https://midnight-commander.org/ticket/4447
-
-Index: lib/shell.c
---- lib/shell.c.orig
-+++ lib/shell.c
-@@ -74,6 +74,8 @@ mc_shell_get_installed_in_system (void)
-         mc_shell->path = g_strdup ("/bin/dash");
-     else if (access ("/bin/busybox", X_OK) == 0)
-         mc_shell->path = g_strdup ("/bin/busybox");
-+    else if (access ("/bin/ksh", X_OK) == 0)
-+        mc_shell->path = g_strdup ("/bin/ksh");
-     else if (access ("/bin/zsh", X_OK) == 0)
-         mc_shell->path = g_strdup ("/bin/zsh");
-     else if (access ("/bin/tcsh", X_OK) == 0)
-@@ -204,6 +206,13 @@ mc_shell_recognize_path (mc_shell_t * mc_shell)
-         mc_shell->type = SHELL_BASH;
-         mc_shell->name = "bash";
-     }
-+#if 0
-+    else if (strstr (mc_shell->path, "/ksh") != NULL || getenv ("KSH_VERSION") != NULL)
-+    {
-+        mc_shell->type = SHELL_KSH;
-+        mc_shell->name = "ksh";
-+    }
-+#endif
-     else if (strstr (mc_shell->path, "/sh") != NULL || getenv ("SH") != NULL)
-     {
-         mc_shell->type = SHELL_SH;

misc/mc/patches/patch-lib_shell_h

@@ -1,13 +0,0 @@
-Index: lib/shell.h
---- lib/shell.h.orig
-+++ lib/shell.h
-@@ -18,7 +18,8 @@ typedef enum
-     SHELL_DASH,                 /* Debian variant of ash */
-     SHELL_TCSH,
-     SHELL_ZSH,
--    SHELL_FISH
-+    SHELL_FISH,
-+    SHELL_KSH
- } shell_type_t;
- 
- /*** structures declarations (and typedefs of structures)*****************************************/

misc/mc/patches/patch-src_diffviewer_ydiff_c

@@ -1,10 +1,10 @@
 Index: src/diffviewer/ydiff.c
 --- src/diffviewer/ydiff.c.orig
 +++ src/diffviewer/ydiff.c
-@@ -823,7 +823,7 @@ dff_execute (const char *args, const char *extra, cons
+@@ -821,7 +821,7 @@ dff_execute (const char *args, const char *extra, cons
      /* escape potential $ to avoid shell variable substitutions in popen() */
-     file1_esc = strutils_shell_escape (file1);
+     file1_esc = str_shell_escape (file1);
-     file2_esc = strutils_shell_escape (file2);
+     file2_esc = str_shell_escape (file2);
 -    cmd = g_strdup_printf ("diff %s %s %s %s %s", args, extra, opt, file1_esc, file2_esc);
 +    cmd = g_strdup_printf ("gdiff %s %s %s %s %s", args, extra, opt, file1_esc, file2_esc);
      g_free (file1_esc);

misc/mc/patches/patch-src_subshell_common_c

@@ -1,41 +0,0 @@
-Index: src/subshell/common.c
---- src/subshell/common.c.orig
-+++ src/subshell/common.c
-@@ -380,6 +380,21 @@ init_subshell_child (const char *pty_name)
-         }
-         break;
- 
-+    case SHELL_KSH:
-+        /* Do we have a custom init file ~/.local/share/mc/kshrc? */
-+        init_file = mc_config_get_full_path (MC_KSHRC_FILE);
-+
-+        /* Otherwise use ~/.kshrc */
-+        if (!exist_file (init_file))
-+        {
-+            g_free (init_file);
-+            init_file = g_strdup (".kshrc");
-+        }
-+
-+        /* Put init file to ENV variable used by ksh */
-+        g_setenv ("ENV", init_file, TRUE);
-+        break;
-+
-         /* TODO: Find a way to pass initfile to TCSH and FISH */
-     case SHELL_TCSH:
-     case SHELL_FISH:
-@@ -429,6 +444,7 @@ init_subshell_child (const char *pty_name)
- 
-     case SHELL_ASH_BUSYBOX:
-     case SHELL_DASH:
-+    case SHELL_KSH:
-     case SHELL_TCSH:
-     case SHELL_FISH:
-         execl (mc_global.shell->path, mc_global.shell->path, (char *) NULL);
-@@ -1136,6 +1152,7 @@ init_subshell_precmd (char *precmd, size_t buff_size)
-          * "PRECMD=precmd; "
-          * "PS1='$($PRECMD)$ '\n",
-          */
-+    case SHELL_KSH:
-         g_snprintf (precmd, buff_size,
-                     "precmd() { "
-                     "if [ ! \"${PWD##$HOME}\" ]; then "

misc/mc/pkg/PLIST

@@ -36,6 +36,7 @@ libexec/mc/extfs.d/patchsetfs
 libexec/mc/extfs.d/rpm
 libexec/mc/extfs.d/rpms+
 libexec/mc/extfs.d/s3+
+libexec/mc/extfs.d/torrent
 libexec/mc/extfs.d/trpm
 libexec/mc/extfs.d/u7z
 libexec/mc/extfs.d/uace
@@ -84,6 +85,7 @@ man/it/
 man/it/man1/
 @man man/it/man1/mc.1
 @man man/man1/mc.1
+@man man/man1/mcdiff.1
 @man man/man1/mcedit.1
 @man man/man1/mcview.1
 man/pl/
@@ -102,15 +104,16 @@ share/examples/mc/edit.indent.rc
 share/examples/mc/filehighlight.ini
 @sample ${SYSCONFDIR}/mc/filehighlight.ini
 share/examples/mc/mc.default.keymap
-@sample ${SYSCONFDIR}/mc/mc.default.keymap
+@sample ${SYSCONFDIR}/mc/mc.keymap
 share/examples/mc/mc.emacs.keymap
 @sample ${SYSCONFDIR}/mc/mc.emacs.keymap
 share/examples/mc/mc.ext.ini
 @sample ${SYSCONFDIR}/mc/mc.ext.ini
 share/examples/mc/mc.keymap
-@sample ${SYSCONFDIR}/mc/mc.keymap
 share/examples/mc/mc.menu
 @sample ${SYSCONFDIR}/mc/mc.menu
+share/examples/mc/mc.vim.keymap
+@sample ${SYSCONFDIR}/mc/mc.vim.keymap
 share/examples/mc/mcedit.menu
 @sample ${SYSCONFDIR}/mc/mcedit.menu
 share/examples/mc/sfs.ini
@@ -261,14 +264,23 @@ share/mc/skins/gotar.ini
 share/mc/skins/gray-green-purple256.ini
 share/mc/skins/gray-orange-blue256.ini
 share/mc/skins/julia256.ini
+share/mc/skins/julia256root.ini
 share/mc/skins/mc46.ini
+share/mc/skins/modarcon16-defbg-thin.ini
 share/mc/skins/modarcon16-defbg.ini
+share/mc/skins/modarcon16-thin.ini
 share/mc/skins/modarcon16.ini
+share/mc/skins/modarcon16root-defbg-thin.ini
 share/mc/skins/modarcon16root-defbg.ini
+share/mc/skins/modarcon16root-thin.ini
 share/mc/skins/modarcon16root.ini
+share/mc/skins/modarin256-defbg-thin.ini
 share/mc/skins/modarin256-defbg.ini
+share/mc/skins/modarin256-thin.ini
 share/mc/skins/modarin256.ini
+share/mc/skins/modarin256root-defbg-thin.ini
 share/mc/skins/modarin256root-defbg.ini
+share/mc/skins/modarin256root-thin.ini
 share/mc/skins/modarin256root.ini
 share/mc/skins/nicedark.ini
 share/mc/skins/sand256.ini
@@ -276,7 +288,9 @@ share/mc/skins/seasons-autumn16M.ini
 share/mc/skins/seasons-spring16M.ini
 share/mc/skins/seasons-summer16M.ini
 share/mc/skins/seasons-winter16M.ini
+share/mc/skins/xoria256-thin.ini
 share/mc/skins/xoria256.ini
+share/mc/skins/xoria256root-thin.ini
 share/mc/skins/yadt256-defbg.ini
 share/mc/skins/yadt256.ini
 share/mc/syntax/