From nobody Sun Dec 28 15:25:58 2025 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 4dfNTz1YXzz6LwSJ for ; Sun, 28 Dec 2025 15:25:59 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfNTz0rykz3FGW for ; Sun, 28 Dec 2025 15:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766935559; 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=x6OOeRGAeJEVlyRzkWBdXexcQ+eCnKTg126FbeJ2lYc=; b=lPZUdXVsXAD7iAUZN/SfK2wRk/1EfP46aZF08L2d1LyRZz88+gF55tNa9II/cc4x/Kq5uM +XYuSS5LdupLbPrvueHUF7LxYnBRNbin0C/cb5pOBpjkE4GqJI+t8ez3WL45pGQJzjmXkD 019NRPHrl0gJwsfZ1F8535pxPO2hNwA8Y5PKCpqDHxYkNsF77rv/PFKPwAQnKE5QP2Chei K62Hu6mLoD5mYkD/bvwqqCSnMENIr2qFseWT+6suuYRx4N60a2aC+Mc+MsQSZRD2HEXEFc N2DvsddNnyRwQya/d0OSHTq0f8Eku27Jxjgs02Vmg7PRc6qDrwV0h3cJRDsdpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766935559; 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=x6OOeRGAeJEVlyRzkWBdXexcQ+eCnKTg126FbeJ2lYc=; b=Rt0ImrvlcBKMqQxZlA++PjLv9wI6v4t9sa2Agnqf/m1fuAR1OjRLMfQMh8thREGeRl3tGJ hudKkivMP4xpCwV5lZ80DbWkN2WqhpfYBtqBiyAtR9/ImkwHIS/ea+I/xO7work53ZqJmr wTKj1Wa13okxrOfJtT5k+a8VlfW6rFC+hLaqwZaXURH4/PZvP6yRxZndimVdNC3iUfHctJ oy40J22iapL3CxBLDwN2NzdhXTZmUaeH8VzFf1j6JQ8jkkfyeYRb0UAVdcSJ26EGpRZ1F7 Di/ApgDjdmTlrMrhHcA2WvgFblXxsK/ouzMMH7jJeWqVVFbH3vQW8zAt+U0vAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766935559; a=rsa-sha256; cv=none; b=F+qW3RBr093exh4ZsMKw1ctuX4/a4La0dXNWW+7lPYPqbJya/ijmuAGfNHFPIz0guC+k85 CyrdFWRsNJ7OL//a0+u6UKwUC8gzXsBwOEBV+31tRlcbR0reqn7f7vYQgKu7XQ0Ed1hKvH rrnnQbyhJ0slPrewh/QFmSgDo9t951u534zMpSyHWcp4WZODb1F89+ibYxWT3Hr11yxEwo kKiMYUSW9KR3LI7n3Uv+LhNs8fcMngGSA+X3Se9ZeHtSZ6E/H9sf+z9KmPAZ4H7pGLyC2J mxokWLCR6lzjNhUvvUvxvBPBMLMZM8OVAXgw1Y1LpQY2ti5bN+jZWqP5wy59TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfNTy6lyQzqk4 for ; Sun, 28 Dec 2025 15:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 445ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 15:25:58 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: c35f76fc2d0b - main - Uses/zig.mk: Handle the "NO_WRKSUBDIR" distfiles case 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c35f76fc2d0b8a7547c94fcf12693d66eb1a3b26 Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 15:25:58 +0000 Message-Id: <69514c06.445ff.29aa4a07@gitrepo.freebsd.org> The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=c35f76fc2d0b8a7547c94fcf12693d66eb1a3b26 commit c35f76fc2d0b8a7547c94fcf12693d66eb1a3b26 Author: Gleb Popov AuthorDate: 2025-12-28 15:02:18 +0000 Commit: Gleb Popov CommitDate: 2025-12-28 15:25:52 +0000 Uses/zig.mk: Handle the "NO_WRKSUBDIR" distfiles case Reported by: Siva Mahadevan --- Mk/Uses/zig.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/zig.mk b/Mk/Uses/zig.mk index 5727a812fede..5708ff05a3da 100644 --- a/Mk/Uses/zig.mk +++ b/Mk/Uses/zig.mk @@ -70,7 +70,13 @@ zig-pre-extract: . for z in ${ZIG_TUPLE} . for group url dir in ${z:S/:/ /g:tw} ${MAKE} -C ${.CURDIR} do-extract EXTRACT_ONLY=${url:T} WRKDIR=${ZIG_TMPDEPSDIR} - ${MV} ${ZIG_TMPDEPSDIR}/* ${ZIG_DEPSDIR}/${dir} + # In some cases the distfile holds files at the top level of the archive, + # s we have to move ${ZIG_TMPDEPSDIR} itself, not its contents. + if [ "$$(${FIND} ${ZIG_TMPDEPSDIR} -depth 1 -type f)" ]; then \ + ${MV} ${ZIG_TMPDEPSDIR} ${ZIG_DEPSDIR}/${dir}; \ + else \ + ${MV} ${ZIG_TMPDEPSDIR}/* ${ZIG_DEPSDIR}/${dir}; \ + fi . endfor . endfor @${RMDIR} ${ZIG_TMPDEPSDIR}