Update to 2.3.5.

5 files changed, 12 insertions, 48 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 451fd09b1406..74eeafa334d2 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	balsa
-PORTVERSION=	2.3.4
-PORTREVISION=	2
+PORTVERSION=	2.3.5
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/
 DISTNAME=	balsa-${PORTVERSION}
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index c5e0bcb6f7ef..1b417518b7f0 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1,2 +1,2 @@
-MD5 (balsa-2.3.4.tar.bz2) = 12b1ffb936ac679468adb33b422b72d8
-SIZE (balsa-2.3.4.tar.bz2) = 3137183
+MD5 (balsa-2.3.5.tar.bz2) = ccc5f1f11028dd604c6dac97017a1274
+SIZE (balsa-2.3.5.tar.bz2) = 3185594
diff --git a/mail/balsa/files/patch-libbalsa_mailbox_mbox.c b/mail/balsa/files/patch-libbalsa_mailbox_mbox.c
index 391f582b2926..d6843e323af4 100644
--- a/mail/balsa/files/patch-libbalsa_mailbox_mbox.c
+++ b/mail/balsa/files/patch-libbalsa_mailbox_mbox.c
@@ -1,19 +1,19 @@
---- libbalsa/mailbox_mbox.c.orig	Wed Nov 24 21:05:03 2004
-+++ libbalsa/mailbox_mbox.c	Wed Nov 24 21:06:54 2004
-@@ -27,6 +27,7 @@
- #include <libgnome/libgnome.h>
+--- libbalsa/mailbox_mbox.c.orig	Tue Sep 20 13:01:57 2005
++++ libbalsa/mailbox_mbox.c	Thu Sep 22 20:32:25 2005
+@@ -26,6 +26,7 @@
+ 
  #include <gmime/gmime-stream-fs.h>
  
 +#include <sys/stat.h>
  #include <stdlib.h>
  #include <unistd.h>
  #include <fcntl.h>
-@@ -195,7 +196,7 @@
+@@ -215,7 +216,7 @@ libbalsa_mailbox_mbox_create(const gchar
  	if(!create)
  	    return(-1);
  
 -	if ((fd = creat(path, S_IRUSR | S_IWUSR)) == -1) {
 +	if ((fd = open(path, O_CREAT | O_TRUNC | O_WRONLY, S_IRUSR | S_IWUSR)) == -1) {
- 	    g_warning("An error:\n%s\n occured while trying to "
+ 	    g_warning("An error:\n%s\n occurred while trying to "
  		      "create the mailbox \"%s\"\n",
  		      strerror(errno), path);
diff --git a/mail/balsa/files/patch-src_sendmsg-window.c b/mail/balsa/files/patch-src_sendmsg-window.c
deleted file mode 100644
index 0dd0d83e5245..000000000000
--- a/mail/balsa/files/patch-src_sendmsg-window.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/sendmsg-window.c.orig	Fri Jun 24 04:36:25 2005
-+++ src/sendmsg-window.c	Sun Jul 31 22:10:14 2005
-@@ -2009,7 +2009,7 @@ add_attachment(BalsaSendmsg * bsmsg, gch
- 		       ATTACH_ICON_COLUMN, pixbuf,
- 		       ATTACH_TYPE_COLUMN, content_type,
- 		       ATTACH_MODE_COLUMN, attach_data->mode,
--		       ATTACH_SIZE_COLUMN, attach_stat.st_size,
-+		       ATTACH_SIZE_COLUMN, (glong) attach_stat.st_size,
- 		       ATTACH_DESC_COLUMN, utf8name,
- 		       -1);
-     g_object_unref(attach_data);
-@@ -2659,7 +2659,7 @@ render_attach_size(GtkTreeViewColumn *co
- 		   GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
- {
-     gint mode;
--    gint size;
-+    glong size;
-     gchar *sstr;
- 
-     gtk_tree_model_get(model, iter, ATTACH_MODE_COLUMN, &mode,
-@@ -2674,7 +2674,7 @@ render_attach_size(GtkTreeViewColumn *co
-     else if (size > 1200)
- 	sstr = g_strdup_printf("%.2fkB", (gfloat)size / (gfloat)1024);
-     else
--	sstr = g_strdup_printf("%dB", size);
-+	sstr = g_strdup_printf("%ldB", size);
-     g_object_set(cell, "text", sstr, NULL);
- }
- 
-@@ -2780,7 +2780,7 @@ create_info_pane(BalsaSendmsg * bsmsg, S
- 			       GDK_TYPE_PIXBUF,
- 			       G_TYPE_STRING,
- 			       G_TYPE_INT,
--			       G_TYPE_INT,
-+			       G_TYPE_LONG,
- 			       G_TYPE_STRING);
- 
-     bsmsg->attachments[1] = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index fdb4f4d7b88a..6dc8b6b49c19 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -63,6 +63,8 @@ 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/message-window.png
+share/gnome/help/balsa/C/figures/msg-part-select.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
@@ -111,6 +113,7 @@ share/locale/lv/LC_MESSAGES/balsa.mo
 share/locale/ml/LC_MESSAGES/balsa.mo
 share/locale/ms/LC_MESSAGES/balsa.mo
 share/locale/nb/LC_MESSAGES/balsa.mo
+share/locale/ne/LC_MESSAGES/balsa.mo
 share/locale/nl/LC_MESSAGES/balsa.mo
 share/locale/nn/LC_MESSAGES/balsa.mo
 share/locale/no/LC_MESSAGES/balsa.mo