Attachment 253083 Details for Bug 281057 – [PATCH] misc/mc: update 4.8.31 → 4.8.32

[patch] [PATCH] misc/mc: update 4.8.31 → 4.8.32

0001-misc-mc-update-4.8.31-4.8.32.patch (text/plain), 6.16 KB, created by Älven on 2024-08-25 12:50:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Älven

Created: 2024-08-25 12:50:42 UTC

Size: 6.16 KB

patch

obsolete

>From f2670791d23531ea6833100af372e363a39bdd42 Mon Sep 17 00:00:00 2001
>From: Ãlven <alster@vinterdalen.se>
>Date: Sun, 25 Aug 2024 16:47:42 +0400
>Subject: [PATCH] misc/mc: update 4.8.31 â 4.8.32
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>---
> misc/mc/Makefile                              | 31 +++++++------------
> misc/mc/distinfo                              |  6 ++--
> .../files/extra-patch-src_diffviewer_ydiff.c  |  8 ++---
> misc/mc/pkg-plist                             | 12 +++++++
> 4 files changed, 30 insertions(+), 27 deletions(-)
>
>diff --git a/misc/mc/Makefile b/misc/mc/Makefile
>index 06c035f5988b..056b0d958427 100644
>--- a/misc/mc/Makefile
>+++ b/misc/mc/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	mc
>-PORTVERSION=	4.8.31
>+DISTVERSION=	4.8.32
> CATEGORIES=	misc shells
> MASTER_SITES=	http://ftp.midnight-commander.org/ \
> 		https://ftp.osuosl.org/pub/midnightcommander/
>@@ -13,21 +13,22 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> RUN_DEPENDS=	zip:archivers/zip
> 
>-.if ${:!diff --version 2>/dev/null | grep -c GNU\ diffutils || :!} < 1
>-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_diffviewer_ydiff.c
>-RUN_DEPENDS+=	gdiff:textproc/diffutils
>-.endif
>-
> USES=		gmake gnome libtool perl5 pkgconfig python shebangfix tar:xz
>+USE_GNOME=	glib20
>+
> SHEBANG_FILES=	${WRKSRC}/src/vfs/extfs/helpers/s3+.in \
> 		${WRKSRC}/src/vfs/extfs/helpers/uc1541
> 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
>+.if ${:!diff --version 2>/dev/null | grep -c GNU\ diffutils || :!} < 1
>+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_diffviewer_ydiff.c
>+RUN_DEPENDS+=	gdiff:textproc/diffutils
>+.endif
>+
>+PORTDOCS=	COPYING FAQ HACKING INSTALL NEWS README TODO
> 
> OPTIONS_DEFINE=	ASPELL DOCS EDITOR EXTATTR ICONV NLS PCRE2 SFTP SUBSHELL X11
> OPTIONS_DEFAULT=	EDITOR ICONV SFTP SLANG SUBSHELL X11
>@@ -47,33 +48,23 @@ 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
>-
> EXTATTR_LIB_DEPENDS=	libe2p.so:sysutils/e2fsprogs-core
>-
> ICONV_USES=		iconv
> ICONV_CONFIGURE_ENABLE=	charset
>-
> NCURSES_CONFIGURE_ON=	--with-screen=ncurses
> NCURSES_CFLAGS+=	-DNCURSES_WIDECHAR
>-
>+NLS_USES=		gettext
> 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
>-
> SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
> SLANG_CONFIGURE_ON=	--with-screen=slang
>-
> SUBSHELL_CONFIGURE_WITH=subshell
> SUBSHELL_SUB_FILES=	pkg-message
>-
> X11_BUILD_DEPENDS=	${LOCALBASE}/include/X11/Xlib.h:x11/libX11
> X11_CONFIGURE_WITH=	x
> 
>diff --git a/misc/mc/distinfo b/misc/mc/distinfo
>index 820fc65d4bc0..985a9884ec3c 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 = 1724587269
>+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
>-- 
>2.46.0
>

Flags:

alster: maintainer-approval? (danfe)

Actions: View | Diff

Attachments on bug 281057: 253083