17 files changed, 116 insertions, 377 deletions

diff --git a/mail/evolution/files/patch-..::db-3.1.17::dist::Makefile.in b/mail/evolution/files/patch-..::db-3.1.17::dist::Makefile.in
deleted file mode 100644
index 8609f029b432..000000000000
--- a/mail/evolution/files/patch-..::db-3.1.17::dist::Makefile.in
+++ /dev/null
@@ -1,44 +0,0 @@
-
-$FreeBSD$
-
---- ../db-3.1.17/dist/Makefile.in.orig	Tue Jul 18 18:37:57 2000
-+++ ../db-3.1.17/dist/Makefile.in	Fri Dec 14 16:49:51 2001
-@@ -34,11 +34,11 @@
- libdb=		libdb.a
- 
- libso_base=	libdb
--libso_linkname=	$(libso_base)-$(SOVERSION).la
--libso=		$(libso_base)-$(SOVERSION).@SOSUFFIX@
--libso_target=	$(libso_base)-$(SOVERSION).la
-+libso_linkname=	$(libso_base)$(SOMAJOR).la
-+libso=		$(libso_base)$(SOMAJOR).@SOSUFFIX@
-+libso_target=	$(libso_base)$(SOMAJOR).la
- libso_default=	$(libso_base).@SOSUFFIX@
--libso_major=	$(libso_base)-$(SOMAJOR).@SOSUFFIX@
-+libso_major=	$(libso_base)$(SOMAJOR).@SOSUFFIX@.1
- 
- ##################################################
- # C++
-@@ -49,10 +49,10 @@
- ##################################################
- libcxx=		libdb_cxx.a
- libxso_base=	libdb_cxx
--libxso=		$(libxso_base)-$(SOVERSION).@SOSUFFIX@
--libxso_target=	$(libxso_base)-$(SOVERSION).la
-+libxso=		$(libxso_base)$(SOMAJOR).@SOSUFFIX@
-+libxso_target=	$(libxso_base)$(SOMAJOR).la
- libxso_default=	$(libxso_base).@SOSUFFIX@
--libxso_major=	$(libxso_base)-$(SOMAJOR).@SOSUFFIX@
-+libxso_major=	$(libxso_base)$(SOMAJOR).@SOSUFFIX@.1
- 
- ##################################################
- # JAVA
-@@ -112,7 +112,7 @@
- bindir=	@bindir@
- includedir=@includedir@
- libdir=	@libdir@
--docdir=	$(prefix)/docs
-+docdir=	$(prefix)/share/doc/db3
- 
- dmode=	755
- emode=	555
diff --git a/mail/evolution/files/patch-..::db-3.1.17::dist::ltmain.sh b/mail/evolution/files/patch-..::db-3.1.17::dist::ltmain.sh
deleted file mode 100644
index 902d705c895b..000000000000
--- a/mail/evolution/files/patch-..::db-3.1.17::dist::ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ../db-3.1.17/dist/ltmain.sh.orig	Sun Jul 30 20:45:53 2000
-+++ ../db-3.1.17/dist/ltmain.sh	Fri Dec 14 19:32:11 2001
-@@ -2694,6 +2694,9 @@
- 	    # Absolute path.
- 	    rpath="$rpath$dir:"
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Relative path: add a thisdir entry.
- 	    rpath="$rpath\$thisdir/$dir:"
-@@ -3356,10 +3359,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index 8bd2ee6f707c..eadafd8477d1 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,36 +1,14 @@
---- configure.orig	Fri Mar 12 02:06:47 2004
-+++ configure	Fri Mar 12 02:28:50 2004
-@@ -10407,6 +10407,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/types.h>
- #include <sys/socket.h>
- socklen_t x;
- 
-@@ -11519,7 +11520,7 @@
- CPPFLAGS="$DB3_CFLAGS $CPPFLAGS"
- 
- 
--for ac_header in db.h db3/db.h
-+for ac_header in db3/db.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -11712,9 +11713,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--{ { echo "$as_me:$LINENO: error: Found db.h is not version $evolution_db_version" >&5
--echo "$as_me: error: Found db.h is not version $evolution_db_version" >&2;}
--   { (exit 1); exit 1; }; }
-+#{ { echo "$as_me:$LINENO: error: Found db.h is not version $evolution_db_version" >&5
-+#echo "$as_me: error: Found db.h is not version $evolution_db_version" >&2;}
-+#   { (exit 1); exit 1; }; }
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
-@@ -13075,7 +13076,7 @@
+--- configure.orig	Wed Sep 29 14:06:43 2004
++++ configure	Wed Sep 29 14:24:28 2004
+@@ -24206,6 +24206,7 @@
+ 		#include <sys/socket.h>
+ 		#include <netinet/in.h>
+ 		#include <netdb.h>
++		#include <stdio.h>
+ 
+ 
+ int
+@@ -25772,7 +25773,7 @@
  	LDFLAGS_save="$LDFLAGS"
  
  	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
@@ -39,7 +17,7 @@
  	echo "$as_me:$LINENO: checking for Kerberos 5" >&5
  echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
  if test "${ac_cv_lib_kerberos5+set}" = set; then
-@@ -13860,10 +13861,10 @@
+@@ -26928,10 +26929,10 @@
  Example: --with-nspr-libs=/usr/lib" >&2;}
     { (exit 1); exit 1; }; }
         				else
@@ -52,7 +30,7 @@
  			fi
  
  			echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5
-@@ -17387,7 +17388,7 @@
+@@ -30807,7 +30808,7 @@
  idldir="$datadir/idl/evolution-$BASE_VERSION"
  
  
diff --git a/mail/evolution/files/patch-addressbook_conduit_address-conduit.c b/mail/evolution/files/patch-addressbook_conduit_address-conduit.c
deleted file mode 100644
index 7ace497e3a7c..000000000000
--- a/mail/evolution/files/patch-addressbook_conduit_address-conduit.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- addressbook/conduit/address-conduit.c.orig	Tue Aug 26 19:45:53 2003
-+++ addressbook/conduit/address-conduit.c	Fri Aug  6 12:19:52 2004
-@@ -610,6 +610,7 @@
- 	case E_CARD_SIMPLE_FIELD_EMAIL_2:
- 		return E_CARD_SIMPLE_FIELD_EMAIL_3;
- 	default:
-+		break;
- 	}
- 
- 	return E_CARD_SIMPLE_FIELD_LAST;
-@@ -625,6 +626,7 @@
- 	case E_CARD_SIMPLE_FIELD_PHONE_HOME:
- 		return E_CARD_SIMPLE_FIELD_PHONE_HOME_2;
- 	default:
-+		break;
- 	}
- 
- 	return E_CARD_SIMPLE_FIELD_LAST;
-@@ -640,6 +642,7 @@
- 	case E_CARD_SIMPLE_FIELD_PHONE_BUSINESS:
- 		return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2;
- 	default:
-+		break;
- 	}
- 
- 	return E_CARD_SIMPLE_FIELD_LAST;
-@@ -657,6 +660,7 @@
- 	case E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX:
- 		return E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX;
- 	default:
-+		break;
- 	}
- 
- 	return E_CARD_SIMPLE_FIELD_LAST;
diff --git a/mail/evolution/files/patch-calendar_cal-client_cal-client.h b/mail/evolution/files/patch-calendar_cal-client_cal-client.h
deleted file mode 100644
index 6ac301776c00..000000000000
--- a/mail/evolution/files/patch-calendar_cal-client_cal-client.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- calendar/cal-client/cal-client.h.orig	Mon Aug  2 12:55:04 2004
-+++ calendar/cal-client/cal-client.h	Mon Aug  2 12:57:11 2004
-@@ -213,7 +213,7 @@
- CalClientResult cal_client_remove_object (CalClient *client, const char *uid);
- CalClientResult cal_client_remove_object_with_mod (CalClient *client, const char *uid, CalObjModType mod);
- 
--CalClientSendResult cal_client_send_object (CalClient *client, icalcomponent *icalcomp, 
-+CalClientResult cal_client_send_object (CalClient *client, icalcomponent *icalcomp, 
- 					    icalcomponent **new_icalcomp, GList **users,
- 					    char error_msg[256]);
- 
diff --git a/mail/evolution/files/patch-calendar_gui_e-day-view.c b/mail/evolution/files/patch-calendar_gui_e-day-view.c
deleted file mode 100644
index a3cff05c7893..000000000000
--- a/mail/evolution/files/patch-calendar_gui_e-day-view.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- calendar/gui/e-day-view.c.orig	Mon Aug  2 13:04:10 2004
-+++ calendar/gui/e-day-view.c	Mon Aug  2 13:04:59 2004
-@@ -3235,7 +3235,7 @@
- 	case GDK_SCROLL_DOWN:
- 		e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
- 		return TRUE;
--	default:
-+	default:;
- 	}
- 
- 	return FALSE;
-@@ -3255,7 +3255,7 @@
- 	case GDK_SCROLL_DOWN:
- 		e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
- 		return TRUE;
--	default:
-+	default:;
- 	}
- 
- 	return FALSE;
diff --git a/mail/evolution/files/patch-camel_Makefile.in b/mail/evolution/files/patch-camel_Makefile.in
new file mode 100644
index 000000000000..a4250e85cbb3
--- /dev/null
+++ b/mail/evolution/files/patch-camel_Makefile.in
@@ -0,0 +1,11 @@
+--- camel/Makefile.in.orig	Tue Dec 30 00:44:37 2003
++++ camel/Makefile.in	Tue Dec 30 00:44:45 2003
+@@ -221,7 +221,7 @@
+ soundsdir = @soundsdir@
+ viewsdir = @viewsdir@
+ 
+-SUBDIRS = . providers tests
++SUBDIRS = . providers
+ 
+ libcamelincludedir = $(privincludedir)/camel
+ 
diff --git a/mail/evolution/files/patch-camel_camel-mime-utils.c b/mail/evolution/files/patch-camel_camel-mime-utils.c
new file mode 100644
index 000000000000..33111196a800
--- /dev/null
+++ b/mail/evolution/files/patch-camel_camel-mime-utils.c
@@ -0,0 +1,11 @@
+--- 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));
+ 	}
++
++	tm.tm_isdst = -1;
+ 
+ 	t = mktime(&tm);
+ #if defined(HAVE_TIMEZONE)
diff --git a/mail/evolution/files/patch-e-util_e-component-listener.c b/mail/evolution/files/patch-e-util_e-component-listener.c
deleted file mode 100644
index b8609f21896d..000000000000
--- a/mail/evolution/files/patch-e-util_e-component-listener.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- e-util/e-component-listener.c.orig	Mon Aug  2 11:57:30 2004
-+++ e-util/e-component-listener.c	Mon Aug  2 11:58:50 2004
-@@ -52,7 +52,7 @@
- 			cl->priv->component = CORBA_OBJECT_NIL;
- 			g_object_unref (cl);
- 			break;
--		default :
-+		default :;
- 		}
- 	}
- }
diff --git a/mail/evolution/files/patch-e-util_e-host-utils.c b/mail/evolution/files/patch-e-util_e-host-utils.c
new file mode 100644
index 000000000000..3d92fc70fca2
--- /dev/null
+++ b/mail/evolution/files/patch-e-util_e-host-utils.c
@@ -0,0 +1,24 @@
+--- e-util/e-host-utils.c.orig	Tue Apr 13 15:19:43 2004
++++ e-util/e-host-utils.c	Sun Oct  3 01:17:57 2004
+@@ -136,12 +136,21 @@
+ 	case EAI_SERVICE:
+ 		return NO_DATA;
+ 		break;
++#ifdef EAI_ADDRFAMILY
+ 	case EAI_ADDRFAMILY:
+ 		return NO_ADDRESS;
+ 		break;
++#endif
++#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
+ 	case EAI_NODATA:
+ 		return NO_DATA;
+ 		break;
++#endif
++#ifdef EAI_NOFAMILY
++	case EAI_NOFAMILY:
++		return NO_ADDRESS;
++		break;
++#endif
+ 	case EAI_MEMORY:
+ 		return ENOMEM;
+ 		break;
diff --git a/mail/evolution/files/patch-e-util_e-msgport.c b/mail/evolution/files/patch-e-util_e-msgport.c
new file mode 100644
index 000000000000..85bd48595b3d
--- /dev/null
+++ b/mail/evolution/files/patch-e-util_e-msgport.c
@@ -0,0 +1,47 @@
+--- e-util/e-msgport.c.orig	Wed Jan 14 00:04:04 2004
++++ e-util/e-msgport.c	Sun Sep 19 14:01:25 2004
+@@ -921,9 +921,13 @@
+ void e_thread_put(EThread *e, EMsg *msg)
+ {
+ 	pthread_t id;
++	pthread_attr_t attr;
+ 	EMsg *dmsg = NULL;
+ 
+ 	pthread_mutex_lock(&e->mutex);
++	pthread_attr_init(&attr);
++	/* Give us a 1 MB thread stack size. */
++	pthread_attr_setstacksize(&attr, 0x100000);
+ 
+ 	/* the caller forgot to tell us what to do, well, we can't do anything can we */
+ 	if (e->received == NULL) {
+@@ -962,13 +966,14 @@
+ 		e_msgport_put(e->server_port, msg);
+ 		if (e->waiting == 0
+ 		    && g_list_length(e->id_list) < e->queue_limit
+-		    && pthread_create(&id, NULL, thread_dispatch, e) == 0) {
++		    && pthread_create(&id, &attr, thread_dispatch, e) == 0) {
+ 			struct _thread_info *info = g_malloc0(sizeof(*info));
+ 			t(printf("created NEW thread %ld\n", id));
+ 			info->id = id;
+ 			info->busy = TRUE;
+ 			e->id_list = g_list_append(e->id_list, info);
+ 		}
++		pthread_attr_destroy(&attr);
+ 		pthread_mutex_unlock(&e->mutex);
+ 		return;
+ 	}
+@@ -977,12 +982,13 @@
+ 	if (e->id == E_THREAD_NONE) {
+ 		int err;
+ 
+-		if ((err = pthread_create(&e->id, NULL, thread_dispatch, e)) != 0) {
++		if ((err = pthread_create(&e->id, &attr, thread_dispatch, e)) != 0) {
+ 			g_warning("Could not create dispatcher thread, message queued?: %s", strerror(err));
+ 			e->id = E_THREAD_NONE;
+ 		}
+ 	}
+ 
++	pthread_attr_destroy(&attr);
+ 	pthread_mutex_unlock(&e->mutex);
+ 
+ 	if (dmsg) {
diff --git a/mail/evolution/files/patch-libical_src_libical_icaltime.c b/mail/evolution/files/patch-libical_src_libical_icaltime.c
deleted file mode 100644
index 6f24e0f4cbf4..000000000000
--- a/mail/evolution/files/patch-libical_src_libical_icaltime.c
+++ /dev/null
@@ -1,106 +0,0 @@
---- libical/src/libical/icaltime.c.orig	Tue Aug 26 20:25:02 2003
-+++ libical/src/libical/icaltime.c	Tue Aug 26 20:29:05 2003
-@@ -46,6 +46,76 @@
- 
- #include "icaltimezone.h"
- 
-+static time_t make_time(struct tm *tm, int tzm)
-+{
-+  time_t tim;
-+
-+  static int days[] = { -1, 30, 58, 89, 119, 150, 180, 211, 242, 272, 303, 333, 364 };
-+
-+  /* check that year specification within range */
-+
-+  if (tm->tm_year < 70 || tm->tm_year > 138)
-+    return((time_t) -1);
-+
-+  /* check that month specification within range */
-+
-+  if (tm->tm_mon < 0 || tm->tm_mon > 11)
-+    return((time_t) -1);
-+
-+  /* check for upper bound of Jan 17, 2038 (to avoid possibility of
-+     32-bit arithmetic overflow) */
-+  
-+  if (tm->tm_year == 138) {
-+    if (tm->tm_mon > 0)
-+      return((time_t) -1);
-+    else if (tm->tm_mday > 17)
-+      return((time_t) -1);
-+  }
-+
-+  /*
-+   *  calculate elapsed days since start of the epoch (midnight Jan
-+   *  1st, 1970 UTC) 17 = number of leap years between 1900 and 1970
-+   *  (number of leap days to subtract)
-+   */
-+
-+  tim = (tm->tm_year - 70) * 365 + ((tm->tm_year - 1) / 4) - 17;
-+
-+  /* add number of days elapsed in the current year */
-+
-+  tim += days[tm->tm_mon];
-+
-+  /* check and adjust for leap years (the leap year check only valid
-+     during the 32-bit era */
-+
-+  if ((tm->tm_year & 3) == 0 && tm->tm_mon > 1)
-+    tim += 1;
-+
-+  /* elapsed days to current date */
-+
-+  tim += tm->tm_mday;
-+
-+
-+  /* calculate elapsed hours since start of the epoch */
-+
-+  tim = tim * 24 + tm->tm_hour;
-+
-+  /* calculate elapsed minutes since start of the epoch */
-+
-+  tim = tim * 60 + tm->tm_min;
-+  
-+  /* adjust per time zone specification */
-+  
-+  tim -= tzm;
-+  
-+  /* calculate elapsed seconds since start of the epoch */
-+  
-+  tim = tim * 60 + tm->tm_sec;
-+  
-+  /* return number of seconds since start of the epoch */
-+  
-+  return(tim);
-+}
-+
- 
- struct icaltimetype 
- icaltime_from_timet(time_t tm, int is_date)
-@@ -221,13 +291,7 @@
-     stm.tm_year = tt.year-1900;
-     stm.tm_isdst = -1;
- 
--    if(tt.is_utc == 1 || tt.is_date == 1){
--        char *old_tz = set_tz("UTC");
--	t = mktime(&stm);
--	unset_tz(old_tz);
--    } else {
--	t = mktime(&stm);
--    }
-+    t = make_time(&stm, 0);
- 
-     return t;
- 
-@@ -269,10 +333,7 @@
-     stm.tm_year = tt.year-1900;
-     stm.tm_isdst = -1;
- 
--    /* Set TZ to UTC and use mktime to convert to a time_t. */
--    old_tz = set_tz ("UTC");
--    t = mktime (&stm);
--    unset_tz (old_tz);
-+    t = make_time(&stm, 0);
- 
-     return t;
- }
diff --git a/mail/evolution/files/patch-ltmain.sh b/mail/evolution/files/patch-ltmain.sh
deleted file mode 100644
index bb660972a6d1..000000000000
--- a/mail/evolution/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig	Thu May 22 16:42:22 2003
-+++ ltmain.sh	Tue May 27 12:12:52 2003
-@@ -1072,7 +1072,7 @@
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -1082,8 +1082,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -2498,6 +2506,9 @@
- 	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4325,10 +4336,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/mail/evolution/files/patch-mail_em-utils.h b/mail/evolution/files/patch-mail_em-utils.h
new file mode 100644
index 000000000000..b3e7b9ffbe25
--- /dev/null
+++ b/mail/evolution/files/patch-mail_em-utils.h
@@ -0,0 +1,10 @@
+--- mail/em-utils.h.orig	Tue Aug  3 16:59:46 2004
++++ mail/em-utils.h	Tue Aug  3 17:00:04 2004
+@@ -23,6 +23,7 @@
+ #ifndef __EM_UTILS_H__
+ #define __EM_UTILS_H__
+ 
++#include <sys/types.h>
+ #include <glib.h>
+ 
+ #ifdef __cplusplus
diff --git a/mail/evolution/files/patch-mail_message-browser.c b/mail/evolution/files/patch-mail_message-browser.c
deleted file mode 100644
index 56558473bcd9..000000000000
--- a/mail/evolution/files/patch-mail_message-browser.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mail/message-browser.c.orig	Mon Aug  2 13:11:44 2004
-+++ mail/message-browser.c	Mon Aug  2 13:11:51 2004
-@@ -344,7 +344,7 @@
- 	case GDK_Escape:
- 		message_browser_close (NULL, mb, NULL);
- 		return TRUE;	
--	default:
-+	default:;
- 	}
- 	
- 	return FALSE;
diff --git a/mail/evolution/files/patch-my-evolution::e-summary-preferences.c b/mail/evolution/files/patch-my-evolution::e-summary-preferences.c
deleted file mode 100644
index e7f22e6e7845..000000000000
--- a/mail/evolution/files/patch-my-evolution::e-summary-preferences.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- my-evolution/e-summary-preferences.c.orig	Thu Oct 24 18:14:17 2002
-+++ my-evolution/e-summary-preferences.c	Sun Nov 24 01:23:59 2002
-@@ -581,8 +581,11 @@
- 	{"http://barrapunto.com/gnome.rdf", "Barrapunto GNOME", FALSE,},
- 	{"http://www.bsdtoday.com/backend/bt.rdf", "BSD Today", FALSE},
- 	{"http://beyond2000.com/b2k.rdf", "Beyond 2000", FALSE},
-+	{"http://daily.daemonnews.org/ddn.rdf.php3", "Daily Daemon News", FALSE},
- 	{"http://www.dictionary.com/wordoftheday/wotd.rss", N_("Dictionary.com Word of the Day"), FALSE},
- 	{"http://www.dvdreview.com/rss/newschannel.rss", "DVD Review", FALSE},
-+	{"http://www.freebsd.org/gnome/news.rdf", "FreeBSD GNOME Project News", FALSE},
-+	{"http://www.freebsd.org/news/news.rdf", "FreeBSD Newsflash", FALSE},
- 	{"http://freshmeat.net/backend/fm.rdf", "Freshmeat", FALSE},
- 	{"http://www.gnomedesktop.org/backend.php", "Footnotes - GNOME News", FALSE},
- 	{"http://headlines.internet.com/internetnews/prod-news/news.rss", "Internet.com", FALSE},
diff --git a/mail/evolution/files/patch-tools_Makefile.in b/mail/evolution/files/patch-tools_Makefile.in
deleted file mode 100644
index 36504035faed..000000000000
--- a/mail/evolution/files/patch-tools_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- tools/Makefile.in.orig	Fri Mar 12 02:59:53 2004
-+++ tools/Makefile.in	Fri Mar 12 03:00:37 2004
-@@ -267,7 +267,8 @@
- 
- 
- killev_LDADD = \
--	$(top_builddir)/e-util/libeutil.la
-+	$(top_builddir)/e-util/libeutil.la \
-+	$(E_UTIL_LIBS)
- 
- 
- CLEANFILES = evolution-addressbook-clean $(BUILT_SOURCES)