From 273f33b218af457ffac8a86f49a54795ea21d0c9 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Sat, 17 Apr 2004 12:42:45 +0000
Subject: Really fix the permissions of files copied to ~/evolution, so that
 the program does not give "Permission denied" arguments while running (and
 things like the local mail folders work properly).  Lets go with the revision
 bump done recently.

---
 mail/evolution/distinfo         |  4 ++--
 mail/evolution/patches/patch-ah | 33 +++++++++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 4 deletions(-)

(limited to 'mail/evolution')

diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index daf3656cd08..3a375ee1ea4 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2004/01/04 21:37:09 rh Exp $
+$NetBSD: distinfo,v 1.23 2004/04/17 12:42:45 jmmv Exp $
 
 SHA1 (evolution-1.4.5.tar.bz2) = 56ab7828236623f63f4dd085cfabaef832f5c945
 Size (evolution-1.4.5.tar.bz2) = 13641682 bytes
@@ -8,7 +8,7 @@ SHA1 (patch-ad) = 364fc8c885eba81b77cc219dab678cac2714f130
 SHA1 (patch-ae) = a78bb477e3ebcade556ae9c0c1ef0ffc05f05e36
 SHA1 (patch-af) = dbbd2272d21079d6fe28d59e75f9acb26634f438
 SHA1 (patch-ag) = 57d64084a79c6e3a687b7a148fdea02b0f1eefbd
-SHA1 (patch-ah) = 1fb53511cce4e1cc448604cb5d7ff4c29e38e409
+SHA1 (patch-ah) = a4b15e3405e4f6a432392a30bf489abd4e94a181
 SHA1 (patch-ai) = 2d73b5a3a2a006bb29b83650154ca64d721ef09d
 SHA1 (patch-aj) = 9b098568fd94c0597a216b8b9cf89eaef3307a4b
 SHA1 (patch-ak) = 567c9afcd7947202b4aec0ffacc6c1fb76b35fb7
diff --git a/mail/evolution/patches/patch-ah b/mail/evolution/patches/patch-ah
index dc7d6b4c173..485edeba241 100644
--- a/mail/evolution/patches/patch-ah
+++ b/mail/evolution/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.4 2004/01/04 21:37:09 rh Exp $
+$NetBSD: patch-ah,v 1.5 2004/04/17 12:42:45 jmmv Exp $
 
---- shell/e-setup.c.orig	2003-04-17 00:37:56.000000000 +1000
+--- shell/e-setup.c.orig	2003-04-16 16:37:56.000000000 +0200
 +++ shell/e-setup.c
 @@ -139,6 +139,16 @@ check_evolution_directory (const char *e
  		}
@@ -19,3 +19,32 @@ $NetBSD: patch-ah,v 1.4 2004/01/04 21:37:09 rh Exp $
  	}
  
  	if (retval == FALSE)
+@@ -170,19 +180,22 @@ copy_default_stuff (const char *evolutio
+ 		return FALSE;
+ 	}
+ 
++	retval = TRUE;
++
+ 	command = g_strconcat ("cp -r " DEFAULT_USER_PATH "/* ", evolution_directory, NULL);
++	retval &= (system (command) == 0);
++	g_free (command);
++
++	command = g_strconcat ("chmod -R u+w ", evolution_directory, NULL);
++	retval &= (system (command) == 0);
++	g_free (command);
+ 
+-	if (system (command) != 0) {
++	if (!retval) {
+ 		/* FIXME: Give more help.  */
+ 		e_notice (NULL, GTK_MESSAGE_ERROR,
+ 			  _("An error occurred in copying files into\n`%s'."), evolution_directory);
+-		retval = FALSE;
+-	} else {
+-		retval = TRUE;
+ 	}
+ 
+-	g_free (command);
+-
+ 	return retval;
+ }
+ 
-- 
cgit v1.2.3