Update to 0.2

12 files changed, 210 insertions, 202 deletions

diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index 1a5ffe1..f274982 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	0.1
+PORTVERSION=	0.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
@@ -22,9 +22,10 @@ LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		bonobo.2:${PORTSDIR}/devel/bonobo \
 		gnomevfs.0:${PORTSDIR}/devel/gnomevfs \
 		unicode.0:${PORTSDIR}/devel/libunicode \
-		gtkhtml.2:${PORTSDIR}/www/gtkhtml \
+		gtkhtml.3:${PORTSDIR}/www/gtkhtml \
 		ldap.1:${PORTSDIR}/net/openldap \
-		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter
+		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
+		gpilotd.0:${PORTSDIR}/palm/gnomepilot
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -34,7 +35,8 @@ USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure libical/configure
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
+		--datadir=${PREFIX}/share/gnome \
+		--with-pisock=${LOCALBASE}/pilot
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
diff --git a/mail/evolution-devel/distinfo b/mail/evolution-devel/distinfo
index 58074eb..712134b 100644
--- a/mail/evolution-devel/distinfo
+++ b/mail/evolution-devel/distinfo
@@ -1 +1 @@
-MD5 (evolution-0.1.tar.gz) = b9a89ba71388172eb28cb72998041427
+MD5 (evolution-0.2.tar.gz) = 65b5eaa61dd2afc920210c0c45acd253
diff --git a/mail/evolution-devel/files/patch-aa b/mail/evolution-devel/files/patch-aa
index f7c3576..0b720b1 100644
--- a/mail/evolution-devel/files/patch-aa
+++ b/mail/evolution-devel/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Fri Jun  2 15:13:10 2000
-+++ configure	Wed Jun 28 17:39:26 2000
-@@ -4079,7 +4079,7 @@
+--- configure.orig	Mon Jul 10 20:48:19 2000
++++ configure	Tue Jul 11 19:15:28 2000
+@@ -4116,7 +4116,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -9,18 +9,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -5621,8 +5621,8 @@
- fi
- 
- if $have_pthread; then 
-- 	THREADS_LIBS="$PTHREAD_LIB `glib-config --libs gthread`"
--	THREADS_CFLAGS="`glib-config --cflags gthread`"
-+ 	THREADS_LIBS="$PTHREAD_LIB `$GLIB_CONFIG --libs gthread`"
-+	THREADS_CFLAGS="`$GLIB_CONFIG --cflags gthread`"
- else
- 	THREADS_LIBS=""
- 	THREADS_CFLAGS=""
-@@ -5697,8 +5697,8 @@
+@@ -5795,8 +5795,8 @@
      { echo "configure: error: Did not find gdkpixbuf installed" 1>&2; exit 1; }
  fi
  
@@ -31,7 +20,7 @@
  
  
  
-@@ -6771,10 +6771,10 @@
+@@ -7583,10 +7583,10 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/mail/evolution-devel/files/patch-ab b/mail/evolution-devel/files/patch-ab
index 5cf4506..33e7762 100644
--- a/mail/evolution-devel/files/patch-ab
+++ b/mail/evolution-devel/files/patch-ab
@@ -19,51 +19,51 @@
 -INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-DG_LOG_DOMAIN=\"wombat-pas\"				-I$(top_srcdir) 					-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend		        $(BONOBO_GNOME_CFLAGS)
 +INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-DG_LOG_DOMAIN=\"wombat-pas\"				-I$(top_srcdir) 					-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend		        $(BONOBO_GNOME_CFLAGS)
  
---- addressbook/gui/component/Makefile.in.orig	Fri Jun  2 15:49:05 2000
-+++ addressbook/gui/component/Makefile.in	Wed Jun 28 18:22:43 2000
-@@ -152,3 +152,3 @@
+--- addressbook/gui/component/Makefile.in.orig	Mon Jul 10 21:34:24 2000
++++ addressbook/gui/component/Makefile.in	Tue Jul 11 19:32:26 2000
+@@ -168,3 +168,3 @@
+ 
+-INCLUDES =  	-DG_LOG_DOMAIN=\"evolution-addressbook\"		$(EXTRA_GNOME_CFLAGS)					$(GNOME_INCLUDEDIR)					-I$(top_srcdir)						-I$(top_builddir)					-I$(top_srcdir)/shell					-I$(top_builddir)/shell					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)/widgets/e-table				-I$(top_srcdir)/widgets/misc				-I$(top_srcdir)/addressbook/gui/minicard		-I$(top_srcdir)/addressbook/contact-editor		-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			$(BONOBO_HTML_GNOME_CFLAGS)				-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"		-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
++INCLUDES =  	-DG_LOG_DOMAIN=\"evolution-addressbook\"		$(EXTRA_GNOME_CFLAGS)					$(GNOME_INCLUDEDIR)					-I$(top_srcdir)						-I$(top_builddir)					-I$(top_srcdir)/shell					-I$(top_builddir)/shell					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)/widgets/e-table				-I$(top_srcdir)/widgets/misc				-I$(top_srcdir)/addressbook/gui/minicard		-I$(top_srcdir)/addressbook/contact-editor		-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			$(BONOBO_HTML_GNOME_CFLAGS)				-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"		-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
+
+--- addressbook/gui/component/select-names/Makefile.in.orig	Mon Jul 10 21:34:25 2000
++++ addressbook/gui/component/select-names/Makefile.in	Tue Jul 11 22:42:25 2000
+@@ -179,3 +179,3 @@
  
 -INCLUDES =  	-DG_LOG_DOMAIN=\"evolution-addressbook\"		$(EXTRA_GNOME_CFLAGS)					$(GNOME_INCLUDEDIR)					-I$(top_srcdir)						-I$(top_builddir)					-I$(top_srcdir)/shell					-I$(top_builddir)/shell					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)/widgets/e-table				-I$(top_srcdir)/addressbook/gui/minicard		-I$(top_srcdir)/addressbook/contact-editor		-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			$(BONOBO_HTML_GNOME_CFLAGS)				-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"		-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
 +INCLUDES =  	-DG_LOG_DOMAIN=\"evolution-addressbook\"		$(EXTRA_GNOME_CFLAGS)					$(GNOME_INCLUDEDIR)					-I$(top_srcdir)						-I$(top_builddir)					-I$(top_srcdir)/shell					-I$(top_builddir)/shell					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)/widgets/e-table				-I$(top_srcdir)/addressbook/gui/minicard		-I$(top_srcdir)/addressbook/contact-editor		-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			$(BONOBO_HTML_GNOME_CFLAGS)				-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"		-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
  
---- calendar/cal-client/Makefile.in.orig	Fri Jun  2 15:49:10 2000
-+++ calendar/cal-client/Makefile.in	Wed Jun 28 17:58:32 2000
-@@ -161,3 +161,3 @@
+--- calendar/cal-client/Makefile.in.orig	Mon Jul 10 21:34:30 2000
++++ calendar/cal-client/Makefile.in	Tue Jul 11 19:33:16 2000
+@@ -175,3 +175,3 @@
  
--INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-DG_LOG_DOMAIN=\"cal-client\"				-I$(top_srcdir)/calendar				-I$(srcdir) -I$(top_srcdir) 				-I. 							-I.. 							-I$(top_builddir)				        -I$(includedir)                                 	$(BONOBO_GNOME_CFLAGS)
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-DG_LOG_DOMAIN=\"cal-client\"				-I$(top_srcdir)/calendar				-I$(srcdir) -I$(top_srcdir) 				-I. 							-I.. 							-I$(top_builddir)				        -I$(includedir)                                 	$(BONOBO_GNOME_CFLAGS)
+-INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-DG_LOG_DOMAIN=\"cal-client\"				-I$(top_srcdir)/calendar				-I$(srcdir) -I$(top_srcdir) 				-I. 							-I.. 							-I$(top_builddir)					-I$(top_builddir)/libical/src/libical			-I$(top_srcdir)/libical/src/libical			$(BONOBO_GNOME_CFLAGS)
++INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-DG_LOG_DOMAIN=\"cal-client\"				-I$(top_srcdir)/calendar				-I$(srcdir) -I$(top_srcdir) 				-I. 							-I.. 							-I$(top_builddir)					-I$(top_builddir)/libical/src/libical			-I$(top_srcdir)/libical/src/libical			$(BONOBO_GNOME_CFLAGS)
  
---- calendar/cal-util/Makefile.in.orig	Fri Jun  2 15:49:08 2000
-+++ calendar/cal-util/Makefile.in	Wed Jun 28 17:41:18 2000
-@@ -151,3 +151,3 @@
+--- calendar/cal-util/Makefile.in.orig	Mon Jul 10 21:34:29 2000
++++ calendar/cal-util/Makefile.in	Tue Jul 11 19:34:04 2000
+@@ -165,3 +165,3 @@
  
--INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DG_LOG_DOMAIN=\"cal-util\"				-I$(top_srcdir) 					-I$(top_srcdir)/calendar				-I. 							-I.. 							-I$(top_builddir)				        $(GNOME_INCLUDEDIR)
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DG_LOG_DOMAIN=\"cal-util\"				-I$(top_srcdir) 					-I$(top_srcdir)/calendar				-I. 							-I.. 							-I$(top_builddir)				        $(GNOME_INCLUDEDIR)
+-INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DG_LOG_DOMAIN=\"cal-util\"				-I$(top_srcdir) 					-I$(top_srcdir)/calendar				-I. 							-I.. 							-I$(top_builddir)					-I$(top_srcdir)/libical/src/libical			-I$(top_builddir)/libical/src/libical		        $(GNOME_INCLUDEDIR)
++INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DG_LOG_DOMAIN=\"cal-util\"				-I$(top_srcdir) 					-I$(top_srcdir)/calendar				-I. 							-I.. 							-I$(top_builddir)					-I$(top_srcdir)/libical/src/libical			-I$(top_builddir)/libical/src/libical		        $(GNOME_INCLUDEDIR)
  
---- calendar/gui/Makefile.in.orig	Fri Jun  2 15:49:11 2000
-+++ calendar/gui/Makefile.in	Wed Jun 28 19:39:03 2000
-@@ -151,3 +151,3 @@
+--- calendar/gui/Makefile.in.orig	Mon Jul 10 21:34:31 2000
++++ calendar/gui/Makefile.in	Tue Jul 11 22:41:10 2000
+@@ -165,3 +165,3 @@
  
 -help_base = $(datadir)/gnome/help/cal
 +help_base = $(datadir)/help/cal
  
-@@ -156,3 +156,3 @@
+@@ -172,3 +172,3 @@
  
--INCLUDES =  	-DG_LOG_DOMAIN=\"calendar-gui\"				-I$(top_builddir)/shell					-I$(top_srcdir)/shell					-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(includedir)						$(BONOBO_VFS_GNOME_CFLAGS)				$(GNOME_CONDUIT_INCLUDEDIR)				$(PISOCK_INCLUDEDIR)                  			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES =  	-DG_LOG_DOMAIN=\"calendar-gui\"				-I$(top_builddir)/shell					-I$(top_srcdir)/shell					-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(includedir)						$(BONOBO_VFS_GNOME_CFLAGS)				$(GNOME_CONDUIT_INCLUDEDIR)				$(PISOCK_INCLUDEDIR)                  			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
+-INCLUDES =  	-DG_LOG_DOMAIN=\"calendar-gui\"				-I$(top_builddir)/shell					-I$(top_srcdir)/shell					-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(top_srcdir)/widgets					-I$(includedir)						$(BONOBO_VFS_GNOME_CFLAGS)				-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
++INCLUDES =  	-DG_LOG_DOMAIN=\"calendar-gui\"				-I$(top_builddir)/shell					-I$(top_srcdir)/shell					-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(top_srcdir)/widgets					-I$(includedir)						$(BONOBO_VFS_GNOME_CFLAGS)				-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
  
-@@ -766,3 +766,3 @@
+@@ -593,3 +593,3 @@
  install-data-local:
 -	$(mkinstalldirs) $(DESTDIR)$(help_base)/C
 +#	$(mkinstalldirs) $(DESTDIR)$(help_base)/C
- 
---- calendar/pcs/Makefile.in.orig	Fri Jun  2 15:49:09 2000
-+++ calendar/pcs/Makefile.in	Wed Jun 28 17:42:02 2000
-@@ -149,3 +149,3 @@
- 
--INCLUDES =  	-DG_LOG_DOMAIN=\"wombat-pcs\"				-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(top_builddir)/libical/src/libical			$(BONOBO_GNOME_CFLAGS)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES =  	-DG_LOG_DOMAIN=\"wombat-pcs\"				-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(top_builddir)/libical/src/libical			$(BONOBO_GNOME_CFLAGS)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
- 
+ 	$(mkinstalldirs) $(Conduitsdir)
 --- calendar/gui/dialogs/Makefile.in.orig	Fri Jun  2 15:49:12 2000
 +++ calendar/gui/dialogs/Makefile.in	Wed Jun 28 18:24:00 2000
 @@ -151,3 +151,3 @@
@@ -71,24 +71,31 @@
 -INCLUDES =  	-DG_LOG_DOMAIN=\"calendar-gui\"				-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(includedir)						-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			$(BONOBO_VFS_GNOME_CFLAGS)			        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 +INCLUDES =  	-DG_LOG_DOMAIN=\"calendar-gui\"				-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(includedir)						-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			$(BONOBO_VFS_GNOME_CFLAGS)			        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
  
---- mail/Makefile.in.orig	Fri Jun  2 15:48:53 2000
-+++ mail/Makefile.in	Wed Jun 28 17:44:12 2000
-@@ -157,3 +157,3 @@
+--- calendar/pcs/Makefile.in.orig	Mon Jul 10 21:34:30 2000
++++ calendar/pcs/Makefile.in	Tue Jul 11 19:35:14 2000
+@@ -163,3 +163,3 @@
  
--INCLUDES =  	-I$(top_srcdir)/widgets					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)						-I$(top_srcdir)/camel					-I$(top_builddir)/shell					-I$(top_srcdir)/shell					$(BONOBO_HTML_GNOME_CFLAGS)				-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"		-DEVOLUTION_DATADIR=\""$(datadir)"\"            	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"		-DG_LOG_DOMAIN=\"evolution-mail\"
-+INCLUDES =  	-I$(top_srcdir)/widgets					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)						-I$(top_srcdir)/camel					-I$(top_builddir)/shell					-I$(top_srcdir)/shell					$(BONOBO_HTML_GNOME_CFLAGS)				-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"		-DEVOLUTION_DATADIR=\""$(datadir)"\"            	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"		-DG_LOG_DOMAIN=\"evolution-mail\"
+-INCLUDES =  	-DG_LOG_DOMAIN=\"wombat-pcs\"				-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(top_builddir)/libical/src/libical			$(BONOBO_VFS_GNOME_CFLAGS)			        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
++INCLUDES =  	-DG_LOG_DOMAIN=\"wombat-pcs\"				-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(top_builddir)/libical/src/libical			$(BONOBO_VFS_GNOME_CFLAGS)			        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
  
---- shell/Makefile.in.orig	Fri Jun  2 15:48:43 2000
-+++ shell/Makefile.in	Wed Jun 28 17:44:32 2000
-@@ -153,3 +153,3 @@
+--- mail/Makefile.in.orig	Mon Jul 10 21:34:09 2000
++++ mail/Makefile.in	Tue Jul 11 19:36:13 2000
+@@ -169,3 +169,3 @@
  
--INCLUDES =  	-I$(top_srcdir)/widgets					-I$(top_srcdir)/widgets/misc				-I$(top_srcdir)						$(BONOBO_GNOME_CFLAGS)					-DEVOLUTION_IMAGES=\""$(imagesdir)"\"			-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"   	-DEVOLUTION_DATADIR=\""$(datadir)"\"            	-DG_LOG_DOMAIN=\"evolution-shell\"
-+INCLUDES =  	-I$(top_srcdir)/widgets					-I$(top_srcdir)/widgets/misc				-I$(top_srcdir)						$(BONOBO_GNOME_CFLAGS)					-DEVOLUTION_IMAGES=\""$(imagesdir)"\"			-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"   	-DEVOLUTION_DATADIR=\""$(datadir)"\"            	-DG_LOG_DOMAIN=\"evolution-shell\"
+-INCLUDES =  	-I$(top_srcdir)/widgets					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)						-I$(top_srcdir)/camel					-I$(top_builddir)/shell					-I$(top_srcdir)/shell					$(BONOBO_HTML_GNOME_CFLAGS)				$(GNOME_VFS_CFLAGS)					$(GCONF_CFLAGS)						-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"		-DEVOLUTION_DATADIR=\""$(datadir)"\"            	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"		-DG_LOG_DOMAIN=\"evolution-mail\"			$(THREADS_CFLAGS)
++INCLUDES =  	-I$(top_srcdir)/widgets					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)						-I$(top_srcdir)/camel					-I$(top_builddir)/shell					-I$(top_srcdir)/shell					$(BONOBO_HTML_GNOME_CFLAGS)				$(GNOME_VFS_CFLAGS)					$(GCONF_CFLAGS)						-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"		-DEVOLUTION_DATADIR=\""$(datadir)"\"            	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"		-DG_LOG_DOMAIN=\"evolution-mail\"			$(THREADS_CFLAGS)
  
---- wombat/Makefile.in.orig	Fri Jun  2 15:49:13 2000
-+++ wombat/Makefile.in	Wed Jun 28 17:45:11 2000
-@@ -149,3 +149,3 @@
+--- shell/Makefile.in.orig	Mon Jul 10 21:33:55 2000
++++ shell/Makefile.in	Tue Jul 11 19:36:47 2000
+@@ -165,3 +165,3 @@
+ 
+-INCLUDES =  	-I$(top_srcdir)/widgets							-I$(top_srcdir)/widgets/misc						-I$(top_srcdir)								$(BONOBO_GNOME_CFLAGS)							$(GCONF_CFLAGS)								-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\"			-DEVOLUTION_VERSION=\""$(VERSION)"\"					-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"   			-DEVOLUTION_DATADIR=\""$(datadir)"\"            			-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"			-DG_LOG_DOMAIN=\"evolution-shell\"
++INCLUDES =  	-I$(top_srcdir)/widgets							-I$(top_srcdir)/widgets/misc						-I$(top_srcdir)								$(BONOBO_GNOME_CFLAGS)							$(GCONF_CFLAGS)								-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\"			-DEVOLUTION_VERSION=\""$(VERSION)"\"					-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"   			-DEVOLUTION_DATADIR=\""$(datadir)"\"            			-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"			-DG_LOG_DOMAIN=\"evolution-shell\"
+
+--- wombat/Makefile.in.orig	Mon Jul 10 21:34:33 2000
++++ wombat/Makefile.in	Tue Jul 11 19:37:30 2000
+@@ -163,3 +163,3 @@
  
--INCLUDES =  	-DG_LOG_DOMAIN=\"wombat\"				-I$(top_srcdir)/e-util					-I$(top_srcdir)						-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			-I$(top_srcdir)/calendar				-I$(top_srcdir)/calendar/pcs				$(EXTRA_GNOME_CFLAGS)					$(GNOME_INCLUDEDIR)					-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES =  	-DG_LOG_DOMAIN=\"wombat\"				-I$(top_srcdir)/e-util					-I$(top_srcdir)						-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			-I$(top_srcdir)/calendar				-I$(top_srcdir)/calendar/pcs				$(EXTRA_GNOME_CFLAGS)					$(GNOME_INCLUDEDIR)					-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"
+-INCLUDES =  	-DG_LOG_DOMAIN=\"wombat\"				-I$(top_srcdir)/e-util					-I$(top_srcdir)						-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			-I$(top_srcdir)/calendar				-I$(top_srcdir)/calendar/pcs				$(GNOME_INCLUDEDIR)					$(BONOBO_VFS_GNOME_CFLAGS)					-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"
++INCLUDES =  	-DG_LOG_DOMAIN=\"wombat\"				-I$(top_srcdir)/e-util					-I$(top_srcdir)						-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			-I$(top_srcdir)/calendar				-I$(top_srcdir)/calendar/pcs				$(GNOME_INCLUDEDIR)					$(BONOBO_VFS_GNOME_CFLAGS)					-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"
  
diff --git a/mail/evolution-devel/files/patch-ac b/mail/evolution-devel/files/patch-ac
index 196b503..ea98267 100644
--- a/mail/evolution-devel/files/patch-ac
+++ b/mail/evolution-devel/files/patch-ac
@@ -1,35 +1,42 @@
+--- camel/providers/imap/Makefile.in.orig	Mon Jul 10 21:34:06 2000
++++ camel/providers/imap/Makefile.in	Tue Jul 11 19:17:54 2000
+@@ -181,3 +181,3 @@
+ 
+-libcamelimap_la_LDFLAGS = -version-info 0:0:0
++libcamelimap_la_LDFLAGS = -avoid-version
+ 
 --- camel/providers/mbox/Makefile.in.orig	Fri Jun  2 15:48:47 2000
 +++ camel/providers/mbox/Makefile.in	Wed Jun 28 18:54:19 2000
 @@ -167,3 +167,3 @@
  
--libcamelmbox_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) 
-+libcamelmbox_la_LDFLAGS = -avoid-version -rpath $(libdir) 
+-libcamelmbox_la_LDFLAGS = -version-info 0:0:0
++libcamelmbox_la_LDFLAGS = -avoid-version
  
 --- camel/providers/pop3/Makefile.in.orig	Fri Jun  2 15:48:48 2000
 +++ camel/providers/pop3/Makefile.in	Wed Jun 28 18:54:35 2000
 @@ -167,3 +167,3 @@
  
--libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -version-info 0:0:0 -rpath $(libdir) 
-+libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -avoid-version -rpath $(libdir) 
+-libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -version-info 0:0:0
++libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -avoid-version
  
 --- camel/providers/sendmail/Makefile.in.orig	Fri Jun  2 15:48:49 2000
 +++ camel/providers/sendmail/Makefile.in	Wed Jun 28 18:54:52 2000
 @@ -167,3 +167,3 @@
  
--libcamelsendmail_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) 
-+libcamelsendmail_la_LDFLAGS = -avoid-version -rpath $(libdir) 
+-libcamelsendmail_la_LDFLAGS = -version-info 0:0:0
++libcamelsendmail_la_LDFLAGS = -avoid-version
  
 --- camel/providers/smtp/Makefile.in.orig	Fri Jun  2 15:48:49 2000
 +++ camel/providers/smtp/Makefile.in	Wed Jun 28 18:55:06 2000
 @@ -167,3 +167,3 @@
  
--libcamelsmtp_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) 
-+libcamelsmtp_la_LDFLAGS = -avoid-version -rpath $(libdir) 
+-libcamelsmtp_la_LDFLAGS = -version-info 0:0:0
++libcamelsmtp_la_LDFLAGS = -avoid-version
  
 --- camel/providers/vee/Makefile.in.orig	Fri Jun  2 15:48:50 2000
 +++ camel/providers/vee/Makefile.in	Wed Jun 28 18:55:19 2000
 @@ -167,3 +167,3 @@
  
--libcamelvee_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) 
-+libcamelvee_la_LDFLAGS = -avoid-version -rpath $(libdir) 
+-libcamelvee_la_LDFLAGS = -version-info 0:0:0
++libcamelvee_la_LDFLAGS = -avoid-version
  
diff --git a/mail/evolution-devel/pkg-plist b/mail/evolution-devel/pkg-plist
index d97ff39..e892124 100644
--- a/mail/evolution-devel/pkg-plist
+++ b/mail/evolution-devel/pkg-plist
@@ -3,8 +3,8 @@ bin/evolution-addressbook
 bin/evolution-calendar
 bin/evolution-mail
 bin/killev
-bin/test-mail
 bin/wombat
+include/camel/broken-date-parser.h
 include/camel/camel-address.h
 include/camel/camel-data-wrapper.h
 include/camel/camel-exception-list.def
@@ -12,6 +12,9 @@ include/camel/camel-exception.h
 include/camel/camel-folder-search.h
 include/camel/camel-folder-summary.h
 include/camel/camel-folder.h
+include/camel/camel-imap-folder.h
+include/camel/camel-imap-store.h
+include/camel/camel-imap-stream.h
 include/camel/camel-internet-address.h
 include/camel/camel-mbox-folder.h
 include/camel/camel-mbox-store.h
@@ -19,10 +22,10 @@ include/camel/camel-mbox-summary.h
 include/camel/camel-medium.h
 include/camel/camel-mime-filter-basic.h
 include/camel/camel-mime-filter-charset.h
+include/camel/camel-mime-filter-crlf.h
 include/camel/camel-mime-filter-from.h
 include/camel/camel-mime-filter-index.h
 include/camel/camel-mime-filter-save.h
-include/camel/camel-mime-filter-smtp.h
 include/camel/camel-mime-filter.h
 include/camel/camel-mime-message.h
 include/camel/camel-mime-parser.h
@@ -58,15 +61,10 @@ include/camel/gstring-util.h
 include/camel/hash-table-utils.h
 include/camel/md5-utils.h
 include/camel/string-utils.h
-include/composer/e-msg-composer-address-dialog.h
-include/composer/e-msg-composer-address-entry.h
-include/composer/e-msg-composer-attachment-bar.h
-include/composer/e-msg-composer-attachment.h
-include/composer/e-msg-composer-hdrs.h
-include/composer/e-msg-composer.h
 include/ename/e-name-western-tables.h
 include/ename/e-name-western.h
 include/evolution/cal-client/cal-client.h
+include/evolution/cal-util/cal-component.h
 include/evolution/cal-util/cal-recur.h
 include/evolution/cal-util/cal-util.h
 include/evolution/cal-util/calobj.h
@@ -77,9 +75,6 @@ include/evolution/ebook/e-book-view-listener.h
 include/evolution/ebook/e-book-view.h
 include/evolution/ebook/e-book.h
 include/evolution/ebook/e-card-cursor.h
-include/evolution/ebook/e-card-iterator.h
-include/evolution/ebook/e-card-list-iterator.h
-include/evolution/ebook/e-card-list.h
 include/evolution/ebook/e-card-pairs.h
 include/evolution/ebook/e-card-simple.h
 include/evolution/ebook/e-card-types.h
@@ -101,6 +96,8 @@ include/icalvalue.h
 include/icalvcal.h
 include/icalversion.h
 include/pvl.h
+lib/evolution/camel-providers/%%VERSION%%/libcamelimap.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelimap.urls
 lib/evolution/camel-providers/%%VERSION%%/libcamelmbox.so
 lib/evolution/camel-providers/%%VERSION%%/libcamelmbox.urls
 lib/evolution/camel-providers/%%VERSION%%/libcamelpop3.so
@@ -126,22 +123,18 @@ lib/libebook.so.0
 lib/libename.a
 lib/libename.so
 lib/libename.so.0
+lib/libeselectnames.a
+lib/libeselectnames.so
+lib/libeselectnames.so.0
 lib/libical.a
-lib/libical.so
-lib/libical.so.0
 lib/libicalss.a
-lib/libicalss.so
-lib/libicalss.so.0
+share/evolution/default_user/ldapservers.xml
 share/evolution/default_user/shortcuts.xml
 share/evolution/filtertypes.xml
 share/evolution/vfoldertypes.xml
+share/gnome/apps/Applications/evolution.desktop
 share/gnome/evolution/default_user/local/Calendar/folder-metadata.xml
 share/gnome/evolution/default_user/local/Contacts/folder-metadata.xml
-share/gnome/evolution/default_user/local/Directories/folder-metadata.xml
-share/gnome/evolution/default_user/local/Directories/subfolders/Bigfoot/folder-metadata.xml
-share/gnome/evolution/default_user/local/Directories/subfolders/Bigfoot/uri
-share/gnome/evolution/default_user/local/Directories/subfolders/Netcenter/folder-metadata.xml
-share/gnome/evolution/default_user/local/Directories/subfolders/Netcenter/uri
 share/gnome/evolution/default_user/local/Drafts/folder-metadata.xml
 share/gnome/evolution/default_user/local/Inbox/folder-metadata.xml
 share/gnome/evolution/default_user/local/Inbox/mbox
@@ -160,14 +153,19 @@ share/gnome/evolution/glade/e-msg-composer-address-dialog.glade
 share/gnome/evolution/glade/e-msg-composer-address-dialog.glade.h
 share/gnome/evolution/glade/e-msg-composer-attachment.glade
 share/gnome/evolution/glade/e-msg-composer-attachment.glade.h
+share/gnome/evolution/glade/e-shell-folder-creation-dialog.glade
 share/gnome/evolution/glade/e-table-config.glade
+share/gnome/evolution/glade/e-table-field-chooser.glade
 share/gnome/evolution/glade/e-table-group.glade
 share/gnome/evolution/glade/event-editor-dialog.glade
 share/gnome/evolution/glade/fullname.glade
 share/gnome/evolution/glade/ldap-server-dialog.glade
 share/gnome/evolution/glade/ldap-server-dialog.glade.h
+share/gnome/evolution/glade/mail-config.glade
+share/gnome/evolution/glade/select-names.glade
 share/gnome/help/evolution/C/fig/calendar.png
-share/gnome/help/evolution/C/fig/config-camel.png
+share/gnome/help/evolution/C/fig/config-cal.png
+share/gnome/help/evolution/C/fig/config-mail.png
 share/gnome/help/evolution/C/fig/contact.png
 share/gnome/help/evolution/C/fig/filter-new-fig.png
 share/gnome/help/evolution/C/fig/mail-druid-pic.png
@@ -194,21 +192,26 @@ share/gnome/images/evolution/house.png
 share/gnome/images/evolution/malehead.png
 share/gnome/oaf/addressbook.oafinfo
 share/gnome/oaf/calendar-control.oafinfo
+share/gnome/oaf/evolution-addressbook-select-names.oafinfo
 share/gnome/oaf/evolution-calendar.oafinfo
 share/gnome/oaf/evolution-mail.oafinfo
 share/gnome/oaf/wombat.oafinfo
+share/gnome/pixmaps/evolution.png
 share/locale/da/LC_MESSAGES/evolution.mo
+share/locale/de/LC_MESSAGES/evolution.mo
 share/locale/el/LC_MESSAGES/evolution.mo
 share/locale/es/LC_MESSAGES/evolution.mo
 share/locale/fr/LC_MESSAGES/evolution.mo
 share/locale/gl/LC_MESSAGES/evolution.mo
 share/locale/hu/LC_MESSAGES/evolution.mo
+share/locale/it/LC_MESSAGES/evolution.mo
 share/locale/ja/LC_MESSAGES/evolution.mo
 share/locale/ko/LC_MESSAGES/evolution.mo
 share/locale/nl/LC_MESSAGES/evolution.mo
 share/locale/no/LC_MESSAGES/evolution.mo
-share/locale/pt/LC_MESSAGES/evolution.mo
 share/locale/ru/LC_MESSAGES/evolution.mo
+share/locale/pl/LC_MESSAGES/evolution.mo
+share/locale/sl/LC_MESSAGES/evolution.mo
 share/locale/sv/LC_MESSAGES/evolution.mo
 share/locale/tr/LC_MESSAGES/evolution.mo
 share/locale/uk/LC_MESSAGES/evolution.mo
@@ -223,10 +226,6 @@ share/locale/uk/LC_MESSAGES/evolution.mo
 @dirrm share/gnome/evolution/default_user/local/Outbox
 @dirrm share/gnome/evolution/default_user/local/Inbox
 @dirrm share/gnome/evolution/default_user/local/Drafts
-@dirrm share/gnome/evolution/default_user/local/Directories/subfolders/Netcenter
-@dirrm share/gnome/evolution/default_user/local/Directories/subfolders/Bigfoot
-@dirrm share/gnome/evolution/default_user/local/Directories/subfolders
-@dirrm share/gnome/evolution/default_user/local/Directories
 @dirrm share/gnome/evolution/default_user/local/Contacts
 @dirrm share/gnome/evolution/default_user/local/Calendar
 @dirrm share/gnome/evolution/default_user/local
@@ -240,6 +239,6 @@ share/locale/uk/LC_MESSAGES/evolution.mo
 @dirrm include/evolution/ebook
 @dirrm include/evolution/cal-util
 @dirrm include/evolution/cal-client
+@dirrm include/evolution
 @dirrm include/ename
-@dirrm include/composer
 @dirrm include/camel
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 1a5ffe1..f274982 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	0.1
+PORTVERSION=	0.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
@@ -22,9 +22,10 @@ LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		bonobo.2:${PORTSDIR}/devel/bonobo \
 		gnomevfs.0:${PORTSDIR}/devel/gnomevfs \
 		unicode.0:${PORTSDIR}/devel/libunicode \
-		gtkhtml.2:${PORTSDIR}/www/gtkhtml \
+		gtkhtml.3:${PORTSDIR}/www/gtkhtml \
 		ldap.1:${PORTSDIR}/net/openldap \
-		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter
+		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
+		gpilotd.0:${PORTSDIR}/palm/gnomepilot
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -34,7 +35,8 @@ USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure libical/configure
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
+		--datadir=${PREFIX}/share/gnome \
+		--with-pisock=${LOCALBASE}/pilot
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 58074eb..712134b 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1 +1 @@
-MD5 (evolution-0.1.tar.gz) = b9a89ba71388172eb28cb72998041427
+MD5 (evolution-0.2.tar.gz) = 65b5eaa61dd2afc920210c0c45acd253
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index f7c3576..0b720b1 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Fri Jun  2 15:13:10 2000
-+++ configure	Wed Jun 28 17:39:26 2000
-@@ -4079,7 +4079,7 @@
+--- configure.orig	Mon Jul 10 20:48:19 2000
++++ configure	Tue Jul 11 19:15:28 2000
+@@ -4116,7 +4116,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -9,18 +9,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -5621,8 +5621,8 @@
- fi
- 
- if $have_pthread; then 
-- 	THREADS_LIBS="$PTHREAD_LIB `glib-config --libs gthread`"
--	THREADS_CFLAGS="`glib-config --cflags gthread`"
-+ 	THREADS_LIBS="$PTHREAD_LIB `$GLIB_CONFIG --libs gthread`"
-+	THREADS_CFLAGS="`$GLIB_CONFIG --cflags gthread`"
- else
- 	THREADS_LIBS=""
- 	THREADS_CFLAGS=""
-@@ -5697,8 +5697,8 @@
+@@ -5795,8 +5795,8 @@
      { echo "configure: error: Did not find gdkpixbuf installed" 1>&2; exit 1; }
  fi
  
@@ -31,7 +20,7 @@
  
  
  
-@@ -6771,10 +6771,10 @@
+@@ -7583,10 +7583,10 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/mail/evolution/files/patch-ab b/mail/evolution/files/patch-ab
index 5cf4506..33e7762 100644
--- a/mail/evolution/files/patch-ab
+++ b/mail/evolution/files/patch-ab
@@ -19,51 +19,51 @@
 -INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-DG_LOG_DOMAIN=\"wombat-pas\"				-I$(top_srcdir) 					-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend		        $(BONOBO_GNOME_CFLAGS)
 +INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-DG_LOG_DOMAIN=\"wombat-pas\"				-I$(top_srcdir) 					-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend		        $(BONOBO_GNOME_CFLAGS)
  
---- addressbook/gui/component/Makefile.in.orig	Fri Jun  2 15:49:05 2000
-+++ addressbook/gui/component/Makefile.in	Wed Jun 28 18:22:43 2000
-@@ -152,3 +152,3 @@
+--- addressbook/gui/component/Makefile.in.orig	Mon Jul 10 21:34:24 2000
++++ addressbook/gui/component/Makefile.in	Tue Jul 11 19:32:26 2000
+@@ -168,3 +168,3 @@
+ 
+-INCLUDES =  	-DG_LOG_DOMAIN=\"evolution-addressbook\"		$(EXTRA_GNOME_CFLAGS)					$(GNOME_INCLUDEDIR)					-I$(top_srcdir)						-I$(top_builddir)					-I$(top_srcdir)/shell					-I$(top_builddir)/shell					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)/widgets/e-table				-I$(top_srcdir)/widgets/misc				-I$(top_srcdir)/addressbook/gui/minicard		-I$(top_srcdir)/addressbook/contact-editor		-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			$(BONOBO_HTML_GNOME_CFLAGS)				-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"		-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
++INCLUDES =  	-DG_LOG_DOMAIN=\"evolution-addressbook\"		$(EXTRA_GNOME_CFLAGS)					$(GNOME_INCLUDEDIR)					-I$(top_srcdir)						-I$(top_builddir)					-I$(top_srcdir)/shell					-I$(top_builddir)/shell					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)/widgets/e-table				-I$(top_srcdir)/widgets/misc				-I$(top_srcdir)/addressbook/gui/minicard		-I$(top_srcdir)/addressbook/contact-editor		-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			$(BONOBO_HTML_GNOME_CFLAGS)				-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"		-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
+
+--- addressbook/gui/component/select-names/Makefile.in.orig	Mon Jul 10 21:34:25 2000
++++ addressbook/gui/component/select-names/Makefile.in	Tue Jul 11 22:42:25 2000
+@@ -179,3 +179,3 @@
  
 -INCLUDES =  	-DG_LOG_DOMAIN=\"evolution-addressbook\"		$(EXTRA_GNOME_CFLAGS)					$(GNOME_INCLUDEDIR)					-I$(top_srcdir)						-I$(top_builddir)					-I$(top_srcdir)/shell					-I$(top_builddir)/shell					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)/widgets/e-table				-I$(top_srcdir)/addressbook/gui/minicard		-I$(top_srcdir)/addressbook/contact-editor		-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			$(BONOBO_HTML_GNOME_CFLAGS)				-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"		-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
 +INCLUDES =  	-DG_LOG_DOMAIN=\"evolution-addressbook\"		$(EXTRA_GNOME_CFLAGS)					$(GNOME_INCLUDEDIR)					-I$(top_srcdir)						-I$(top_builddir)					-I$(top_srcdir)/shell					-I$(top_builddir)/shell					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)/widgets/e-table				-I$(top_srcdir)/addressbook/gui/minicard		-I$(top_srcdir)/addressbook/contact-editor		-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			$(BONOBO_HTML_GNOME_CFLAGS)				-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"		-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
  
---- calendar/cal-client/Makefile.in.orig	Fri Jun  2 15:49:10 2000
-+++ calendar/cal-client/Makefile.in	Wed Jun 28 17:58:32 2000
-@@ -161,3 +161,3 @@
+--- calendar/cal-client/Makefile.in.orig	Mon Jul 10 21:34:30 2000
++++ calendar/cal-client/Makefile.in	Tue Jul 11 19:33:16 2000
+@@ -175,3 +175,3 @@
  
--INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-DG_LOG_DOMAIN=\"cal-client\"				-I$(top_srcdir)/calendar				-I$(srcdir) -I$(top_srcdir) 				-I. 							-I.. 							-I$(top_builddir)				        -I$(includedir)                                 	$(BONOBO_GNOME_CFLAGS)
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-DG_LOG_DOMAIN=\"cal-client\"				-I$(top_srcdir)/calendar				-I$(srcdir) -I$(top_srcdir) 				-I. 							-I.. 							-I$(top_builddir)				        -I$(includedir)                                 	$(BONOBO_GNOME_CFLAGS)
+-INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-DG_LOG_DOMAIN=\"cal-client\"				-I$(top_srcdir)/calendar				-I$(srcdir) -I$(top_srcdir) 				-I. 							-I.. 							-I$(top_builddir)					-I$(top_builddir)/libical/src/libical			-I$(top_srcdir)/libical/src/libical			$(BONOBO_GNOME_CFLAGS)
++INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-DG_LOG_DOMAIN=\"cal-client\"				-I$(top_srcdir)/calendar				-I$(srcdir) -I$(top_srcdir) 				-I. 							-I.. 							-I$(top_builddir)					-I$(top_builddir)/libical/src/libical			-I$(top_srcdir)/libical/src/libical			$(BONOBO_GNOME_CFLAGS)
  
---- calendar/cal-util/Makefile.in.orig	Fri Jun  2 15:49:08 2000
-+++ calendar/cal-util/Makefile.in	Wed Jun 28 17:41:18 2000
-@@ -151,3 +151,3 @@
+--- calendar/cal-util/Makefile.in.orig	Mon Jul 10 21:34:29 2000
++++ calendar/cal-util/Makefile.in	Tue Jul 11 19:34:04 2000
+@@ -165,3 +165,3 @@
  
--INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DG_LOG_DOMAIN=\"cal-util\"				-I$(top_srcdir) 					-I$(top_srcdir)/calendar				-I. 							-I.. 							-I$(top_builddir)				        $(GNOME_INCLUDEDIR)
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DG_LOG_DOMAIN=\"cal-util\"				-I$(top_srcdir) 					-I$(top_srcdir)/calendar				-I. 							-I.. 							-I$(top_builddir)				        $(GNOME_INCLUDEDIR)
+-INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DG_LOG_DOMAIN=\"cal-util\"				-I$(top_srcdir) 					-I$(top_srcdir)/calendar				-I. 							-I.. 							-I$(top_builddir)					-I$(top_srcdir)/libical/src/libical			-I$(top_builddir)/libical/src/libical		        $(GNOME_INCLUDEDIR)
++INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DG_LOG_DOMAIN=\"cal-util\"				-I$(top_srcdir) 					-I$(top_srcdir)/calendar				-I. 							-I.. 							-I$(top_builddir)					-I$(top_srcdir)/libical/src/libical			-I$(top_builddir)/libical/src/libical		        $(GNOME_INCLUDEDIR)
  
---- calendar/gui/Makefile.in.orig	Fri Jun  2 15:49:11 2000
-+++ calendar/gui/Makefile.in	Wed Jun 28 19:39:03 2000
-@@ -151,3 +151,3 @@
+--- calendar/gui/Makefile.in.orig	Mon Jul 10 21:34:31 2000
++++ calendar/gui/Makefile.in	Tue Jul 11 22:41:10 2000
+@@ -165,3 +165,3 @@
  
 -help_base = $(datadir)/gnome/help/cal
 +help_base = $(datadir)/help/cal
  
-@@ -156,3 +156,3 @@
+@@ -172,3 +172,3 @@
  
--INCLUDES =  	-DG_LOG_DOMAIN=\"calendar-gui\"				-I$(top_builddir)/shell					-I$(top_srcdir)/shell					-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(includedir)						$(BONOBO_VFS_GNOME_CFLAGS)				$(GNOME_CONDUIT_INCLUDEDIR)				$(PISOCK_INCLUDEDIR)                  			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES =  	-DG_LOG_DOMAIN=\"calendar-gui\"				-I$(top_builddir)/shell					-I$(top_srcdir)/shell					-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(includedir)						$(BONOBO_VFS_GNOME_CFLAGS)				$(GNOME_CONDUIT_INCLUDEDIR)				$(PISOCK_INCLUDEDIR)                  			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
+-INCLUDES =  	-DG_LOG_DOMAIN=\"calendar-gui\"				-I$(top_builddir)/shell					-I$(top_srcdir)/shell					-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(top_srcdir)/widgets					-I$(includedir)						$(BONOBO_VFS_GNOME_CFLAGS)				-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
++INCLUDES =  	-DG_LOG_DOMAIN=\"calendar-gui\"				-I$(top_builddir)/shell					-I$(top_srcdir)/shell					-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(top_srcdir)/widgets					-I$(includedir)						$(BONOBO_VFS_GNOME_CFLAGS)				-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
  
-@@ -766,3 +766,3 @@
+@@ -593,3 +593,3 @@
  install-data-local:
 -	$(mkinstalldirs) $(DESTDIR)$(help_base)/C
 +#	$(mkinstalldirs) $(DESTDIR)$(help_base)/C
- 
---- calendar/pcs/Makefile.in.orig	Fri Jun  2 15:49:09 2000
-+++ calendar/pcs/Makefile.in	Wed Jun 28 17:42:02 2000
-@@ -149,3 +149,3 @@
- 
--INCLUDES =  	-DG_LOG_DOMAIN=\"wombat-pcs\"				-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(top_builddir)/libical/src/libical			$(BONOBO_GNOME_CFLAGS)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES =  	-DG_LOG_DOMAIN=\"wombat-pcs\"				-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(top_builddir)/libical/src/libical			$(BONOBO_GNOME_CFLAGS)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
- 
+ 	$(mkinstalldirs) $(Conduitsdir)
 --- calendar/gui/dialogs/Makefile.in.orig	Fri Jun  2 15:49:12 2000
 +++ calendar/gui/dialogs/Makefile.in	Wed Jun 28 18:24:00 2000
 @@ -151,3 +151,3 @@
@@ -71,24 +71,31 @@
 -INCLUDES =  	-DG_LOG_DOMAIN=\"calendar-gui\"				-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(includedir)						-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			$(BONOBO_VFS_GNOME_CFLAGS)			        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 +INCLUDES =  	-DG_LOG_DOMAIN=\"calendar-gui\"				-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(includedir)						-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			$(BONOBO_VFS_GNOME_CFLAGS)			        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
  
---- mail/Makefile.in.orig	Fri Jun  2 15:48:53 2000
-+++ mail/Makefile.in	Wed Jun 28 17:44:12 2000
-@@ -157,3 +157,3 @@
+--- calendar/pcs/Makefile.in.orig	Mon Jul 10 21:34:30 2000
++++ calendar/pcs/Makefile.in	Tue Jul 11 19:35:14 2000
+@@ -163,3 +163,3 @@
  
--INCLUDES =  	-I$(top_srcdir)/widgets					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)						-I$(top_srcdir)/camel					-I$(top_builddir)/shell					-I$(top_srcdir)/shell					$(BONOBO_HTML_GNOME_CFLAGS)				-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"		-DEVOLUTION_DATADIR=\""$(datadir)"\"            	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"		-DG_LOG_DOMAIN=\"evolution-mail\"
-+INCLUDES =  	-I$(top_srcdir)/widgets					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)						-I$(top_srcdir)/camel					-I$(top_builddir)/shell					-I$(top_srcdir)/shell					$(BONOBO_HTML_GNOME_CFLAGS)				-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"		-DEVOLUTION_DATADIR=\""$(datadir)"\"            	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"		-DG_LOG_DOMAIN=\"evolution-mail\"
+-INCLUDES =  	-DG_LOG_DOMAIN=\"wombat-pcs\"				-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(top_builddir)/libical/src/libical			$(BONOBO_VFS_GNOME_CFLAGS)			        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
++INCLUDES =  	-DG_LOG_DOMAIN=\"wombat-pcs\"				-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(top_builddir)/libical/src/libical			$(BONOBO_VFS_GNOME_CFLAGS)			        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
  
---- shell/Makefile.in.orig	Fri Jun  2 15:48:43 2000
-+++ shell/Makefile.in	Wed Jun 28 17:44:32 2000
-@@ -153,3 +153,3 @@
+--- mail/Makefile.in.orig	Mon Jul 10 21:34:09 2000
++++ mail/Makefile.in	Tue Jul 11 19:36:13 2000
+@@ -169,3 +169,3 @@
  
--INCLUDES =  	-I$(top_srcdir)/widgets					-I$(top_srcdir)/widgets/misc				-I$(top_srcdir)						$(BONOBO_GNOME_CFLAGS)					-DEVOLUTION_IMAGES=\""$(imagesdir)"\"			-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"   	-DEVOLUTION_DATADIR=\""$(datadir)"\"            	-DG_LOG_DOMAIN=\"evolution-shell\"
-+INCLUDES =  	-I$(top_srcdir)/widgets					-I$(top_srcdir)/widgets/misc				-I$(top_srcdir)						$(BONOBO_GNOME_CFLAGS)					-DEVOLUTION_IMAGES=\""$(imagesdir)"\"			-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"   	-DEVOLUTION_DATADIR=\""$(datadir)"\"            	-DG_LOG_DOMAIN=\"evolution-shell\"
+-INCLUDES =  	-I$(top_srcdir)/widgets					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)						-I$(top_srcdir)/camel					-I$(top_builddir)/shell					-I$(top_srcdir)/shell					$(BONOBO_HTML_GNOME_CFLAGS)				$(GNOME_VFS_CFLAGS)					$(GCONF_CFLAGS)						-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"		-DEVOLUTION_DATADIR=\""$(datadir)"\"            	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"		-DG_LOG_DOMAIN=\"evolution-mail\"			$(THREADS_CFLAGS)
++INCLUDES =  	-I$(top_srcdir)/widgets					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)						-I$(top_srcdir)/camel					-I$(top_builddir)/shell					-I$(top_srcdir)/shell					$(BONOBO_HTML_GNOME_CFLAGS)				$(GNOME_VFS_CFLAGS)					$(GCONF_CFLAGS)						-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"		-DEVOLUTION_DATADIR=\""$(datadir)"\"            	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"		-DG_LOG_DOMAIN=\"evolution-mail\"			$(THREADS_CFLAGS)
  
---- wombat/Makefile.in.orig	Fri Jun  2 15:49:13 2000
-+++ wombat/Makefile.in	Wed Jun 28 17:45:11 2000
-@@ -149,3 +149,3 @@
+--- shell/Makefile.in.orig	Mon Jul 10 21:33:55 2000
++++ shell/Makefile.in	Tue Jul 11 19:36:47 2000
+@@ -165,3 +165,3 @@
+ 
+-INCLUDES =  	-I$(top_srcdir)/widgets							-I$(top_srcdir)/widgets/misc						-I$(top_srcdir)								$(BONOBO_GNOME_CFLAGS)							$(GCONF_CFLAGS)								-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\"			-DEVOLUTION_VERSION=\""$(VERSION)"\"					-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"   			-DEVOLUTION_DATADIR=\""$(datadir)"\"            			-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"			-DG_LOG_DOMAIN=\"evolution-shell\"
++INCLUDES =  	-I$(top_srcdir)/widgets							-I$(top_srcdir)/widgets/misc						-I$(top_srcdir)								$(BONOBO_GNOME_CFLAGS)							$(GCONF_CFLAGS)								-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\"			-DEVOLUTION_VERSION=\""$(VERSION)"\"					-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"   			-DEVOLUTION_DATADIR=\""$(datadir)"\"            			-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"			-DG_LOG_DOMAIN=\"evolution-shell\"
+
+--- wombat/Makefile.in.orig	Mon Jul 10 21:34:33 2000
++++ wombat/Makefile.in	Tue Jul 11 19:37:30 2000
+@@ -163,3 +163,3 @@
  
--INCLUDES =  	-DG_LOG_DOMAIN=\"wombat\"				-I$(top_srcdir)/e-util					-I$(top_srcdir)						-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			-I$(top_srcdir)/calendar				-I$(top_srcdir)/calendar/pcs				$(EXTRA_GNOME_CFLAGS)					$(GNOME_INCLUDEDIR)					-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES =  	-DG_LOG_DOMAIN=\"wombat\"				-I$(top_srcdir)/e-util					-I$(top_srcdir)						-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			-I$(top_srcdir)/calendar				-I$(top_srcdir)/calendar/pcs				$(EXTRA_GNOME_CFLAGS)					$(GNOME_INCLUDEDIR)					-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"
+-INCLUDES =  	-DG_LOG_DOMAIN=\"wombat\"				-I$(top_srcdir)/e-util					-I$(top_srcdir)						-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			-I$(top_srcdir)/calendar				-I$(top_srcdir)/calendar/pcs				$(GNOME_INCLUDEDIR)					$(BONOBO_VFS_GNOME_CFLAGS)					-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"
++INCLUDES =  	-DG_LOG_DOMAIN=\"wombat\"				-I$(top_srcdir)/e-util					-I$(top_srcdir)						-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			-I$(top_srcdir)/calendar				-I$(top_srcdir)/calendar/pcs				$(GNOME_INCLUDEDIR)					$(BONOBO_VFS_GNOME_CFLAGS)					-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"
  
diff --git a/mail/evolution/files/patch-ac b/mail/evolution/files/patch-ac
index 196b503..ea98267 100644
--- a/mail/evolution/files/patch-ac
+++ b/mail/evolution/files/patch-ac
@@ -1,35 +1,42 @@
+--- camel/providers/imap/Makefile.in.orig	Mon Jul 10 21:34:06 2000
++++ camel/providers/imap/Makefile.in	Tue Jul 11 19:17:54 2000
+@@ -181,3 +181,3 @@
+ 
+-libcamelimap_la_LDFLAGS = -version-info 0:0:0
++libcamelimap_la_LDFLAGS = -avoid-version
+ 
 --- camel/providers/mbox/Makefile.in.orig	Fri Jun  2 15:48:47 2000
 +++ camel/providers/mbox/Makefile.in	Wed Jun 28 18:54:19 2000
 @@ -167,3 +167,3 @@
  
--libcamelmbox_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) 
-+libcamelmbox_la_LDFLAGS = -avoid-version -rpath $(libdir) 
+-libcamelmbox_la_LDFLAGS = -version-info 0:0:0
++libcamelmbox_la_LDFLAGS = -avoid-version
  
 --- camel/providers/pop3/Makefile.in.orig	Fri Jun  2 15:48:48 2000
 +++ camel/providers/pop3/Makefile.in	Wed Jun 28 18:54:35 2000
 @@ -167,3 +167,3 @@
  
--libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -version-info 0:0:0 -rpath $(libdir) 
-+libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -avoid-version -rpath $(libdir) 
+-libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -version-info 0:0:0
++libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -avoid-version
  
 --- camel/providers/sendmail/Makefile.in.orig	Fri Jun  2 15:48:49 2000
 +++ camel/providers/sendmail/Makefile.in	Wed Jun 28 18:54:52 2000
 @@ -167,3 +167,3 @@
  
--libcamelsendmail_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) 
-+libcamelsendmail_la_LDFLAGS = -avoid-version -rpath $(libdir) 
+-libcamelsendmail_la_LDFLAGS = -version-info 0:0:0
++libcamelsendmail_la_LDFLAGS = -avoid-version
  
 --- camel/providers/smtp/Makefile.in.orig	Fri Jun  2 15:48:49 2000
 +++ camel/providers/smtp/Makefile.in	Wed Jun 28 18:55:06 2000
 @@ -167,3 +167,3 @@
  
--libcamelsmtp_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) 
-+libcamelsmtp_la_LDFLAGS = -avoid-version -rpath $(libdir) 
+-libcamelsmtp_la_LDFLAGS = -version-info 0:0:0
++libcamelsmtp_la_LDFLAGS = -avoid-version
  
 --- camel/providers/vee/Makefile.in.orig	Fri Jun  2 15:48:50 2000
 +++ camel/providers/vee/Makefile.in	Wed Jun 28 18:55:19 2000
 @@ -167,3 +167,3 @@
  
--libcamelvee_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) 
-+libcamelvee_la_LDFLAGS = -avoid-version -rpath $(libdir) 
+-libcamelvee_la_LDFLAGS = -version-info 0:0:0
++libcamelvee_la_LDFLAGS = -avoid-version
  
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index d97ff39..e892124 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -3,8 +3,8 @@ bin/evolution-addressbook
 bin/evolution-calendar
 bin/evolution-mail
 bin/killev
-bin/test-mail
 bin/wombat
+include/camel/broken-date-parser.h
 include/camel/camel-address.h
 include/camel/camel-data-wrapper.h
 include/camel/camel-exception-list.def
@@ -12,6 +12,9 @@ include/camel/camel-exception.h
 include/camel/camel-folder-search.h
 include/camel/camel-folder-summary.h
 include/camel/camel-folder.h
+include/camel/camel-imap-folder.h
+include/camel/camel-imap-store.h
+include/camel/camel-imap-stream.h
 include/camel/camel-internet-address.h
 include/camel/camel-mbox-folder.h
 include/camel/camel-mbox-store.h
@@ -19,10 +22,10 @@ include/camel/camel-mbox-summary.h
 include/camel/camel-medium.h
 include/camel/camel-mime-filter-basic.h
 include/camel/camel-mime-filter-charset.h
+include/camel/camel-mime-filter-crlf.h
 include/camel/camel-mime-filter-from.h
 include/camel/camel-mime-filter-index.h
 include/camel/camel-mime-filter-save.h
-include/camel/camel-mime-filter-smtp.h
 include/camel/camel-mime-filter.h
 include/camel/camel-mime-message.h
 include/camel/camel-mime-parser.h
@@ -58,15 +61,10 @@ include/camel/gstring-util.h
 include/camel/hash-table-utils.h
 include/camel/md5-utils.h
 include/camel/string-utils.h
-include/composer/e-msg-composer-address-dialog.h
-include/composer/e-msg-composer-address-entry.h
-include/composer/e-msg-composer-attachment-bar.h
-include/composer/e-msg-composer-attachment.h
-include/composer/e-msg-composer-hdrs.h
-include/composer/e-msg-composer.h
 include/ename/e-name-western-tables.h
 include/ename/e-name-western.h
 include/evolution/cal-client/cal-client.h
+include/evolution/cal-util/cal-component.h
 include/evolution/cal-util/cal-recur.h
 include/evolution/cal-util/cal-util.h
 include/evolution/cal-util/calobj.h
@@ -77,9 +75,6 @@ include/evolution/ebook/e-book-view-listener.h
 include/evolution/ebook/e-book-view.h
 include/evolution/ebook/e-book.h
 include/evolution/ebook/e-card-cursor.h
-include/evolution/ebook/e-card-iterator.h
-include/evolution/ebook/e-card-list-iterator.h
-include/evolution/ebook/e-card-list.h
 include/evolution/ebook/e-card-pairs.h
 include/evolution/ebook/e-card-simple.h
 include/evolution/ebook/e-card-types.h
@@ -101,6 +96,8 @@ include/icalvalue.h
 include/icalvcal.h
 include/icalversion.h
 include/pvl.h
+lib/evolution/camel-providers/%%VERSION%%/libcamelimap.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelimap.urls
 lib/evolution/camel-providers/%%VERSION%%/libcamelmbox.so
 lib/evolution/camel-providers/%%VERSION%%/libcamelmbox.urls
 lib/evolution/camel-providers/%%VERSION%%/libcamelpop3.so
@@ -126,22 +123,18 @@ lib/libebook.so.0
 lib/libename.a
 lib/libename.so
 lib/libename.so.0
+lib/libeselectnames.a
+lib/libeselectnames.so
+lib/libeselectnames.so.0
 lib/libical.a
-lib/libical.so
-lib/libical.so.0
 lib/libicalss.a
-lib/libicalss.so
-lib/libicalss.so.0
+share/evolution/default_user/ldapservers.xml
 share/evolution/default_user/shortcuts.xml
 share/evolution/filtertypes.xml
 share/evolution/vfoldertypes.xml
+share/gnome/apps/Applications/evolution.desktop
 share/gnome/evolution/default_user/local/Calendar/folder-metadata.xml
 share/gnome/evolution/default_user/local/Contacts/folder-metadata.xml
-share/gnome/evolution/default_user/local/Directories/folder-metadata.xml
-share/gnome/evolution/default_user/local/Directories/subfolders/Bigfoot/folder-metadata.xml
-share/gnome/evolution/default_user/local/Directories/subfolders/Bigfoot/uri
-share/gnome/evolution/default_user/local/Directories/subfolders/Netcenter/folder-metadata.xml
-share/gnome/evolution/default_user/local/Directories/subfolders/Netcenter/uri
 share/gnome/evolution/default_user/local/Drafts/folder-metadata.xml
 share/gnome/evolution/default_user/local/Inbox/folder-metadata.xml
 share/gnome/evolution/default_user/local/Inbox/mbox
@@ -160,14 +153,19 @@ share/gnome/evolution/glade/e-msg-composer-address-dialog.glade
 share/gnome/evolution/glade/e-msg-composer-address-dialog.glade.h
 share/gnome/evolution/glade/e-msg-composer-attachment.glade
 share/gnome/evolution/glade/e-msg-composer-attachment.glade.h
+share/gnome/evolution/glade/e-shell-folder-creation-dialog.glade
 share/gnome/evolution/glade/e-table-config.glade
+share/gnome/evolution/glade/e-table-field-chooser.glade
 share/gnome/evolution/glade/e-table-group.glade
 share/gnome/evolution/glade/event-editor-dialog.glade
 share/gnome/evolution/glade/fullname.glade
 share/gnome/evolution/glade/ldap-server-dialog.glade
 share/gnome/evolution/glade/ldap-server-dialog.glade.h
+share/gnome/evolution/glade/mail-config.glade
+share/gnome/evolution/glade/select-names.glade
 share/gnome/help/evolution/C/fig/calendar.png
-share/gnome/help/evolution/C/fig/config-camel.png
+share/gnome/help/evolution/C/fig/config-cal.png
+share/gnome/help/evolution/C/fig/config-mail.png
 share/gnome/help/evolution/C/fig/contact.png
 share/gnome/help/evolution/C/fig/filter-new-fig.png
 share/gnome/help/evolution/C/fig/mail-druid-pic.png
@@ -194,21 +192,26 @@ share/gnome/images/evolution/house.png
 share/gnome/images/evolution/malehead.png
 share/gnome/oaf/addressbook.oafinfo
 share/gnome/oaf/calendar-control.oafinfo
+share/gnome/oaf/evolution-addressbook-select-names.oafinfo
 share/gnome/oaf/evolution-calendar.oafinfo
 share/gnome/oaf/evolution-mail.oafinfo
 share/gnome/oaf/wombat.oafinfo
+share/gnome/pixmaps/evolution.png
 share/locale/da/LC_MESSAGES/evolution.mo
+share/locale/de/LC_MESSAGES/evolution.mo
 share/locale/el/LC_MESSAGES/evolution.mo
 share/locale/es/LC_MESSAGES/evolution.mo
 share/locale/fr/LC_MESSAGES/evolution.mo
 share/locale/gl/LC_MESSAGES/evolution.mo
 share/locale/hu/LC_MESSAGES/evolution.mo
+share/locale/it/LC_MESSAGES/evolution.mo
 share/locale/ja/LC_MESSAGES/evolution.mo
 share/locale/ko/LC_MESSAGES/evolution.mo
 share/locale/nl/LC_MESSAGES/evolution.mo
 share/locale/no/LC_MESSAGES/evolution.mo
-share/locale/pt/LC_MESSAGES/evolution.mo
 share/locale/ru/LC_MESSAGES/evolution.mo
+share/locale/pl/LC_MESSAGES/evolution.mo
+share/locale/sl/LC_MESSAGES/evolution.mo
 share/locale/sv/LC_MESSAGES/evolution.mo
 share/locale/tr/LC_MESSAGES/evolution.mo
 share/locale/uk/LC_MESSAGES/evolution.mo
@@ -223,10 +226,6 @@ share/locale/uk/LC_MESSAGES/evolution.mo
 @dirrm share/gnome/evolution/default_user/local/Outbox
 @dirrm share/gnome/evolution/default_user/local/Inbox
 @dirrm share/gnome/evolution/default_user/local/Drafts
-@dirrm share/gnome/evolution/default_user/local/Directories/subfolders/Netcenter
-@dirrm share/gnome/evolution/default_user/local/Directories/subfolders/Bigfoot
-@dirrm share/gnome/evolution/default_user/local/Directories/subfolders
-@dirrm share/gnome/evolution/default_user/local/Directories
 @dirrm share/gnome/evolution/default_user/local/Contacts
 @dirrm share/gnome/evolution/default_user/local/Calendar
 @dirrm share/gnome/evolution/default_user/local
@@ -240,6 +239,6 @@ share/locale/uk/LC_MESSAGES/evolution.mo
 @dirrm include/evolution/ebook
 @dirrm include/evolution/cal-util
 @dirrm include/evolution/cal-client
+@dirrm include/evolution
 @dirrm include/ename
-@dirrm include/composer
 @dirrm include/camel