10 files changed, 58 insertions, 190 deletions

diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index 625e8f08abb2..b10c33720382 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTVERSION=	1.2.3
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://people.FreeBSD.org/~sobomax/:local
diff --git a/mail/evolution-devel/distinfo b/mail/evolution-devel/distinfo
index 7b3dda4a6de4..444317781d0f 100644
--- a/mail/evolution-devel/distinfo
+++ b/mail/evolution-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome/evolution-1.2.2.tar.bz2) = 69805b56b0c6e44de26e9542554f4da3
+MD5 (gnome/evolution-1.2.3.tar.bz2) = e1fd6e2fcfddb555a042e96b558ae84f
 MD5 (gnome/db-3.1.17.tar.bz2) = b237f4e38a650d096389ff54d564928d
diff --git a/mail/evolution-devel/files/patch-camel_camel-mime-utils.c b/mail/evolution-devel/files/patch-camel_camel-mime-utils.c
index 33111196a800..a3ac61282d69 100644
--- a/mail/evolution-devel/files/patch-camel_camel-mime-utils.c
+++ b/mail/evolution-devel/files/patch-camel_camel-mime-utils.c
@@ -1,11 +1,29 @@
---- camel/camel-mime-utils.c.orig	Fri May  3 15:47:41 2002
-+++ camel/camel-mime-utils.c	Sun May  5 18:09:24 2002
-@@ -3388,6 +3388,8 @@
- 		}
- 		d(printf("named offset = %d\n", offset));
+--- camel/camel-mime-utils.c.orig	Mon Oct  7 22:44:40 2002
++++ camel/camel-mime-utils.c	Mon Dec  2 02:34:31 2002
+@@ -3387,6 +3387,8 @@
+ 		return 0;
  	}
-+
+ 
 +	tm.tm_isdst = -1;
++
+ 	d(printf ("\ndecoding date '%s'\n", inptr));
  
- 	t = mktime(&tm);
- #if defined(HAVE_TIMEZONE)
+ 	memset (&tm, 0, sizeof(tm));
+@@ -3739,8 +3741,6 @@
+ 	/* X-Mailing-List: gnome-hackers */
+ 	/* X-Mailing-List: <gnome-hackers> */
+ 	{ "X-Mailing-List", "[ \t]*<?([^@>]+)@?([^ \n\t\r>]*)" },
+-	/* X-Loop: gnome-hackers@gnome.org */
+-	{ "X-Loop", "[ \t]*([^@]+)@?([^ \n\t\r>]*)" },
+ 	/* List-Id: GNOME stuff <gnome-hackers.gnome.org> */
+ 	/* List-Id: <gnome-hackers.gnome.org> */
+ 	/* List-Id: <gnome-hackers> */
+@@ -3756,6 +3756,8 @@
+ 	/* X-List: gnome-hackers */
+ 	/* X-List: gnome-hackers@gnome.org */
+ 	{ "X-List", "[ \t]*([^@]+)@?([^ \n\t\r>]*)" },	
++	/* X-Loop: gnome-hackers@gnome.org */
++	{ "X-Loop", "[ \t]*([^@]+)@?([^ \n\t\r>]*)" },
+ 	/* Sender: owner-gnome-hackers@gnome.org */
+ 	/* Sender: owner-gnome-hacekrs */
+ 	{ "Sender", "[ \t]*owner-([^@]+)@?([^ @\n\t\r>]*)" },
diff --git a/mail/evolution-devel/files/patch-gpg-temp b/mail/evolution-devel/files/patch-gpg-temp
deleted file mode 100644
index 93871b48be15..000000000000
--- a/mail/evolution-devel/files/patch-gpg-temp
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -u -r1.2.8.1 camel-mime-filter-canon.c
---- camel/camel-mime-filter-canon.c	21 Jan 2003 03:07:05 -0000	1.2.8.1
-+++ camel/camel-mime-filter-canon.c	26 Feb 2003 23:12:09 -0000
-@@ -26,6 +26,7 @@
- #include <config.h>
- #endif
- 
-+#include <stdio.h>
- #include <string.h>
- #include <ctype.h>
- 
-@@ -170,7 +171,7 @@
- 	if (len)
- 		filter(f, in, len, prespace, out, outlen, outprespace);
- 
--	/* the data didn't contain an eol or was too short for "From ", we only need to check for "From" and add an eol */
-+	/* the data didn't contain an eol or was too short for "From ", we only need to check for "From" */
- 	if (f->backlen) {
- 		inptr = (unsigned char *)f->backbuf;
- 		inend = (unsigned char *)f->backbuf + f->backlen;
-@@ -195,20 +196,7 @@
- 			while (o>starto && (o[-1] == ' ' || o[-1] == '\t' || o[-1]=='\r'))
- 				o--;
- 		}
--		/* check end of line canonicalisation */
--		if (o>starto) {
--			if (flags & CAMEL_MIME_FILTER_CANON_CRLF) {
--				if (o[-1] != '\r')
--					*o++ = '\r';
--			} else {
--				if (o[-1] == '\r')
--					o--;
--			}
--		}
--
--		/* and always finish with an eol */
--		*o++ = '\n';
--
-+		
- 		*outlen = o - *out;
- 		
- 		f->backlen = 0;
-diff -u -r1.24 camel-stream-filter.c
---- camel/camel-stream-filter.c	19 Jul 2002 11:25:02 -0000	1.24
-+++ camel/camel-stream-filter.c	26 Feb 2003 23:12:10 -0000
-@@ -19,11 +19,16 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#include <stdio.h>
- #include <string.h>
- #include "camel-stream-filter.h"
- 
- #define d(x)
--/*#include <stdio.h>*/
- 
- /* use my malloc debugger? */
- /*extern void g_check(void *mp);*/
-@@ -368,10 +373,18 @@
- {
- 	CamelStreamFilter *filter = (CamelStreamFilter *)stream;
- 	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
--
-+	struct _filter *f;
-+	
- 	if (p->filteredlen > 0)
- 		return FALSE;
--
-+	
-+	f = p->filters;
-+	while (f) {
-+		if (f->filter->backlen > 0)
-+			return FALSE;
-+		f = f->next;
-+	}
-+	
- 	return camel_stream_eos(filter->source);
- }
- 
diff --git a/mail/evolution-devel/pkg-plist b/mail/evolution-devel/pkg-plist
index b50eacbbaf10..b4a01a6f0495 100644
--- a/mail/evolution-devel/pkg-plist
+++ b/mail/evolution-devel/pkg-plist
@@ -198,6 +198,7 @@ include/evolution/e-util/e-request.h
 include/evolution/e-util/e-sexp.h
 include/evolution/e-util/e-time-utils.h
 include/evolution/e-util/e-url.h
+include/evolution/e-util/e-xml-hash-utils.h
 include/evolution/e-util/md5-utils.h
 include/evolution/ebook/addressbook.h
 include/evolution/ebook/e-book-listener.h
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 625e8f08abb2..b10c33720382 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTVERSION=	1.2.3
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://people.FreeBSD.org/~sobomax/:local
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 7b3dda4a6de4..444317781d0f 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome/evolution-1.2.2.tar.bz2) = 69805b56b0c6e44de26e9542554f4da3
+MD5 (gnome/evolution-1.2.3.tar.bz2) = e1fd6e2fcfddb555a042e96b558ae84f
 MD5 (gnome/db-3.1.17.tar.bz2) = b237f4e38a650d096389ff54d564928d
diff --git a/mail/evolution/files/patch-camel_camel-mime-utils.c b/mail/evolution/files/patch-camel_camel-mime-utils.c
index 33111196a800..a3ac61282d69 100644
--- a/mail/evolution/files/patch-camel_camel-mime-utils.c
+++ b/mail/evolution/files/patch-camel_camel-mime-utils.c
@@ -1,11 +1,29 @@
---- camel/camel-mime-utils.c.orig	Fri May  3 15:47:41 2002
-+++ camel/camel-mime-utils.c	Sun May  5 18:09:24 2002
-@@ -3388,6 +3388,8 @@
- 		}
- 		d(printf("named offset = %d\n", offset));
+--- camel/camel-mime-utils.c.orig	Mon Oct  7 22:44:40 2002
++++ camel/camel-mime-utils.c	Mon Dec  2 02:34:31 2002
+@@ -3387,6 +3387,8 @@
+ 		return 0;
  	}
-+
+ 
 +	tm.tm_isdst = -1;
++
+ 	d(printf ("\ndecoding date '%s'\n", inptr));
  
- 	t = mktime(&tm);
- #if defined(HAVE_TIMEZONE)
+ 	memset (&tm, 0, sizeof(tm));
+@@ -3739,8 +3741,6 @@
+ 	/* X-Mailing-List: gnome-hackers */
+ 	/* X-Mailing-List: <gnome-hackers> */
+ 	{ "X-Mailing-List", "[ \t]*<?([^@>]+)@?([^ \n\t\r>]*)" },
+-	/* X-Loop: gnome-hackers@gnome.org */
+-	{ "X-Loop", "[ \t]*([^@]+)@?([^ \n\t\r>]*)" },
+ 	/* List-Id: GNOME stuff <gnome-hackers.gnome.org> */
+ 	/* List-Id: <gnome-hackers.gnome.org> */
+ 	/* List-Id: <gnome-hackers> */
+@@ -3756,6 +3756,8 @@
+ 	/* X-List: gnome-hackers */
+ 	/* X-List: gnome-hackers@gnome.org */
+ 	{ "X-List", "[ \t]*([^@]+)@?([^ \n\t\r>]*)" },	
++	/* X-Loop: gnome-hackers@gnome.org */
++	{ "X-Loop", "[ \t]*([^@]+)@?([^ \n\t\r>]*)" },
+ 	/* Sender: owner-gnome-hackers@gnome.org */
+ 	/* Sender: owner-gnome-hacekrs */
+ 	{ "Sender", "[ \t]*owner-([^@]+)@?([^ @\n\t\r>]*)" },
diff --git a/mail/evolution/files/patch-gpg-temp b/mail/evolution/files/patch-gpg-temp
deleted file mode 100644
index 93871b48be15..000000000000
--- a/mail/evolution/files/patch-gpg-temp
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -u -r1.2.8.1 camel-mime-filter-canon.c
---- camel/camel-mime-filter-canon.c	21 Jan 2003 03:07:05 -0000	1.2.8.1
-+++ camel/camel-mime-filter-canon.c	26 Feb 2003 23:12:09 -0000
-@@ -26,6 +26,7 @@
- #include <config.h>
- #endif
- 
-+#include <stdio.h>
- #include <string.h>
- #include <ctype.h>
- 
-@@ -170,7 +171,7 @@
- 	if (len)
- 		filter(f, in, len, prespace, out, outlen, outprespace);
- 
--	/* the data didn't contain an eol or was too short for "From ", we only need to check for "From" and add an eol */
-+	/* the data didn't contain an eol or was too short for "From ", we only need to check for "From" */
- 	if (f->backlen) {
- 		inptr = (unsigned char *)f->backbuf;
- 		inend = (unsigned char *)f->backbuf + f->backlen;
-@@ -195,20 +196,7 @@
- 			while (o>starto && (o[-1] == ' ' || o[-1] == '\t' || o[-1]=='\r'))
- 				o--;
- 		}
--		/* check end of line canonicalisation */
--		if (o>starto) {
--			if (flags & CAMEL_MIME_FILTER_CANON_CRLF) {
--				if (o[-1] != '\r')
--					*o++ = '\r';
--			} else {
--				if (o[-1] == '\r')
--					o--;
--			}
--		}
--
--		/* and always finish with an eol */
--		*o++ = '\n';
--
-+		
- 		*outlen = o - *out;
- 		
- 		f->backlen = 0;
-diff -u -r1.24 camel-stream-filter.c
---- camel/camel-stream-filter.c	19 Jul 2002 11:25:02 -0000	1.24
-+++ camel/camel-stream-filter.c	26 Feb 2003 23:12:10 -0000
-@@ -19,11 +19,16 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#include <stdio.h>
- #include <string.h>
- #include "camel-stream-filter.h"
- 
- #define d(x)
--/*#include <stdio.h>*/
- 
- /* use my malloc debugger? */
- /*extern void g_check(void *mp);*/
-@@ -368,10 +373,18 @@
- {
- 	CamelStreamFilter *filter = (CamelStreamFilter *)stream;
- 	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
--
-+	struct _filter *f;
-+	
- 	if (p->filteredlen > 0)
- 		return FALSE;
--
-+	
-+	f = p->filters;
-+	while (f) {
-+		if (f->filter->backlen > 0)
-+			return FALSE;
-+		f = f->next;
-+	}
-+	
- 	return camel_stream_eos(filter->source);
- }
- 
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index b50eacbbaf10..b4a01a6f0495 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -198,6 +198,7 @@ include/evolution/e-util/e-request.h
 include/evolution/e-util/e-sexp.h
 include/evolution/e-util/e-time-utils.h
 include/evolution/e-util/e-url.h
+include/evolution/e-util/e-xml-hash-utils.h
 include/evolution/e-util/md5-utils.h
 include/evolution/ebook/addressbook.h
 include/evolution/ebook/e-book-listener.h