misc/mc: update Midnight Commander to version 4.8.30

PR:		273235
Submitted by:	Phil Krylov

3 files changed, 17 insertions, 12 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 09ecdca2fde1..d7f41964a223 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	mc
-PORTVERSION=	4.8.28
+PORTVERSION=	4.8.30
 CATEGORIES=	misc shells
 MASTER_SITES=	http://ftp.midnight-commander.org/ \
 		https://ftp.osuosl.org/pub/midnightcommander/
@@ -28,7 +28,7 @@ CONFIGURE_ENV=	ZIP=${LOCALBASE}/bin/zip UNZIP=${UNZIP_NATIVE_CMD}
 
 PORTDOCS=	AUTHORS FAQ HACKING MAINTAINERS NEWS README *.txt
 
-OPTIONS_DEFINE=	ASPELL DOCS EDITOR EXTATTR ICONV NLS SFTP SUBSHELL X11
+OPTIONS_DEFINE=	ASPELL DOCS EDITOR EXTATTR ICONV NLS PCRE2 SFTP SUBSHELL X11
 OPTIONS_DEFAULT=	EDITOR ICONV SFTP SLANG SUBSHELL X11
 OPTIONS_SINGLE=	SCREEN
 OPTIONS_SINGLE_SCREEN=	SLANG NCURSES
@@ -37,6 +37,7 @@ OPTIONS_SUB=	yes
 ASPELL_DESC=	Aspell support for internal editor
 EDITOR_DESC=	Build with internal text editor
 EXTATTR_DESC=	Extended filesystem attributes support
+PCRE2_DESC=	Use PCRE2 as low-level search engine
 SCREEN_DESC=	Screen library
 SFTP_DESC=	Support for SFTP (via libssh)
 SUBSHELL_DESC=	Build with subshell support
@@ -58,6 +59,9 @@ NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
 NLS_CONFIGURE_OFF=	--disable-nls
 NLS_USES=		gettext
 
+PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
+PCRE2_CONFIGURE_ON=	--with-search-engine=pcre2
+
 SFTP_LIB_DEPENDS=	libssh2.so:security/libssh2
 SFTP_CONFIGURE_ENABLE=	vfs-sftp
 
@@ -74,9 +78,11 @@ X11_VARS=		CONFLICTS_INSTALL=mc-nox11
 X11_VARS_OFF=		CONFLICTS_INSTALL=mc PKGNAMESUFFIX=-nox11
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|clang||' ${WRKSRC}/configure
+	@${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 2dc7035ff76b..f70d7fc6a3da 100644
--- a/misc/mc/distinfo
+++ b/misc/mc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648383492
-SHA256 (mc-4.8.28.tar.xz) = e994d9be9a7172e9ac4a4ad62107921f6aa312e668b056dfe5b8bcebbaf53803
-SIZE (mc-4.8.28.tar.xz) = 2333072
+TIMESTAMP = 1691954087
+SHA256 (mc-4.8.30.tar.xz) = 5ebc3cb2144b970c5149fda556c4ad50b78780494696cdf2d14a53204c95c7df
+SIZE (mc-4.8.30.tar.xz) = 2380824
diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist
index 64b3c353dfe2..affdcb2a975d 100644
--- a/misc/mc/pkg-plist
+++ b/misc/mc/pkg-plist
@@ -6,7 +6,7 @@ bin/mcview
 %%ETCDIR%%/filehighlight.ini
 %%ETCDIR%%/mc.default.keymap
 %%ETCDIR%%/mc.emacs.keymap
-%%ETCDIR%%/mc.ext
+%%ETCDIR%%/mc.ext.ini
 %%ETCDIR%%/mc.keymap
 %%ETCDIR%%/mc.menu
 %%ETCDIR%%/mcedit.menu
@@ -169,7 +169,6 @@ man/man1/mcview.1.gz
 %%NLS%%%%DATADIR%%/hints/mc.hint.cs
 %%NLS%%%%DATADIR%%/hints/mc.hint.da
 %%NLS%%%%DATADIR%%/hints/mc.hint.de
-%%NLS%%%%DATADIR%%/hints/mc.hint.de_CH
 %%NLS%%%%DATADIR%%/hints/mc.hint.el
 %%NLS%%%%DATADIR%%/hints/mc.hint.en_GB
 %%NLS%%%%DATADIR%%/hints/mc.hint.eo
@@ -178,14 +177,13 @@ man/man1/mcview.1.gz
 %%NLS%%%%DATADIR%%/hints/mc.hint.eu
 %%NLS%%%%DATADIR%%/hints/mc.hint.fa
 %%NLS%%%%DATADIR%%/hints/mc.hint.fr
-%%NLS%%%%DATADIR%%/hints/mc.hint.fr_CA
 %%NLS%%%%DATADIR%%/hints/mc.hint.ga
 %%NLS%%%%DATADIR%%/hints/mc.hint.gl
 %%NLS%%%%DATADIR%%/hints/mc.hint.hu
 %%NLS%%%%DATADIR%%/hints/mc.hint.id
 %%NLS%%%%DATADIR%%/hints/mc.hint.it
-%%NLS%%%%DATADIR%%/hints/mc.hint.it_IT
 %%NLS%%%%DATADIR%%/hints/mc.hint.ja
+%%NLS%%%%DATADIR%%/hints/mc.hint.ka
 %%NLS%%%%DATADIR%%/hints/mc.hint.ko
 %%NLS%%%%DATADIR%%/hints/mc.hint.lt
 %%NLS%%%%DATADIR%%/hints/mc.hint.nb
@@ -198,10 +196,8 @@ man/man1/mcview.1.gz
 %%NLS%%%%DATADIR%%/hints/mc.hint.sk
 %%NLS%%%%DATADIR%%/hints/mc.hint.sr
 %%NLS%%%%DATADIR%%/hints/mc.hint.sv
-%%NLS%%%%DATADIR%%/hints/mc.hint.sv_SE
 %%NLS%%%%DATADIR%%/hints/mc.hint.tr
 %%NLS%%%%DATADIR%%/hints/mc.hint.uk
-%%NLS%%%%DATADIR%%/hints/mc.hint.zh
 %%NLS%%%%DATADIR%%/hints/mc.hint.zh_CN
 %%NLS%%%%DATADIR%%/hints/mc.hint.zh_TW
 %%ICONV%%%%DATADIR%%/mc.charsets
@@ -241,6 +237,7 @@ man/man1/mcview.1.gz
 %%EDITOR%%%%DATADIR%%/syntax/aspx.syntax
 %%EDITOR%%%%DATADIR%%/syntax/assembler.syntax
 %%EDITOR%%%%DATADIR%%/syntax/awk.syntax
+%%EDITOR%%%%DATADIR%%/syntax/b.syntax
 %%EDITOR%%%%DATADIR%%/syntax/c.syntax
 %%EDITOR%%%%DATADIR%%/syntax/cabal.syntax
 %%EDITOR%%%%DATADIR%%/syntax/changelog.syntax
@@ -301,6 +298,7 @@ man/man1/mcview.1.gz
 %%EDITOR%%%%DATADIR%%/syntax/php.syntax
 %%EDITOR%%%%DATADIR%%/syntax/po.syntax
 %%EDITOR%%%%DATADIR%%/syntax/povray.syntax
+%%EDITOR%%%%DATADIR%%/syntax/privoxy.syntax
 %%EDITOR%%%%DATADIR%%/syntax/procmail.syntax
 %%EDITOR%%%%DATADIR%%/syntax/properties.syntax
 %%EDITOR%%%%DATADIR%%/syntax/protobuf.syntax
@@ -321,6 +319,7 @@ man/man1/mcview.1.gz
 %%EDITOR%%%%DATADIR%%/syntax/syntax.syntax
 %%EDITOR%%%%DATADIR%%/syntax/tcl.syntax
 %%EDITOR%%%%DATADIR%%/syntax/texinfo.syntax
+%%EDITOR%%%%DATADIR%%/syntax/toml.syntax
 %%EDITOR%%%%DATADIR%%/syntax/ts.syntax
 %%EDITOR%%%%DATADIR%%/syntax/tt.syntax
 %%EDITOR%%%%DATADIR%%/syntax/unknown.syntax