From nobody Tue Mar 07 21:00:48 2023 X-Original-To: dev-commits-ports-main@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 4PWSXJ5dHkz3wddJ; Tue, 7 Mar 2023 21:00:48 +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 4PWSXJ5C17z3wfT; Tue, 7 Mar 2023 21:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678222848; 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=qHolqn2EdkZJBrLdA3imoxDvplVAFNMeqEObgGuXG7E=; b=Ec+aXQu2Hfs4Fr8TJsqmDZrAmCx1yCXm38v2E6JgAqkmS6Zuyoi0UIIpQri/aBC+kbGvli WQuAVe98JJGhZZggo3NL76nwVkDSWzrSK9US+/boXecU7U8vTGdWwkXddMqa5luS58F3pO FsmmPONFVVf3dVu+nInjk4iQmX0RLyQNSo1aRdLHcLiGghJMl/LBmayjPiE/PW9qaQrc2B bHCTAIpBSwmpbnadEFpaU3oXbBxxLE08IT0agGvzhAkzL/0lMmtjZhrhv/Mo9x84+7RosW 0KntjYYb8KuEKwX2UxC7RYcNmidYCEgjNzmGB+WAySxvesGbaGN/bGdKRhDZ5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678222848; 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=qHolqn2EdkZJBrLdA3imoxDvplVAFNMeqEObgGuXG7E=; b=pFI3C2UHqsh9naytjqVZ23bzE+9Lrhk4Uo38q1/2PNaEGhcptBZ5/X98dqaNEW8uTFqTOc pEulNKGdg0y6ztNoUt/bHlPHdWAsg8D6l3u9QlGyrIarpzh3xXPm0zbop4W/nphpM13wFQ ACG6N6/v2hM7FI06FHtxjG4FacgerhAuOqMvIVgLh76/GOM57Q8Bk3SgVryi7q+5hdNFCn GKRXXdV65DB9eeD60O9oFMVG0U6C7U4yPHg589kb0ZU1W1l5rDK1iqc8nZmy84daTXhrI+ PJOidlfgQp7nf8NnqvYzm3zLrb1H3hF+4nHPy/7xvMkEd+AfTxcgNbRsr0ZAew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678222848; a=rsa-sha256; cv=none; b=RrRL1TxcYRbY0wsZs9UjJCE6D3QQ1LQ+rbhJP/k//w8ZLWYpy22hEXIAdRndwe9F61I9f6 y/S4aa823CI+ahX47KBO/h4XnAwdoGdwQGzob18ogqNuphA1228hEl/oOsCZw4hgUQ4aM3 RaxzRxhQFr3iHGmrR/qm9NWHWK3PKxNRIG6kuwttzDdlvjBCrokUu4zuxFSgH9890cIh84 YSjprA01h78knvr+77kgkuXuXEJPl5IyuexaRpoFEmNPLF/oqp75aN9CXlQkN2cS1hb2y+ XDSyY+h2b4kvar0hLVX9UZFQQ9QJmVZX3QCqxnE440pa6yzlf3wIq+UxfSmuFA== 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 4PWSXJ4HMtzylX; Tue, 7 Mar 2023 21:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 327L0m5L028631; Tue, 7 Mar 2023 21:00:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327L0mWN028630; Tue, 7 Mar 2023 21:00:48 GMT (envelope-from git) Date: Tue, 7 Mar 2023 21:00:48 GMT Message-Id: <202303072100.327L0mWN028630@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christian Weisgerber Subject: git: 386b28c3c1ba - main - devel/got: update to 0.85 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: naddy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 386b28c3c1babc5d17d35b7044b8a485b488dc5a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by naddy: URL: https://cgit.FreeBSD.org/ports/commit/?id=386b28c3c1babc5d17d35b7044b8a485b488dc5a commit 386b28c3c1babc5d17d35b7044b8a485b488dc5a Author: Christian Weisgerber AuthorDate: 2023-03-07 21:00:12 +0000 Commit: Christian Weisgerber CommitDate: 2023-03-07 21:00:12 +0000 devel/got: update to 0.85 User-visible changes: - fall back to vi(1) instead of ed(1) if neither EDITOR nor VISUAL are set --- devel/got/Makefile | 2 +- devel/got/distinfo | 6 +-- devel/got/files/openbsd-compat/sha2.h | 11 ++++++ devel/got/files/patch-regress_cmdline_commit.sh | 20 ---------- devel/got/files/patch-regress_cmdline_common.sh | 23 ----------- devel/got/files/patch-regress_cmdline_histedit.sh | 47 ----------------------- 6 files changed, 15 insertions(+), 94 deletions(-) diff --git a/devel/got/Makefile b/devel/got/Makefile index f63c17119a66..ec7a9c5dec40 100644 --- a/devel/got/Makefile +++ b/devel/got/Makefile @@ -1,5 +1,5 @@ PORTNAME= got -PORTVERSION= 0.84 +PORTVERSION= 0.85 CATEGORIES= devel MASTER_SITES= https://gameoftrees.org/releases/ diff --git a/devel/got/distinfo b/devel/got/distinfo index 2e08f69776c8..f6237a522f2a 100644 --- a/devel/got/distinfo +++ b/devel/got/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677106306 -SHA256 (got-0.84.tar.gz) = 43d573e37f2a1cce7ed6d30c459d19a44a4e7ca77ca3f92cf982bb747341628c -SIZE (got-0.84.tar.gz) = 801305 +TIMESTAMP = 1678215583 +SHA256 (got-0.85.tar.gz) = 4d11f22fc1bf73cb4b9ac0fab836dd973b752ca67c98d6701e4ec1b9bf1557b3 +SIZE (got-0.85.tar.gz) = 804469 diff --git a/devel/got/files/openbsd-compat/sha2.h b/devel/got/files/openbsd-compat/sha2.h new file mode 100644 index 000000000000..28eb07763b8f --- /dev/null +++ b/devel/got/files/openbsd-compat/sha2.h @@ -0,0 +1,11 @@ +#ifndef _OPENBSD_COMPAT_SHA2_H_ +#define _OPENBSD_COMPAT_SHA2_H_ + +#include + +#define SHA2_CTX SHA256_CTX +#define SHA256Init SHA256_Init +#define SHA256Update SHA256_Update +#define SHA256Final SHA256_Final + +#endif diff --git a/devel/got/files/patch-regress_cmdline_commit.sh b/devel/got/files/patch-regress_cmdline_commit.sh deleted file mode 100644 index 6113f815e739..000000000000 --- a/devel/got/files/patch-regress_cmdline_commit.sh +++ /dev/null @@ -1,20 +0,0 @@ ---- regress/cmdline/commit.sh.orig 2023-01-30 08:56:03 UTC -+++ regress/cmdline/commit.sh -@@ -1492,7 +1492,7 @@ test_commit_prepared_logmsg() { - - cat > $testroot/editor.sh < $testroot/editor.sh < $testroot/editor.sh < $testroot/editor.sh < $testroot/editor.sh < $testroot/editor.sh < $testroot/editor.sh <