mc: Update to 4.8.23

Version 4.8.23

- Core

  * Modify "File exists" query dialog (#3935):
    * change layout
    * rename "Update" button to "If older"
    * add new "If smaller" button": overwrite file with smaller one
    * add "Don't overwrite with zero length file" checkbox
  * Speed up of large directory structures delete (#3958)
  * Support key binding for menu (#212)

- Editor

  * Expanded syntax highlighting rules (#3975):
    * expanded file name regexp for sh.syntax
    * use ini.syntax for systemd cofiguration files
  * Syntax updates:
    * shell (#3981)
    * ebuild (#3988)
    * RPM spec (#3991)

- Viewer

  * Quick one-off backwards search with N. New action SearchOppositeContinue for key bind (default is shift-n) (#3452)

- Misc

  * Code cleanup (#3955)
  * Use Geeqie (a fork of GQview) as main image viewer, fallback to GQview (#3962)
  * File highlighting updates (#3966)
    * .go, .s: highlight as source
    * .m4v: highlighting as media
  * New skins:
    * featured-plus: featured skin with alternative directory and file select/mark colors (#3973)

- Fixes

  * Compilation fail on AIX (#3960)
  * Incorrect file version sort (#3965, #3905)
  * Garbage in the hardlink error creation message window (#3990)
  * Cannot shell, or FTP, or SFTP link when the file panel is tree, or info, or quick view (#3948)
  * Failed gpm connect attempt ... for vc /dev/tty0 (#3208, #3614)
  * Incorrect include/editor order in mc.ext (#3965)
  * mcedit: incorrect C/C++ syntax highlighting in some cases (#3487)
  * Unknown type name 'sighandler_t' on Illumos (#3971)

6 files changed, 28 insertions, 62 deletions

diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index 45815512ea4..303ca247788 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.115 2019/08/11 13:23:10 wiz Exp $
+# $NetBSD: Makefile,v 1.116 2019/11/20 17:02:14 nia Exp $
 
-DISTNAME=	mc-4.8.22
-PKGREVISION=	1
+DISTNAME=	mc-4.8.23
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.midnight-commander.org/downloads/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	http://ftp.midnight-commander.org/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	cheusov@NetBSD.org
-HOMEPAGE=	http://www.midnight-commander.org/
+HOMEPAGE=	https://www.midnight-commander.org/
 COMMENT=	User-friendly file manager and visual shell
 LICENSE=	gnu-gpl-v2
 
diff --git a/sysutils/mc/PLIST b/sysutils/mc/PLIST
index b0ba0ad09d1..b95bde01f49 100644
--- a/sysutils/mc/PLIST
+++ b/sysutils/mc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2019/01/18 22:28:38 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.18 2019/11/20 17:02:14 nia Exp $
 bin/mc
 bin/mcdiff
 bin/mcedit
@@ -211,6 +211,7 @@ share/mc/skins/dark.ini
 share/mc/skins/darkfar.ini
 share/mc/skins/default.ini
 share/mc/skins/double-lines.ini
+share/mc/skins/featured-plus.ini
 share/mc/skins/featured.ini
 share/mc/skins/gotar.ini
 share/mc/skins/gray-green-purple256.ini
diff --git a/sysutils/mc/distinfo b/sysutils/mc/distinfo
index 67ac8482d10..cf8f3fea137 100644
--- a/sysutils/mc/distinfo
+++ b/sysutils/mc/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.33 2019/01/18 22:28:38 bsiegert Exp $
+$NetBSD: distinfo,v 1.34 2019/11/20 17:02:14 nia Exp $
 
-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 (mc-4.8.23.tar.xz) = 021a33828922b45d18daa23189d6c86d17e61e09
+RMD160 (mc-4.8.23.tar.xz) = 4eda875d4988d1aa353c771e803b3dca9e3dee1a
+SHA512 (mc-4.8.23.tar.xz) = e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6
+Size (mc-4.8.23.tar.xz) = 2552944 bytes
 SHA1 (patch-ac) = d01357b685acd8e863510248ed7519ae2821757f
 SHA1 (patch-ad) = 4484b91511cf5bac73f4ae940988d46239e2cd95
-SHA1 (patch-configure) = 8fdc579fb4d8d4c018488b9b160bb24f9a82aa42
 SHA1 (patch-src_subshell_common.c) = b6d390da68aa0028d21683b1959340e51f67efd6
-SHA1 (patch-src_vfs_extfs_helpers_Makefile.in) = c5d4735ce9548714731fdb1227e1acac78f11332
+SHA1 (patch-src_vfs_sfs_Makefile.in) = 90ce81b0dcf2ef2134884137d86e147219d180ed
diff --git a/sysutils/mc/patches/patch-configure b/sysutils/mc/patches/patch-configure
deleted file mode 100644
index bad37d4b6fe..00000000000
--- a/sysutils/mc/patches/patch-configure
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2017/03/13 09:20:25 wiz Exp $
-
-Fix unportable test(1) operator.
-
---- configure.orig	2017-03-04 17:54:35.000000000 +0000
-+++ configure
-@@ -15719,7 +15719,7 @@ fi
- 
- 
- 
--    if test x$enable_tests == xno; then
-+    if test x$enable_tests = xno; then
-                 tests_msg="no"
-     else
- 
-@@ -15786,7 +15786,7 @@ fi
- $as_echo "$as_me: WARNING: 'Check' testing framework not found. Check your environment" >&2;}
-                 tests_msg="no ('Check' testing framework not found)"
- 
--                                                if test x$enable_tests == xyes; then
-+                                                if test x$enable_tests = xyes; then
-                     as_fn_error $? "You explicitly specified '--enable-tests', but this requirement cannot be met." "$LINENO" 5
-                 fi
- 
-@@ -15798,7 +15798,7 @@ $as_echo "no" >&6; }
- $as_echo "$as_me: WARNING: 'Check' testing framework not found. Check your environment" >&2;}
-                 tests_msg="no ('Check' testing framework not found)"
- 
--                                                if test x$enable_tests == xyes; then
-+                                                if test x$enable_tests = xyes; then
-                     as_fn_error $? "You explicitly specified '--enable-tests', but this requirement cannot be met." "$LINENO" 5
-                 fi
- 
diff --git a/sysutils/mc/patches/patch-src_vfs_extfs_helpers_Makefile.in b/sysutils/mc/patches/patch-src_vfs_extfs_helpers_Makefile.in
deleted file mode 100644
index 72ff3fba318..00000000000
--- a/sysutils/mc/patches/patch-src_vfs_extfs_helpers_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_vfs_extfs_helpers_Makefile.in,v 1.1 2015/08/28 07:47:08 wiz Exp $
-
-Install config file to example directory.
-
---- src/vfs/extfs/helpers/Makefile.in.orig	2015-08-28 07:03:49.000000000 +0000
-+++ src/vfs/extfs/helpers/Makefile.in
-@@ -486,7 +486,7 @@ EXTFS_OUT = \
- 
- @ENABLE_VFS_TRUE@extfs_DATA = $(EXTFS_MISC)
- @ENABLE_VFS_TRUE@extfs_SCRIPTS = $(EXTFS_CONST) $(EXTFS_OUT)
--@ENABLE_VFS_TRUE@extfsconfdir = $(sysconfdir)/@PACKAGE@
-+@ENABLE_VFS_TRUE@extfsconfdir = @datadir@/examples/@PACKAGE@
- @ENABLE_VFS_TRUE@extfsconf_DATA = $(EXTFSCONFFILES)
- EXTRA_DIST = $(EXTFS_MISC) $(EXTFS_CONST) $(EXTFSCONFFILES)
- all: all-am
diff --git a/sysutils/mc/patches/patch-src_vfs_sfs_Makefile.in b/sysutils/mc/patches/patch-src_vfs_sfs_Makefile.in
new file mode 100644
index 00000000000..f1385a23833
--- /dev/null
+++ b/sysutils/mc/patches/patch-src_vfs_sfs_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_vfs_sfs_Makefile.in,v 1.1 2019/11/20 17:02:14 nia Exp $
+
+Install config file to example directory.
+
+--- src/vfs/sfs/Makefile.in.orig	2019-11-20 13:51:35.560921188 +0000
++++ src/vfs/sfs/Makefile.in
+@@ -493,7 +493,7 @@ libvfs_sfs_la_SOURCES = \
+ 	sfs.c sfs.h
+ 
+ SFSCONFFILES = sfs.ini
+-@ENABLE_VFS_SFS_TRUE@sfsconfdir = $(sysconfdir)/@PACKAGE@
++@ENABLE_VFS_SFS_TRUE@sfsconfdir = @datadir@/examples/@PACKAGE@
+ @ENABLE_VFS_SFS_TRUE@sfsconf_DATA = $(SFSCONFFILES)
+ EXTRA_DIST = $(SFSCONFFILES)
+ all: all-am