hi,

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.

cheerio Berndt

Jeremy C. Reed wrote
> What do these "<<<<<<<" mean?
> 
> (from pkgsrc/www/mozilla)
> BUILD_DEPENDS+= autoconf:../../devel/autoconf
> <<<<<<< Makefile                               <----
> BUILD_DEPENDS+= zip:../../archivers/zip        <----
> =======                                        <----
> BUILD_DEPENDS+= zip:../../archivers/zip
> >>>>>>> 1.41                                   <----
> DEPENDS+=       gtk+>=1.2.8:../../x11/gtk
> 
> This causes:
> 
> rainier:/usr/pkgsrc/www/mozilla$ make
> "Makefile", line 15: Need an operator
> "Makefile", line 17: Need an operator
> "Makefile", line 19: Need an operator
> Fatal errors encountered -- cannot continue
> 
> I also found it in Packages.txt:
> 
> <<<<<<< Packages.txt
>    browser such as navigator (pkgsrc/www/navigator) or lynx (pkgsrc/www/lynx).
> ** a few lines here **
> =======
> ** a few more lines here **
>    subdirectories will be searched for all the binary packages.
> >>>>>>> 1.115
> 
> Thanks,
> 
>    Jeremy C. Reed
>    http://www.reedmedia.net/
> 
> 


-- 
Name    : Berndt Josef Wulf            | +++ With BSD on Packet Radio +++
E-Mail  : wulf@ping.net.au             |    tfkiss, tnt, dpbox, wampes
ICQ     : 18196098                     |  VK5ABN, Nairne, South Australia 
URL     : http://www.ping.net.au/~wulf | MBOX : vk5abn@vk5abn.#lmr.#sa.au.oc
Sysinfo : DEC AXPpci33+, NetBSD-1.4.2  | BBS  : vk5abn.#lmr.#sa.aus.oc