Evolution is the integrated mail, calendar and address book

distributed suite for GNOME from Helix Code, Inc.

17 files changed, 959 insertions, 0 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 8673056d5d1f..4030eb640e74 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -17,6 +17,7 @@
     SUBDIR += elm
     SUBDIR += elm+ME
     SUBDIR += emil
+    SUBDIR += evolution
     SUBDIR += exim
     SUBDIR += exmh
     SUBDIR += exmh2
diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
new file mode 100644
index 000000000000..38cc62912241
--- /dev/null
+++ b/mail/evolution-devel/Makefile
@@ -0,0 +1,48 @@
+# New ports collection makefile for:	evolution
+# Date created:				28th June 2000
+# Whom:					Ade Lovett <ade@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	evolution
+PORTVERSION=	0.1
+CATEGORIES=	mail gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	unstable/sources/evolution
+
+MAINTAINER=	ade@FreeBSD.org
+
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
+		xml.5:${PORTSDIR}/textproc/libxml \
+		glade.3:${PORTSDIR}/devel/libglade \
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+		gnomeprint.9:${PORTSDIR}/print/gnomeprint \
+		oaf.0:${PORTSDIR}/devel/oaf \
+		bonobo.2:${PORTSDIR}/devel/bonobo \
+		gnomevfs.0:${PORTSDIR}/devel/gnomevfs \
+		unicode.0:${PORTSDIR}/devel/libunicode \
+		gtkhtml.2:${PORTSDIR}/www/gtkhtml \
+		ldap.1:${PORTSDIR}/net/openldap \
+		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter
+
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
+USE_GMAKE=	yes
+USE_X_PREFIX=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	configure libical/configure
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GLIB_CONFIG="${GLIB_CONFIG}" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
+
+PLIST_SUB=	VERSION=${PORTVERSION}
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/mail/evolution-devel/distinfo b/mail/evolution-devel/distinfo
new file mode 100644
index 000000000000..58074eb54fec
--- /dev/null
+++ b/mail/evolution-devel/distinfo
@@ -0,0 +1 @@
+MD5 (evolution-0.1.tar.gz) = b9a89ba71388172eb28cb72998041427
diff --git a/mail/evolution-devel/files/patch-aa b/mail/evolution-devel/files/patch-aa
new file mode 100644
index 000000000000..f7c3576f597f
--- /dev/null
+++ b/mail/evolution-devel/files/patch-aa
@@ -0,0 +1,48 @@
+--- configure.orig	Fri Jun  2 15:13:10 2000
++++ configure	Wed Jun 28 17:39:26 2000
+@@ -4079,7 +4079,7 @@
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CATOBJEXT=.mo
+-		   DATADIRNAME=lib
++		   DATADIRNAME=share
+ 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 @@
+     { echo "configure: error: Did not find gdkpixbuf installed" 1>&2; exit 1; }
+ fi
+ 
+-GLIB_CFLAGS="`glib-config --cflags`"
+-GLIB_LIBS="`glib-config --libs`"
++GLIB_CFLAGS="`$GLIB_CONFIG --cflags`"
++GLIB_LIBS="`$GLIB_CONFIG --libs`"
+ 
+ 
+ 
+@@ -6771,10 +6771,10 @@
+       *) # Relative path.
+         ac_sub_cache_file="$ac_dots$cache_file" ;;
+       esac
+-  case "$ac_given_INSTALL" in
+-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-        esac
++#  case "$ac_given_INSTALL" in
++#        [/$]*) INSTALL="$ac_given_INSTALL" ;;
++#        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
++#        esac
+ 
+       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+       # The eval makes quoting arguments work.
diff --git a/mail/evolution-devel/files/patch-ab b/mail/evolution-devel/files/patch-ab
new file mode 100644
index 000000000000..5cf4506520d4
--- /dev/null
+++ b/mail/evolution-devel/files/patch-ab
@@ -0,0 +1,94 @@
+--- addressbook/ename/Makefile.in.orig	Fri Jun  2 15:48:59 2000
++++ addressbook/ename/Makefile.in	Wed Jun 28 18:13:26 2000
+@@ -149,3 +149,3 @@
+ 
+-INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-DG_LOG_DOMAIN=\"EName\"				-I$(srcdir)						-I$(srcdir)/..						-I$(top_srcdir) 					-I. 							-I.. 							-I$(top_builddir)				        -I$(includedir)                                         $(GNOME_INCLUDEDIR)
++INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-DG_LOG_DOMAIN=\"EName\"				-I$(srcdir)						-I$(srcdir)/..						-I$(top_srcdir) 					-I. 							-I.. 							-I$(top_builddir)				        -I$(includedir)                                         $(GNOME_INCLUDEDIR)
+ 
+--- addressbook/backend/ebook/Makefile.in.orig	Fri Jun  2 15:49:01 2000
++++ addressbook/backend/ebook/Makefile.in	Wed Jun 28 18:18:09 2000
+@@ -159,3 +159,3 @@
+ 
+-INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-DG_LOG_DOMAIN=\"EBook\"				-I$(top_srcdir) 					-I$(top_srcdir)/addressbook/backend			-I$(top_srcdir)/addressbook/ename			-I$(top_builddir)/addressbook/backend			-I$(top_builddir)/addressbook/ename		        $(BONOBO_GNOME_CFLAGS)
++INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-DG_LOG_DOMAIN=\"EBook\"				-I$(top_srcdir) 					-I$(top_srcdir)/addressbook/backend			-I$(top_srcdir)/addressbook/ename			-I$(top_builddir)/addressbook/backend			-I$(top_builddir)/addressbook/ename		        $(BONOBO_GNOME_CFLAGS)
+ 
+--- addressbook/backend/pas/Makefile.in.orig	Fri Jun  2 15:49:02 2000
++++ addressbook/backend/pas/Makefile.in	Wed Jun 28 18:20:11 2000
+@@ -157,3 +157,3 @@
+ 
+-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 @@
+ 
+-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 @@
+ 
+-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)
+ 
+--- 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 @@
+ 
+-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)
+ 
+--- 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 @@
+ 
+-help_base = $(datadir)/gnome/help/cal
++help_base = $(datadir)/help/cal
+ 
+@@ -156,3 +156,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"\"
+ 
+@@ -766,3 +766,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"\"
+ 
+--- 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 @@
+ 
+-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 @@
+ 
+-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\"
+ 
+--- 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 @@
+ 
+-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\"
+ 
+--- 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 @@
+ 
+-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"\"
+ 
diff --git a/mail/evolution-devel/files/patch-ac b/mail/evolution-devel/files/patch-ac
new file mode 100644
index 000000000000..196b503da75b
--- /dev/null
+++ b/mail/evolution-devel/files/patch-ac
@@ -0,0 +1,35 @@
+--- 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) 
+ 
+--- 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) 
+ 
+--- 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) 
+ 
+--- 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) 
+ 
+--- 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) 
+ 
diff --git a/mail/evolution-devel/pkg-comment b/mail/evolution-devel/pkg-comment
new file mode 100644
index 000000000000..017eaee53071
--- /dev/null
+++ b/mail/evolution-devel/pkg-comment
@@ -0,0 +1 @@
+An integrated mail, calendar and address book distributed suite
diff --git a/mail/evolution-devel/pkg-descr b/mail/evolution-devel/pkg-descr
new file mode 100644
index 000000000000..a158def801a0
--- /dev/null
+++ b/mail/evolution-devel/pkg-descr
@@ -0,0 +1,7 @@
+Evolution is the integrated mail, calendar and address book
+distributed suite from Helix Code, Inc.
+
+Note that Evolution is still beta. This means it may delete all of
+your mail if you give it the chance.
+
+WWW: http://www.helixcode.com/apps/evolution.php3
diff --git a/mail/evolution-devel/pkg-plist b/mail/evolution-devel/pkg-plist
new file mode 100644
index 000000000000..d97ff39308ad
--- /dev/null
+++ b/mail/evolution-devel/pkg-plist
@@ -0,0 +1,245 @@
+bin/evolution
+bin/evolution-addressbook
+bin/evolution-calendar
+bin/evolution-mail
+bin/killev
+bin/test-mail
+bin/wombat
+include/camel/camel-address.h
+include/camel/camel-data-wrapper.h
+include/camel/camel-exception-list.def
+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-internet-address.h
+include/camel/camel-mbox-folder.h
+include/camel/camel-mbox-store.h
+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-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
+include/camel/camel-mime-part-utils.h
+include/camel/camel-mime-part.h
+include/camel/camel-mime-utils.h
+include/camel/camel-movemail.h
+include/camel/camel-multipart.h
+include/camel/camel-object.h
+include/camel/camel-pop3-folder.h
+include/camel/camel-pop3-store.h
+include/camel/camel-provider.h
+include/camel/camel-seekable-stream.h
+include/camel/camel-seekable-substream.h
+include/camel/camel-sendmail-transport.h
+include/camel/camel-service.h
+include/camel/camel-session.h
+include/camel/camel-smtp-transport.h
+include/camel/camel-store.h
+include/camel/camel-stream-buffer.h
+include/camel/camel-stream-filter.h
+include/camel/camel-stream-fs.h
+include/camel/camel-stream-mem.h
+include/camel/camel-stream.h
+include/camel/camel-transport.h
+include/camel/camel-types.h
+include/camel/camel-url.h
+include/camel/camel-vee-folder.h
+include/camel/camel-vee-store.h
+include/camel/camel.h
+include/camel/gmime-content-field.h
+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-recur.h
+include/evolution/cal-util/cal-util.h
+include/evolution/cal-util/calobj.h
+include/evolution/cal-util/timeutil.h
+include/evolution/ebook/e-book-listener.h
+include/evolution/ebook/e-book-types.h
+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
+include/evolution/ebook/e-card.h
+include/ical.h
+include/icalcalendar.h
+include/icalcluster.h
+include/icalcomponent.h
+include/icalenums.h
+include/icalerror.h
+include/icalmemory.h
+include/icalparameter.h
+include/icalparser.h
+include/icalproperty.h
+include/icalrestriction.h
+include/icalstore.h
+include/icaltypes.h
+include/icalvalue.h
+include/icalvcal.h
+include/icalversion.h
+include/pvl.h
+lib/evolution/camel-providers/%%VERSION%%/libcamelmbox.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelmbox.urls
+lib/evolution/camel-providers/%%VERSION%%/libcamelpop3.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelpop3.urls
+lib/evolution/camel-providers/%%VERSION%%/libcamelsendmail.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelsendmail.urls
+lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.urls
+lib/evolution/camel-providers/%%VERSION%%/libcamelvee.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelvee.urls
+lib/libcal-client.a
+lib/libcal-client.so
+lib/libcal-client.so.0
+lib/libcal-util.a
+lib/libcal-util.so
+lib/libcal-util.so.0
+lib/libcamel.a
+lib/libcamel.so
+lib/libcamel.so.0
+lib/libebook.a
+lib/libebook.so
+lib/libebook.so.0
+lib/libename.a
+lib/libename.so
+lib/libename.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/shortcuts.xml
+share/evolution/filtertypes.xml
+share/evolution/vfoldertypes.xml
+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
+share/gnome/evolution/default_user/local/Outbox/folder-metadata.xml
+share/gnome/evolution/default_user/local/Trash/folder-metadata.xml
+share/gnome/evolution/ecps/medbook.ecps
+share/gnome/evolution/ecps/phonelist.ecps
+share/gnome/evolution/ecps/smallbook.ecps
+share/gnome/evolution/glade/alarm-notify.glade
+share/gnome/evolution/glade/alphabet.glade
+share/gnome/evolution/glade/categories.glade
+share/gnome/evolution/glade/contact-editor.glade
+share/gnome/evolution/glade/e-contact-print.glade
+share/gnome/evolution/glade/e-contact-print.glade.h
+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-table-config.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/help/evolution/C/fig/calendar.png
+share/gnome/help/evolution/C/fig/config-camel.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
+share/gnome/help/evolution/C/fig/mainwindow-pic.png
+share/gnome/help/evolution/C/fig/vfolder-createrule-fig.png
+share/gnome/idl/addressbook.idl
+share/gnome/idl/evolution-calendar.idl
+share/gnome/images/evolution/briefcase.png
+share/gnome/images/evolution/cellphone.png
+share/gnome/images/evolution/envelope.png
+share/gnome/images/evolution/evolution-calendar-mini.png
+share/gnome/images/evolution/evolution-calendar.png
+share/gnome/images/evolution/evolution-contacts-mini.png
+share/gnome/images/evolution/evolution-contacts.png
+share/gnome/images/evolution/evolution-inbox-mini.png
+share/gnome/images/evolution/evolution-inbox.png
+share/gnome/images/evolution/evolution-notes-mini.png
+share/gnome/images/evolution/evolution-notes.png
+share/gnome/images/evolution/evolution-tasks-mini.png
+share/gnome/images/evolution/evolution-tasks.png
+share/gnome/images/evolution/evolution-today.png
+share/gnome/images/evolution/globe.png
+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-calendar.oafinfo
+share/gnome/oaf/evolution-mail.oafinfo
+share/gnome/oaf/wombat.oafinfo
+share/locale/da/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/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/sv/LC_MESSAGES/evolution.mo
+share/locale/tr/LC_MESSAGES/evolution.mo
+share/locale/uk/LC_MESSAGES/evolution.mo
+@dirrm share/gnome/images/evolution
+@dirrm share/gnome/images
+@dirrm share/gnome/help/evolution/C/fig
+@dirrm share/gnome/help/evolution/C
+@dirrm share/gnome/help/evolution
+@dirrm share/gnome/evolution/glade
+@dirrm share/gnome/evolution/ecps
+@dirrm share/gnome/evolution/default_user/local/Trash
+@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
+@dirrm share/gnome/evolution/default_user
+@dirrm share/gnome/evolution
+@dirrm share/evolution/default_user
+@dirrm share/evolution
+@dirrm lib/evolution/camel-providers/%%VERSION%%
+@dirrm lib/evolution/camel-providers
+@dirrm lib/evolution
+@dirrm include/evolution/ebook
+@dirrm include/evolution/cal-util
+@dirrm include/evolution/cal-client
+@dirrm include/ename
+@dirrm include/composer
+@dirrm include/camel
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
new file mode 100644
index 000000000000..38cc62912241
--- /dev/null
+++ b/mail/evolution/Makefile
@@ -0,0 +1,48 @@
+# New ports collection makefile for:	evolution
+# Date created:				28th June 2000
+# Whom:					Ade Lovett <ade@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	evolution
+PORTVERSION=	0.1
+CATEGORIES=	mail gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	unstable/sources/evolution
+
+MAINTAINER=	ade@FreeBSD.org
+
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
+		xml.5:${PORTSDIR}/textproc/libxml \
+		glade.3:${PORTSDIR}/devel/libglade \
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+		gnomeprint.9:${PORTSDIR}/print/gnomeprint \
+		oaf.0:${PORTSDIR}/devel/oaf \
+		bonobo.2:${PORTSDIR}/devel/bonobo \
+		gnomevfs.0:${PORTSDIR}/devel/gnomevfs \
+		unicode.0:${PORTSDIR}/devel/libunicode \
+		gtkhtml.2:${PORTSDIR}/www/gtkhtml \
+		ldap.1:${PORTSDIR}/net/openldap \
+		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter
+
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
+USE_GMAKE=	yes
+USE_X_PREFIX=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	configure libical/configure
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GLIB_CONFIG="${GLIB_CONFIG}" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
+
+PLIST_SUB=	VERSION=${PORTVERSION}
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
new file mode 100644
index 000000000000..58074eb54fec
--- /dev/null
+++ b/mail/evolution/distinfo
@@ -0,0 +1 @@
+MD5 (evolution-0.1.tar.gz) = b9a89ba71388172eb28cb72998041427
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
new file mode 100644
index 000000000000..f7c3576f597f
--- /dev/null
+++ b/mail/evolution/files/patch-aa
@@ -0,0 +1,48 @@
+--- configure.orig	Fri Jun  2 15:13:10 2000
++++ configure	Wed Jun 28 17:39:26 2000
+@@ -4079,7 +4079,7 @@
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CATOBJEXT=.mo
+-		   DATADIRNAME=lib
++		   DATADIRNAME=share
+ 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 @@
+     { echo "configure: error: Did not find gdkpixbuf installed" 1>&2; exit 1; }
+ fi
+ 
+-GLIB_CFLAGS="`glib-config --cflags`"
+-GLIB_LIBS="`glib-config --libs`"
++GLIB_CFLAGS="`$GLIB_CONFIG --cflags`"
++GLIB_LIBS="`$GLIB_CONFIG --libs`"
+ 
+ 
+ 
+@@ -6771,10 +6771,10 @@
+       *) # Relative path.
+         ac_sub_cache_file="$ac_dots$cache_file" ;;
+       esac
+-  case "$ac_given_INSTALL" in
+-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-        esac
++#  case "$ac_given_INSTALL" in
++#        [/$]*) INSTALL="$ac_given_INSTALL" ;;
++#        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
++#        esac
+ 
+       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+       # The eval makes quoting arguments work.
diff --git a/mail/evolution/files/patch-ab b/mail/evolution/files/patch-ab
new file mode 100644
index 000000000000..5cf4506520d4
--- /dev/null
+++ b/mail/evolution/files/patch-ab
@@ -0,0 +1,94 @@
+--- addressbook/ename/Makefile.in.orig	Fri Jun  2 15:48:59 2000
++++ addressbook/ename/Makefile.in	Wed Jun 28 18:13:26 2000
+@@ -149,3 +149,3 @@
+ 
+-INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-DG_LOG_DOMAIN=\"EName\"				-I$(srcdir)						-I$(srcdir)/..						-I$(top_srcdir) 					-I. 							-I.. 							-I$(top_builddir)				        -I$(includedir)                                         $(GNOME_INCLUDEDIR)
++INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-DG_LOG_DOMAIN=\"EName\"				-I$(srcdir)						-I$(srcdir)/..						-I$(top_srcdir) 					-I. 							-I.. 							-I$(top_builddir)				        -I$(includedir)                                         $(GNOME_INCLUDEDIR)
+ 
+--- addressbook/backend/ebook/Makefile.in.orig	Fri Jun  2 15:49:01 2000
++++ addressbook/backend/ebook/Makefile.in	Wed Jun 28 18:18:09 2000
+@@ -159,3 +159,3 @@
+ 
+-INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-DG_LOG_DOMAIN=\"EBook\"				-I$(top_srcdir) 					-I$(top_srcdir)/addressbook/backend			-I$(top_srcdir)/addressbook/ename			-I$(top_builddir)/addressbook/backend			-I$(top_builddir)/addressbook/ename		        $(BONOBO_GNOME_CFLAGS)
++INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-DG_LOG_DOMAIN=\"EBook\"				-I$(top_srcdir) 					-I$(top_srcdir)/addressbook/backend			-I$(top_srcdir)/addressbook/ename			-I$(top_builddir)/addressbook/backend			-I$(top_builddir)/addressbook/ename		        $(BONOBO_GNOME_CFLAGS)
+ 
+--- addressbook/backend/pas/Makefile.in.orig	Fri Jun  2 15:49:02 2000
++++ addressbook/backend/pas/Makefile.in	Wed Jun 28 18:20:11 2000
+@@ -157,3 +157,3 @@
+ 
+-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 @@
+ 
+-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 @@
+ 
+-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)
+ 
+--- 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 @@
+ 
+-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)
+ 
+--- 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 @@
+ 
+-help_base = $(datadir)/gnome/help/cal
++help_base = $(datadir)/help/cal
+ 
+@@ -156,3 +156,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"\"
+ 
+@@ -766,3 +766,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"\"
+ 
+--- 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 @@
+ 
+-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 @@
+ 
+-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\"
+ 
+--- 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 @@
+ 
+-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\"
+ 
+--- 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 @@
+ 
+-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"\"
+ 
diff --git a/mail/evolution/files/patch-ac b/mail/evolution/files/patch-ac
new file mode 100644
index 000000000000..196b503da75b
--- /dev/null
+++ b/mail/evolution/files/patch-ac
@@ -0,0 +1,35 @@
+--- 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) 
+ 
+--- 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) 
+ 
+--- 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) 
+ 
+--- 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) 
+ 
+--- 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) 
+ 
diff --git a/mail/evolution/pkg-comment b/mail/evolution/pkg-comment
new file mode 100644
index 000000000000..017eaee53071
--- /dev/null
+++ b/mail/evolution/pkg-comment
@@ -0,0 +1 @@
+An integrated mail, calendar and address book distributed suite
diff --git a/mail/evolution/pkg-descr b/mail/evolution/pkg-descr
new file mode 100644
index 000000000000..a158def801a0
--- /dev/null
+++ b/mail/evolution/pkg-descr
@@ -0,0 +1,7 @@
+Evolution is the integrated mail, calendar and address book
+distributed suite from Helix Code, Inc.
+
+Note that Evolution is still beta. This means it may delete all of
+your mail if you give it the chance.
+
+WWW: http://www.helixcode.com/apps/evolution.php3
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
new file mode 100644
index 000000000000..d97ff39308ad
--- /dev/null
+++ b/mail/evolution/pkg-plist
@@ -0,0 +1,245 @@
+bin/evolution
+bin/evolution-addressbook
+bin/evolution-calendar
+bin/evolution-mail
+bin/killev
+bin/test-mail
+bin/wombat
+include/camel/camel-address.h
+include/camel/camel-data-wrapper.h
+include/camel/camel-exception-list.def
+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-internet-address.h
+include/camel/camel-mbox-folder.h
+include/camel/camel-mbox-store.h
+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-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
+include/camel/camel-mime-part-utils.h
+include/camel/camel-mime-part.h
+include/camel/camel-mime-utils.h
+include/camel/camel-movemail.h
+include/camel/camel-multipart.h
+include/camel/camel-object.h
+include/camel/camel-pop3-folder.h
+include/camel/camel-pop3-store.h
+include/camel/camel-provider.h
+include/camel/camel-seekable-stream.h
+include/camel/camel-seekable-substream.h
+include/camel/camel-sendmail-transport.h
+include/camel/camel-service.h
+include/camel/camel-session.h
+include/camel/camel-smtp-transport.h
+include/camel/camel-store.h
+include/camel/camel-stream-buffer.h
+include/camel/camel-stream-filter.h
+include/camel/camel-stream-fs.h
+include/camel/camel-stream-mem.h
+include/camel/camel-stream.h
+include/camel/camel-transport.h
+include/camel/camel-types.h
+include/camel/camel-url.h
+include/camel/camel-vee-folder.h
+include/camel/camel-vee-store.h
+include/camel/camel.h
+include/camel/gmime-content-field.h
+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-recur.h
+include/evolution/cal-util/cal-util.h
+include/evolution/cal-util/calobj.h
+include/evolution/cal-util/timeutil.h
+include/evolution/ebook/e-book-listener.h
+include/evolution/ebook/e-book-types.h
+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
+include/evolution/ebook/e-card.h
+include/ical.h
+include/icalcalendar.h
+include/icalcluster.h
+include/icalcomponent.h
+include/icalenums.h
+include/icalerror.h
+include/icalmemory.h
+include/icalparameter.h
+include/icalparser.h
+include/icalproperty.h
+include/icalrestriction.h
+include/icalstore.h
+include/icaltypes.h
+include/icalvalue.h
+include/icalvcal.h
+include/icalversion.h
+include/pvl.h
+lib/evolution/camel-providers/%%VERSION%%/libcamelmbox.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelmbox.urls
+lib/evolution/camel-providers/%%VERSION%%/libcamelpop3.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelpop3.urls
+lib/evolution/camel-providers/%%VERSION%%/libcamelsendmail.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelsendmail.urls
+lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.urls
+lib/evolution/camel-providers/%%VERSION%%/libcamelvee.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelvee.urls
+lib/libcal-client.a
+lib/libcal-client.so
+lib/libcal-client.so.0
+lib/libcal-util.a
+lib/libcal-util.so
+lib/libcal-util.so.0
+lib/libcamel.a
+lib/libcamel.so
+lib/libcamel.so.0
+lib/libebook.a
+lib/libebook.so
+lib/libebook.so.0
+lib/libename.a
+lib/libename.so
+lib/libename.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/shortcuts.xml
+share/evolution/filtertypes.xml
+share/evolution/vfoldertypes.xml
+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
+share/gnome/evolution/default_user/local/Outbox/folder-metadata.xml
+share/gnome/evolution/default_user/local/Trash/folder-metadata.xml
+share/gnome/evolution/ecps/medbook.ecps
+share/gnome/evolution/ecps/phonelist.ecps
+share/gnome/evolution/ecps/smallbook.ecps
+share/gnome/evolution/glade/alarm-notify.glade
+share/gnome/evolution/glade/alphabet.glade
+share/gnome/evolution/glade/categories.glade
+share/gnome/evolution/glade/contact-editor.glade
+share/gnome/evolution/glade/e-contact-print.glade
+share/gnome/evolution/glade/e-contact-print.glade.h
+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-table-config.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/help/evolution/C/fig/calendar.png
+share/gnome/help/evolution/C/fig/config-camel.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
+share/gnome/help/evolution/C/fig/mainwindow-pic.png
+share/gnome/help/evolution/C/fig/vfolder-createrule-fig.png
+share/gnome/idl/addressbook.idl
+share/gnome/idl/evolution-calendar.idl
+share/gnome/images/evolution/briefcase.png
+share/gnome/images/evolution/cellphone.png
+share/gnome/images/evolution/envelope.png
+share/gnome/images/evolution/evolution-calendar-mini.png
+share/gnome/images/evolution/evolution-calendar.png
+share/gnome/images/evolution/evolution-contacts-mini.png
+share/gnome/images/evolution/evolution-contacts.png
+share/gnome/images/evolution/evolution-inbox-mini.png
+share/gnome/images/evolution/evolution-inbox.png
+share/gnome/images/evolution/evolution-notes-mini.png
+share/gnome/images/evolution/evolution-notes.png
+share/gnome/images/evolution/evolution-tasks-mini.png
+share/gnome/images/evolution/evolution-tasks.png
+share/gnome/images/evolution/evolution-today.png
+share/gnome/images/evolution/globe.png
+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-calendar.oafinfo
+share/gnome/oaf/evolution-mail.oafinfo
+share/gnome/oaf/wombat.oafinfo
+share/locale/da/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/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/sv/LC_MESSAGES/evolution.mo
+share/locale/tr/LC_MESSAGES/evolution.mo
+share/locale/uk/LC_MESSAGES/evolution.mo
+@dirrm share/gnome/images/evolution
+@dirrm share/gnome/images
+@dirrm share/gnome/help/evolution/C/fig
+@dirrm share/gnome/help/evolution/C
+@dirrm share/gnome/help/evolution
+@dirrm share/gnome/evolution/glade
+@dirrm share/gnome/evolution/ecps
+@dirrm share/gnome/evolution/default_user/local/Trash
+@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
+@dirrm share/gnome/evolution/default_user
+@dirrm share/gnome/evolution
+@dirrm share/evolution/default_user
+@dirrm share/evolution
+@dirrm lib/evolution/camel-providers/%%VERSION%%
+@dirrm lib/evolution/camel-providers
+@dirrm lib/evolution
+@dirrm include/evolution/ebook
+@dirrm include/evolution/cal-util
+@dirrm include/evolution/cal-client
+@dirrm include/ename
+@dirrm include/composer
+@dirrm include/camel