1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00

Update to 2.3.16.

This commit is contained in:
Joe Marcus Clarke 2007-05-31 05:52:02 +00:00
parent 03d257c5b2
commit 3e7961e639
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=192445
5 changed files with 51 additions and 52 deletions

View File

@ -7,8 +7,7 @@
#
PORTNAME= balsa
PORTVERSION= 2.3.15
PORTREVISION= 2
PORTVERSION= 2.3.16
CATEGORIES= mail gnome
MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/
DISTNAME= balsa-${PORTVERSION}

View File

@ -1,3 +1,3 @@
MD5 (balsa-2.3.15.tar.bz2) = 1f38726db84fb5a9b2e8bdfa3e11baf0
SHA256 (balsa-2.3.15.tar.bz2) = 835e154f03ea6556c81cd5d408c4dd070e7658214f7c78e9eed0f7fa7fb42f6d
SIZE (balsa-2.3.15.tar.bz2) = 2534332
MD5 (balsa-2.3.16.tar.bz2) = c2919b9d30b8df9f917740230212435b
SHA256 (balsa-2.3.16.tar.bz2) = ddd58f9ffc3a147f1256850b09eab964f95a8fc7c625a0a446547baa74c19232
SIZE (balsa-2.3.16.tar.bz2) = 2550609

View File

@ -1,11 +1,11 @@
--- libbalsa/mailbox_local.h.orig Thu Dec 29 01:49:05 2005
+++ libbalsa/mailbox_local.h Thu Dec 29 01:49:13 2005
@@ -66,7 +66,7 @@ struct _LibBalsaMailboxLocalClass {
--- libbalsa/mailbox_local.h.orig Sun May 6 13:57:53 2007
+++ libbalsa/mailbox_local.h Thu May 31 01:04:10 2007
@@ -79,7 +79,7 @@ struct _LibBalsaMailboxLocalClass {
gint (*check_files)(const gchar * path, gboolean create);
void (*set_path)(LibBalsaMailboxLocal * local, const gchar * path);
void (*remove_files)(LibBalsaMailboxLocal * local);
- guint (*fileno)(LibBalsaMailboxLocal * local, guint msgno);
+ guint (*sti_fileno)(LibBalsaMailboxLocal * local, guint msgno);
LibBalsaMailboxLocalMessageInfo *(*get_info)(LibBalsaMailboxLocal * local,
guint msgno);
};
GObject *libbalsa_mailbox_local_new(const gchar * path, gboolean create);

View File

@ -1,5 +1,5 @@
--- libbalsa/mailbox_maildir.c.orig Tue Dec 27 04:44:40 2005
+++ libbalsa/mailbox_maildir.c Thu Dec 29 01:52:57 2005
--- libbalsa/mailbox_maildir.c.orig Sun May 6 13:57:53 2007
+++ libbalsa/mailbox_maildir.c Thu May 31 01:06:37 2007
@@ -25,6 +25,8 @@
#define _XOPEN_SOURCE 500
#define _XOPEN_SOURCE_EXTENDED 1
@ -9,25 +9,25 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
@@ -50,7 +52,7 @@ struct message_info {
@@ -49,7 +51,7 @@ struct message_info {
/* The message's order when parsing; needed for saving the message
* tree in a form that will match the msgnos when the mailbox is
* reopened. */
- guint fileno;
+ guint mi_fileno;
};
#define REAL_FLAGS(flags) (flags & LIBBALSA_MESSAGE_FLAGS_REAL)
#define REAL_FLAGS(flags) ((flags) & LIBBALSA_MESSAGE_FLAGS_REAL)
#define FLAGS_REALLY_DIFFER(orig_flags, flags) \
@@ -194,7 +196,7 @@ libbalsa_mailbox_maildir_class_init(LibB
@@ -174,7 +176,7 @@ libbalsa_mailbox_maildir_class_init(LibB
libbalsa_mailbox_local_class->check_files = lbm_maildir_check_files;
libbalsa_mailbox_local_class->set_path = lbm_maildir_set_path;
libbalsa_mailbox_local_class->remove_files = lbm_maildir_remove_files;
libbalsa_mailbox_local_class->load_message = lbm_maildir_load_message;
- libbalsa_mailbox_local_class->fileno = lbm_maildir_fileno;
+ libbalsa_mailbox_local_class->sti_fileno = lbm_maildir_fileno;
libbalsa_mailbox_local_class->get_info = lbm_maildir_get_info;
}
static void
@@ -408,7 +410,7 @@ static LibBalsaMessageFlag parse_filenam
@@ -389,7 +391,7 @@ static LibBalsaMessageFlag parse_filenam
}
static void lbm_maildir_parse(LibBalsaMailboxMaildir * mdir,
@ -36,10 +36,10 @@
{
gchar *path;
GDir *dir;
@@ -463,12 +465,12 @@ static void lbm_maildir_parse(LibBalsaMa
@@ -442,12 +444,12 @@ static void lbm_maildir_parse(LibBalsaMa
msg_info->key=key;
msg_info->filename=g_strdup(filename);
msg_info->flags = msg_info->orig_flags = flags;
msg_info->local_info.flags = msg_info->orig_flags = flags;
- msg_info->fileno = 0;
+ msg_info->mi_fileno = 0;
}
@ -52,7 +52,7 @@
}
g_dir_close(dir);
}
@@ -476,16 +478,16 @@ static void lbm_maildir_parse(LibBalsaMa
@@ -455,16 +457,16 @@ static void lbm_maildir_parse(LibBalsaMa
static void
lbm_maildir_parse_subdirs(LibBalsaMailboxMaildir * mdir)
{
@ -73,7 +73,7 @@
}
static gboolean
@@ -927,7 +929,7 @@ lbm_maildir_fileno(LibBalsaMailboxLocal
@@ -864,7 +866,7 @@ lbm_maildir_fileno(LibBalsaMailboxLocal
msg_info =
message_info_from_msgno((LibBalsaMailboxMaildir *) local, msgno);
@ -81,4 +81,4 @@
+ return msg_info->mi_fileno;
}
/* Called with mailbox locked. */
static LibBalsaMailboxLocalMessageInfo *

View File

@ -1,5 +1,5 @@
--- libbalsa/mailbox_mh.c.orig Sat Sep 16 03:27:23 2006
+++ libbalsa/mailbox_mh.c Sat Dec 16 01:40:22 2006
--- libbalsa/mailbox_mh.c.orig Wed May 16 13:49:05 2007
+++ libbalsa/mailbox_mh.c Thu May 31 01:09:09 2007
@@ -27,6 +27,8 @@
/* to compile this on BSD/Darwin */
#undef _POSIX_SOURCE
@ -9,25 +9,25 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
@@ -46,7 +48,7 @@ struct message_info {
LibBalsaMessageFlag flags;
LibBalsaMessageFlag orig_flags;
LibBalsaMessage *message;
@@ -45,7 +47,7 @@
struct message_info {
LibBalsaMailboxLocalMessageInfo local_info;
LibBalsaMessageFlag orig_flags; /* Has only real flags */
- gint fileno;
+ gint mi_fileno;
};
static LibBalsaMailboxLocalClass *parent_class = NULL;
@@ -278,7 +280,7 @@ libbalsa_mailbox_mh_load_config(LibBalsa
#define REAL_FLAGS(flags) (flags & LIBBALSA_MESSAGE_FLAGS_REAL)
@@ -260,7 +262,7 @@ libbalsa_mailbox_mh_load_config(LibBalsa
#define MH_BASENAME(msgno) \
g_strdup_printf((msgno->orig_flags & LIBBALSA_MESSAGE_FLAG_DELETED) ? \
#define MH_BASENAME(msg_info) \
g_strdup_printf((msg_info->orig_flags & LIBBALSA_MESSAGE_FLAG_DELETED) ? \
- ",%d" : "%d", msg_info->fileno)
+ ",%d" : "%d", msg_info->mi_fileno)
static GMimeStream *
libbalsa_mailbox_mh_get_message_stream(LibBalsaMailbox * mailbox,
@@ -338,7 +340,7 @@ static gint
@@ -335,7 +337,7 @@ static gint
lbm_mh_compare_fileno(const struct message_info ** a,
const struct message_info ** b)
{
@ -35,8 +35,8 @@
+ return (*a)->mi_fileno - (*b)->mi_fileno;
}
#define INVALID_FLAG ((unsigned) -1)
@@ -357,7 +359,7 @@ lbm_mh_parse_mailbox(LibBalsaMailboxMh *
static void
@@ -352,7 +354,7 @@ lbm_mh_parse_mailbox(LibBalsaMailboxMh *
while ((filename = g_dir_read_name(dir)) != NULL) {
LibBalsaMessageFlag delete_flag = 0;
@ -45,7 +45,7 @@
if (filename[0] == ',') {
filename++;
@@ -366,22 +368,22 @@ lbm_mh_parse_mailbox(LibBalsaMailboxMh *
@@ -361,22 +363,22 @@ lbm_mh_parse_mailbox(LibBalsaMailboxMh *
if (lbm_mh_check_filename(filename) == FALSE)
continue;
@ -64,7 +64,7 @@
+ GINT_TO_POINTER(mh_fileno));
if (!msg_info) {
msg_info = g_new0(struct message_info, 1);
msg_info->flags = INVALID_FLAG;
msg_info->local_info.flags = INVALID_FLAG;
g_hash_table_insert(mh->messages_info,
- GINT_TO_POINTER(fileno), msg_info);
+ GINT_TO_POINTER(mh_fileno), msg_info);
@ -74,7 +74,7 @@
}
msg_info->orig_flags = delete_flag;
}
@@ -399,17 +401,17 @@ static const gchar *LibBalsaMailboxMhRep
@@ -394,17 +396,17 @@ static const gchar *LibBalsaMailboxMhRep
static const gchar *LibBalsaMailboxMhRecent = "recent:";
static void
@ -96,7 +96,7 @@
return;
}
@@ -438,7 +440,7 @@ lbm_mh_handle_seq_line(LibBalsaMailboxMh
@@ -433,7 +435,7 @@ lbm_mh_handle_seq_line(LibBalsaMailboxMh
for (seq = sequences; *seq; seq++) {
guint end = 0;
@ -105,7 +105,7 @@
if (!**seq)
continue;
@@ -449,11 +451,11 @@ lbm_mh_handle_seq_line(LibBalsaMailboxMh
@@ -444,11 +446,11 @@ lbm_mh_handle_seq_line(LibBalsaMailboxMh
if (sscanf(line, "%d", &end) != 1)
break; /* FIXME report error? */
}
@ -120,7 +120,7 @@
}
g_strfreev(sequences);
@@ -585,7 +587,7 @@ lbm_mh_check(LibBalsaMailboxMh * mh, con
@@ -580,7 +582,7 @@ lbm_mh_check(LibBalsaMailboxMh * mh, con
sequences = g_strsplit(p, " ", 0);
for (seq = sequences; *seq; seq++) {
guint end = 0;
@ -129,7 +129,7 @@
if (!**seq)
continue;
@@ -596,15 +598,15 @@ lbm_mh_check(LibBalsaMailboxMh * mh, con
@@ -591,15 +593,15 @@ lbm_mh_check(LibBalsaMailboxMh * mh, con
if (sscanf(p, "%d", &end) != 1)
break; /* FIXME report error? */
}
@ -148,7 +148,7 @@
}
g_strfreev(sequences);
break;
@@ -691,7 +693,7 @@ libbalsa_mailbox_mh_check(LibBalsaMailbo
@@ -686,7 +688,7 @@ libbalsa_mailbox_mh_check(LibBalsaMailbo
else {
g_ptr_array_remove(mh->msgno_2_msg_info, msg_info);
g_hash_table_remove(mh->messages_info,
@ -157,8 +157,8 @@
libbalsa_mailbox_local_msgno_removed(mailbox, msgno);
if (renumber > msgno)
/* First message that needs renumbering. */
@@ -768,11 +770,11 @@ lbm_mh_flag_line(struct message_info *ms
if (!(msg_info->flags & flag))
@@ -763,11 +765,11 @@ lbm_mh_flag_line(struct message_info *ms
if (!(msg_info->local_info.flags & flag))
return;
- if (li->last < msg_info->fileno - 1) {
@ -172,7 +172,7 @@
}
static gboolean
@@ -853,7 +855,7 @@ libbalsa_mailbox_mh_sync(LibBalsaMailbox
@@ -849,7 +851,7 @@ libbalsa_mailbox_mh_sync(LibBalsaMailbox
/* free old information */
g_ptr_array_remove(mh->msgno_2_msg_info, msg_info);
g_hash_table_remove(mh->messages_info,
@ -181,7 +181,7 @@
libbalsa_mailbox_local_msgno_removed(mailbox, msgno);
} else {
lbm_mh_flag_line(msg_info, LIBBALSA_MESSAGE_FLAG_NEW, &unseen);
@@ -1084,7 +1086,7 @@ libbalsa_mailbox_mh_fetch_message_struct
@@ -1038,7 +1040,7 @@ libbalsa_mailbox_mh_fetch_message_struct
* we'll just add new lines and let the next sync merge them with any
* existing lines. */
static void
@ -190,7 +190,7 @@
LibBalsaMessageFlag flags)
{
FILE *fp;
@@ -1095,13 +1097,13 @@ lbm_mh_update_sequences(LibBalsaMailboxM
@@ -1049,13 +1051,13 @@ lbm_mh_update_sequences(LibBalsaMailboxM
return;
if (flags & LIBBALSA_MESSAGE_FLAG_NEW)
@ -208,7 +208,7 @@
fclose(fp);
}
@@ -1118,7 +1120,7 @@ libbalsa_mailbox_mh_add_message(LibBalsa
@@ -1072,7 +1074,7 @@ libbalsa_mailbox_mh_add_message(LibBalsa
int fd;
GMimeStream *out_stream;
GMimeFilter *crlffilter;
@ -217,7 +217,7 @@
int retries;
GMimeStream *in_stream;
@@ -1161,14 +1163,14 @@ libbalsa_mailbox_mh_add_message(LibBalsa
@@ -1115,14 +1117,14 @@ libbalsa_mailbox_mh_add_message(LibBalsa
libbalsa_mime_stream_shared_unlock(stream);
g_object_unref(in_stream);
@ -234,7 +234,7 @@
rename_status = libbalsa_safe_rename(tmp, new_filename);
g_free(new_filename);
if (rename_status != -1)
@@ -1191,9 +1193,9 @@ libbalsa_mailbox_mh_add_message(LibBalsa
@@ -1145,9 +1147,9 @@ libbalsa_mailbox_mh_add_message(LibBalsa
"Too high activity?");
return FALSE;
}