Update to 2.6.1.

8 files changed, 34 insertions, 28 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index d310eb6..3f9b3c3 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.6.0
+PORTVERSION=	2.6.1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 992e44c..9866efc 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/file-roller-2.6.0.tar.bz2) = 8c858a7cc4ab0f2844fd2148a2cfd954
-SIZE (gnome2/file-roller-2.6.0.tar.bz2) = 1241766
+MD5 (gnome2/file-roller-2.6.1.tar.bz2) = cd9f62d28629e0643615be146a7736dc
+SIZE (gnome2/file-roller-2.6.1.tar.bz2) = 1270682
diff --git a/archivers/file-roller/files/patch-src_fr-command-tar.c b/archivers/file-roller/files/patch-src_fr-command-tar.c
index 728ff0b..ea69f11 100644
--- a/archivers/file-roller/files/patch-src_fr-command-tar.c
+++ b/archivers/file-roller/files/patch-src_fr-command-tar.c
@@ -1,7 +1,7 @@
---- src/fr-command-tar.c.orig	Mon Mar  8 18:20:07 2004
-+++ src/fr-command-tar.c	Sun Mar 14 00:14:41 2004
-@@ -196,6 +196,11 @@
- 	return g_strndup (f_start + 1, f_end - f_start);
+--- src/fr-command-tar.c.orig	Mon Apr 19 15:10:23 2004
++++ src/fr-command-tar.c	Tue Apr 20 02:15:36 2004
+@@ -226,6 +226,11 @@
+ 	return g_strdup (f_start);
  }
  
 +static char *months[] = {
@@ -12,7 +12,7 @@
  
  static void
  process_line (char     *line, 
-@@ -204,28 +209,36 @@
+@@ -234,28 +239,37 @@
  	FileData    *fdata;
  	FRCommand   *comm = FR_COMMAND (data);
  	char       **fields;
@@ -29,6 +29,11 @@
  
 -	date_idx = get_index_from_pattern (line, "%n%n%n%n-%n%n-%n%n %n%n:%n%n");
 +	fields = split_line (line, 7);
++
++	fdata->size = atol (fields[2]);
++	for (i = 0; i < 12; i++) {
++		if (!strncmp(fields[3], months[i], 3)) break;
++	}
  
 -	field_size = get_prev_field (line, date_idx, 1);
 -	fdata->size = atol (field_size);
@@ -39,10 +44,6 @@
 -	fdata->modified = mktime_from_string (field_date, field_time);
 -	g_free (field_date);
 -	g_free (field_time);
-+	fdata->size = atol (fields[2]);
-+	for (i = 0; i < 12; i++) {
-+		if (!strncmp(fields[3], months[i], 3)) break;
-+	}
 +	tm.tm_mon = i;
 +	tm.tm_year = atoi (fields[6]) - 1900;
 +	tm.tm_mday = atoi (fields[4]);
@@ -57,12 +58,12 @@
  
  	/* Full path */
  
--	field_name = get_next_field (line, date_idx, 3);
+-	field_name = tar_get_last_field (line, date_idx, 3);
 +	field_name = get_last_field (line, 8);
  	fields = g_strsplit (field_name, " -> ", 2);
  
  	if (fields[1] == NULL) {
-@@ -244,7 +257,6 @@
+@@ -274,7 +288,6 @@
  	if (fields[1] != NULL)
  		fdata->link = g_strdup (fields[1]);
  	g_strfreev (fields);
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index b757bd1..dead90f 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -101,6 +101,7 @@ share/locale/cy/LC_MESSAGES/file-roller.mo
 share/locale/da/LC_MESSAGES/file-roller.mo
 share/locale/de/LC_MESSAGES/file-roller.mo
 share/locale/el/LC_MESSAGES/file-roller.mo
+share/locale/en_CA/LC_MESSAGES/file-roller.mo
 share/locale/en_GB/LC_MESSAGES/file-roller.mo
 share/locale/es/LC_MESSAGES/file-roller.mo
 share/locale/et/LC_MESSAGES/file-roller.mo
@@ -109,6 +110,7 @@ share/locale/fa/LC_MESSAGES/file-roller.mo
 share/locale/fi/LC_MESSAGES/file-roller.mo
 share/locale/fr/LC_MESSAGES/file-roller.mo
 share/locale/ga/LC_MESSAGES/file-roller.mo
+share/locale/gu/LC_MESSAGES/file-roller.mo
 share/locale/he/LC_MESSAGES/file-roller.mo
 share/locale/hi/LC_MESSAGES/file-roller.mo
 share/locale/hr/LC_MESSAGES/file-roller.mo
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index d310eb6..3f9b3c3 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.6.0
+PORTVERSION=	2.6.1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo
index 992e44c..9866efc 100644
--- a/archivers/fileroller/distinfo
+++ b/archivers/fileroller/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/file-roller-2.6.0.tar.bz2) = 8c858a7cc4ab0f2844fd2148a2cfd954
-SIZE (gnome2/file-roller-2.6.0.tar.bz2) = 1241766
+MD5 (gnome2/file-roller-2.6.1.tar.bz2) = cd9f62d28629e0643615be146a7736dc
+SIZE (gnome2/file-roller-2.6.1.tar.bz2) = 1270682
diff --git a/archivers/fileroller/files/patch-src_fr-command-tar.c b/archivers/fileroller/files/patch-src_fr-command-tar.c
index 728ff0b..ea69f11 100644
--- a/archivers/fileroller/files/patch-src_fr-command-tar.c
+++ b/archivers/fileroller/files/patch-src_fr-command-tar.c
@@ -1,7 +1,7 @@
---- src/fr-command-tar.c.orig	Mon Mar  8 18:20:07 2004
-+++ src/fr-command-tar.c	Sun Mar 14 00:14:41 2004
-@@ -196,6 +196,11 @@
- 	return g_strndup (f_start + 1, f_end - f_start);
+--- src/fr-command-tar.c.orig	Mon Apr 19 15:10:23 2004
++++ src/fr-command-tar.c	Tue Apr 20 02:15:36 2004
+@@ -226,6 +226,11 @@
+ 	return g_strdup (f_start);
  }
  
 +static char *months[] = {
@@ -12,7 +12,7 @@
  
  static void
  process_line (char     *line, 
-@@ -204,28 +209,36 @@
+@@ -234,28 +239,37 @@
  	FileData    *fdata;
  	FRCommand   *comm = FR_COMMAND (data);
  	char       **fields;
@@ -29,6 +29,11 @@
  
 -	date_idx = get_index_from_pattern (line, "%n%n%n%n-%n%n-%n%n %n%n:%n%n");
 +	fields = split_line (line, 7);
++
++	fdata->size = atol (fields[2]);
++	for (i = 0; i < 12; i++) {
++		if (!strncmp(fields[3], months[i], 3)) break;
++	}
  
 -	field_size = get_prev_field (line, date_idx, 1);
 -	fdata->size = atol (field_size);
@@ -39,10 +44,6 @@
 -	fdata->modified = mktime_from_string (field_date, field_time);
 -	g_free (field_date);
 -	g_free (field_time);
-+	fdata->size = atol (fields[2]);
-+	for (i = 0; i < 12; i++) {
-+		if (!strncmp(fields[3], months[i], 3)) break;
-+	}
 +	tm.tm_mon = i;
 +	tm.tm_year = atoi (fields[6]) - 1900;
 +	tm.tm_mday = atoi (fields[4]);
@@ -57,12 +58,12 @@
  
  	/* Full path */
  
--	field_name = get_next_field (line, date_idx, 3);
+-	field_name = tar_get_last_field (line, date_idx, 3);
 +	field_name = get_last_field (line, 8);
  	fields = g_strsplit (field_name, " -> ", 2);
  
  	if (fields[1] == NULL) {
-@@ -244,7 +257,6 @@
+@@ -274,7 +288,6 @@
  	if (fields[1] != NULL)
  		fdata->link = g_strdup (fields[1]);
  	g_strfreev (fields);
diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist
index b757bd1..dead90f 100644
--- a/archivers/fileroller/pkg-plist
+++ b/archivers/fileroller/pkg-plist
@@ -101,6 +101,7 @@ share/locale/cy/LC_MESSAGES/file-roller.mo
 share/locale/da/LC_MESSAGES/file-roller.mo
 share/locale/de/LC_MESSAGES/file-roller.mo
 share/locale/el/LC_MESSAGES/file-roller.mo
+share/locale/en_CA/LC_MESSAGES/file-roller.mo
 share/locale/en_GB/LC_MESSAGES/file-roller.mo
 share/locale/es/LC_MESSAGES/file-roller.mo
 share/locale/et/LC_MESSAGES/file-roller.mo
@@ -109,6 +110,7 @@ share/locale/fa/LC_MESSAGES/file-roller.mo
 share/locale/fi/LC_MESSAGES/file-roller.mo
 share/locale/fr/LC_MESSAGES/file-roller.mo
 share/locale/ga/LC_MESSAGES/file-roller.mo
+share/locale/gu/LC_MESSAGES/file-roller.mo
 share/locale/he/LC_MESSAGES/file-roller.mo
 share/locale/hi/LC_MESSAGES/file-roller.mo
 share/locale/hr/LC_MESSAGES/file-roller.mo