From nobody Sat Sep 02 15:26:04 2023 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 4RdJdS50VQz4rq0g; Sat, 2 Sep 2023 15:26:04 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RdJdS4WyVz4Gwl; Sat, 2 Sep 2023 15:26:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693668364; 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=TUIzEuLNv1hNcMZC1za7iCxXSAL2R9DARKFYod8Lopo=; b=Uzl5p+538dAXPbR9Lo66Ii2g3XtjJIA8UssbiNS0Nx32+4NHv4yCR+n0biH6duKwotDl12 tI0sL6+V6NONd2/CvHp7BQD8krxlkMxf3ZRjyXDoHJV7PLo3H9K53RooQ32Ac30nRcaonE DhKImpgeP7Xk6cMthDgU5bB+nwlkWEzx4QFG8vo2bN6cAwzMe9SL6c/d2WPCSOQnSdMQdk ncaEP6PlG9WRek35ZebScIfSIe1k8MD3Fr3RT/WVX3Nxj9DiPe4yLxYnRCNTBlH+jhLr4S 3+Q7kg0LWgvkManVg98aV3V8VEkrXN1XkSbTZonxaGIUabjticRLdBMF9DyecA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693668364; a=rsa-sha256; cv=none; b=j9Db9NaTkWmot/Q+xr7EylOXarO2vcW6p0Lv8fSWx+wRjYfGb1tdxsyULruHg4Zrvd2iD3 6ig0HRPuyg6nlZUDZpK9gkxzjPJPcUk1O/6mLNkRvdKpc8VcmjV0d9a+BefFVAgcnzPmeE wB+8N1Ey2cE9IB7uSWhCiCOnvuX9z2PHoc4QKYr4uopdTQkDuJYJIiXiu45+oNFOCNZk3z +/YopDRVMexiqMP9vHs+qUbtqcfT+Mi3raSEKHnWYvJCsDzBspmU3+yZxvMLhuc7w5+7jj Paf1zNh2zjp631sOenZvnTld+wmkX24wbcjHIJracktpOos5yejhqk7C3TDmSw== 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=1693668364; 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=TUIzEuLNv1hNcMZC1za7iCxXSAL2R9DARKFYod8Lopo=; b=ZJONO1p+AVVHIo/w/hWPmro2GDOww2intJ1J812q9w4BARGDvq3bMIMaOzf6/0w3ig+opl qC0bGKulGhJdJFwHs1RK+9g+qKxYEB99uRtSjjs0rqXQyHc4b7Bdky5Fk6FoVLAh+G4UHQ qq9pn1aArhP5QPTYmZv2zV10AF9/XemfDVNzDr8TXOPhhJTE8G5pOtFDIR+gsiq9BtQmfZ S5Mgs4DXydy7h5q5H9jQlu/fJKu+rWCDD7t92y03+1zJ+SrRRUSbR7G+0Cv1tSVaifrCcJ fUOT+ricBpQud21vn6xRAP4dtkdK7rqXFRYJhPNSUd1aXrIqRbKVFOVC5BS9Kg== 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 4RdJdS2v3VznQ6; Sat, 2 Sep 2023 15:26:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 382FQ4wq011245; Sat, 2 Sep 2023 15:26:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 382FQ4fs011242; Sat, 2 Sep 2023 15:26:04 GMT (envelope-from git) Date: Sat, 2 Sep 2023 15:26:04 GMT Message-Id: <202309021526.382FQ4fs011242@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: 8957bf52a7f7 - main - misc/far2l: update the port to version 2.5.2 (color it up) 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: 8957bf52a7f742ff5ee98fc78240dc7737dfa7be Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=8957bf52a7f742ff5ee98fc78240dc7737dfa7be commit 8957bf52a7f742ff5ee98fc78240dc7737dfa7be Author: Alexey Dokuchaev AuthorDate: 2023-09-02 15:24:48 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-09-02 15:24:48 +0000 misc/far2l: update the port to version 2.5.2 (color it up) Drop no longer needed BUILD_DEPENDS, but as a result of M4 -> Perl conversion in the bootstrap scripts upstream we now must patch the hardcoded operating system and CPU architecture names. Reported by: portscout --- misc/far2l/Makefile | 6 +++--- misc/far2l/distinfo | 6 +++--- misc/far2l/files/patch-multiarc_src_formats_7z_C_7zCrc.c | 11 ----------- misc/far2l/pkg-plist | 1 + 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/misc/far2l/Makefile b/misc/far2l/Makefile index 1de0cc1b6b57..6009ddfad0be 100644 --- a/misc/far2l/Makefile +++ b/misc/far2l/Makefile @@ -1,5 +1,5 @@ PORTNAME= far2l -PORTVERSION= 2.5.0 +PORTVERSION= 2.5.2 DISTVERSIONPREFIX= v_ CATEGORIES= misc @@ -9,8 +9,6 @@ WWW= https://github.com/elfmz/far2l LICENSE= GPLv2 -BUILD_DEPENDS= gawk:lang/gawk gm4:devel/m4 \ - ${LOCALBASE}/include/spdlog/spdlog.h:devel/spdlog LIB_DEPENDS= libfmt.so:devel/libfmt \ libpcre.so:devel/pcre \ libuchardet.so:textproc/uchardet \ @@ -48,6 +46,8 @@ X11_USES= xorg X11_USE= XORG=ice,sm,x11,xext,xi post-patch: + @${REINPLACE_CMD} -e 's,Linux x86_64,${OPSYS} ${ARCH},' \ + ${WRKSRC}/far2l/bootstrap/scripts/far2l_m4.pl @${GREP} -Rl --null --include=\*.cpp /bin/bash ${WRKSRC} | ${XARGS} \ -0 ${REINPLACE_CMD} -e 's,/bin/bash,${LOCALBASE}&,' diff --git a/misc/far2l/distinfo b/misc/far2l/distinfo index 2fac71112d90..afbb997c2cde 100644 --- a/misc/far2l/distinfo +++ b/misc/far2l/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673740382 -SHA256 (elfmz-far2l-v_2.5.0_GH0.tar.gz) = c0cdb302d90b71f3c1c04205a6f0eb1bdb5fe81c36b13d8dd184f18e4b35bddb -SIZE (elfmz-far2l-v_2.5.0_GH0.tar.gz) = 6431408 +TIMESTAMP = 1692098850 +SHA256 (elfmz-far2l-v_2.5.2_GH0.tar.gz) = c8ae8bd7b9f242e267f4b13c81735706accdc40046dd262d30a4017b703f36b7 +SIZE (elfmz-far2l-v_2.5.2_GH0.tar.gz) = 6483703 diff --git a/misc/far2l/files/patch-multiarc_src_formats_7z_C_7zCrc.c b/misc/far2l/files/patch-multiarc_src_formats_7z_C_7zCrc.c deleted file mode 100644 index 3badab66c6bb..000000000000 --- a/misc/far2l/files/patch-multiarc_src_formats_7z_C_7zCrc.c +++ /dev/null @@ -1,11 +0,0 @@ ---- multiarc/src/formats/7z/C/7zCrc.c.orig 2023-01-14 23:53:02 UTC -+++ multiarc/src/formats/7z/C/7zCrc.c -@@ -86,7 +86,7 @@ UInt32 MY_FAST_CALL CrcUpdateT1(UInt32 v, const void * - #if !defined(__ARM_FEATURE_CRC32) - #define __ARM_FEATURE_CRC32 1 - #if (!defined(__clang__) || (__clang_major__ > 3)) // fix these numbers -- #define ATTRIB_CRC __attribute__((__target__("arch=armv8-a+crc"))) -+ #define ATTRIB_CRC __attribute__((__target__("crc"))) - #endif - #endif - #if defined(__ARM_FEATURE_CRC32) diff --git a/misc/far2l/pkg-plist b/misc/far2l/pkg-plist index f632b10b62fc..48f58181550f 100644 --- a/misc/far2l/pkg-plist +++ b/misc/far2l/pkg-plist @@ -1,4 +1,5 @@ bin/far2l +bin/far2ledit lib/far2l/Plugins/NetRocks/plug/NetRocks-FILE.broker lib/far2l/Plugins/NetRocks/plug/NetRocks-FTP.broker %%NFS%%lib/far2l/Plugins/NetRocks/plug/NetRocks-NFS.broker