svn commit: r383564 - in head/mail/evolution: . files

[Koop Mast]

Author: kwm
Date: Wed Apr  8 11:46:21 2015
New Revision: 383564
URL: https://svnweb.freebsd.org/changeset/ports/383564

Log:
  Fix the backup/restore feature of evolution.
  
  Reported by:	Randall R. King <rrking949 at cox.net>
  Obtained from:	upstream (patch by Ting-Wei Lan)

Added:
  head/mail/evolution/files/patch-modules_backup-restore_evolution-backup-tool.c   (contents, props changed)
Modified:
  head/mail/evolution/Makefile

Modified: head/mail/evolution/Makefile
==============================================================================
--- head/mail/evolution/Makefile	Wed Apr  8 11:29:32 2015	(r383563)
+++ head/mail/evolution/Makefile	Wed Apr  8 11:46:21 2015	(r383564)
@@ -4,6 +4,7 @@
 
 PORTNAME=	evolution
 PORTVERSION=	3.12.11
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

Added: head/mail/evolution/files/patch-modules_backup-restore_evolution-backup-tool.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/evolution/files/patch-modules_backup-restore_evolution-backup-tool.c	Wed Apr  8 11:46:21 2015	(r383564)
@@ -0,0 +1,33 @@
+From d9e63d55cd8ce597d9668dd4dd6f78c0900c9a94 Mon Sep 17 00:00:00 2001
+From: Ting-Wei Lan <lantw at src.gnome.org>
+Date: Wed, 8 Apr 2015 12:21:47 +0200
+Subject: Bug 747461 - The tar command used to restore backups doesn't work on
+ FreeBSD
+
+
+diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c
+index 840cee1..a288ce6 100644
+--- modules/backup-restore/evolution-backup-tool.c
++++ modules/backup-restore/evolution-backup-tool.c
+@@ -538,14 +538,14 @@ restore (const gchar *filename,
+ 		g_mkdir_with_parents (e_get_user_config_dir (), 0700);
+ 
+ 		command = g_strdup_printf (
+-			"cd $DATADIR && tar xzf %s %s --strip-components=%d",
+-			quotedfname, data_dir, get_dir_level (data_dir));
++			"cd $DATADIR && tar --strip-components %d -xzf %s %s",
++			 get_dir_level (data_dir), quotedfname, data_dir);
+ 		run_cmd (command);
+ 		g_free (command);
+ 
+ 		command = g_strdup_printf (
+-			"cd $CONFIGDIR && tar xzf %s %s --strip-components=%d",
+-			quotedfname, config_dir, get_dir_level (config_dir));
++			"cd $CONFIGDIR && tar --strip-components %d -xzf %s %s",
++			get_dir_level (config_dir), quotedfname, config_dir);
+ 		run_cmd (command);
+ 		g_free (command);
+ 
+-- 
+cgit v0.10.2
+