In /usr/pkgsrc/lang/gcc3 I'm trying to build gcc3 and getting:

# make
make: "/usr/pkgsrc/lang/gcc3/../../mk/bsd.pkg.defaults.mk" line 88: Need 
an operator
make: "/usr/pkgsrc/lang/gcc3/../../mk/bsd.pkg.defaults.mk" line 90: 
Makefile appears to contain unresolved cvs/rcs/??? merge conflicts
make: "/usr/pkgsrc/lang/gcc3/../../mk/bsd.pkg.defaults.mk" line 104: 
Need an operator
make: "/usr/pkgsrc/lang/gcc3/../../mk/bsd.pkg.defaults.mk" line 160: 
Need an operator
make: "/usr/pkgsrc/lang/gcc3/../../mk/bsd.pkg.defaults.mk" line 162: 
Makefile appears to contain unresolved cvs/rcs/??? merge conflicts
make: "/usr/pkgsrc/lang/gcc3/../../mk/bsd.pkg.defaults.mk" line 174: 
Need an operator
make: Fatal errors encountered -- cannot continue

make: stopped in /usr/pkgsrc/lang/gcc3


###

The bsd.pkg.defaults.mk lines in question have things like "<<<<<<" and 
"=====". Some time has past since my last build, what am I forgetting? 
What do I need to re-read?

ciao!

leam