gnome_upgrade fails @ gtk-gnutella

[Fernan Aguero]

First of all, thanks for the work you've all put into this
new version of gnome for FreeBSD!

I've read the announcement, downloaded the upgrade script,
cvsuped my tree and started the upgrade.

It failed at stage 4 while building gtk-gnutella. The last
lines of the output follow. 

I have searched the archives and have not seen this
reported. Also, there is no PR open about it. A search in
Google only brings one hit, which shows the same failure in
netbsd and one line saying that someone may have fixed it:
http://mail-index.netbsd.org/pkgsrc-bulk/2004/12/30/0002.html

The list of my installed ports and their versions (i.e. the
output of pkg_version -v) is at
http://genoma.unsam.edu.ar/~fernan/freebsd/pkg_version-12.Mar.2005.txt
I made the list after the gnome_upgrade script failed,
however, so some ports have already been deleted by the script.

This is on FreeBSD-4.11, i386.

Thanks in advance for any help,

Fernan

[ ... ]
Checking libgtk2.a in gtk2...^M
cd gtk2; make libgtk2.a^M
/bin/rm -f downloads.o^M
cc -c -I../../../.. -I../../.. -I../..  -I/usr/local/include/atk-1.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/X11R6/include/gtk-2.0 -I/usr/X11R6/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/X11R6/include/pango-1.0 -I/usr/local/include/freetype2 -I/usr/local/include -I/usr/local/include/libxml2 -I/usr/local/include -DGUI_SOURCES -DCURDIR=src/ui/gtk/gtk2 -O -O -pipe -I/usr/local/include/ downloads.c^M
In file included from downloads.c:30:^M
pbarcellrenderer.h:57: warning: `GTK_TYPE_CELL_RENDERER_PROGRESS' redefined^M
/usr/X11R6/include/gtk-2.0/gtk/gtkcellrendererprogress.h:34: warning: this is the location of the previous definition^M
In file included from downloads.c:30:^M
pbarcellrenderer.h:62: redefinition of `GtkCellRendererProgress'^M
/usr/X11R6/include/gtk-2.0/gtk/gtkcellrendererprogress.h:41: `GtkCellRendererProgress' previously declared here^M
pbarcellrenderer.h:63: redefinition of `GtkCellRendererProgressClass'^M
/usr/X11R6/include/gtk-2.0/gtk/gtkcellrendererprogress.h:42: `GtkCellRendererProgressClass' previously declared here^M
pbarcellrenderer.h:66: redefinition of `struct _GtkCellRendererProgress'^M
pbarcellrenderer.h:71: redefinition of `struct _GtkCellRendererProgressClass'^M
*** Error code 1