balsa-2.2.1 almost compiles

[supraexpress at globaleyes.net]

I am trying to "upgrade" the FBSD balsa2-2.0.18 port to use balsa-2.2.1 but
have run into a snag, as listed below. Attached are three patches that I had
to make (don't know if the AF_INET6/POSIX test in
"libbalsa/imap/imap-handle.c.diffs" is the proper way to selectively include
AF_INET6 or not). I also had to remove the "patch-libmutt_configure" patch as
balsa-2.2.1 configure now has the change in question, already included.


if gcc -DG_DISABLE_DEPRECATED -I. -I. -I.. -I.. -I.. -I../libbalsa  -I../libbalsa/imap  -DORBIT2=1 -D_THREAD_SAFE -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/orbit-2.0 -I/usr/local/include/libbonobo-2.0 -I/usr/local/include/bonobo-activation-2.0 -I/usr/local/include/libart-2.0 -I/usr/local/include/atk-1.0 -I/usr/local/include/libxml2 -I/usr/local/include -I/usr/X11R6/include/libgnome-2.0 -I/usr/X11R6/include/gconf/2 -I/usr/X11R6/include/gnome-vfs-2.0 -I/usr/X11R6/lib/gnome-vfs-2.0/include -I/usr/X11R6/include/libgnomeui-2.0 -I/usr/X11R6/include/libgnomecanvas-2.0 -I/usr/X11R6/include/gtk-2.0 -I/usr/X11R6/include/libbonoboui-2.0 -I/usr/X11R6/include/pango-1.0 -I/usr/X11R6/include -I/usr/local/include/freetype2 -I/usr/X11R6/lib/gtk-2.0/include -I/usr/X11R6/include/gnome-vfs-module-2.0 -I/usr/X11R6/include/gmime-2.0   -I/usr/local/include/libart-2.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/libxm
 l2 -I/usr/local/include -I/usr/local/include/atk-1.0 -I/usr/X11R6/include/libgnomeprint-2.2 -I/usr/X11R6/include/pango-1.0 -I/usr/X11R6/include/libgnomeprintui-2.2 -I/usr/X11R6/include/libgnomecanvas-2.0 -I/usr/X11R6/include -I/usr/local/include/freetype2 -I/usr/X11R6/include/gtk-2.0 -I/usr/X11R6/lib/gtk-2.0/include   -I/usr/local/include   -I/usr/local/include -D_THREAD_SAFE  -O -mcpu=pentiumpro -march=pentiumpro -mcpu=pentiumpro -MT misc.o -MD -MP -MF ".deps/misc.Tpo" -c -o misc.o misc.c;  then mv -f ".deps/misc.Tpo" ".deps/misc.Po"; else rm -f ".deps/misc.Tpo"; exit 1; fi
In file included from misc.c:33:
/usr/include/sys/file.h:156: error: syntax error before "u_int"
*** Error code 1

Stop in /usr/ports/mail/balsa2/work/balsa-2.2.1/libbalsa.
*** Error code 1

Stop in /usr/ports/mail/balsa2/work/balsa-2.2.1/libbalsa.
-------------- next part --------------
*** libbalsa/imap/imap-handle.c.orig	Fri Jul 30 01:51:18 2004
--- libbalsa/imap/imap-handle.c	Thu Aug  5 09:37:49 2004
***************
*** 22,27 ****
--- 22,28 ----
  #define _BSD_SOURCE   1
  #include <sys/types.h>
  #include <sys/socket.h>
+ #include <netinet/in.h>
  #include <netdb.h>
  #include <glib.h>
  #include <glib-object.h>
***************
*** 361,368 ****
--- 362,371 ----
      fd = socket (cur->ai_family, cur->ai_socktype, cur->ai_protocol);
      if (fd >= 0) {
        int sa_size = sizeof (struct sockaddr_in);
+ #if __POSIX_VISIBLE >= 200112
        if (cur->ai_addr->sa_family == AF_INET6)
          sa_size = sizeof (struct sockaddr_in6);
+ #endif
        if ((rc=connect(fd, cur->ai_addr, sa_size)) == 0) {
  	break;
        } else {
-------------- next part --------------
*** libbalsa/mailbox_maildir.c.orig	Fri Jul 30 01:51:17 2004
--- libbalsa/mailbox_maildir.c	Thu Aug  5 09:41:26 2004
***************
*** 31,36 ****
--- 31,37 ----
  #include <fcntl.h>
  #include <errno.h>
  #include <string.h>
+ #include <sys/stat.h>
  
  #include "libbalsa.h"
  #include "misc.h"
-------------- next part --------------
*** libbalsa/mailbox_mh.c.orig	Fri Jul 30 01:51:18 2004
--- libbalsa/mailbox_mh.c	Thu Aug  5 09:43:19 2004
***************
*** 32,37 ****
--- 32,38 ----
  #include <errno.h>
  #include <utime.h>
  #include <string.h>
+ #include <sys/stat.h>
  
  #include "libbalsa.h"
  #include "misc.h"