Update to 4.8.1.1

PR:		166650
Submitted by:	Svyatoslav Lempert
Feature safe:	yes

4 files changed, 27 insertions, 15 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index f23bd29a0ea3..52a3481c9392 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mc
-PORTVERSION=	4.7.5.6
+PORTVERSION=	4.8.1.1
 PORTREVISION=	0
 CATEGORIES=	misc shells
 MASTER_SITES=	http://www.midnight-commander.org/downloads/ \
diff --git a/misc/mc/distinfo b/misc/mc/distinfo
index 71df53b4962b..2ccb664f795e 100644
--- a/misc/mc/distinfo
+++ b/misc/mc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mc-4.7.5.6.tar.xz) = 8fc20859eac824b062fb2862429579b75cdbfb8d9011f1a7793d516550af4ffd
-SIZE (mc-4.7.5.6.tar.xz) = 1995148
+SHA256 (mc-4.8.1.1.tar.xz) = 94d307bfd979ed62bdf14f2bab8ca97327526bdd27a9d4bc5c810889e89e85e2
+SIZE (mc-4.8.1.1.tar.xz) = 2012644
diff --git a/misc/mc/files/patch-lib-tty-win.c b/misc/mc/files/patch-lib-tty-win.c
index c759ff135d19..be9b4631d64f 100644
--- a/misc/mc/files/patch-lib-tty-win.c
+++ b/misc/mc/files/patch-lib-tty-win.c
@@ -1,20 +1,20 @@
---- lib/tty/win.c.orig	2011-12-02 18:59:45.000000000 +0700
-+++ lib/tty/win.c	2011-12-02 19:00:11.000000000 +0700
-@@ -98,7 +98,7 @@
+--- lib/tty/win.c.old	2012-04-05 02:20:57.000000000 +0900
++++ lib/tty/win.c	2012-04-05 02:24:53.000000000 +0900
+@@ -96,7 +96,7 @@
  void
  do_enter_ca_mode (void)
  {
--    if (xterm_flag && smcup != NULL)
-+    if (xterm_flag)
+-    if (mc_global.tty.xterm_flag && smcup != NULL)
++    if (mc_global.tty.xterm_flag)
      {
          fprintf (stdout, /* ESC_STR ")0" */ ESC_STR "7" ESC_STR "[?47h");
          fflush (stdout);
-@@ -110,7 +110,7 @@
+@@ -108,7 +108,7 @@
  void
  do_exit_ca_mode (void)
  {
--    if (xterm_flag && rmcup != NULL)
-+    if (xterm_flag)
+-    if (mc_global.tty.xterm_flag && rmcup != NULL)
++    if (mc_global.tty.xterm_flag)
      {
          fprintf (stdout, ESC_STR "[?47l" ESC_STR "8" ESC_STR "[m");
          fflush (stdout);
diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist
index 4efc80b65838..e0a94b04c374 100644
--- a/misc/mc/pkg-plist
+++ b/misc/mc/pkg-plist
@@ -2,7 +2,6 @@ bin/mc
 bin/mcdiff
 %%EDITOR%%bin/mcedit
 bin/mcview
-etc/mc/cedit.menu
 %%EDITOR%%etc/mc/edit.indent.rc
 %%EDITOR%%etc/mc/edit.spell.rc
 etc/mc/filehighlight.ini
@@ -12,6 +11,7 @@ etc/mc/mc.keymap.default
 etc/mc/mc.keymap.emacs
 etc/mc/mc.menu
 etc/mc/mc.menu.sr
+etc/mc/mcedit.menu
 etc/mc/sfs.ini
 libexec/mc/extfs.d/README
 libexec/mc/extfs.d/README.extfs
@@ -19,15 +19,18 @@ libexec/mc/extfs.d/a+
 libexec/mc/extfs.d/apt+
 libexec/mc/extfs.d/audio
 libexec/mc/extfs.d/bpp
+libexec/mc/extfs.d/changesetfs
 libexec/mc/extfs.d/deb
 libexec/mc/extfs.d/deba
 libexec/mc/extfs.d/debd
 libexec/mc/extfs.d/dpkg+
+libexec/mc/extfs.d/gitfs+
 libexec/mc/extfs.d/hp48+
 libexec/mc/extfs.d/iso9660
 libexec/mc/extfs.d/lslR
 libexec/mc/extfs.d/mailfs
 libexec/mc/extfs.d/patchfs
+libexec/mc/extfs.d/patchsetfs
 libexec/mc/extfs.d/rpm
 libexec/mc/extfs.d/rpms+
 libexec/mc/extfs.d/s3+
@@ -72,7 +75,6 @@ libexec/mc/mc.sh
 %%NLS%%share/locale/cs/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/da/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/de/LC_MESSAGES/mc.mo
-%%NLS%%share/locale/de_CH/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
@@ -111,6 +113,13 @@ libexec/mc/mc.sh
 %%NLS%%share/locale/wa/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/mc.mo
+%%DATADIR%%/examples/macros.d/macro.0.sh
+%%DATADIR%%/examples/macros.d/macro.1.sh
+%%DATADIR%%/examples/macros.d/macro.3.sh
+%%DATADIR%%/examples/macros.d/macro.4.sh
+%%DATADIR%%/examples/macros.d/macro.5.sh
+%%DATADIR%%/examples/macros.d/macro.6.sh
+%%DATADIR%%/examples/macros.d/macro.7.sh
 %%DATADIR%%/help/mc.hlp
 %%NLS%%%%DATADIR%%/help/mc.hlp.es
 %%NLS%%%%DATADIR%%/help/mc.hlp.hu
@@ -139,9 +148,12 @@ libexec/mc/mc.sh
 %%DATADIR%%/skins/gotar.ini
 %%DATADIR%%/skins/mc46.ini
 %%DATADIR%%/skins/nicedark.ini
+%%DATADIR%%/skins/sand256.ini
+%%DATADIR%%/skins/xoria256.ini
 %%EDITOR%%%%DATADIR%%/syntax/PKGBUILD.syntax
 %%EDITOR%%%%DATADIR%%/syntax/Syntax
 %%EDITOR%%%%DATADIR%%/syntax/ada95.syntax
+%%EDITOR%%%%DATADIR%%/syntax/as.syntax
 %%EDITOR%%%%DATADIR%%/syntax/aspx.syntax
 %%EDITOR%%%%DATADIR%%/syntax/assembler.syntax
 %%EDITOR%%%%DATADIR%%/syntax/awk.syntax
@@ -214,6 +226,8 @@ libexec/mc/mc.sh
 @dirrm %%DATADIR%%/skins
 @dirrm %%DATADIR%%/hints
 @dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%/examples/macros.d
+@dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%
 %%NLS%%@dirrmtry share/locale/sv_SE/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/sv_SE
@@ -223,8 +237,6 @@ libexec/mc/mc.sh
 %%NLS%%@dirrmtry share/locale/ia
 %%NLS%%@dirrmtry share/locale/fi_FI/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/fi_FI
-%%NLS%%@dirrmtry share/locale/de_CH/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de_CH
 @dirrm libexec/mc/fish
 @dirrm libexec/mc/extfs.d
 @dirrm libexec/mc