Call bspatch with a full path; this fixes problems where people are running freebsd-update with a PATH which doesn't include /usr/local/bin
On Sat, Sep 25, 2004 at 03:30:36PM -0000, Colin Percival wrote: > + WORKDIR?=${.CURDIR}/work > + MAILTO?=root > ++BSPATCH!=which bspatch || echo /usr/local/bin/bspatch ^^^^^^^^^^^^^^^^ I think it must be ${LOCALBASE}/bin/bspatch, do you? -- Rgdz, /"\ ASCII RIBBON CAMPAIGN Sergey Osokin aka oZZ, \ / AGAINST HTML MAIL http://ozz.pp.ru/ X AND NEWS / \
"Sergey A. Osokin" <osa@FreeBSD.org> wrote: >On Sat, Sep 25, 2004 at 03:30:36PM -0000, Colin Percival wrote: > > + WORKDIR?=${.CURDIR}/work > > + MAILTO?=root > > ++BSPATCH!=which bspatch || echo /usr/local/bin/bspatch > ^^^^^^^^^^^^^^^^ > I think it must be ${LOCALBASE}/bin/bspatch, do you? Only if LOCALBASE is defined in make.conf (which it isn't, at least on my system). The makefile being patched there isn't part of the build process for the freebsd-update port (ok, not much, at least); it's part of the actual program. (I had a reason for this once. I don't any more, and some day I'll replace that makefile with a much cleaner shell script, but I don't want to mess with it right now.) I suppose I could have used sed and made that a %%LOCALBASE%%, but if someone doesn't have ${LOCALBASE}/bin in their path *and* they put LOCALBASE somewhere other than /usr/local, I'm not especially inclined to change things to suit them. Even for them, FreeBSD Update will still work; it will just waste bandwidth by downloading complete modified files instead of using the patches. Colin Percival
State Changed From-To: open->closed Commited, thanks! (please consider the reply on the note of osa@)