Update to 2.5.5.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1915 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 13 insertions, 53 deletions

diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index 832ddcbb8..ca2c41086 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.5.4
-PORTREVISION=	1
+PORTVERSION=	2.5.5
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo
index aaabd05c5..a39671c70 100644
--- a/archivers/fileroller/distinfo
+++ b/archivers/fileroller/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/file-roller-2.5.4.tar.bz2) = 018863c1b13ef61383c5c4327191d027
-SIZE (gnome2/file-roller-2.5.4.tar.bz2) = 994317
+MD5 (gnome2/file-roller-2.5.5.tar.bz2) = cb978dea329bd7405a0928eb6dbc2432
+SIZE (gnome2/file-roller-2.5.5.tar.bz2) = 998288
diff --git a/archivers/fileroller/files/patch-src_fr-command-tar.c b/archivers/fileroller/files/patch-src_fr-command-tar.c
index 6f51fa144..08e5c765f 100644
--- a/archivers/fileroller/files/patch-src_fr-command-tar.c
+++ b/archivers/fileroller/files/patch-src_fr-command-tar.c
@@ -1,5 +1,5 @@
---- src/fr-command-tar.c.orig	Mon Feb 16 10:53:20 2004
-+++ src/fr-command-tar.c	Wed Feb 18 17:30:26 2004
+--- src/fr-command-tar.c.orig	Tue Feb 24 04:00:01 2004
++++ src/fr-command-tar.c	Wed Feb 25 18:20:33 2004
 @@ -83,6 +83,11 @@
  	return mktime (&tm);
  }
@@ -50,39 +50,3 @@
  	fields = g_strsplit (name_field, " -> ", 2);
  
  	if (fields[1] == NULL) {
-@@ -176,7 +196,7 @@
- 				      process_line,
- 				      comm);
- 
--	fr_process_begin_command (comm->process, "gtar");
-+	fr_process_begin_command (comm->process, "tar");
- 	fr_process_add_arg (comm->process, "--force-local");
- 	fr_process_add_arg (comm->process, "-tvf");
- 	fr_process_add_arg (comm->process, comm->e_filename);
-@@ -234,7 +254,7 @@
- 				      process_line__add,
- 				      comm);
- 
--	fr_process_begin_command (comm->process, "gtar");
-+	fr_process_begin_command (comm->process, "tar");
- 	fr_process_add_arg (comm->process, "--force-local");
- 	fr_process_add_arg (comm->process, "-v");
- 
-@@ -285,7 +305,7 @@
- 				      process_line__delete,
- 				      comm);
- 
--	fr_process_begin_command (comm->process, "gtar");
-+	fr_process_begin_command (comm->process, "tar");
- 	fr_process_set_begin_func (comm->process, begin_func__delete, comm);
- 	fr_process_add_arg (comm->process, "--force-local");
- 	fr_process_add_arg (comm->process, "-v");
-@@ -322,7 +342,7 @@
- 				      process_line__extract,
- 				      comm);
- 
--	fr_process_begin_command (comm->process, "gtar");
-+	fr_process_begin_command (comm->process, "tar");
- 	fr_process_add_arg (comm->process, "--force-local");
- 	fr_process_add_arg (comm->process, "-v");
- 	fr_process_add_arg (comm->process, "-xf");
diff --git a/archivers/fileroller/files/patch-src_menu-callbacks.c b/archivers/fileroller/files/patch-src_menu-callbacks.c
deleted file mode 100644
index a79f1398b..000000000
--- a/archivers/fileroller/files/patch-src_menu-callbacks.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/menu-callbacks.c.orig	Sat Jan 31 13:54:09 2004
-+++ src/menu-callbacks.c	Sat Jan 31 13:54:23 2004
-@@ -661,7 +661,7 @@
- 				  int           response,
- 				  CopyMoveData *data)
- {
--	FRWindow    *window = data->window;;
-+	FRWindow    *window = data->window;
- 	char        *folder;
- 	char        *new_path;
- 
diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist
index 95bc52b6e..3f71ae127 100644
--- a/archivers/fileroller/pkg-plist
+++ b/archivers/fileroller/pkg-plist
@@ -1,12 +1,14 @@
 bin/file-roller
 etc/gconf/gconf.xml.defaults/apps/file-roller/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs/batch-add/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs/extract/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/file-roller/general/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/file-roller/listing/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/file-roller/ui/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs/batch-add/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs/extract/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/general/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/listing/%gconf.xml
@@ -22,7 +24,11 @@ share/gnome/application-registry/file-roller.applications
 share/gnome/applications/file-roller.desktop
 share/gnome/file-roller/glade/file_roller.glade
 share/gnome/file-roller/glade/file_roller_prop.glade
+share/gnome/help/file-roller/C/figures/file-roller_home.png
+share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/C/figures/file-roller_main_window.png
+share/gnome/help/file-roller/C/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/C/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/C/file-roller.xml
 share/gnome/help/file-roller/C/legal.xml
 share/gnome/help/file-roller/ru/figures/fr-add-dialog.png
@@ -117,12 +123,14 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/listing
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/general
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs/extract
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs/batch-add
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/dialogs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/ui
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/listing
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/general
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs/extract
+@dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs/batch-add
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true