- Update to 4.7.5

- Obey WITHOUT_X11

PR:		154154
Submitted by:	Dima Panov
Feature safe:	yes

4 files changed, 33 insertions, 89 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 6ca15ce36e1c..073e3890a5c8 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mc
-PORTVERSION=	4.7.4
-PORTREVISION=	3
+PORTVERSION=	4.7.5
 CATEGORIES=	misc shells
 MASTER_SITES=	http://www.midnight-commander.org/downloads/ \
 		${MASTER_SITE_SUNSITE}
@@ -66,7 +65,7 @@ PLIST_SUB+=	NLS=""
 _MANLANG=	es hu it pl ru sr
 .endif
 
-.if !defined(WITH_X11) || defined(MINIMAL)
+.if !defined(WITH_X11) || (defined(WITHOUT_X11) || defined(MINIMAL))
 CONFIGURE_ARGS+=--without-x
 .else
 USE_XORG=	x11 xext
diff --git a/misc/mc/distinfo b/misc/mc/distinfo
index d0010b6236c1..c04b5ce3915b 100644
--- a/misc/mc/distinfo
+++ b/misc/mc/distinfo
@@ -1,3 +1,2 @@
-MD5 (mc-4.7.4.tar.lzma) = 9932eaef64b7501c01f06faa888e8998
-SHA256 (mc-4.7.4.tar.lzma) = 41140edb4effbfd5a86d241acd7a76a21c8ba26db99eab7b07a1ff69169dabf4
-SIZE (mc-4.7.4.tar.lzma) = 2070397
+SHA256 (mc-4.7.5.tar.lzma) = 5e5893e9484e4854a29fa422834e79c9ef007c1672136331ef28bdddbfc1c457
+SIZE (mc-4.7.5.tar.lzma) = 1922463
diff --git a/misc/mc/files/patch-src-dialog.c b/misc/mc/files/patch-src-dialog.c
deleted file mode 100644
index 55d276ee66e9..000000000000
--- a/misc/mc/files/patch-src-dialog.c
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/dialog.c.orig	2010-10-20 20:19:09.000000000 +0700
-+++ src/dialog.c	2010-10-20 20:23:32.000000000 +0700
-@@ -110,6 +110,9 @@
- {
-     int space;
- 
-+    if (h->state != DLG_ACTIVE)
-+        return;
-+
-     space = (h->flags & DLG_COMPACT) ? 0 : 1;
- 
-     tty_setcolor (DLG_NORMALC (h));
-@@ -317,7 +320,7 @@
- void
- dlg_erase (Dlg_head * h)
- {
--    if (h != NULL)
-+    if (h != NULL && h->state == DLG_ACTIVE)
-         tty_fill_region (h->y, h->x, h->lines, h->cols, ' ');
- }
- 
-@@ -458,7 +461,7 @@
- {
-     /* cannot focus disabled widget ... */
- 
--    if (h->current != NULL)
-+    if (h->current != NULL && h->state == DLG_ACTIVE)
-     {
-         Widget *current = (Widget *) h->current->data;
- 
-@@ -478,7 +481,7 @@
- {
-     /* ... but can unfocus disabled widget */
- 
--    if (h->current != NULL)
-+    if (h->current != NULL && h->state == DLG_ACTIVE)
-     {
-         Widget *current = (Widget *) h->current->data;
- 
-@@ -649,7 +652,7 @@
- {
-     GList *p = h->current;
- 
--    if (p != NULL)
-+    if (p != NULL && h->state == DLG_ACTIVE)
-     {
-         Widget *w;
- 
-@@ -683,6 +686,9 @@
- void
- dlg_redraw (Dlg_head * h)
- {
-+    if (h->state != DLG_ACTIVE)
-+        return;
-+
-     if (h->winch_pending)
-     {
-         h->winch_pending = FALSE;
diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist
index 288e9cf1a730..4650f8d1194b 100644
--- a/misc/mc/pkg-plist
+++ b/misc/mc/pkg-plist
@@ -1,19 +1,15 @@
 bin/mc
 bin/mcdiff
 %%EDITOR%%bin/mcedit
-bin/mcmfmt
 bin/mcview
-%%EDITOR%%etc/mc/Syntax
 etc/mc/cedit.menu
 %%EDITOR%%etc/mc/edit.indent.rc
 %%EDITOR%%etc/mc/edit.spell.rc
 etc/mc/filehighlight.ini
-%%CHARSETS%%etc/mc/mc.charsets
 etc/mc/mc.ext
 etc/mc/mc.keymap
 etc/mc/mc.keymap.default
 etc/mc/mc.keymap.emacs
-etc/mc/mc.lib
 etc/mc/mc.menu
 etc/mc/mc.menu.sr
 etc/mc/sfs.ini
@@ -70,7 +66,6 @@ libexec/mc/mc.csh
 libexec/mc/mc.sh
 %%NLS%%share/locale/az/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/be/LC_MESSAGES/mc.mo
-%%NLS%%share/locale/be@tarask/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/mc.mo
@@ -80,11 +75,14 @@ libexec/mc/mc.sh
 %%NLS%%share/locale/es/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/fi_FI/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/id/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/it/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/mc.mo
@@ -107,24 +105,26 @@ 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%%/mc.hint
-%%NLS%%%%DATADIR%%/mc.hint.cs
-%%NLS%%%%DATADIR%%/mc.hint.es
-%%NLS%%%%DATADIR%%/mc.hint.hu
-%%NLS%%%%DATADIR%%/mc.hint.it
-%%NLS%%%%DATADIR%%/mc.hint.nl
-%%NLS%%%%DATADIR%%/mc.hint.pl
-%%NLS%%%%DATADIR%%/mc.hint.ru
-%%NLS%%%%DATADIR%%/mc.hint.sr
-%%NLS%%%%DATADIR%%/mc.hint.uk
-%%NLS%%%%DATADIR%%/mc.hint.zh
-%%DATADIR%%/mc.hlp
-%%NLS%%%%DATADIR%%/mc.hlp.es
-%%NLS%%%%DATADIR%%/mc.hlp.hu
-%%NLS%%%%DATADIR%%/mc.hlp.it
-%%NLS%%%%DATADIR%%/mc.hlp.pl
-%%NLS%%%%DATADIR%%/mc.hlp.ru
-%%NLS%%%%DATADIR%%/mc.hlp.sr
+%%DATADIR%%/help/mc.hlp
+%%NLS%%%%DATADIR%%/help/mc.hlp.es
+%%NLS%%%%DATADIR%%/help/mc.hlp.hu
+%%NLS%%%%DATADIR%%/help/mc.hlp.it
+%%NLS%%%%DATADIR%%/help/mc.hlp.pl
+%%NLS%%%%DATADIR%%/help/mc.hlp.ru
+%%NLS%%%%DATADIR%%/help/mc.hlp.sr
+%%DATADIR%%/hints/mc.hint
+%%NLS%%%%DATADIR%%/hints/mc.hint.cs
+%%NLS%%%%DATADIR%%/hints/mc.hint.es
+%%NLS%%%%DATADIR%%/hints/mc.hint.hu
+%%NLS%%%%DATADIR%%/hints/mc.hint.it
+%%NLS%%%%DATADIR%%/hints/mc.hint.nl
+%%NLS%%%%DATADIR%%/hints/mc.hint.pl
+%%NLS%%%%DATADIR%%/hints/mc.hint.ru
+%%NLS%%%%DATADIR%%/hints/mc.hint.sr
+%%NLS%%%%DATADIR%%/hints/mc.hint.uk
+%%NLS%%%%DATADIR%%/hints/mc.hint.zh
+%%CHARSETS%%%%DATADIR%%/mc.charsets
+%%DATADIR%%/mc.lib
 %%DATADIR%%/skins/darkfar.ini
 %%DATADIR%%/skins/default.ini
 %%DATADIR%%/skins/double-lines.ini
@@ -132,6 +132,7 @@ libexec/mc/mc.sh
 %%DATADIR%%/skins/gotar.ini
 %%DATADIR%%/skins/nicedark.ini
 %%EDITOR%%%%DATADIR%%/syntax/PKGBUILD.syntax
+%%EDITOR%%%%DATADIR%%/syntax/Syntax
 %%EDITOR%%%%DATADIR%%/syntax/ada95.syntax
 %%EDITOR%%%%DATADIR%%/syntax/aspx.syntax
 %%EDITOR%%%%DATADIR%%/syntax/assembler.syntax
@@ -142,6 +143,7 @@ libexec/mc/mc.sh
 %%EDITOR%%%%DATADIR%%/syntax/cs.syntax
 %%EDITOR%%%%DATADIR%%/syntax/css.syntax
 %%EDITOR%%%%DATADIR%%/syntax/cxx.syntax
+%%EDITOR%%%%DATADIR%%/syntax/cython.syntax
 %%EDITOR%%%%DATADIR%%/syntax/d.syntax
 %%EDITOR%%%%DATADIR%%/syntax/debian-changelog.syntax
 %%EDITOR%%%%DATADIR%%/syntax/debian-control.syntax
@@ -202,9 +204,11 @@ libexec/mc/mc.sh
 %%EDITOR%%%%DATADIR%%/syntax/yxx.syntax
 %%EDITOR%%@dirrm %%DATADIR%%/syntax
 @dirrm %%DATADIR%%/skins
+@dirrm %%DATADIR%%/hints
+@dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%
-%%NLS%%@dirrm share/locale/be@tarask/LC_MESSAGES
-%%NLS%%@dirrm share/locale/be@tarask
+%%NLS%%@dirrm share/locale/fi_FI/LC_MESSAGES
+%%NLS%%@dirrm share/locale/fi_FI
 @dirrm libexec/mc/fish
 @dirrm libexec/mc/extfs.d
 @dirrm libexec/mc