Date: Wed, 18 Sep 2024 16:40:07 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: bcfcbefc31bf - main - misc/mc: update Midnight Commander to version 4.8.32 Message-ID: <202409181640.48IGe7Ek012269@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=bcfcbefc31bf5205701ab75d02072271ccd6ba9d commit bcfcbefc31bf5205701ab75d02072271ccd6ba9d Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2024-09-18 16:37:38 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2024-09-18 16:37:38 +0000 misc/mc: update Midnight Commander to version 4.8.32 PR: 281057 Reported by: portscout --- misc/mc/Makefile | 10 ++-------- misc/mc/distinfo | 6 +++--- misc/mc/files/extra-patch-src_diffviewer_ydiff.c | 8 ++++---- misc/mc/pkg-plist | 12 ++++++++++++ 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/misc/mc/Makefile b/misc/mc/Makefile index 06c035f5988b..982c6f86900c 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -1,5 +1,5 @@ PORTNAME= mc -PORTVERSION= 4.8.31 +PORTVERSION= 4.8.32 CATEGORIES= misc shells MASTER_SITES= http://ftp.midnight-commander.org/ \ https://ftp.osuosl.org/pub/midnightcommander/ @@ -24,10 +24,9 @@ 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 TODO +PORTDOCS= AUTHORS FAQ HACKING NEWS README TODO OPTIONS_DEFINE= ASPELL DOCS EDITOR EXTATTR ICONV NLS PCRE2 SFTP SUBSHELL X11 OPTIONS_DEFAULT= EDITOR ICONV SFTP SLANG SUBSHELL X11 @@ -77,11 +76,6 @@ SUBSHELL_SUB_FILES= pkg-message X11_BUILD_DEPENDS= ${LOCALBASE}/include/X11/Xlib.h:x11/libX11 X11_CONFIGURE_WITH= x -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 - post-patch-EXTATTR-off: @${REINPLACE_CMD} -e '/found_e2p=/s|yes|disabled|; /e2p library/ \ { s| or|,|; s|)|&, or disabled|; }' ${WRKSRC}/configure diff --git a/misc/mc/distinfo b/misc/mc/distinfo index 820fc65d4bc0..907ef6e65c73 100644 --- a/misc/mc/distinfo +++ b/misc/mc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1706345345 -SHA256 (mc-4.8.31.tar.xz) = 24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a -SIZE (mc-4.8.31.tar.xz) = 2385632 +TIMESTAMP = 1724434629 +SHA256 (mc-4.8.32.tar.xz) = 4ddc83d1ede9af2363b3eab987f54b87cf6619324110ce2d3a0e70944d1359fe +SIZE (mc-4.8.32.tar.xz) = 2385648 diff --git a/misc/mc/files/extra-patch-src_diffviewer_ydiff.c b/misc/mc/files/extra-patch-src_diffviewer_ydiff.c index 988d45e447a5..8e5db73504b7 100644 --- a/misc/mc/files/extra-patch-src_diffviewer_ydiff.c +++ b/misc/mc/files/extra-patch-src_diffviewer_ydiff.c @@ -1,9 +1,9 @@ ---- src/diffviewer/ydiff.c.orig 2017-03-04 20:51:38 UTC +--- src/diffviewer/ydiff.c.orig 2024-08-08 07:49:18 UTC +++ src/diffviewer/ydiff.c -@@ -816,7 +816,7 @@ dff_execute (const char *args, const char *extra, cons +@@ -821,7 +821,7 @@ dff_execute (const char *args, const char *extra, cons /* escape potential $ to avoid shell variable substitutions in popen() */ - file1_esc = strutils_shell_escape (file1); - file2_esc = strutils_shell_escape (file2); + file1_esc = str_shell_escape (file1); + file2_esc = str_shell_escape (file2); - cmd = g_strdup_printf ("diff %s %s %s %s %s", args, extra, opt, file1_esc, file2_esc); + cmd = g_strdup_printf ("gdiff %s %s %s %s %s", args, extra, opt, file1_esc, file2_esc); g_free (file1_esc); diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist index f97ce738cc0a..8a9b056d803e 100644 --- a/misc/mc/pkg-plist +++ b/misc/mc/pkg-plist @@ -143,6 +143,7 @@ libexec/mc/shell/utime %%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/mcdiff.1.gz share/man/man1/mcedit.1.gz share/man/man1/mcview.1.gz %%NLS%%share/man/pl/man1/mc.1.gz @@ -212,14 +213,23 @@ share/man/man1/mcview.1.gz %%DATADIR%%/skins/gray-green-purple256.ini %%DATADIR%%/skins/gray-orange-blue256.ini %%DATADIR%%/skins/julia256.ini +%%DATADIR%%/skins/julia256root.ini %%DATADIR%%/skins/mc46.ini +%%DATADIR%%/skins/modarcon16-defbg-thin.ini %%DATADIR%%/skins/modarcon16-defbg.ini +%%DATADIR%%/skins/modarcon16-thin.ini %%DATADIR%%/skins/modarcon16.ini +%%DATADIR%%/skins/modarcon16root-defbg-thin.ini %%DATADIR%%/skins/modarcon16root-defbg.ini +%%DATADIR%%/skins/modarcon16root-thin.ini %%DATADIR%%/skins/modarcon16root.ini +%%DATADIR%%/skins/modarin256-defbg-thin.ini %%DATADIR%%/skins/modarin256-defbg.ini +%%DATADIR%%/skins/modarin256-thin.ini %%DATADIR%%/skins/modarin256.ini +%%DATADIR%%/skins/modarin256root-defbg-thin.ini %%DATADIR%%/skins/modarin256root-defbg.ini +%%DATADIR%%/skins/modarin256root-thin.ini %%DATADIR%%/skins/modarin256root.ini %%DATADIR%%/skins/nicedark.ini %%DATADIR%%/skins/sand256.ini @@ -227,7 +237,9 @@ share/man/man1/mcview.1.gz %%DATADIR%%/skins/seasons-spring16M.ini %%DATADIR%%/skins/seasons-summer16M.ini %%DATADIR%%/skins/seasons-winter16M.ini +%%DATADIR%%/skins/xoria256-thin.ini %%DATADIR%%/skins/xoria256.ini +%%DATADIR%%/skins/xoria256root-thin.ini %%DATADIR%%/skins/yadt256-defbg.ini %%DATADIR%%/skins/yadt256.ini %%EDITOR%%%%DATADIR%%/syntax/PKGBUILD.syntax
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409181640.48IGe7Ek012269>