From nobody Wed Sep 18 16:40:07 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X84Bc0Y9Gz5WmHb; Wed, 18 Sep 2024 16:40:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X84Bc027Gz4T4N; Wed, 18 Sep 2024 16:40:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726677608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/USdRROO0j5GFJtMiBjb3LyOUQRqH49K+t5CZOcxb7w=; b=XJrGnf0lg1By05wMldWtpd0Ly345C08YPEE0o/qhl42S/V7QDRkVsMOiyy0mMwAh0Yrikw u3mE0N92AqZo4e4nwzFUmPVRQ77w1QNN7TaT+bEYUsPAUSGTtwj2aB8ygNt6lB0/g52sEQ F4iooK+aWHU3cxUm+QBS6g5O3YQnX42bknFjnbkJrD5g5PCNqfs4b74fkrY/tHR9E1Mjqw zQezsRL5z7E2DFlUBEAZl4Bvy9RXVZznTwLqaitbt/a2JcOK+8Typa2NJsYI4ayfx8ujmD AbY/vWXKjZ/P61EAGne32F3xT54rRxcm4pvPbhTeOYl5I8fz9vBqSHjyGztfXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726677608; a=rsa-sha256; cv=none; b=no7NVM0K5LDEsdnHAfIcGr3CfjvLCVfHWmShZSESOlPY6J8m+TWwW2MLk+GklmlWdEpNlu dfjvjv8YRP8aICGqB7Bnv+U6Bf30TJytz0Qow8pqa374WDZZLjjinNJeNl9ClVQl6yOzWx QZcClE/GjzGF1rSIKJS72IdoagcuzKnRJiSCejN3gQHJzn1OqRf1txFeRv5BrrIAHSvlJd vKdCsFkE4S5fujUTQ4GxDaHJfaP3fNTLKsq35HDPJVHuyBuajY5H8DC/K05zWjuW8u+Kra yLARjlPNy58aGJ1vIlvmoDYgVNqu7CDrY9ip73yFPIYWIZ+k4f3WJeezeZomzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726677608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/USdRROO0j5GFJtMiBjb3LyOUQRqH49K+t5CZOcxb7w=; b=RDj3BpG4IWkBJFAYwTRlPov87NRtI36qxsm9dl1wOhWKyRwAW5ZUnHc6drutH5zXu1Atva 6BGr7CKTC6XX9J2i2oYHaUlrKAfJhET6vwKfiVOW5DA+f57M2Qtc/7gjezC0AK6bayYd3z FHd/2XAen42+MxD4pAjVcEZZl8RVs40nz7RvM9zlGg2aMPfbUHVLBMaeeBoOnz8M4daK4i /BwR6TecTV7ZTVT3vo0LE1hEzuZZ4y9pGJurezMkcYY5U4pQWwgusmPc5p+AUvLyZXzd5+ ZnBJQWPZxNGuNw4be405KTLa11n07ddwgSBK+0w9e413J3mWkfq4gp25JhmsbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X84Bb6lqzzTrW; Wed, 18 Sep 2024 16:40:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48IGe7PE012274; Wed, 18 Sep 2024 16:40:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48IGe7Ek012269; Wed, 18 Sep 2024 16:40:07 GMT (envelope-from git) Date: Wed, 18 Sep 2024 16:40:07 GMT Message-Id: <202409181640.48IGe7Ek012269@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: bcfcbefc31bf - main - misc/mc: update Midnight Commander to version 4.8.32 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcfcbefc31bf5205701ab75d02072271ccd6ba9d Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=bcfcbefc31bf5205701ab75d02072271ccd6ba9d commit bcfcbefc31bf5205701ab75d02072271ccd6ba9d Author: Alexey Dokuchaev AuthorDate: 2024-09-18 16:37:38 +0000 Commit: Alexey Dokuchaev 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