Re: Regression in dist fetching on Darwin

[Thomas Klausner <wiz%gatalith.at@localhost>]

On Wed, May 17, 2023 at 02:26:58PM -0500, Jason Bacon wrote:
> On 5/17/23 13:30, Thomas Klausner wrote:
> > On Wed, May 17, 2023 at 01:07:47PM -0500, Jason Bacon wrote:
> > > I just updated my pkgsrc tree and now get this error when trying to
> > > build any package:
> > > 
> > > => Bootstrap dependency digest>=20211023: found digest-20220214
> > > => Fetching APE-3.5.3.132-8dd3e7898c86d89227beb3d26c9c1172102c1a83.tar.gz
> > > => Total size: 193348 bytes
> > > env: /usr/bin/ftp: No such file or directory
> > > fetch: Unable to fetch expected file
> > > APE-3.5.3.132-8dd3e7898c86d89227beb3d26c9c11
> > > 
> > > It was working fine this morning.  I have not touched my mk.conf or
> > > anything else.
> > > 
> > > Any ideas?
> > 
> > I changed the default fetch tool today.
> > 
> > You might need to re-bootstrap.
> > 
> > I thought that on Darwin you should use /usr/bin/curl by default
> > though, why is that not used?
> >   Thomas
> 
> Adding FETCH_USING=curl to mk.conf works around it.
> 
> I think there's a problem with the current mk files, though, as there is
> no ftp command in the macOS Ventura base, but:
> 
> Darwin tarpon.local  bacon ~ 261: (pkgsrc): grep ftp
> Pkgsrc/pkgsrc/mk/tools/tools.Darwin.mk
> TOOLS_PLATFORM.ftp?=            /usr/bin/ftp

I've added a check around that setting so it's only set when the file
actually exists.

I've also restored the preference order so the fetch tool is preferred
if it exists, then ftp, curl, wget, and fallback to fetch.
 Thomas