Update to 1.4.6

changes:
Updated translations and bug-fixes.

Among them:

#54319 - Message-list blank even tho there are messages (Jeff Stedfast)
#50535 - Doesn't handle EHLO errors proper (Jeff Stedfast)
#50485 - Problems with accentuated gpg passphrases (Jeff Stedfast)
#50096 - GroupWise attachments and indexing (Jeff Stedfast)
#45504 - Warning Dialogs "Error while 'Fetching Mail" On POP3
         auto download (Michael Zucchi)
#49357 - Email date is incorrect (Jeff Stedfast)
#46006 - Attempted ESMTP handshake with invalid IPv6 address (Jeff Stedfast)
#41610 - Crash if remote POP reports 0 byte len messag e(Michael Zucchi)
#48759 - Strange behaviour with save as dialog (Jeff Stedfast)
#47638 - Default charset is empty (Jeff Stedfast)
#48466 - Properties window open after attachment removed (Charles Zhang)
#48166 - Size filter doesnt remember the size (Jeff Stedfast)
#53530 - Duplicate of attachments are seen on forward as Redirect (Bill Zhu)
#48998 - Apply Button always remain activated (Charles Zhang)
#51551 - Encoding of the Organization is UNKNOWN (Suresh Chandrasekharan)
#40917 - backspace shouldn't highlight the whole remaining string in
         Setup Assistant (Suresh Chandrasekharan)
#47878 - Change "Helvetica" to "Sans Regular" for printing footers (Rodney Dawes)
#32996 - Can select VFolders as Offline folders in Evolution
	 Settings (Michael Zucchi)
#39410 - "Work offline" does not propobly sync all mails in "offline folders"
         (Michael Zucchi)
#48290 - Selecting inverse theme causes text to be printed white-on-white (Antonio Zu)
[...]

And many, many more.
see http://bugzilla.ximian.com/show_bug.cgi

14 files changed, 70 insertions, 133 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 9811ae27244..de8735216ab 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2004/04/17 10:58:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.62 2004/05/06 10:03:54 recht Exp $
 
-DISTNAME=		evolution-1.4.5
-PKGREVISION=		9
+DISTNAME=		evolution-1.4.6
 CATEGORIES=		mail time gnome
 MASTER_SITES=		ftp://ftp.ximian.com/pub/source/evolution/ \
 			${MASTER_SITE_GNOME:=sources/evolution/1.4/}
@@ -11,7 +10,6 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://ximian.com/products/evolution/
 COMMENT=		GNOME mailer, calendar, contact manager, and communications tool
 
-BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 DEPENDS+=		psmisc-[0-9]*:../../sysutils/psmisc
 BUILD_USES_MSGFMT=	YES
 
@@ -34,18 +32,21 @@ CONFIGURE_ARGS+=	--enable-ipv6=no
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_GNU_TOOLS+=		make yacc
 USE_X11=		YES
 USE_LIBTOOL=		YES
 USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
-YACC=			${PREFIX}/bin/bison -y
 
 REPLACE_PERL+=		libical/scripts/mkderivedvalues.pl
 REPLACE_PERL+=		libical/scripts/mkparameterrestrictions.pl
+REPLACE_PERL+=		libical/scripts/mkderivedcomponents.pl
+REPLACE_PERL+=		libical/scripts/mkderivedparameters.pl
+REPLACE_PERL+=		libical/scripts/mkderivedproperties.pl
 REPLACE_PERL+=		libical/scripts/mkrestrictionrecords.pl
 REPLACE_PERL+=		libical/scripts/mkrestrictiontable.pl
 REPLACE_PERL+=		tools/csv2vcard
+REPLACE_PERL+=		tools/evolution-addressbook-clean
 REPLACE_PERL+=		tools/evolution-addressbook-clean.in
 REPLACE_PERL+=		tools/killev
 CPPFLAGS+=		-I/usr/include/krb5 -I/usr/include/gssapi
@@ -71,13 +72,6 @@ GCONF2_SCHEMAS+=	evolution-mail.schemas
 BUILDLINK_TRANSFORM+=	S:-DG_DISABLE_DEPRECATED:
 BUILDLINK_TRANSFORM+=	S:-DGTK_DISABLE_DEPRECATED:
 
-pre-configure:
-	for i in ${WRKSRC}/camel/providers/*/Makefile.in ; do		\
-		${SED} <$$i >$$i.fixed					\
-		 -e 's|^\(lib.*_la_LIBADD.*\)$$|\1 ../../libcamel.la|' &&\
-		${MV} $$i.fixed $$i ;					\
-	done
-
 .if !exists(/usr/include/semaphore.h)
 LDFLAGS+=	-lsemaphore
 .include "../../devel/pthread-sem/buildlink3.mk"
@@ -95,6 +89,7 @@ LDFLAGS+=	-lsemaphore
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../textproc/gnome-spell/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libunicode/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
diff --git a/mail/evolution/PLIST b/mail/evolution/PLIST
index f4e75dbc929..3a0ec5994e9 100644
--- a/mail/evolution/PLIST
+++ b/mail/evolution/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2004/01/14 07:27:51 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.17 2004/05/06 10:03:54 recht Exp $
 bin/evolution
 bin/evolution-1.4
 bin/evolution-addressbook-export
@@ -1223,6 +1223,7 @@ ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/evolution-1.4.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/evolution-1.4.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/evolution-1.4.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/evolution-1.4.mo
+${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/evolution-1.4.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/evolution-1.4.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/evolution-1.4.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/evolution-1.4.mo
@@ -1239,6 +1240,7 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/evolution-1.4.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/evolution-1.4.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/evolution-1.4.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/evolution-1.4.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/evolution-1.4.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/evolution-1.4.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/evolution-1.4.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/evolution-1.4.mo
@@ -1252,11 +1254,17 @@ share/mime-info/evolution-1.4.mime
 share/omf/evolution/evolution-1.4-C.omf
 share/pixmaps/evolution-1.4.png
 share/pixmaps/evolution.png
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/evolution
+@comment in scrollkeeper: @dirrm share/omf
+@comment in xdg-dirs: @dirrm share/mime-info
 @dirrm share/idl/evolution-1.4
+@comment in ORBit2: @dirrm share/idl
 @dirrm share/gnome/help/evolution-1.4/C/figures
 @dirrm share/gnome/help/evolution-1.4/C
 @dirrm share/gnome/help/evolution-1.4
+@comment in gnome-dirs: @dirrm share/gnome/help
+@comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/evolution/1.4/zoneinfo/Pacific
 @dirrm share/evolution/1.4/zoneinfo/Indian
 @dirrm share/evolution/1.4/zoneinfo/Europe
@@ -1304,6 +1312,7 @@ share/pixmaps/evolution.png
 @dirrm share/evolution/1.4/default_user
 @dirrm share/evolution/1.4
 @dirrm share/evolution
+@comment in xdg-dirs: @dirrm share/applications
 @dirrm libexec/evolution/1.4/camel
 @dirrm libexec/evolution/1.4
 @dirrm libexec/evolution
@@ -1313,6 +1322,7 @@ share/pixmaps/evolution.png
 @dirrm lib/evolution/1.4/camel-providers
 @dirrm lib/evolution/1.4
 @dirrm lib/evolution
+@comment in libbonobo: @dirrm lib/bonobo/servers
 @dirrm include/evolution-1.4/wombat
 @dirrm include/evolution-1.4/widgets
 @dirrm include/evolution-1.4/shell
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 3a375ee1ea4..efe5e72fe85 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,16 +1,13 @@
-$NetBSD: distinfo,v 1.23 2004/04/17 12:42:45 jmmv Exp $
+$NetBSD: distinfo,v 1.24 2004/05/06 10:03:54 recht Exp $
 
-SHA1 (evolution-1.4.5.tar.bz2) = 56ab7828236623f63f4dd085cfabaef832f5c945
-Size (evolution-1.4.5.tar.bz2) = 13641682 bytes
-SHA1 (patch-aa) = 18e70a56fc02caa578470c635d74ea591b7b434c
-SHA1 (patch-ac) = 8d67b244be31b1eb655b3f4f7f532089b152adec
-SHA1 (patch-ad) = 364fc8c885eba81b77cc219dab678cac2714f130
-SHA1 (patch-ae) = a78bb477e3ebcade556ae9c0c1ef0ffc05f05e36
-SHA1 (patch-af) = dbbd2272d21079d6fe28d59e75f9acb26634f438
-SHA1 (patch-ag) = 57d64084a79c6e3a687b7a148fdea02b0f1eefbd
+SHA1 (evolution-1.4.6.tar.bz2) = 35d7273762b1f17fb8ad845af593a1ee07f94115
+Size (evolution-1.4.6.tar.bz2) = 13927597 bytes
+SHA1 (patch-aa) = 62be469421e909f03725e82fede9659868a2d3ea
+SHA1 (patch-ab) = 620e1ed4d7798e006c0f2a0397b75ba5953569b6
+SHA1 (patch-ac) = 4d697887fea37d1d8ccfde20d39a049487d3fe9a
+SHA1 (patch-ad) = a305a87e73fb422ee4e71740ea00e7248ec00220
+SHA1 (patch-af) = 64845da64d106246a2802343ce2d4e0da85888ba
+SHA1 (patch-ag) = 8e63e147266368044463667228a4fd0d1faf98eb
 SHA1 (patch-ah) = a4b15e3405e4f6a432392a30bf489abd4e94a181
-SHA1 (patch-ai) = 2d73b5a3a2a006bb29b83650154ca64d721ef09d
+SHA1 (patch-ai) = 0f49dc487d5cc697521bb59a45e9c8e2eda10491
 SHA1 (patch-aj) = 9b098568fd94c0597a216b8b9cf89eaef3307a4b
-SHA1 (patch-ak) = 567c9afcd7947202b4aec0ffacc6c1fb76b35fb7
-SHA1 (patch-al) = 9781fd654c639502440cff8640a14a53310e068e
-SHA1 (patch-am) = 518450475312fc3c74ecba4bc70bd3339195e12b
diff --git a/mail/evolution/patches/patch-aa b/mail/evolution/patches/patch-aa
index a8ceb676229..2f1cb187d87 100644
--- a/mail/evolution/patches/patch-aa
+++ b/mail/evolution/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2004/01/04 21:37:09 rh Exp $
+$NetBSD: patch-aa,v 1.14 2004/05/06 10:03:54 recht Exp $
 
---- configure.orig	2003-09-16 05:17:17.000000000 +1000
+--- configure.orig	2004-03-04 23:07:24.000000000 +0100
 +++ configure
-@@ -11659,8 +11659,8 @@ fi
+@@ -11454,8 +11454,8 @@ fi
  # This can only change between Evolution versions (and then can only
  # go up.)
  evolution_db_version_major=3
diff --git a/mail/evolution/patches/patch-ab b/mail/evolution/patches/patch-ab
new file mode 100644
index 00000000000..fa9e30e3895
--- /dev/null
+++ b/mail/evolution/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.7 2004/05/06 10:03:54 recht Exp $
+
+--- tools/Makefile.in.orig	2004-03-10 16:24:01.000000000 +0100
++++ tools/Makefile.in
+@@ -267,7 +267,8 @@ killev_SOURCES = \
+ 
+ 
+ killev_LDADD = \
+-	$(top_builddir)/e-util/libeutil.la
++	$(top_builddir)/e-util/libeutil.la \
++	$(E_UTIL_LIBS)
+ 
+ 
+ CLEANFILES = evolution-addressbook-clean $(BUILT_SOURCES)
diff --git a/mail/evolution/patches/patch-ac b/mail/evolution/patches/patch-ac
index dee2fdc953d..6bac9a837c3 100644
--- a/mail/evolution/patches/patch-ac
+++ b/mail/evolution/patches/patch-ac
@@ -1,20 +1,18 @@
-$NetBSD: patch-ac,v 1.7 2004/01/04 21:37:09 rh Exp $
+$NetBSD: patch-ac,v 1.8 2004/05/06 10:03:54 recht Exp $
 
---- shell/main.c.orig	2003-07-29 01:19:13.000000000 +1000
+--- shell/main.c.orig	2003-05-19 21:41:05.000000000 +0200
 +++ shell/main.c
-@@ -91,6 +91,25 @@ static gboolean killev = FALSE;
+@@ -91,6 +91,22 @@ static gboolean killev = FALSE;
  
  extern char *evolution_debug_log;
  
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) && defined(_PTH_PTHREAD_H_)
 +#include <gtk/gtk.h>
-+#include <pthread.h>
 +
 +/*
 + * Pth is non-preemptive, so we yield the processor periodically
 + */
 +
-+#ifdef _PTH_PTHREAD_H_
 +static gint
 +pth_nbschedule (gpointer data)
 +{
@@ -22,13 +20,12 @@ $NetBSD: patch-ac,v 1.7 2004/01/04 21:37:09 rh Exp $
 +
 +	return TRUE;
 +}
-+#endif /* _PTH_PTHREAD_H_ */
-+#endif /* __NetBSD__ */
++#endif /* _PTH_PTHREAD_H_ && __NetBSD__ */
 +
  
  static GtkWidget *
  quit_box_new (void)
-@@ -374,6 +393,10 @@ idle_cb (void *data)
+@@ -374,6 +390,10 @@ idle_cb (void *data)
  	else
  		startup_line_mode = E_SHELL_STARTUP_LINE_MODE_OFFLINE;
  
@@ -39,7 +36,7 @@ $NetBSD: patch-ac,v 1.7 2004/01/04 21:37:09 rh Exp $
  	shell = e_shell_new (evolution_directory, ! no_splash, startup_line_mode, &result);
  	g_free (evolution_directory);
  
-@@ -634,6 +657,10 @@ main (int argc, char **argv)
+@@ -634,6 +654,10 @@ main (int argc, char **argv)
  
  	gtk_idle_add (idle_cb, uri_list);
  
diff --git a/mail/evolution/patches/patch-ad b/mail/evolution/patches/patch-ad
index 9642d4aaad3..080a3910421 100644
--- a/mail/evolution/patches/patch-ad
+++ b/mail/evolution/patches/patch-ad
@@ -1,15 +1,17 @@
-$NetBSD: patch-ad,v 1.3 2003/01/09 13:59:25 rh Exp $
+$NetBSD: patch-ad,v 1.4 2004/05/06 10:03:54 recht Exp $
 
---- camel/providers/imap/camel-imap-store.c.orig	Fri Dec  6 03:06:49 2002
+--- camel/providers/imap/camel-imap-store.c.orig	2003-09-08 22:55:16.000000000 +0200
 +++ camel/providers/imap/camel-imap-store.c
-@@ -24,6 +24,10 @@
+@@ -24,6 +24,12 @@
   *
   */
  
++#ifdef	_PTH_PTHREAD_H_
 +#ifdef	_POSIX_THREAD_SYSCALL_SOFT
 +#undef	_POSIX_THREAD_SYSCALL_SOFT
 +#endif
 +#define	_POSIX_THREAD_SYSCALL_SOFT	0
++#endif
  
  #ifdef HAVE_CONFIG_H
  #include <config.h>
diff --git a/mail/evolution/patches/patch-ae b/mail/evolution/patches/patch-ae
deleted file mode 100644
index c2f01bc4302..00000000000
--- a/mail/evolution/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2003/01/09 13:59:25 rh Exp $
-
---- camel/providers/nntp/camel-nntp-summary.h.orig	Tue May  7 23:53:40 2002
-+++ camel/providers/nntp/camel-nntp-summary.h
-@@ -24,7 +24,6 @@
- #include <camel/camel-folder-summary.h>
- #include <camel/camel-folder.h>
- #include <camel/camel-exception.h>
--#include <libibex/ibex.h>
- 
- #define CAMEL_NNTP_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_nntp_summary_get_type (), CamelNNTPSummary)
- #define CAMEL_NNTP_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_summary_get_type (), CamelNNTPSummaryClass)
diff --git a/mail/evolution/patches/patch-af b/mail/evolution/patches/patch-af
index a1868f710a4..e622ccd7f09 100644
--- a/mail/evolution/patches/patch-af
+++ b/mail/evolution/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2001/12/03 10:08:26 tron Exp $
+$NetBSD: patch-af,v 1.4 2004/05/06 10:03:54 recht Exp $
 
---- e-util/e-db3-utils.c.orig	Fri Jun  1 03:02:11 2001
+--- e-util/e-db3-utils.c.orig	2002-11-02 09:25:00.000000000 +0100
 +++ e-util/e-db3-utils.c
-@@ -14,9 +14,9 @@
+@@ -13,9 +13,9 @@
  #include <libgnome/gnome-util.h>
  
  #if DB_VERSION_MAJOR != 3 || \
diff --git a/mail/evolution/patches/patch-ag b/mail/evolution/patches/patch-ag
index a9bea5231ee..7c6e9793a22 100644
--- a/mail/evolution/patches/patch-ag
+++ b/mail/evolution/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.4 2002/09/05 23:25:27 rh Exp $
+$NetBSD: patch-ag,v 1.5 2004/05/06 10:03:54 recht Exp $
 
---- e-util/e-dbhash.c.orig	Mon Oct 22 23:54:12 2001
+--- e-util/e-dbhash.c.orig	2001-10-22 15:54:12.000000000 +0200
 +++ e-util/e-dbhash.c
 @@ -16,9 +16,9 @@
  #include "md5-utils.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-ag,v 1.4 2002/09/05 23:25:27 rh Exp $
  #endif
  
  struct _EDbHashPrivate 
-@@ -37,9 +37,9 @@
+@@ -37,9 +37,9 @@ e_dbhash_new (const char *filename)
  
  	db_version (&major, &minor, &patch);
  
diff --git a/mail/evolution/patches/patch-ai b/mail/evolution/patches/patch-ai
index 9d846275bb0..79e23a98fd4 100644
--- a/mail/evolution/patches/patch-ai
+++ b/mail/evolution/patches/patch-ai
@@ -1,15 +1,17 @@
-$NetBSD: patch-ai,v 1.4 2002/03/26 20:50:13 rh Exp $
+$NetBSD: patch-ai,v 1.5 2004/05/06 10:03:54 recht Exp $
 
---- camel/camel-transport.c.orig	Sat Oct 27 18:59:27 2001
-+++ camel/camel-transport.c	Tue Mar 26 15:01:50 2002
-@@ -23,6 +23,11 @@
+--- camel/camel-transport.c.orig	2002-05-11 00:05:28.000000000 +0200
++++ camel/camel-transport.c
+@@ -23,6 +23,13 @@
   * USA
   */
  
++#ifdef	_PTH_PTHREAD_H_
 +#ifdef	_POSIX_THREAD_SYSCALL_SOFT
 +#undef	_POSIX_THREAD_SYSCALL_SOFT
 +#endif
 +#define	_POSIX_THREAD_SYSCALL_SOFT	0
++#endif
 +
  #ifdef HAVE_CONFIG_H
  #include <config.h>
diff --git a/mail/evolution/patches/patch-ak b/mail/evolution/patches/patch-ak
deleted file mode 100644
index 1ab6c8d801b..00000000000
--- a/mail/evolution/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.4 2004/01/04 21:37:09 rh Exp $
-
---- composer/e-msg-composer.c.orig	2003-09-13 05:12:48.000000000 +1000
-+++ composer/e-msg-composer.c
-@@ -52,6 +52,10 @@
- #include <errno.h>
- #include <ctype.h>
- 
-+#ifdef send
-+#undef send
-+#endif
-+
- #include <gtk/gtkoptionmenu.h>
- #include <gtk/gtkscrolledwindow.h>
- 
diff --git a/mail/evolution/patches/patch-al b/mail/evolution/patches/patch-al
deleted file mode 100644
index 45309fd3563..00000000000
--- a/mail/evolution/patches/patch-al
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-al,v 1.7 2004/01/04 21:37:09 rh Exp $
-
---- mail/importers/Makefile.in.orig	2003-09-16 05:17:15.000000000 +1000
-+++ mail/importers/Makefile.in
-@@ -275,6 +275,7 @@ libevolution_netscape_importer_la_LIBADD
- 	$(top_builddir)/e-util/libeutil.la			\
- 	$(top_builddir)/filter/libfilter.la			\
- 	$(top_builddir)/shell/libeshell.la			\
-+	../libevolution-mail.la					\
- 	$(IMPORTERS_LIBS)
- 
- 
-@@ -287,6 +288,7 @@ libevolution_elm_importer_la_LDFLAGS = -
- libevolution_elm_importer_la_LIBADD = \
- 	$(top_builddir)/shell/importer/libevolution-importer.la \
- 	$(top_builddir)/e-util/libeutil.la			\
-+	../libevolution-mail.la					\
- 	$(IMPORTERS_LIBS)
- 
- 
-@@ -300,6 +302,7 @@ libevolution_pine_importer_la_LIBADD = \
- 	$(top_builddir)/shell/importer/libevolution-importer.la \
- 	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
- 	$(top_builddir)/camel/libcamel.la			\
-+	../libevolution-mail.la					\
- 	$(IMPORTERS_LIBS)
- 
- 
-@@ -356,10 +359,10 @@ libevolution_pine_importer_la_DEPENDENCI
- am_libevolution_pine_importer_la_OBJECTS = pine-importer.lo
- libevolution_pine_importer_la_OBJECTS = \
- 	$(am_libevolution_pine_importer_la_OBJECTS)
--libmbox_la_LIBADD =
-+libmbox_la_LIBADD = $(top_builddir)/camel/libcamel.la ../libevolution-mail.la
- am_libmbox_la_OBJECTS = evolution-mbox-importer.lo
- libmbox_la_OBJECTS = $(am_libmbox_la_OBJECTS)
--liboutlook_la_LIBADD =
-+liboutlook_la_LIBADD = $(top_builddir)/camel/libcamel.la ../libevolution-mail.la
- am_liboutlook_la_OBJECTS = evolution-outlook-importer.lo
- liboutlook_la_OBJECTS = $(am_liboutlook_la_OBJECTS)
- 
diff --git a/mail/evolution/patches/patch-am b/mail/evolution/patches/patch-am
deleted file mode 100644
index 05898c85430..00000000000
--- a/mail/evolution/patches/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-am,v 1.5 2004/01/04 21:37:09 rh Exp $
-
---- mail/Makefile.in.orig	2004-01-04 08:09:37.000000000 +1000
-+++ mail/Makefile.in
-@@ -531,6 +531,7 @@ DIST_SUBDIRS = $(SUBDIRS)
- SOURCES = $(libevolution_mail_la_SOURCES)
- 
- all: $(BUILT_SOURCES)
-+	${MAKE} ${AM_MAKEFLAGS} ${component_LTLIBRARIES}
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
- .SUFFIXES: