On Thu, 15 Oct 2020, Berndt Josef Wulf wrote:

> Its a conflict that occured during a cvs update that hasn't been
> cleaned up.
> 
> I can't speak for Mozilla, but if you delete the lines that I
> marked with <---- it should get you a step further
> 
> Unless you changed anything in your pkgsrc tree, this shouldn't
> have happened.

Thanks for the explanation. Yes -- I did have a changed Mozilla package
(trying M18 but went back) and a modified Packages.txt. I guess that the
'cvs update -d -P' was smart to not destroy my changes.

   Jeremy C. Reed
   http://www.reedmedia.net/