Re: Fix PATCHORIG docs in bsd.port.mk

On Wed, Apr 05, 2023 at 06:48:34AM +0100, Stuart Henderson wrote:
> I think I'd keep that - largely because it shows _why_ it's useful to
> have a variable rather than fixed string for this.

How about this:


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 5 Apr 2023 08:05: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,11 @@ 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 .
+In the unlikely event that one of the ${DISTFILES} already contains
+.Pa .orig.port
+files, set this to something else, such as
+.Pa .orig.obsdport .
See also
.Cm distpatch ,
.Ev DISTORIG .


--
Best Regards
Edd Barrett

https://www.theunixzoo.co.uk