5 files changed, 30 insertions, 14 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 66640d08ff16..66922159ede2 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.8.1.1
+PORTVERSION=	2.8.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index c851d8dc6c5a..81ff61d1b494 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.8.1.1.tar.bz2) = dcf3a8cc527a7d8b5ae0ac56d66fff64
-SHA256 (gnome2/evolution-2.8.1.1.tar.bz2) = 0eeedf3808949772603bef4d54c879437dbc08d08dacba19f5994acc6ba60cb0
-SIZE (gnome2/evolution-2.8.1.1.tar.bz2) = 12897409
+MD5 (gnome2/evolution-2.8.2.tar.bz2) = e2f00b1e8459b544ec01fa10b7a3091c
+SHA256 (gnome2/evolution-2.8.2.tar.bz2) = 1de7d328cab76fc4a89120bdf1261fe45b2d9e98f2e65c974de7c797bb2b9331
+SIZE (gnome2/evolution-2.8.2.tar.bz2) = 12922577
diff --git a/mail/evolution/files/patch-data_Makefile.in b/mail/evolution/files/patch-data_Makefile.in
new file mode 100644
index 000000000000..06105b89c2d5
--- /dev/null
+++ b/mail/evolution/files/patch-data_Makefile.in
@@ -0,0 +1,23 @@
+--- data/Makefile.in.orig	Mon Nov 20 14:17:52 2006
++++ data/Makefile.in	Mon Nov 20 14:26:10 2006
+@@ -753,15 +753,15 @@ uninstall-info: uninstall-info-recursive
+ install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file)
+ 	$(mkinstalldirs) $(DESTDIR)$(desktopdir);							\
+ 	$(INSTALL_DATA) $(desktop_file)									\
+-			$(DESTDIR)$(desktopdir)/$(desktop_file:.desktop ;	\
++			$(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ;     \
+ 	$(mkinstalldirs) $(DESTDIR)$(keysdir);								\
+-	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys ;	\
++	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;    \
+ 	$(mkinstalldirs) $(DESTDIR)$(mimedir);								\
+-	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime ;
++	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
+ 
+ uninstall-local: uninstall-kde-applnk
+-	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; 	\
+-	rm -rf $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;	\
++	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ;      \
++	rm -rf $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;  \
+ 	rm -rf $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
+ 
+ # CDE Stuff
diff --git a/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c b/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c
index 4d8e131a6250..e69de29bb2d1 100644
--- a/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c
+++ b/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c
@@ -1,10 +0,0 @@
---- plugins/groupwise-features/proxy-login.c.orig	Fri Jul 29 18:55:40 2005
-+++ plugins/groupwise-features/proxy-login.c	Fri Jul 29 18:55:58 2005
-@@ -236,7 +236,6 @@ proxy_login_get_cnc (EAccount *account)
- {
- 	EGwConnection *cnc;
- 	CamelURL *url;
--	url = camel_url_new (account->source->url, NULL);
- 	char *uri = NULL, *failed_auth = NULL, *key = NULL, *prompt = NULL, *password = NULL;
- 	const char *use_ssl, *soap_port;
- 
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 7782d112f7e4..3ca58645b18f 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -340,6 +340,8 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.so
 %%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
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.la
@@ -385,6 +387,7 @@ 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
 lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-publish-calendar.eplug