!!!broken!!!

[Kris Kennaway]

On Sat, Apr 10, 2004 at 09:18:08PM +0200, Luka Kodric( wrote:
> i get this error:
> 
> [daemon:~] root# cd /usr/ports && make index && portsdb -u
> Generating INDEX-5 - please wait..===> devel/apr failed:
> "Makefile", line 48: Need an operator
> "Makefile", line 53: Makefile appears to contain unresolved cvs/rcs/??? 
> merge conflicts
> "Makefile", line 54: Need an operator
> make: fatal errors encountered -- cannot continue
> *** Error code 1
> 1 error

As you can see, make thinks that file contains a CVS conflict; does
it?

Kris
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20040410/1ea12395/attachment.bin