From nobody Mon Oct 02 11:33:38 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 4Rzf3Q5h0Lz4vynx; Mon, 2 Oct 2023 11:33:38 +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 4Rzf3Q56x1z3DKb; Mon, 2 Oct 2023 11:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696246418; 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=J5Ib/XS9YQYZXKRoEKSuo/foJA+Qxo3bkhnN21h66S4=; b=tMJCbgBZqR+xHnbuJs6hu+PIj/12nzUQHYV7ZEQ84FRYw/kO+dQ6KJAnZh9vZsj93E5te4 ffm+hFQqX4WV6iaI5leL1enbrj+ANyDSmwjypWKDK3rMOSqOSoH7Dehl8VqOqiz7zmC0bZ dzzpKTwLYT7rr/0HgZk8RSCgxrUy12y12aPBn5mB81RmAYCWYeAz0G4mVMsjaccfyr46D4 Mxxd1mTm3oZy0A34qNwUKxkJO2bhd2clZCYQaU51XoqqGiMWsQ5ujK02rxPoT8pzCW/Cj7 qcexmGPkfc+b8KC1euX61gdC9653CoQYLKcAlRutZfnqHmL+0f/PSbVA9Ccu5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696246418; a=rsa-sha256; cv=none; b=CnaWp35YIRlt/SdNQk5g1hjNtsMpT98fRGAmJtKUt6BRhTcVoVFpJi+WqynS5ZP4HTdX5A OmgkFN55ws2sZ/9g+gq/NZ6cI6zIR+K9uxgPv0TaN7933gj2nwlRb4Px7F4958e4GtCK8v l2k93YHz5SZAa4AKyg87iA8SMAtL8JtSsBhFrQUIQORfl9wQceS2WJOrKeUK5jthRla5mt 8VcVfLdlk+UmR56DX12p32MPO4Bp4o8i5K8MMubJ0M1iMPAOSks1Rh5yVN4R0DHmT7KDCn epVxW+SceXkBPwncZOh8/cexyO7vF2qY1M/GeZnnYDOSAtpQv63UleEMi5EVuA== 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=1696246418; 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=J5Ib/XS9YQYZXKRoEKSuo/foJA+Qxo3bkhnN21h66S4=; b=SwywQGvqOQU6YrZT3+a8sqjtk9tt4zmIGXZ2mClcphXQ5+qJDkuPrgDrRKbMIO4LLvDmRm HiEj75hknUa4PRy/Tx+AsQ1YhC5pCbZWL8e/RCskBzZ2WZXzIo2LuzTYbDS54t67jgLvlI Bq/3bxthJZP4O2Oxnu7RAk9esyJd0OABlT7dHZnK5QEVc2ynt8WDecWGfQJBqKCv3U+zVa pqAS20nSBgKW/Y5ZJbJVMeMgP4xokFFb5P8OHuJxYyD0/uqC4L0S0zdPn6LbDmji5/W60F yWOShusnLKuI5/ghZCKXVH4ZIDGztyybkhRhQtXye4AUtrKPA1fUjm2C1vLDNQ== 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 4Rzf3Q46D8z19Gf; Mon, 2 Oct 2023 11:33:38 +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 392BXcHi002498; Mon, 2 Oct 2023 11:33:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 392BXcAC002495; Mon, 2 Oct 2023 11:33:38 GMT (envelope-from git) Date: Mon, 2 Oct 2023 11:33:38 GMT Message-Id: <202310021133.392BXcAC002495@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: 6b1b15742593 - main - cargo.mk: Strip vV from GitHub tags only when followed by a digit 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: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b1b157425932c2977c10a53c090101215c8ad5e Auto-Submitted: auto-generated The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b1b157425932c2977c10a53c090101215c8ad5e commit 6b1b157425932c2977c10a53c090101215c8ad5e Author: Tobias Kortkamp AuthorDate: 2023-09-30 08:38:19 +0000 Commit: Tobias Kortkamp CommitDate: 2023-10-02 11:33:25 +0000 cargo.mk: Strip vV from GitHub tags only when followed by a digit Fixes the following in games/veloren-weekly when iced crates have a tag similar to veloren-winit-0.28 $ cd games/veloren-weekly $ make cargo-crates-merge $ make [...] ===> Configuring for veloren-weekly-s20230830 ===> Cargo config: find: /usr/ports/games/veloren-weekly/work/egui_winit_platform-eloren-winit-0.28: No such file or directory find: /usr/ports/games/veloren-weekly/work/iced-eloren-winit-0.28: No such file or directory find: /usr/ports/games/veloren-weekly/work/iced-eloren-winit-0.28: No such file or directory find: /usr/ports/games/veloren-weekly/work/iced-eloren-winit-0.28: No such file or directory find: /usr/ports/games/veloren-weekly/work/iced-eloren-winit-0.28: No such file or directory find: /usr/ports/games/veloren-weekly/work/iced-eloren-winit-0.28: No such file or directory find: /usr/ports/games/veloren-weekly/work/iced-eloren-winit-0.28: No such file or directory [...] [patch.'https://gitlab.com/Imbris/keyboard-keynames.git'] keyboard-keynames = { path = '/usr/ports/games/veloren-weekly/work/keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d' } [...] [patch.'https://github.com/Imberflur/egui_winit_platform.git'] egui_winit_platform = { path = '/usr/ports/games/veloren-weekly/work/egui_winit_platform-eloren-winit-0.28' } [...] [patch.'https://github.com/Imberflur/iced'] iced_core = { path = '/usr/ports/games/veloren-weekly/work/iced-eloren-winit-0.28' } iced_futures = { path = '/usr/ports/games/veloren-weekly/work/iced-eloren-winit-0.28' } iced_graphics = { path = '/usr/ports/games/veloren-weekly/work/iced-eloren-winit-0.28' } iced_native = { path = '/usr/ports/games/veloren-weekly/work/iced-eloren-winit-0.28' } iced_style = { path = '/usr/ports/games/veloren-weekly/work/iced-eloren-winit-0.28' } iced_winit = { path = '/usr/ports/games/veloren-weekly/work/iced-eloren-winit-0.28' } [...] ===> Updating Cargo.lock error: failed to load source for dependency `iced_core` Caused by: Unable to update /usr/ports/games/veloren-weekly/work/iced-eloren-winit-0.28 Caused by: failed to read `/usr/ports/games/veloren-weekly/work/iced-eloren-winit-0.28/Cargo.toml` Caused by: No such file or directory (os error 2) *** Error code 101 Stop. make[1]: stopped in /usr/ports/games/veloren-weekly PR: 273468 Reported by: jbeich --- Mk/Scripts/cargo-crates-git-common.awk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Mk/Scripts/cargo-crates-git-common.awk b/Mk/Scripts/cargo-crates-git-common.awk index f4023bb4f880..36eb0027d3d7 100644 --- a/Mk/Scripts/cargo-crates-git-common.awk +++ b/Mk/Scripts/cargo-crates-git-common.awk @@ -65,7 +65,9 @@ function split_git_url(info, git_url, url, path, account, project, commit, i, d # "GitHub silently converts tags starting with v to not have v in the filename # and extraction directory. It also replaces + with -." dir_ver = commit - sub(/^[vV]/, "", dir_ver) + if (dir_ver ~ /^[vV][0-9]/) { + sub(/^[vV]/, "", dir_ver) + } gsub(/\+/, "-", dir_ver) gsub(/--/, "-", dir_ver) info["dir"] = sprintf("%s-%s", project, dir_ver)