link problems with glade2 using latest cvsup, FBSD 6-STABLE

[Bob Frazier]

OS:  freebsd 6-stable (as of a week ago)
ports:  refreshed today (and several times over the week to try and correct this problem)

port:  devel/glade2

Bug description:  when attempting to build glade2 using the latest ports (etc.) in a 
gnome upgrade, and after attempting portupgrade -Rf gettext (which took a couple of days 
to complete, FYI, and had the same error at the end), you get a link error (missing 
symbol '_' in gnome/gnomecontrol.c).

possible workaround:  see patch (below).  In short I force definition of '_' as 
'gettext'.  I will have to complete the gnome upgrade before I can determine whether or 
not this will actually work.


(please excuse wraparound, thanks)

--- work/glade-2.12.1/glade/gnome/gnomecontrol.c.old    2007-11-04 19:07:59.000000000 -0800
+++ work/glade-2.12.1/glade/gnome/gnomecontrol.c        2007-11-04 19:08:41.000000000 -0800
@@ -42,10 +42,15 @@
  #include <bonobo.h>

  /* Include the 21x21 icon pixmap for this widget, to be used in the palette */
  #include "../graphics/gnome-control.xpm"

+// my temporary patch
+#ifndef _
+#define _(X) gettext(X)
+#endif // _
+
  /*
   * This is the GbWidget struct for this widget (see ../gbwidget.h).
   * It is initialized in the init() function at the end of this file
   */
  static GbWidget gbwidget;