Building of abiword 3.0 fails on 6.1.5/amd64

[Ottavio Caruso <ottavio2006-netbsd%yahoo.com@localhost>]

I'm trying to build Abiword 3.0.0 from sources reusing the existing
files (pointing to 2.8). I have changed Makefile.common pointing to
3.0.0 and updates PLIST. Presumably I should also modify all patches,
because this is what I get with pkglint:

-bash-4.3# pkglint
ERROR: ../../editors/abiword/patches/patch-aa:3: Comment expected.
WARN: ../../editors/abiword/patches/patch-aa:6: Unexpected end of hunk
(-7,+7 expected).
ERROR: ../../editors/abiword/patches/patch-ab:3: Comment expected.
ERROR: ../../editors/abiword/patches/patch-ac:3: Comment expected.
ERROR: ../../editors/abiword/patches/patch-ad:3: Comment expected.
ERROR: ../../editors/abiword/patches/patch-sa:3: Comment expected.
5 errors and 1 warnings found. (Use -e for more details.)

However I've ignored that and run:
# make NO_CHECKSUM=yes update

and it stops here:


3 out of 3 hunks failed--saving rejects to src/Makefile.in.rej
done
Patch /usr/pkgsrc/editors/abiword/../../editors/abiword/patches/patch-src_Makefile.in
failed
=> Verifying /usr/pkgsrc/editors/abiword/../../editors/abiword/patches/patch-src_af_util_xp_ut__go__file.h
=> Applying pkgsrc patch
/usr/pkgsrc/editors/abiword/../../editors/abiword/patches/patch-src_af_util_xp_ut__go__file.h
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_af_util_xp_ut__go__file.h,v 1.1 2012/05/03
06:16:42 wiz Exp $
|
|Fix build with glib-2.32.
|
|--- src/af/util/xp/ut_go_file.h.orig   2009-08-27 13:27:10.000000000 +0000
|+++ src/af/util/xp/ut_go_file.h
--------------------------
Patching file src/af/util/xp/ut_go_file.h using Plan A...
Reversed (or previously applied) patch detected!  Assume -R? [y]
Hunk #1 succeeded at 31.
done
ERROR: Patching failed due to modified or broken patch file(s):
ERROR:  /usr/pkgsrc/editors/abiword/../../editors/abiword/patches/patch-aa
ERROR:  /usr/pkgsrc/editors/abiword/../../editors/abiword/patches/patch-ab
ERROR:  /usr/pkgsrc/editors/abiword/../../editors/abiword/patches/patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp
ERROR:  /usr/pkgsrc/editors/abiword/../../editors/abiword/patches/patch-plugins_garble_xp_abiword-garble-png.cpp
ERROR:  /usr/pkgsrc/editors/abiword/../../editors/abiword/patches/patch-src_Makefile.in
*** Error code 1

Stop.
make: stopped in /usr/pkgsrc/editors/abiword
*** Error code 1

Stop.
make: stopped in /usr/pkgsrc/editors/abiword
*** Error code 1

Stop.
make: stopped in /usr/pkgsrc/editors/abiword
*** Error code 1

Stop.

I could past the etire log to pastebin if needed.