From nobody Sat Apr 23 07:49:24 2022 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 144F0199F1C5; Sat, 23 Apr 2022 07:49:26 +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 4Klk1x4ByDz3Nx2; Sat, 23 Apr 2022 07:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650700166; 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=izrqLtBwml687zXggI3l6xYSjEBF+tDBce92sS9AX64=; b=lTZ5W/A+IhvT2VjZziP1rwWzrlp5ZOYxBWVGFDiS5rfHGsJmbCEuB1KtrQgQoxD1eku+mY lJj0OPDJc6CCBQNnvVN0lpia5DOBbRuFJhwDu+nTeNppq9ZHAcPOVJgucExlOw3FYculwV klAheIXTc7uvsMDmdlOWlh1LGyk5cPQswPu5pcyzlvh8yjMluVz4qKUUW3KDSWlSr+BCLq lfHvMt9dXePHG5dT+lacHUzvlfdkq9rxipKDDWuJ2otA2hZ34PlyUV3RJrXu0URyYs3M2s YV3YsDoq8pSU7YbV7FmY/JtG/CzzZrd3VmD3/CiEfhm1ZjF3lqhFrX0klLxg0A== 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 DE2255F9E; Sat, 23 Apr 2022 07:49:24 +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 23N7nO7F010208; Sat, 23 Apr 2022 07:49:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23N7nOCZ010207; Sat, 23 Apr 2022 07:49:24 GMT (envelope-from git) Date: Sat, 23 Apr 2022 07:49:24 GMT Message-Id: <202204230749.23N7nOCZ010207@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: 7fb087ab6ed9 - main - Uses/cargo: Try to simplify cargo-crates-merge usage 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: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fb087ab6ed9ab8aa6e888c2ef77314cd057a631 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650700165; 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=izrqLtBwml687zXggI3l6xYSjEBF+tDBce92sS9AX64=; b=SuQDqib1CVxj5i1EZJB/IpTtZ9zYzfGCAnmcQlc7Ow98Drup4ltAWTVm2XCqKcjvhQADSm pC6Sejr7f6b0sP2OsKcJF7a6jXlBz9vJ0d6jGgmxJhCOEPSXfqWZjLXEUkZnB/ecXN9S9F pthFQauG5/JEKDx9wGCE0MsxbmRAdlDrzRSOzCQINdCWz0ZS9InIjGuxy+hgi/sweT9s8J Fe0mFcKex3L8T35Vgc46z6EaF5GSCNK/qEhxhy/rqQSl2ZOXFd7dMHffbd0GIi5sX40z/B xv42cw1WK9HpojQLkhETr/hGCMCgCj9o4j3H5tFcI74UgBs7n0lybVNeN27iMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650700166; a=rsa-sha256; cv=none; b=YWSA7JBrdyn9cCE2Yk+qVCQ2jd0zOjHs7BMb510xIUeiMzVtmOCgx87/3OISGUYOhT4ANR hUJMxAo7V9KY52I6NRbqME7eRTCvpGgrhxjd6jqNd9B4B8btquS+E0OBbIUtNax25TMlNa FZF1LTljYMpIDRWj+lN5arXTvOpfKMLdyyDmuqlZWZZ0w17FLUcXPl97klZAHOZqyfa7Ak k6V1Qn531WB9Q/gyZvjjz1Bi4lqfagpFkNJOUaW3Esh82kR/5SmbrFe1VsN5y947o2Vx/j Lph00Y3JUvL/nrXGxnMeQ5VQB64FDsvbcz9rWZlXQ6JU0W70etJUK6huJD09Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=7fb087ab6ed9ab8aa6e888c2ef77314cd057a631 commit 7fb087ab6ed9ab8aa6e888c2ef77314cd057a631 Author: Tobias Kortkamp AuthorDate: 2022-04-15 08:45:54 +0000 Commit: Tobias Kortkamp CommitDate: 2022-04-23 07:40:45 +0000 Uses/cargo: Try to simplify cargo-crates-merge usage Always start with a clean work directory state and end with one too. Automatically run makesum too. --- Mk/Uses/cargo.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index 0e31eef26778..ed6d2c8cfc42 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -391,13 +391,15 @@ cargo-crates-licenses: configure # cargo-crates-merge will in-place update CARGO_CRATES in the port # based on the crates list from Cargo.lock. If there is no Cargo.lock # for some reason, try and generate it first. -cargo-crates-merge: cargo-crates-generate-lockfile +cargo-crates-merge: @if ! type portedit > /dev/null 2>&1; then \ ${ECHO_MSG} "===> Please install \"ports-mgmt/portfmt\""; exit 1; \ fi + @${MAKE} clean cargo-crates-generate-lockfile @f="${MASTERDIR}/Makefile"; [ -r "${MASTERDIR}/Makefile.crates" ] && f="${MASTERDIR}/Makefile.crates"; \ ${_CARGO_AWK} ${SCRIPTSDIR}/cargo-crates.awk ${CARGO_CARGOLOCK} | \ portedit merge -i $$f; \ - ${ECHO_MSG} "CARGO_CRATES in $$f was updated" + ${MAKE} clean makesum; \ + ${ECHO_MSG} "${DISTINFO_FILE} and CARGO_CRATES in $$f were updated"; .endif