5 files changed, 42 insertions, 61 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index d4910fdc8288..7578ee2515ad 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mc
-PORTVERSION=	4.7.0.2
-PORTREVISION=	2
+PORTVERSION=	4.7.2
+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 5c28c779541c..ab7bfccfe5bb 100644
--- a/misc/mc/distinfo
+++ b/misc/mc/distinfo
@@ -1,3 +1,3 @@
-MD5 (mc-4.7.0.2.tar.bz2) = 4618626cacd3481e39719a4571c1b5be
-SHA256 (mc-4.7.0.2.tar.bz2) = 6f23757e1911f6e0e84ce41e53a09b2315576c57c564fccd0b783c4dd5756eb3
-SIZE (mc-4.7.0.2.tar.bz2) = 2809115
+MD5 (mc-4.7.2.tar.bz2) = 82d0f923f686e462eeb739760f8c45bd
+SHA256 (mc-4.7.2.tar.bz2) = 804f3a789ca66cbd82f971588896b603191a738f27b9532355276ae6e4995c0e
+SIZE (mc-4.7.2.tar.bz2) = 2876328
diff --git a/misc/mc/files/patch-lib-util.c b/misc/mc/files/patch-lib-util.c
deleted file mode 100644
index 0f62cfd8e638..000000000000
--- a/misc/mc/files/patch-lib-util.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/util.c.orig	2010-02-11 01:25:48.000000000 +0600
-+++ lib/util.c	2010-02-11 01:26:03.000000000 +0600
-@@ -50,6 +50,7 @@
- #include "lib/strutil.h"
- 
- #include "src/file.h"		/* copy_file_file() */
-+#include "src/main.h"		/* eight_bit_clean */
- 
- /*In order to use everywhere the same setup 
-   for the locale we use defines               */
diff --git a/misc/mc/files/patch-src-subshell.c b/misc/mc/files/patch-src-subshell.c
deleted file mode 100644
index bfe50b284abe..000000000000
--- a/misc/mc/files/patch-src-subshell.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/subshell.c.orig	2010-02-06 15:34:55.000000000 +0600
-+++ src/subshell.c	2010-02-06 15:35:52.000000000 +0600
-@@ -948,7 +948,7 @@
-     wptr = fail_on_error ? &wtime : NULL;
- 
-     while (1) {
--	if (!subshell_alive)
-+	if (!subshell_alive || !pty_buffer)
- 	    return FALSE;
- 
- 	/* Prepare the file-descriptor set and call `select' */
diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist
index c24c96b47a96..e9030c8f1104 100644
--- a/misc/mc/pkg-plist
+++ b/misc/mc/pkg-plist
@@ -1,4 +1,5 @@
 bin/mc
+bin/mcdiff
 %%EDITOR%%bin/mcedit
 bin/mcmfmt
 bin/mcview
@@ -6,8 +7,6 @@ bin/mcview
 etc/mc/cedit.menu
 %%EDITOR%%etc/mc/edit.indent.rc
 %%EDITOR%%etc/mc/edit.spell.rc
-etc/mc/extfs/extfs.ini
-etc/mc/extfs/sfs.ini
 etc/mc/filehighlight.ini
 %%CHARSETS%%etc/mc/mc.charsets
 etc/mc/mc.ext
@@ -17,6 +16,39 @@ etc/mc/mc.keymap.emacs
 etc/mc/mc.lib
 etc/mc/mc.menu
 etc/mc/mc.menu.sr
+etc/mc/sfs.ini
+libexec/mc/extfs.d/README
+libexec/mc/extfs.d/README.extfs
+libexec/mc/extfs.d/a+
+libexec/mc/extfs.d/apt+
+libexec/mc/extfs.d/audio
+libexec/mc/extfs.d/bpp
+libexec/mc/extfs.d/deb
+libexec/mc/extfs.d/deba
+libexec/mc/extfs.d/debd
+libexec/mc/extfs.d/dpkg+
+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/rpm
+libexec/mc/extfs.d/rpms+
+libexec/mc/extfs.d/s3+
+libexec/mc/extfs.d/trpm
+libexec/mc/extfs.d/u7z
+libexec/mc/extfs.d/uace
+libexec/mc/extfs.d/ualz
+libexec/mc/extfs.d/uar
+libexec/mc/extfs.d/uarc
+libexec/mc/extfs.d/uarj
+libexec/mc/extfs.d/uc1541
+libexec/mc/extfs.d/ucab
+libexec/mc/extfs.d/uha
+libexec/mc/extfs.d/ulha
+libexec/mc/extfs.d/urar
+libexec/mc/extfs.d/uzip
+libexec/mc/extfs.d/uzoo
 libexec/mc/mc-wrapper.csh
 libexec/mc/mc-wrapper.sh
 libexec/mc/mc.csh
@@ -59,37 +91,6 @@ 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%%/extfs/README
-%%DATADIR%%/extfs/a
-%%DATADIR%%/extfs/apt
-%%DATADIR%%/extfs/audio
-%%DATADIR%%/extfs/bpp
-%%DATADIR%%/extfs/deb
-%%DATADIR%%/extfs/deba
-%%DATADIR%%/extfs/debd
-%%DATADIR%%/extfs/dpkg
-%%DATADIR%%/extfs/hp48
-%%DATADIR%%/extfs/iso9660
-%%DATADIR%%/extfs/lslR
-%%DATADIR%%/extfs/mailfs
-%%DATADIR%%/extfs/patchfs
-%%DATADIR%%/extfs/rpm
-%%DATADIR%%/extfs/rpms
-%%DATADIR%%/extfs/s3
-%%DATADIR%%/extfs/trpm
-%%DATADIR%%/extfs/u7z
-%%DATADIR%%/extfs/uace
-%%DATADIR%%/extfs/ualz
-%%DATADIR%%/extfs/uar
-%%DATADIR%%/extfs/uarc
-%%DATADIR%%/extfs/uarj
-%%DATADIR%%/extfs/uc1541
-%%DATADIR%%/extfs/ucab
-%%DATADIR%%/extfs/uha
-%%DATADIR%%/extfs/ulha
-%%DATADIR%%/extfs/urar
-%%DATADIR%%/extfs/uzip
-%%DATADIR%%/extfs/uzoo
 %%DATADIR%%/mc.hint
 %%NLS%%%%DATADIR%%/mc.hint.cs
 %%NLS%%%%DATADIR%%/mc.hint.es
@@ -113,6 +114,7 @@ libexec/mc/mc.sh
 %%DATADIR%%/skins/double-lines.ini
 %%DATADIR%%/skins/featured.ini
 %%DATADIR%%/skins/gotar.ini
+%%DATADIR%%/skins/nicedark.ini
 %%EDITOR%%%%DATADIR%%/syntax/PKGBUILD.syntax
 %%EDITOR%%%%DATADIR%%/syntax/ada95.syntax
 %%EDITOR%%%%DATADIR%%/syntax/aspx.syntax
@@ -140,6 +142,7 @@ libexec/mc/mc.sh
 %%EDITOR%%%%DATADIR%%/syntax/haskell.syntax
 %%EDITOR%%%%DATADIR%%/syntax/html.syntax
 %%EDITOR%%%%DATADIR%%/syntax/idl.syntax
+%%EDITOR%%%%DATADIR%%/syntax/ini.syntax
 %%EDITOR%%%%DATADIR%%/syntax/j.syntax
 %%EDITOR%%%%DATADIR%%/syntax/java.syntax
 %%EDITOR%%%%DATADIR%%/syntax/js.syntax
@@ -183,10 +186,9 @@ libexec/mc/mc.sh
 %%EDITOR%%%%DATADIR%%/syntax/yxx.syntax
 %%EDITOR%%@dirrm %%DATADIR%%/syntax
 @dirrm %%DATADIR%%/skins
-@dirrm %%DATADIR%%/extfs
 @dirrm %%DATADIR%%
 %%NLS%%@dirrmtry share/locale/be-tarask/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/be-tarask
+@dirrm libexec/mc/extfs.d
 @dirrm libexec/mc
-@dirrm etc/mc/extfs
 @dirrm etc/mc