Update to 2.21.5.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10089 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 16 insertions, 23 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 9d144e27d..e14e717b3 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.156 2007/11/15 20:22:36 marcus Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.157 2007/12/22 20:10:27 kwm Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.21.4
+PORTVERSION=	2.21.5
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -59,14 +59,6 @@ OPTIONS=	PILOT "Enable Palm Pilot sync support" off \
 USE_LDCONFIG=	${PREFIX}/lib/evolution/${EVO_VERSION}
 .include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
 
-.if defined(PACKAGE_BUILDING)
-WITH_DBUS=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libdbus-glib-1.so)
-WITH_DBUS=	yes
-.endif
-
 .if defined(WITH_PILOT)
 LIB_DEPENDS+=	gpilotdconduit.2:${PORTSDIR}/palm/gnome-pilot
 CONFIGURE_ARGS+=	--with-pisock=${LOCALBASE} \
@@ -87,13 +79,6 @@ CONFIGURE_ARGS+=--with-openldap=no
 RUN_DEPENDS+=	spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 .endif
 
-.if defined(WITH_DBUS)
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-PLIST_SUB+=	DBUS=""
-.else
-PLIST_SUB+=	DBUS="@comment "
-.endif
-
 .if !defined(NO_KERBEROS) && exists(/usr/lib/libkrb5.so)
 CONFIGURE_ARGS+=	--with-krb5=/usr
 .else
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 2787e3bb2..31936a855 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.21.4.tar.bz2) = 04f7d3aada64a21b6ee41ff4164f4246
-SHA256 (gnome2/evolution-2.21.4.tar.bz2) = 7fab730358871e516c30e9211d893d8c288276038dc5fbb3b080d6ac3e22b779
-SIZE (gnome2/evolution-2.21.4.tar.bz2) = 25605844
+MD5 (gnome2/evolution-2.21.5.tar.bz2) = 80982f22860e447e51ddc4475cfedd70
+SHA256 (gnome2/evolution-2.21.5.tar.bz2) = a05d77782f9e912ad81dc6c402c74b94102542a0800a7319abe00b2e857cceaa
+SIZE (gnome2/evolution-2.21.5.tar.bz2) = 26131687
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 89c0890d6..5be251f8e 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -41,6 +41,7 @@ include/evolution-%%VERSION%%/e-util/e-sorter.h
 include/evolution-%%VERSION%%/e-util/e-text-event-processor-emacs-like.h
 include/evolution-%%VERSION%%/e-util/e-text-event-processor-types.h
 include/evolution-%%VERSION%%/e-util/e-text-event-processor.h
+include/evolution-%%VERSION%%/e-util/e-util-labels.h
 include/evolution-%%VERSION%%/e-util/e-util-marshal.h
 include/evolution-%%VERSION%%/e-util/e-util.h
 include/evolution-%%VERSION%%/e-util/e-xml-utils.h
@@ -296,6 +297,8 @@ lib/evolution/%%VERSION%%/plugins/libmail-account-disable.la
 lib/evolution/%%VERSION%%/plugins/libmail-account-disable.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-backup-restore.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-backup-restore.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-bogo-junk-plugin.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-bogo-junk-plugin.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.la
@@ -346,8 +349,6 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.so
-%%DBUS%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-new-mail-notify.la
-%%DBUS%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-new-mail-notify.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.la
@@ -365,6 +366,8 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so
 lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-backup-restore.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-backup-restore.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-bogo-junk-plugin.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug
@@ -400,7 +403,6 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-mark-all-read.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mark-calendar-offline.eplug
-%%DBUS%%lib/evolution/%%VERSION%%/plugins/org-gnome-new-mail-notify.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-prefer-plain.eplug
@@ -423,6 +425,7 @@ libexec/evolution/%%VERSION%%/csv2vcard
 libexec/evolution/%%VERSION%%/evolution-addressbook-clean
 libexec/evolution/%%VERSION%%/evolution-addressbook-export
 libexec/evolution/%%VERSION%%/evolution-alarm-notify
+libexec/evolution/%%VERSION%%/evolution-backup
 libexec/evolution/%%VERSION%%/killev
 share/applications/evolution.desktop
 %%DATADIR%%/%%VERSION%%/addresstypes.xml
@@ -450,6 +453,7 @@ share/applications/evolution.desktop
 %%DATADIR%%/%%VERSION%%/errors/mail-composer.error
 %%DATADIR%%/%%VERSION%%/errors/mail.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-attachment-reminder.error
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-backup-restore.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-default-mailer.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-exchange-operations.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-face.errors.xml
@@ -529,7 +533,11 @@ share/applications/evolution.desktop
 %%DATADIR%%/%%VERSION%%/help/quickref/pt/quickref.pdf
 %%DATADIR%%/%%VERSION%%/help/quickref/sq/quickref.pdf
 %%DATADIR%%/%%VERSION%%/help/quickref/sv/quickref.pdf
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/folder-copy.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/folder-move.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/go-today.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/mail-copy.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/mail-move.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/view-calendar-day.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/view-calendar-list.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/view-calendar-month.png