Add a couple of patches to make evolution do the right thing on

initial startup (you no longer have to manually copy some files
around).  These updates will be committed to the next version of
evolution itself.

Many thanks to Dan Winship <danw@helixcode.com> for pointing
me in the right direction after my bug report.

6 files changed, 14 insertions, 36 deletions

diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index 5c68abdc9d53..19972763f78b 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	evolution
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
@@ -51,7 +52,4 @@ pre-patch:
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/mail/evolution-devel/files/patch-ah b/mail/evolution-devel/files/patch-ah
index 2ccd3568a007..92e9ce533671 100644
--- a/mail/evolution-devel/files/patch-ah
+++ b/mail/evolution-devel/files/patch-ah
@@ -1,10 +1,3 @@
---- filter/Makefile.in.orig	Sat Aug 19 19:26:37 2000
-+++ filter/Makefile.in	Wed Aug 23 12:09:59 2000
-@@ -164,3 +164,3 @@
- 
--gladedir = $(prefix)/share/evolution/glade
-+gladedir = $(datadir)/evolution/glade
- glade_DATA = filter.glade
 --- mail/mail-crypto.c.orig	Fri Aug 11 15:27:12 2000
 +++ mail/mail-crypto.c	Wed Aug 23 11:17:44 2000
 @@ -189,7 +189,7 @@
diff --git a/mail/evolution-devel/pkg-plist b/mail/evolution-devel/pkg-plist
index d6a11e6976f8..351711ddb7ad 100644
--- a/mail/evolution-devel/pkg-plist
+++ b/mail/evolution-devel/pkg-plist
@@ -149,13 +149,10 @@ lib/libeselectnames.so.0
 lib/libical.a
 lib/libicalss.a
 lib/libicalvcal.a
-share/evolution/addresstypes.xml
-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/addresstypes.xml
 share/gnome/evolution/arrow.png
+share/gnome/evolution/default_user/ldapservers.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/Drafts/folder-metadata.xml
@@ -164,9 +161,11 @@ share/gnome/evolution/default_user/local/Inbox/mbox
 share/gnome/evolution/default_user/local/Outbox/folder-metadata.xml
 share/gnome/evolution/default_user/local/Sent/folder-metadata.xml
 share/gnome/evolution/default_user/local/Trash/folder-metadata.xml
+share/gnome/evolution/default_user/shortcuts.xml
 share/gnome/evolution/ecps/medbook.ecps
 share/gnome/evolution/ecps/phonelist.ecps
 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/categories.glade
@@ -193,6 +192,7 @@ share/gnome/evolution/glade/mail-config-druid.glade
 share/gnome/evolution/glade/mail-config.glade
 share/gnome/evolution/glade/select-names.glade
 share/gnome/evolution/glade/task-editor-dialog.glade
+share/gnome/evolution/vfoldertypes.xml
 share/gnome/help/evolution/C/aboutbook.html
 share/gnome/help/evolution/C/apx-gloss.html
 share/gnome/help/evolution/C/authors.html
@@ -337,6 +337,7 @@ share/locale/uk/LC_MESSAGES/evolution.mo
 @dirrm share/gnome/help/evolution
 @dirrm share/gnome/evolution/glade
 @dirrm share/gnome/evolution/ecps
+@dirrm share/gnome/evolution/default_user/news
 @dirrm share/gnome/evolution/default_user/local/Trash
 @dirrm share/gnome/evolution/default_user/local/Sent
 @dirrm share/gnome/evolution/default_user/local/Outbox
@@ -347,9 +348,6 @@ share/locale/uk/LC_MESSAGES/evolution.mo
 @dirrm share/gnome/evolution/default_user/local
 @dirrm share/gnome/evolution/default_user
 @dirrm share/gnome/evolution
-@dirrm share/evolution/default_user/news
-@dirrm share/evolution/default_user
-@dirrm share/evolution
 @dirrm lib/evolution/camel-providers/%%VERSION%%
 @dirrm lib/evolution/camel-providers
 @dirrm lib/evolution
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 5c68abdc9d53..19972763f78b 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	evolution
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
@@ -51,7 +52,4 @@ pre-patch:
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/mail/evolution/files/patch-ah b/mail/evolution/files/patch-ah
index 2ccd3568a007..92e9ce533671 100644
--- a/mail/evolution/files/patch-ah
+++ b/mail/evolution/files/patch-ah
@@ -1,10 +1,3 @@
---- filter/Makefile.in.orig	Sat Aug 19 19:26:37 2000
-+++ filter/Makefile.in	Wed Aug 23 12:09:59 2000
-@@ -164,3 +164,3 @@
- 
--gladedir = $(prefix)/share/evolution/glade
-+gladedir = $(datadir)/evolution/glade
- glade_DATA = filter.glade
 --- mail/mail-crypto.c.orig	Fri Aug 11 15:27:12 2000
 +++ mail/mail-crypto.c	Wed Aug 23 11:17:44 2000
 @@ -189,7 +189,7 @@
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index d6a11e6976f8..351711ddb7ad 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -149,13 +149,10 @@ lib/libeselectnames.so.0
 lib/libical.a
 lib/libicalss.a
 lib/libicalvcal.a
-share/evolution/addresstypes.xml
-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/addresstypes.xml
 share/gnome/evolution/arrow.png
+share/gnome/evolution/default_user/ldapservers.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/Drafts/folder-metadata.xml
@@ -164,9 +161,11 @@ share/gnome/evolution/default_user/local/Inbox/mbox
 share/gnome/evolution/default_user/local/Outbox/folder-metadata.xml
 share/gnome/evolution/default_user/local/Sent/folder-metadata.xml
 share/gnome/evolution/default_user/local/Trash/folder-metadata.xml
+share/gnome/evolution/default_user/shortcuts.xml
 share/gnome/evolution/ecps/medbook.ecps
 share/gnome/evolution/ecps/phonelist.ecps
 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/categories.glade
@@ -193,6 +192,7 @@ share/gnome/evolution/glade/mail-config-druid.glade
 share/gnome/evolution/glade/mail-config.glade
 share/gnome/evolution/glade/select-names.glade
 share/gnome/evolution/glade/task-editor-dialog.glade
+share/gnome/evolution/vfoldertypes.xml
 share/gnome/help/evolution/C/aboutbook.html
 share/gnome/help/evolution/C/apx-gloss.html
 share/gnome/help/evolution/C/authors.html
@@ -337,6 +337,7 @@ share/locale/uk/LC_MESSAGES/evolution.mo
 @dirrm share/gnome/help/evolution
 @dirrm share/gnome/evolution/glade
 @dirrm share/gnome/evolution/ecps
+@dirrm share/gnome/evolution/default_user/news
 @dirrm share/gnome/evolution/default_user/local/Trash
 @dirrm share/gnome/evolution/default_user/local/Sent
 @dirrm share/gnome/evolution/default_user/local/Outbox
@@ -347,9 +348,6 @@ share/locale/uk/LC_MESSAGES/evolution.mo
 @dirrm share/gnome/evolution/default_user/local
 @dirrm share/gnome/evolution/default_user
 @dirrm share/gnome/evolution
-@dirrm share/evolution/default_user/news
-@dirrm share/evolution/default_user
-@dirrm share/evolution
 @dirrm lib/evolution/camel-providers/%%VERSION%%
 @dirrm lib/evolution/camel-providers
 @dirrm lib/evolution