Update to 0.6

3 files changed, 40 insertions, 35 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 18d9f131a442..1baf6565b8df 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	0.5.1
-PORTREVISION=	2
+PORTVERSION=	0.6
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
@@ -26,8 +25,6 @@ LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml \
 		ldap.1:${PORTSDIR}/net/openldap \
 		gpilotd.0:${PORTSDIR}/palm/gnomepilot
 
-BROKEN=		"Build failures with new bonobo"
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 7e7ed914c20a..62d303e6a8a3 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1 +1 @@
-MD5 (evolution-0.5.1.tar.gz) = 6bc6e4f59b5cdfdbf50868aecaa382b1
+MD5 (evolution-0.6.tar.gz) = 91afc6d162d10145833b3d11ab3fabf5
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 351711ddb7ad..2e6b2ee8eebe 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -8,15 +8,19 @@ bin/load-pine-addressbook
 bin/wombat
 include/camel/broken-date-parser.h
 include/camel/camel-address.h
+include/camel/camel-charset-map-private.h
+include/camel/camel-charset-map.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-imap-command.h
 include/camel/camel-imap-folder.h
 include/camel/camel-imap-store.h
 include/camel/camel-imap-stream.h
+include/camel/camel-imap-summary.h
 include/camel/camel-imap-utils.h
 include/camel/camel-internet-address.h
 include/camel/camel-mbox-folder.h
@@ -31,6 +35,7 @@ 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-linewrap.h
 include/camel/camel-mime-filter-save.h
 include/camel/camel-mime-filter.h
 include/camel/camel-mime-message.h
@@ -42,9 +47,11 @@ include/camel/camel-movemail.h
 include/camel/camel-multipart.h
 include/camel/camel-nntp-auth.h
 include/camel/camel-nntp-folder.h
+include/camel/camel-nntp-grouplist.h
 include/camel/camel-nntp-newsrc.h
 include/camel/camel-nntp-resp-codes.h
 include/camel/camel-nntp-store.h
+include/camel/camel-nntp-types.h
 include/camel/camel-nntp-utils.h
 include/camel/camel-object.h
 include/camel/camel-pop3-folder.h
@@ -168,25 +175,21 @@ share/gnome/evolution/ecps/smallbook.ecps
 share/gnome/evolution/filtertypes.xml
 share/gnome/evolution/glade/alarm-notify.glade
 share/gnome/evolution/glade/alphabet.glade
+share/gnome/evolution/glade/cal-prefs-dialog.glade
 share/gnome/evolution/glade/categories.glade
 share/gnome/evolution/glade/contact-editor.glade
 share/gnome/evolution/glade/e-contact-editor-confirm-delete.glade
 share/gnome/evolution/glade/e-contact-print.glade
-share/gnome/evolution/glade/e-contact-print.glade.h
+share/gnome/evolution/glade/e-itip-control.glade
+share/gnome/evolution/glade/e-meeting-dialog.glade
 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/filter.glade
 share/gnome/evolution/glade/fulladdr.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/local-config.glade
 share/gnome/evolution/glade/mail-config-druid.glade
 share/gnome/evolution/glade/mail-config.glade
@@ -206,7 +209,6 @@ share/gnome/help/evolution/C/config-setupassist.html
 share/gnome/help/evolution/C/config-sync.html
 share/gnome/help/evolution/C/config.html
 share/gnome/help/evolution/C/docbook.css
-share/gnome/help/evolution/C/fdl.html
 share/gnome/help/evolution/C/fig/calendar.png
 share/gnome/help/evolution/C/fig/config-cal.png
 share/gnome/help/evolution/C/fig/config-mail.png
@@ -218,24 +220,31 @@ share/gnome/help/evolution/C/fig/mail-composer.png
 share/gnome/help/evolution/C/fig/mail-druid-pic.png
 share/gnome/help/evolution/C/fig/mail-inbox.png
 share/gnome/help/evolution/C/fig/mainwindow-pic.png
+share/gnome/help/evolution/C/fig/print-dest.png
+share/gnome/help/evolution/C/fig/print-preview.png
 share/gnome/help/evolution/C/fig/vfolder-createrule-fig.png
-share/gnome/help/evolution/C/gpl.html
 share/gnome/help/evolution/C/index.html
 share/gnome/help/evolution/C/introduction.html
-share/gnome/help/evolution/C/ln15.html
 share/gnome/help/evolution/C/menuref-cal-editor.html
 share/gnome/help/evolution/C/menuref-cal.html
 share/gnome/help/evolution/C/menuref-contact-editor.html
-share/gnome/help/evolution/C/menuref-mail-context.html
 share/gnome/help/evolution/C/menuref-mail-editor.html
 share/gnome/help/evolution/C/menuref-mail.html
 share/gnome/help/evolution/C/menuref.html
-share/gnome/help/evolution/C/p1827.html
-share/gnome/help/evolution/C/stylesheet-images/caution.png
-share/gnome/help/evolution/C/stylesheet-images/important.png
-share/gnome/help/evolution/C/stylesheet-images/note.png
-share/gnome/help/evolution/C/stylesheet-images/tip.png
-share/gnome/help/evolution/C/stylesheet-images/warning.png
+share/gnome/help/evolution/C/p1924.html
+share/gnome/help/evolution/C/print-destination.html
+share/gnome/help/evolution/C/stylesheet-images/caution.gif
+share/gnome/help/evolution/C/stylesheet-images/home.gif
+share/gnome/help/evolution/C/stylesheet-images/important.gif
+share/gnome/help/evolution/C/stylesheet-images/next.gif
+share/gnome/help/evolution/C/stylesheet-images/note.gif
+share/gnome/help/evolution/C/stylesheet-images/prev.gif
+share/gnome/help/evolution/C/stylesheet-images/tip.gif
+share/gnome/help/evolution/C/stylesheet-images/toc-blank.gif
+share/gnome/help/evolution/C/stylesheet-images/toc-minus.gif
+share/gnome/help/evolution/C/stylesheet-images/toc-plus.gif
+share/gnome/help/evolution/C/stylesheet-images/up.gif
+share/gnome/help/evolution/C/stylesheet-images/warning.gif
 share/gnome/help/evolution/C/usage-calendar-apts.html
 share/gnome/help/evolution/C/usage-calendar-multiple.html
 share/gnome/help/evolution/C/usage-calendar-todo.html
@@ -250,13 +259,10 @@ share/gnome/help/evolution/C/usage-mail.html
 share/gnome/help/evolution/C/usage-mainwindow-folderbar.html
 share/gnome/help/evolution/C/usage-mainwindow-menubar.html
 share/gnome/help/evolution/C/usage-mainwindow.html
-share/gnome/help/evolution/C/usage-notes.html
+share/gnome/help/evolution/C/usage-print.html
 share/gnome/help/evolution/C/usage-sync.html
 share/gnome/help/evolution/C/usage.html
-share/gnome/help/evolution/C/x2520.html
-share/gnome/help/evolution/C/x3043.html
-share/gnome/help/evolution/C/x3073.html
-share/gnome/help/evolution/C/x3078.html
+share/gnome/help/evolution/C/x2644.html
 share/gnome/html/evolution-cal-client-decl.txt
 share/gnome/html/evolution-cal-client-sections.txt
 share/gnome/html/evolution-cal-client.hierarchy
@@ -265,13 +271,6 @@ share/gnome/html/evolution-cal-util-decl.txt
 share/gnome/html/evolution-cal-util-sections.txt
 share/gnome/html/evolution-cal-util.hierarchy
 share/gnome/html/evolution-cal-util.types
-share/gnome/html/evolution-devel-guide.html
-share/gnome/html/evolution-devel-guide/book1.html
-share/gnome/html/evolution-devel-guide/calendar-architecture.html
-share/gnome/html/evolution-devel-guide/p51.html
-share/gnome/html/evolution-devel-guide/p9.html
-share/gnome/html/evolution-devel-guide/r55.html
-share/gnome/html/evolution-devel-guide/x34.html
 share/gnome/idl/addressbook.idl
 share/gnome/idl/evolution-calendar.idl
 share/gnome/images/evolution/briefcase.png
@@ -298,6 +297,7 @@ 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/images/evolution/splash.png
 share/gnome/mime-info/evolution.keys
 share/gnome/oaf/addressbook.oafinfo
 share/gnome/oaf/calendar-control.oafinfo
@@ -306,6 +306,14 @@ share/gnome/oaf/evolution-calendar.oafinfo
 share/gnome/oaf/evolution-mail.oafinfo
 share/gnome/oaf/wombat.oafinfo
 share/gnome/pixmaps/evolution.png
+share/gnome/ui/evolution-addressbook-ldap.xml
+share/gnome/ui/evolution-addressbook.xml
+share/gnome/ui/evolution-calendar.xml
+share/gnome/ui/evolution-contact-editor.xml
+share/gnome/ui/evolution-executive-summary.xml
+share/gnome/ui/evolution-mail.xml
+share/gnome/ui/evolution-subscribe.xml
+share/gnome/ui/evolution.xml
 share/locale/da/LC_MESSAGES/evolution.mo
 share/locale/de/LC_MESSAGES/evolution.mo
 share/locale/el/LC_MESSAGES/evolution.mo
@@ -319,6 +327,7 @@ 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/nn/LC_MESSAGES/evolution.mo
 share/locale/no/LC_MESSAGES/evolution.mo
 share/locale/pl/LC_MESSAGES/evolution.mo
 share/locale/pt/LC_MESSAGES/evolution.mo
@@ -330,7 +339,6 @@ share/locale/uk/LC_MESSAGES/evolution.mo
 @dirrm share/gnome/images/evolution/buttons
 @dirrm share/gnome/images/evolution
 @dirrm share/gnome/images
-@dirrm share/gnome/html/evolution-devel-guide
 @dirrm share/gnome/help/evolution/C/stylesheet-images
 @dirrm share/gnome/help/evolution/C/fig
 @dirrm share/gnome/help/evolution/C