misc/mc: update Midnight Commander to version 4.8.31

- Added support for LZO(P) compressed files (via external program)
- Support for native FISH server and protocol had been dropped;
  VFS renamed to generic ``shell''
- Add missing run-time dependency on English dictionary, otherwise
  on every launch, the editor would greet the user with ``No word
  lists can be found for the language "en"'' error message
- Disable Aspell support by default again as it turned out to be
  not just a build dependency
- Do not pass $(E2P_CFLAGS) to ``src/vfs/local/Makefile.in'' now
  that the build issue had been fixed upstream
- Install manpages under ${PREFIX}/share/man, per new world order

PR:		276424 (editor nagging)
Reported by:	portscout (new version)

3 files changed, 33 insertions, 34 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index b6e0f887b391..06c035f5988b 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mc
-PORTVERSION=	4.8.30
-PORTREVISION=	1
+PORTVERSION=	4.8.31
 CATEGORIES=	misc shells
 MASTER_SITES=	http://ftp.midnight-commander.org/ \
 		https://ftp.osuosl.org/pub/midnightcommander/
@@ -25,12 +24,13 @@ SHEBANG_FILES=	${WRKSRC}/src/vfs/extfs/helpers/s3+.in \
 python_OLD_CMD=	@PYTHON@
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	ZIP=${LOCALBASE}/bin/zip UNZIP=${UNZIP_NATIVE_CMD}
 
-PORTDOCS=	AUTHORS FAQ HACKING MAINTAINERS NEWS README *.txt
+PORTDOCS=	AUTHORS FAQ HACKING MAINTAINERS NEWS README TODO
 
 OPTIONS_DEFINE=	ASPELL DOCS EDITOR EXTATTR ICONV NLS PCRE2 SFTP SUBSHELL X11
-OPTIONS_DEFAULT=	ASPELL EDITOR ICONV SFTP SLANG SUBSHELL X11
+OPTIONS_DEFAULT=	EDITOR ICONV SFTP SLANG SUBSHELL X11
 OPTIONS_SINGLE=	SCREEN
 OPTIONS_SINGLE_SCREEN=	SLANG NCURSES
 OPTIONS_SUB=	yes
@@ -45,6 +45,7 @@ SUBSHELL_DESC=	Build with subshell support
 X11_DESC=	X11 events support (if available)
 
 ASPELL_BUILD_DEPENDS=	${LOCALBASE}/include/aspell.h:textproc/aspell
+ASPELL_RUN_DEPENDS=	${LOCALBASE}/share/aspell/en.multi:textproc/en-aspell
 ASPELL_CONFIGURE_ENABLE=aspell
 
 EDITOR_CONFIGURE_WITH=	internal-edit
@@ -80,8 +81,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|clang\*)|*)|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|x$$UNRAR_VERSION.*x|$$UNRAR_VERSION -ge |' \
 		${WRKSRC}/src/vfs/extfs/helpers/urar.in
-	@${REINPLACE_CMD} -e '/^AM_CPPFLAGS = /s|CFLAGS)|& $$(E2P_&|' \
-		${WRKSRC}/src/vfs/local/Makefile.in
 
 post-patch-EXTATTR-off:
 	@${REINPLACE_CMD} -e '/found_e2p=/s|yes|disabled|; /e2p library/ \
diff --git a/misc/mc/distinfo b/misc/mc/distinfo
index f70d7fc6a3da..820fc65d4bc0 100644
--- a/misc/mc/distinfo
+++ b/misc/mc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691954087
-SHA256 (mc-4.8.30.tar.xz) = 5ebc3cb2144b970c5149fda556c4ad50b78780494696cdf2d14a53204c95c7df
-SIZE (mc-4.8.30.tar.xz) = 2380824
+TIMESTAMP = 1706345345
+SHA256 (mc-4.8.31.tar.xz) = 24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a
+SIZE (mc-4.8.31.tar.xz) = 2385632
diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist
index affdcb2a975d..f97ce738cc0a 100644
--- a/misc/mc/pkg-plist
+++ b/misc/mc/pkg-plist
@@ -58,35 +58,26 @@ libexec/mc/extfs.d/urar
 libexec/mc/extfs.d/uwim
 libexec/mc/extfs.d/uzip
 libexec/mc/extfs.d/uzoo
-libexec/mc/fish/README.fish
-libexec/mc/fish/append
-libexec/mc/fish/chmod
-libexec/mc/fish/chown
-libexec/mc/fish/fexists
-libexec/mc/fish/get
-libexec/mc/fish/hardlink
-libexec/mc/fish/info
-libexec/mc/fish/ln
-libexec/mc/fish/ls
-libexec/mc/fish/mkdir
-libexec/mc/fish/mv
-libexec/mc/fish/rmdir
-libexec/mc/fish/send
-libexec/mc/fish/unlink
-libexec/mc/fish/utime
 libexec/mc/mc-wrapper.csh
 libexec/mc/mc-wrapper.sh
 libexec/mc/mc.csh
 libexec/mc/mc.sh
-%%NLS%%man/es/man1/mc.1.gz
-%%NLS%%man/hu/man1/mc.1.gz
-%%NLS%%man/it/man1/mc.1.gz
-man/man1/mc.1.gz
-man/man1/mcedit.1.gz
-man/man1/mcview.1.gz
-%%NLS%%man/pl/man1/mc.1.gz
-%%NLS%%man/ru/man1/mc.1.gz
-%%NLS%%man/sr/man1/mc.1.gz
+libexec/mc/shell/README.shell
+libexec/mc/shell/append
+libexec/mc/shell/chmod
+libexec/mc/shell/chown
+libexec/mc/shell/fexists
+libexec/mc/shell/get
+libexec/mc/shell/hardlink
+libexec/mc/shell/info
+libexec/mc/shell/ln
+libexec/mc/shell/ls
+libexec/mc/shell/mkdir
+libexec/mc/shell/mv
+libexec/mc/shell/rmdir
+libexec/mc/shell/send
+libexec/mc/shell/unlink
+libexec/mc/shell/utime
 %%X11%%share/applications/mc.desktop
 %%NLS%%share/locale/af/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/mc.mo
@@ -148,6 +139,15 @@ man/man1/mcview.1.gz
 %%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
+%%NLS%%share/man/es/man1/mc.1.gz
+%%NLS%%share/man/hu/man1/mc.1.gz
+%%NLS%%share/man/it/man1/mc.1.gz
+share/man/man1/mc.1.gz
+share/man/man1/mcedit.1.gz
+share/man/man1/mcview.1.gz
+%%NLS%%share/man/pl/man1/mc.1.gz
+%%NLS%%share/man/ru/man1/mc.1.gz
+%%NLS%%share/man/sr/man1/mc.1.gz
 %%DATADIR%%/examples/macros.d/macro.0.sh
 %%DATADIR%%/examples/macros.d/macro.1.sh
 %%DATADIR%%/examples/macros.d/macro.3.sh