5 files changed, 47 insertions, 33 deletions

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 030d6547bd20..fbfe032eb47d 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	balsa2
-PORTVERSION=	2.0.3
+PORTVERSION=	2.0.4
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 		ftp://ftp.newton.cx/pub/balsa/
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
index fe5b5c4f7e5e..aa24b72202bb 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1 +1 @@
-MD5 (balsa-2.0.3.tar.bz2) = 76a8b19117b149387d11a1580e3839b6
+MD5 (balsa-2.0.4.tar.bz2) = 63f08cb6691de75833e4bce784794e50
diff --git a/mail/balsa2/files/patch-configure b/mail/balsa2/files/patch-configure
index 018334ba6040..14c25a764123 100644
--- a/mail/balsa2/files/patch-configure
+++ b/mail/balsa2/files/patch-configure
@@ -1,8 +1,8 @@
---- configure.orig	Sun Sep 15 14:42:04 2002
-+++ configure	Mon Sep 16 02:28:13 2002
-@@ -8477,13 +8477,13 @@
- 
+--- configure.orig	Tue Dec 24 07:03:55 2002
++++ configure	Tue Dec 31 14:09:47 2002
+@@ -8600,13 +8601,13 @@
  
+ if test x$enable_deprecated_pspell = xyes ; then
  
 -echo "$as_me:$LINENO: checking for new_pspell_manager in -lpspell" >&5
 -echo $ECHO_N "checking for new_pspell_manager in -lpspell... $ECHO_C" >&6
@@ -18,7 +18,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
-@@ -8494,7 +8494,7 @@
+@@ -8617,7 +8618,7 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -27,7 +27,7 @@
  #ifdef F77_DUMMY_MAIN
  #  ifdef __cplusplus
       extern "C"
-@@ -8504,7 +8504,7 @@
+@@ -8627,7 +8628,7 @@
  int
  main ()
  {
@@ -36,7 +36,7 @@
    ;
    return 0;
  }
-@@ -8521,18 +8521,18 @@
+@@ -8644,18 +8645,18 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -60,7 +60,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBPSPELL 1
  _ACEOF
-@@ -12348,7 +12348,7 @@
+@@ -11238,7 +11239,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -69,7 +69,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
-@@ -12403,7 +12403,7 @@
+@@ -11293,7 +11294,7 @@
  #define ENABLE_LDAP 1
  _ACEOF
  
diff --git a/mail/balsa2/files/patch-src_threads.h b/mail/balsa2/files/patch-src_threads.h
new file mode 100644
index 000000000000..62c60b878960
--- /dev/null
+++ b/mail/balsa2/files/patch-src_threads.h
@@ -0,0 +1,12 @@
+--- src/threads.h.orig	Tue Dec 31 14:06:47 2002
++++ src/threads.h	Tue Dec 31 14:07:32 2002
+@@ -21,6 +21,9 @@
+ 
+ #ifndef __THREADS_H__
+ #define __THREADS_H__
++
++#include <pthread.h>
++
+ /* FIXME: mailbox_lock is really an internal libbalsa mutex. */
+ extern pthread_mutex_t mailbox_lock;
+ 
diff --git a/mail/balsa2/pkg-plist b/mail/balsa2/pkg-plist
index 071c5027cfc5..28b4ce1c81f5 100644
--- a/mail/balsa2/pkg-plist
+++ b/mail/balsa2/pkg-plist
@@ -1,4 +1,5 @@
 bin/balsa
+bin/balsa-ab
 etc/sound/events/balsa.soundlist
 etc/sound/events/email.soundlist
 share/gnome/applications/balsa.desktop
@@ -8,25 +9,25 @@ share/gnome/balsa/pixmaps/balsa-top.png
 share/gnome/balsa/pixmaps/balsa-watermark.png
 share/gnome/balsa/pixmaps/balsa_icon.png
 share/gnome/balsa/pixmaps/balsa_logo.png
-share/gnome/help/balsa-manual/C/balsa-manual.xml
-share/gnome/help/balsa-manual/C/fdl-appendix.xml
-share/gnome/help/balsa-manual/C/figures/address-book-ldap.png
-share/gnome/help/balsa-manual/C/figures/address-book-modify.png
-share/gnome/help/balsa-manual/C/figures/address-book-start.png
-share/gnome/help/balsa-manual/C/figures/address-book-vcard.png
-share/gnome/help/balsa-manual/C/figures/address-book.png
-share/gnome/help/balsa-manual/C/figures/balsa_logo.png
-share/gnome/help/balsa-manual/C/figures/druid-start.png
-share/gnome/help/balsa-manual/C/figures/example-alias.png
-share/gnome/help/balsa-manual/C/figures/figuresdobaaddress-book-modify.png
-share/gnome/help/balsa-manual/C/figures/main-window-toolbar.png
-share/gnome/help/balsa-manual/C/figures/main-window.png
-share/gnome/help/balsa-manual/C/figures/newmsg-window-attachments.png
-share/gnome/help/balsa-manual/C/figures/newmsg-window-toolbar.png
-share/gnome/help/balsa-manual/C/figures/newmsg-window.png
-share/gnome/help/balsa-manual/C/figures/preferences-window.png
-share/gnome/help/balsa-manual/C/figures/spell-check.png
-share/gnome/omf/balsa/balsa-manual-C.omf
+share/gnome/help/balsa/C/balsa.xml
+share/gnome/help/balsa/C/fdl-appendix.xml
+share/gnome/help/balsa/C/figures/address-book-ldap.png
+share/gnome/help/balsa/C/figures/address-book-modify.png
+share/gnome/help/balsa/C/figures/address-book-start.png
+share/gnome/help/balsa/C/figures/address-book-vcard.png
+share/gnome/help/balsa/C/figures/address-book.png
+share/gnome/help/balsa/C/figures/balsa_logo.png
+share/gnome/help/balsa/C/figures/druid-start.png
+share/gnome/help/balsa/C/figures/example-alias.png
+share/gnome/help/balsa/C/figures/figuresdobaaddress-book-modify.png
+share/gnome/help/balsa/C/figures/main-window-toolbar.png
+share/gnome/help/balsa/C/figures/main-window.png
+share/gnome/help/balsa/C/figures/newmsg-window-attachments.png
+share/gnome/help/balsa/C/figures/newmsg-window-toolbar.png
+share/gnome/help/balsa/C/figures/newmsg-window.png
+share/gnome/help/balsa/C/figures/preferences-window.png
+share/gnome/help/balsa/C/figures/spell-check.png
+share/gnome/omf/balsa/balsa-C.omf
 share/gnome/pixmaps/gnome-balsa2.png
 share/gnome/sounds/balsa/newmail.wav
 share/gnome/sounds/balsa/startup.wav
@@ -49,6 +50,7 @@ share/locale/it/LC_MESSAGES/balsa.mo
 share/locale/ja/LC_MESSAGES/balsa.mo
 share/locale/ko/LC_MESSAGES/balsa.mo
 share/locale/lt/LC_MESSAGES/balsa.mo
+share/locale/lv/LC_MESSAGES/balsa.mo
 share/locale/ms/LC_MESSAGES/balsa.mo
 share/locale/nl/LC_MESSAGES/balsa.mo
 share/locale/nn/LC_MESSAGES/balsa.mo
@@ -69,8 +71,8 @@ share/locale/zh_CN/LC_MESSAGES/balsa.mo
 share/locale/zh_TW/LC_MESSAGES/balsa.mo
 @dirrm share/gnome/sounds/balsa
 @dirrm share/gnome/omf/balsa
-@dirrm share/gnome/help/balsa-manual/C/figures
-@dirrm share/gnome/help/balsa-manual/C
-@dirrm share/gnome/help/balsa-manual
+@dirrm share/gnome/help/balsa/C/figures
+@dirrm share/gnome/help/balsa/C
+@dirrm share/gnome/help/balsa
 @dirrm share/gnome/balsa/pixmaps
 @dirrm share/gnome/balsa