this is what happen when i try to compile the package with make update
(i updated via CVS before)
# cd mysql4-server
# make update
make: "/usr/pkgsrc/databases/mysql4-server/Makefile" line 1: Need an operat=
or
make: "/usr/pkgsrc/databases/mysql4-server/Makefile" line 3: Makefile
appears to contain unresolved cvs/rcs/??? merge conflicts
make: "/usr/pkgsrc/databases/mysql4-server/Makefile" line 5: Need an operat=
or
make: Fatal errors encountered -- cannot continue

make: stopped in /usr/pkgsrc/databases/mysql4-server
# pico Makefile
# make update
=3D=3D=3D> Resuming update for mysql-server-4.1.11
=3D=3D=3D> Checking for vulnerabilities in mysql-server-4.1.11
=3D=3D=3D> Patching for mysql-server-4.1.11
=3D=3D=3D> Applying pkgsrc patches for mysql-server-4.1.11
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to Makefile.in.rej
Patch /usr/pkgsrc/databases/mysql4-server/patches/patch-aa failed
*** Error code 1

Stop.
make: stopped in /usr/pkgsrc/databases/mysql4-server
*** Error code 1

Stop.
make: stopped in /usr/pkgsrc/databases/mysql4-server
*** Error code 1

Stop.
make: stopped in /usr/pkgsrc/databases/mysql4-server
#