On Sat, 15 Apr 2006 15:37:33 +0000
Mark Kirby <mark@coris.org.uk> wrote:

> Hi,
> 
> i get this error , i have just updated my copy of pkgsrc.
> 
> ===> Verifying package for ../../audio/musicbrainz
> ===> *** No /usr/pkgsrc/distfiles/pkg-vulnerabilities file found,
> ===> *** skipping vulnerability checks. To fix, install
> ===> *** the pkgsrc/security/audit-packages package and run
> ===> *** '/usr/pkg/sbin/download-vulnerability-list'.
> make: 
> "../../mk/wrapper/../../mk/buildlink3/../../mk/wrapper/../../mk/buildlink3/bsd.buildlink3.mk" 
> line 324: Need an operator
> make: 
> "../../mk/wrapper/../../mk/buildlink3/../../mk/wrapper/../../mk/buildlink3/bsd.buildlink3.mk" 
> line 327: Makefile appears to contain unresolved cvs/rcs/??? merge conflicts
> make: 
> "../../mk/wrapper/../../mk/buildlink3/../../mk/wrapper/../../mk/buildlink3/bsd.buildlink3.mk" 
> line 332: Need an operator
> make: Fatal errors encountered -- cannot continue
> 
> make: stopped in /usr/pkgsrc/audio/musicbrainz
> *** Error code 1

Do you have files with conflicts? looks like it.