From nobody Fri Apr 11 03:20:45 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 4ZYhm55wKCz5sQB1 for ; Fri, 11 Apr 2025 03:21:09 +0000 (UTC) (envelope-from adamw@adamw.org) Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZYhm52fl3z479f for ; Fri, 11 Apr 2025 03:21:04 +0000 (UTC) (envelope-from adamw@adamw.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-5e6ff035e9aso2745290a12.0 for ; Thu, 10 Apr 2025 20:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adamw-org.20230601.gappssmtp.com; s=20230601; t=1744341662; x=1744946462; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=+VTHHz5Lz+u9GniEpZMm+p+N5UHOacOtVK8HUej5xnI=; b=AVdqf2yr+IuS4wve4kPe/O6Fm/bTA1tHaluqP1TxU7tS0rEcvxR8jshqtTuyFBMIMu 2IXSwn9m+rNGYj4qWqngcSn4Dq5bEk1ddmY5iPuRcIldNsPGs1M7aspzYEMBSrmf7Re9 6tpXl0vVjiJtmoxC/YAj8ZY4otqBasf8XcO/u92yS9aGqH/Nz+nCMb/k1T8DLWfSSI0L h5P6GdT1UjJvgCgMgFa3pWqr+m+4WsScnL9Mrkhgu3Idh4SHAnLXZBAInma63ZqFNXtW /UGaqk59b3Y+qOOyPE2u7o0CRWO/CmxUmYuRPujUtBYYE9QqAfu4HsGvODL8rdj46wTm cctg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744341662; x=1744946462; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+VTHHz5Lz+u9GniEpZMm+p+N5UHOacOtVK8HUej5xnI=; b=vCF5h4NufXGYFekkMK6mp1rD78DcCd5ZopX/RVtgPAyRhif31luLFDNdl4TPKS7PYC 1hcDRzwtOPXelhb7CNSA3iK6IpX0lVAwT8Zjie8WPlrNapn9KdeXfHHae9y4LKdaqeQ0 ecYWaB66uO15K/emaQ1+y4BnirnJJNemfyqS2eX9IIiq6LqMI+Ve20qX2S0lcy1Tlb/Z XdoGsA6aULqulKN/0RJmphDx+pBCpBPMvm4rzLb8p1g+Y6AR3Pt16ogdusO4DUENj9KU 7lDNj3jVZ1L7Idscp9wv5PM90y6CeXS+CYh9CTCWUmPe1qSNPphwqGWeUPAdpQCc4602 fIKQ== X-Forwarded-Encrypted: i=1; AJvYcCXa2smyGSjlWAnhGCfoSieqXEFwE7BFJIDT3XY4h1PmfAFXRgFWxXxlGiXVOOROlaML3VdFa8A4APcOo3UIJMXm8zeA8To=@freebsd.org X-Gm-Message-State: AOJu0YxN2DNURBZp7g1/+w/dzXoKmv/3WZNhVRjxj8gnrph5pjEqlrt+ BUyoid6lORv8Z1LYZ+wD8KuMTcJu6bEZtY0tThYbWb/pEk1KoWdJlCQpHCm+IYhODwIhBs/6pE4 XDckocvulDj8EnTwXsfnFdaDlX9dVQXXNtNRouQ== X-Gm-Gg: ASbGncsGXVlhWO36eqOb9QNoub0qIpQiEuKc2FA78TDvytPaYw78MKSjejZsPdJdtc9 jkLNVNFuDfaj9s9jT4WJrpItSpwhN93dwiNMbySLPjd7MoU4MRgOLa0meT8Jo3k9KfdkZgnPoX7 62he7WaiSl3M3ycOGpl4DDwPqQ4YwSEwk= X-Google-Smtp-Source: AGHT+IGucpxaH0v1HCDXux7csA1CoF+qGF96CIJy1DAUslXh87iFWWg6jNil9gZWK2SUDLqTSN1c+lVcoTMIBTnhEfo= X-Received: by 2002:a05:6402:1941:b0:5ed:5554:7c3b with SMTP id 4fb4d7f45d1cf-5f3702879d7mr682186a12.32.1744341661630; Thu, 10 Apr 2025 20:21:01 -0700 (PDT) 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 References: <202504110212.53B2CGWs024977@gitrepo.freebsd.org> In-Reply-To: <202504110212.53B2CGWs024977@gitrepo.freebsd.org> From: Adam Weinberger Date: Thu, 10 Apr 2025 23:20:45 -0400 X-Gm-Features: ATxdqUGrXWT6AlMfiLFCGJJZmkKUG6PeHaV844rXMxj-VvoZhNyFu24w-4FUGBs Message-ID: Subject: Re: git: 0647dd427458 - main - Mk/Uses/go.mk: support v2 and higher proxy URLs To: Enji Cooper Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000001bdf4306327831aa" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4ZYhm52fl3z479f X-Spamd-Bar: ---- --0000000000001bdf4306327831aa Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Apr 10, 2025 at 10:12=E2=80=AFPM Enji Cooper wro= te: > The branch main has been updated by ngie: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3D0647dd427458993a2a4589467d825= 6998c0ee649 > > commit 0647dd427458993a2a4589467d8256998c0ee649 > Author: Enji Cooper > AuthorDate: 2025-04-09 02:15:22 +0000 > Commit: Enji Cooper > CommitDate: 2025-04-11 02:12:05 +0000 > > Mk/Uses/go.mk: support v2 and higher proxy URLs > > golang projects with versions greater than 2.x have different URLs > presented for them via `${GOPROXY}` [1]. In particular, the major > version is added to the URL and to the extracted GOPROXY provided > DISTFILE(s). > > This change adjusts `MASTER_SITES` and `WRKSRC` with `USES+=3D go` to > support the "Major Version Suffixes" documented in the go module > docs [1]. > > Reviewed by: adamw, arrowd > Approved by: adamw (go) > Differential Revision: https://reviews.freebsd.org/D49723 > > 1. https://go.dev/ref/mod#major-version-suffixes > --- > Mk/Uses/go.mk | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk > index 421fd310847f..6e924e039ede 100644 > --- a/Mk/Uses/go.mk > +++ b/Mk/Uses/go.mk > @@ -167,9 +167,19 @@ MASTER_SITES+=3D ${GO_MOD_DIST} > DISTFILES+=3D go.mod > # Fallback to default GO_PROXY > . else > + > +# `GOPROXY` presents sources via the proxy service and in the downloaded > +# `WRKSRC` differently as of v2.x versions of projects. Support this > different > +# directory/REST API scheme: > https://go.dev/ref/mod#major-version-suffixes . > +GO_MODVERSION_MAJOR=3D ${GO_MODVERSION:C/^v//g:C/\..+//g} > +.if ${GO_MODVERSION_MAJOR} > 1 > +WRKSRC=3D ${WRKDIR}/${GO_MODNAME}/v${GO_MODVERSION_MAJOR}= @ > ${GO_MODVERSION} > +MASTER_SITES+=3D > ${GO_GOPROXY}/${GO_MODNAME:C/([A-Z])/!\1/g:tl}/v${GO_MODVERSION_MAJOR}/@v= / > +.else > +WRKSRC=3D ${WRKDIR}/${GO_MODNAME}@${GO_MODVERSION} > MASTER_SITES+=3D ${GO_GOPROXY}/${GO_MODNAME:C/([A-Z])/!\1/g:tl}/@v/ > +.endif > DISTFILES+=3D ${GO_MODFILE} ${GO_DISTFILE} > -WRKSRC=3D ${WRKDIR}/${GO_MODNAME}@${GO_MODVERSION} > . endif > > . endif > Every go port is now failing to build for me: cd: /wrkdirs/usr/ports/devel/shfmt/work/mvdan.cc/sh/v3/v3@v3.11.0: No such file or directory The @ probably needs to be escaped. --=20 Adam Weinberger adamw@adamw.org --0000000000001bdf4306327831aa Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Thu, Apr 10, 2025 at 10:12=E2=80=AFPM Enji= Cooper <ngie@freebsd.org> wr= ote:
The branch = main has been updated by ngie:

URL: https://cgi= t.FreeBSD.org/ports/commit/?id=3D0647dd427458993a2a4589467d8256998c0ee649

commit 0647dd427458993a2a4589467d8256998c0ee649
Author:=C2=A0 =C2=A0 =C2=A0Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2025-04-09 02:15:22 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2025-04-11 02:12:05 +0000

=C2=A0 =C2=A0 Mk/Uses/go.mk: support v2 and higher proxy URLs

=C2=A0 =C2=A0 golang projects with versions greater than 2.x have different= URLs
=C2=A0 =C2=A0 presented for them via `${GOPROXY}` [1]. In particular, the m= ajor
=C2=A0 =C2=A0 version is added to the URL and to the extracted GOPROXY prov= ided
=C2=A0 =C2=A0 DISTFILE(s).

=C2=A0 =C2=A0 This change adjusts `MASTER_SITES` and `WRKSRC` with `USES+= =3D go` to
=C2=A0 =C2=A0 support the "Major Version Suffixes" documented in = the go module
=C2=A0 =C2=A0 docs [1].

=C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 adamw, arrowd
=C2=A0 =C2=A0 Approved by:=C2=A0 =C2=A0 adamw (go)
=C2=A0 =C2=A0 Differential Revision:=C2=A0 https://reviews.freebsd= .org/D49723

=C2=A0 =C2=A0 1. https://go.dev/ref/mod#major-version-s= uffixes
---
=C2=A0Mk/Uses/go.mk | 12 +++++++++++-
=C2=A01 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk
index 421fd310847f..6e924e039ede 100644
--- a/Mk/Uses/go.mk
+++ b/Mk/Uses/go.mk
@@ -167,9 +167,19 @@ MASTER_SITES+=3D=C2=A0 =C2=A0 =C2=A0${GO_MOD_DIST}
=C2=A0DISTFILES+=3D=C2=A0 =C2=A0 go.mod
=C2=A0# Fallback to default GO_PROXY
=C2=A0.=C2=A0 =C2=A0 =C2=A0 =C2=A0 else
+
+# `GOPROXY` presents sources via the proxy service and in the downloaded +# `WRKSRC` differently as of v2.x versions of projects. Support this diffe= rent
+# directory/REST API scheme: https://go.dev/ref/mod#ma= jor-version-suffixes .
+GO_MODVERSION_MAJOR=3D=C2=A0 =C2=A0${GO_MODVERSION:C/^v//g:C/\..+//g}
+.if ${GO_MODVERSION_MAJOR} > 1
+WRKSRC=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${WRKDIR}= /${GO_MODNAME}/v${GO_MODVERSION_MAJOR}@${GO_MODVERSION}
+MASTER_SITES+=3D ${GO_GOPROXY}/${GO_MODNAME:C/([A-Z])/!\1/g:tl}/v${GO_MODV= ERSION_MAJOR}/@v/
+.else
+WRKSRC=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${WRKDIR}= /${GO_MODNAME}@${GO_MODVERSION}
=C2=A0MASTER_SITES+=3D ${GO_GOPROXY}/${GO_MODNAME:C/([A-Z])/!\1/g:tl}/@v/ +.endif
=C2=A0DISTFILES+=3D=C2=A0 =C2=A0 ${GO_MODFILE} ${GO_DISTFILE}
-WRKSRC=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${WRKDIR}= /${GO_MODNAME}@${GO_MODVERSION}
=C2=A0.=C2=A0 =C2=A0 =C2=A0 =C2=A0 endif

=C2=A0.=C2=A0 =C2=A0 =C2=A0 endif

Every go port is now faili= ng to build for me:
cd: /wrkdirs/usr/ports/devel/shfmt/work/mvdan.cc/sh/v3/v3@v3.11.0: No such file or = directory

The=C2=A0@ probably needs to be escaped.


--
Adam Weinberger
--0000000000001bdf4306327831aa--