Update to 2.5.7.

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

4 files changed, 69 insertions, 16 deletions

diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index 1d2775847..13a26281e 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.5.6
-PORTREVISION=	1
+PORTVERSION=	2.5.7
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo
index 1005afde6..18f7526fd 100644
--- a/archivers/fileroller/distinfo
+++ b/archivers/fileroller/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/file-roller-2.5.6.tar.bz2) = 23cb29b32aedbc6ca0024f4706f766dc
-SIZE (gnome2/file-roller-2.5.6.tar.bz2) = 1006550
+MD5 (gnome2/file-roller-2.5.7.tar.bz2) = c449a09e13ddf7097a5db60944f555e1
+SIZE (gnome2/file-roller-2.5.7.tar.bz2) = 1216026
diff --git a/archivers/fileroller/files/patch-src_fr-command-tar.c b/archivers/fileroller/files/patch-src_fr-command-tar.c
index 08704aa09..728ff0bce 100644
--- a/archivers/fileroller/files/patch-src_fr-command-tar.c
+++ b/archivers/fileroller/files/patch-src_fr-command-tar.c
@@ -27,7 +27,7 @@
  
  	fdata = file_data_new ();
  
--	date_idx = get_index_from_pattern (line, "%n%n%n%n-%n%n-%n%n %n%n:%n%n:%n%n");
+-	date_idx = get_index_from_pattern (line, "%n%n%n%n-%n%n-%n%n %n%n:%n%n");
 +	fields = split_line (line, 7);
  
 -	field_size = get_prev_field (line, date_idx, 1);
diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist
index 45382aa21..876bf79bb 100644
--- a/archivers/fileroller/pkg-plist
+++ b/archivers/fileroller/pkg-plist
@@ -16,10 +16,10 @@ etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui/%gconf.xml
 etc/gconf/schemas/file-roller.schemas
 lib/bonobo/libfile-roller-component.so
 libdata/bonobo/servers/File_Roller_Component.server
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
+share/doc/fileroller/AUTHORS
+share/doc/fileroller/NEWS
+share/doc/fileroller/README
+share/doc/fileroller/TODO
 share/gnome/application-registry/file-roller.applications
 share/gnome/applications/file-roller.desktop
 share/gnome/file-roller/glade/file_roller.glade
@@ -31,26 +31,63 @@ 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/de/figures/file-roller_main_window.png
+share/gnome/help/file-roller/de/file-roller.xml
+share/gnome/help/file-roller/de/legal.xml
+share/gnome/help/file-roller/es/figures/file-roller_main_window.png
+share/gnome/help/file-roller/es/file-roller.xml
+share/gnome/help/file-roller/es/legal.xml
+share/gnome/help/file-roller/fr/figures/file-roller_main_window.png
+share/gnome/help/file-roller/fr/file-roller.xml
+share/gnome/help/file-roller/fr/legal.xml
+share/gnome/help/file-roller/it/figures/file-roller_main_window.png
+share/gnome/help/file-roller/it/file-roller.xml
+share/gnome/help/file-roller/it/legal.xml
+share/gnome/help/file-roller/ja/figures/file-roller_main_window.png
+share/gnome/help/file-roller/ja/file-roller.xml
+share/gnome/help/file-roller/ja/legal.xml
+share/gnome/help/file-roller/ko/figures/file-roller_main_window.png
+share/gnome/help/file-roller/ko/file-roller.xml
+share/gnome/help/file-roller/ko/legal.xml
 share/gnome/help/file-roller/ru/figures/fr-add-dialog.png
 share/gnome/help/file-roller/ru/figures/fr-extract.png
 share/gnome/help/file-roller/ru/figures/fr-mainwindow.png
 share/gnome/help/file-roller/ru/figures/fr-prefs.png
 share/gnome/help/file-roller/ru/file-roller.xml
 share/gnome/help/file-roller/ru/legal.xml
+share/gnome/help/file-roller/sv/figures/file-roller_main_window.png
+share/gnome/help/file-roller/sv/file-roller.xml
+share/gnome/help/file-roller/sv/legal.xml
 share/gnome/help/file-roller/uk/figures/fr-add-dialog.png
 share/gnome/help/file-roller/uk/figures/fr-extract.png
 share/gnome/help/file-roller/uk/figures/fr-mainwindow.png
 share/gnome/help/file-roller/uk/figures/fr-prefs.png
 share/gnome/help/file-roller/uk/file-roller.xml
 share/gnome/help/file-roller/uk/legal.xml
+share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png
+share/gnome/help/file-roller/zh_CN/file-roller.xml
+share/gnome/help/file-roller/zh_CN/legal.xml
+share/gnome/help/file-roller/zh_HK/figures/file-roller_main_window.png
+share/gnome/help/file-roller/zh_HK/file-roller.xml
+share/gnome/help/file-roller/zh_HK/legal.xml
+share/gnome/help/file-roller/zh_TW/figures/file-roller_main_window.png
+share/gnome/help/file-roller/zh_TW/file-roller.xml
+share/gnome/help/file-roller/zh_TW/legal.xml
 share/gnome/mime-info/file-roller.keys
 share/gnome/mime-info/file-roller.mime
 share/gnome/omf/file-roller/file-roller-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/file-roller/file-roller-de.omf
+share/gnome/omf/file-roller/file-roller-es.omf
+share/gnome/omf/file-roller/file-roller-fr.omf
+share/gnome/omf/file-roller/file-roller-it.omf
+share/gnome/omf/file-roller/file-roller-ja.omf
+share/gnome/omf/file-roller/file-roller-ko.omf
 share/gnome/omf/file-roller/file-roller-ru.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/file-roller/file-roller-sv.omf
 share/gnome/omf/file-roller/file-roller-uk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/file-roller/file-roller-zh_CN.omf
+share/gnome/omf/file-roller/file-roller-zh_HK.omf
+share/gnome/omf/file-roller/file-roller-zh_TW.omf
 share/gnome/pixmaps/file-roller.png
 share/locale/am/LC_MESSAGES/file-roller.mo
 share/locale/ar/LC_MESSAGES/file-roller.mo
@@ -110,16 +147,36 @@ share/locale/vi/LC_MESSAGES/file-roller.mo
 share/locale/zh_CN/LC_MESSAGES/file-roller.mo
 share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrm share/gnome/omf/file-roller
+@dirrm share/gnome/help/file-roller/zh_TW/figures
+@dirrm share/gnome/help/file-roller/zh_TW
+@dirrm share/gnome/help/file-roller/zh_HK/figures
+@dirrm share/gnome/help/file-roller/zh_HK
+@dirrm share/gnome/help/file-roller/zh_CN/figures
+@dirrm share/gnome/help/file-roller/zh_CN
 @dirrm share/gnome/help/file-roller/uk/figures
 @dirrm share/gnome/help/file-roller/uk
+@dirrm share/gnome/help/file-roller/sv/figures
+@dirrm share/gnome/help/file-roller/sv
 @dirrm share/gnome/help/file-roller/ru/figures
 @dirrm share/gnome/help/file-roller/ru
+@dirrm share/gnome/help/file-roller/ko/figures
+@dirrm share/gnome/help/file-roller/ko
+@dirrm share/gnome/help/file-roller/ja/figures
+@dirrm share/gnome/help/file-roller/ja
+@dirrm share/gnome/help/file-roller/it/figures
+@dirrm share/gnome/help/file-roller/it
+@dirrm share/gnome/help/file-roller/fr/figures
+@dirrm share/gnome/help/file-roller/fr
+@dirrm share/gnome/help/file-roller/es/figures
+@dirrm share/gnome/help/file-roller/es
+@dirrm share/gnome/help/file-roller/de/figures
+@dirrm share/gnome/help/file-roller/de
 @dirrm share/gnome/help/file-roller/C/figures
 @dirrm share/gnome/help/file-roller/C
 @dirrm share/gnome/help/file-roller
 @dirrm share/gnome/file-roller/glade
 @dirrm share/gnome/file-roller
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm share/doc/fileroller
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/listing
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/general
@@ -134,6 +191,3 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @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
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true