On 2023/04/04 22:49:00 +0100, Edd Barrett <edd@theunixzoo.co.uk> wrote:
> On Tue, Apr 04, 2023 at 10:38:24PM +0100, Edd Barrett wrote:
> > Hi,
> >
> > PATCHORIG now defaults to `.orig.port`. This diff corrects the docs in
> > bsd.port.mk(5).
> >
> > (I removed the part about a distfile already containing files with that suffix,
> > as it seems highly unlikely to happen now. Can bring it back if anyone objects)
> >
> > OK?
>
> As pointed out by tb@, also update the reference in DISTORIG.
I can't find other mentions of .orig in bsd.port.mk(5) and I like the
change of mention from .orig to PATCHORIG in DISTORIG. ok for me
> Index: bsd.port.mk.5
> ===================================================================
> RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
> retrieving revision 1.576
> diff -u -p -r1.576 bsd.port.mk.5
> --- bsd.port.mk.5 19 Feb 2023 14:37:54 -0000 1.576
> +++ bsd.port.mk.5 4 Apr 2023 21:46:54 -0000
> @@ -1602,7 +1602,7 @@ to rename original files.
> Defaults to
> .Pa .bak.orig .
> Distinct from
> -.Pa .orig
> +.Ev PATCHORIG
> to avoid confusing
> .Cm update-patches .
> .It Ev DIST_SUBDIR
> @@ -2415,12 +2415,7 @@ to re-generate
> .Pa ${PATCHDIR}/${PATCH_LIST}
> by looking for files using this suffix.
> Defaults to
> -.Pa .orig .
> -For a port that already contains
> -.Pa .orig
> -files in the ${DISTFILES},
> -set this to something else, such as
> -.Pa .pat.orig .
> +.Pa .orig.port .
> See also
> .Cm distpatch ,
> .Ev DISTORIG .
No comments:
Post a Comment