gnome_upgrade failure

[J. W. Ballantine]

Yesterday I tried to upgrade my 4.9-STABLE box from 2.4 to 2.5.
I did a cvsup, followed by a marcusmerge, and lastly a gnome_upgrade.sh.

The gnome_upgrade said it failed because of a glib-2* recursive failure,
but when I looked at the log, the end read:

[Updating the pkgdb <format:bdb1_btree> in /var/db/pkg ... - 318 packages 
found (-0 +1) . done]
--->  Upgrading 'gnome2-fifth-toe-2.4.2' to 'gnome2-fifth-toe-2.5.91' 
(x11/gnome2-fifth-toe)
--->  Building '/usr/ports/x11/gnome2-fifth-toe' with make flags: BATCH=yes 
GNOME_UPGRADE_SH_VER=42 GNOME_UPGRADE_SH_VER=42
pango-1.3.6: "/usr/ports/x11-fonts/Xft" non-existent -- dependency list 
incomplete
XFree86-clients-4.3.0_6: "/usr/ports/x11-fonts/Xft" non-existent -- dependency 
list incomplete
mozilla-1.6_3,2: "/usr/ports/x11-fonts/Xft" non-existent -- dependency list 
incomplete
SNIP...SNIP...SNIP Cleaning for ..........
===>  Cleaning for startup-notification-0.5_2
===>  Cleaning for gnome2-fifth-toe-2.5.91
===>  Vulnerability check disabled
===>  Extracting for gnome2-fifth-toe-2.5.91
===>  Patching for gnome2-fifth-toe-2.5.91
===>  Configuring for gnome2-fifth-toe-2.5.91
--->  Backing up the old version
--->  Uninstalling the old version
Stale dependency: gnome2-fifth-toe-2.4.2 --> gimp-gnome-2.0.pre3_1,1 -- 
manually run 'pkgdb -F' to fix, or specify -O to force.
** The following packages were not installed or upgraded (*:skipped / !:failed)
	! x11/gnome2-fifth-toe (gnome2-fifth-toe-2.4.2)	(uninstall error)

After I do a pkdb -F, should I rerun the gnome_upgrade.sh or just do a
portupgrade on gnome2-fifth-toe?

Jim