That make sense, thanks! And yes, I started putting things into 
/etc/mk.conf about two hours ago.  :)

caio!

leam

dieter wrote:
> leam to port-sparc64 about Re: Failure to build gcc3 on sparc64:
> 
> 
>>Sorry, I'm confused on this, I don't do a lot of cvs work yet. I just
>>updated src and pkgsrc and the file is from 19:16 this evening.
>>
>>Wouldn't this be a new file?
> 
> 
> When cvs can't merge the changes of a local file with those in the
> repository, it leaves the merging to you, indicating the different
> parts with the <<<<< stuff you saw. You can see when this happens if a
> cvs update prefixes a filename with "C" (conflict). So, your
> bsd.pkg.defaults.mk was either locally modified or corrupted. If you
> modified it, it is a better idea to put those changes in /etc/mk.conf .
> 
> kind regards,
> dieter
> 
> 
> 
>>ciao!
>>
>>leam
>>
>>Hubert Feyrer wrote:
>>
>>>On Thu, 4 Sep 2003, leam wrote:
>>>
>>>
>>>>make: "/usr/pkgsrc/lang/gcc3/../../mk/bsd.pkg.defaults.mk" line 90:
>>>>Makefile appears to contain unresolved cvs/rcs/??? merge conflicts
>>>
>>>...
>>>
>>>
>>>>What do I need to re-read?
>>>
>>>
>>>The above line, then clean up the mess. :)
>>>
>>>
>>> - Hubert
>>>
>>
>>
>