Update to 2.17.5.

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

4 files changed, 16 insertions, 61 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 560ad5c89..2609f607c 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Anders Nordby <anders@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/archivers/file-roller/Makefile,v 1.110 2006/12/05 03:21:05 ahze Exp $
+#   $MCom: ports/archivers/file-roller/Makefile,v 1.111 2006/12/19 14:33:29 ahze Exp $
 #
 
 PORTNAME=	file-roller
-PORTVERSION=	2.17.4
+PORTVERSION=	2.17.5
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 2ac15f0b1..0c1d30029 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/file-roller-2.17.4.tar.bz2) = 8e8cb1941d50b45fcda6c1c98303d68c
-SHA256 (gnome2/file-roller-2.17.4.tar.bz2) = 45243bcfeab61c09bda75e54690f078708af06523c41a34de4aa6ca8e7e882ea
-SIZE (gnome2/file-roller-2.17.4.tar.bz2) = 1188766
+MD5 (gnome2/file-roller-2.17.5.tar.bz2) = a252c26c48983a691928fe12352b0a97
+SHA256 (gnome2/file-roller-2.17.5.tar.bz2) = d2add0270676971034f15a05118dfadab275364203ea1ff27f095bc824202164
+SIZE (gnome2/file-roller-2.17.5.tar.bz2) = 1124733
diff --git a/archivers/file-roller/files/patch-src_fr-command-iso.c b/archivers/file-roller/files/patch-src_fr-command-iso.c
index ad26ca03f..d0e0c12a2 100644
--- a/archivers/file-roller/files/patch-src_fr-command-iso.c
+++ b/archivers/file-roller/files/patch-src_fr-command-iso.c
@@ -1,23 +1,23 @@
---- src/fr-command-iso.c.orig	Tue Nov  7 04:03:30 2006
-+++ src/fr-command-iso.c	Sat Nov 18 20:22:18 2006
-@@ -159,6 +159,7 @@ fr_command_iso_extract (FRCommand  *comm
+--- src/fr-command-iso.c.orig	Mon Jan  8 17:06:36 2007
++++ src/fr-command-iso.c	Wed Jan 10 14:43:17 2007
+@@ -164,6 +164,7 @@ fr_command_iso_extract (FRCommand  *comm
  			gboolean    junk_paths,
  			const char *password)
  {
 +	FRCommandIso  *comm_iso = FR_COMMAND_ISO (comm);
  	char  *e_dest_dir;
+ 	char  *e_archive_filename;
  	GList *scan;
- 
-@@ -166,6 +167,7 @@ fr_command_iso_extract (FRCommand  *comm
+@@ -173,6 +174,7 @@ fr_command_iso_extract (FRCommand  *comm
  
  	for (scan = file_list; scan; scan = scan->next) {
  		char       *path = scan->data;
 +		char       *extract_path;
  		const char *filename;
                  char       *file_dir, *e_temp_dest_dir = NULL, *temp_dest_dir = NULL;
- 	
-@@ -180,6 +182,8 @@ fr_command_iso_extract (FRCommand  *comm
- 		if (e_temp_dest_dir == NULL) 
+ 
+@@ -187,6 +189,8 @@ fr_command_iso_extract (FRCommand  *comm
+ 		if (e_temp_dest_dir == NULL)
  			continue;
  
 +		extract_path = g_build_filename (comm_iso->cur_path, path, NULL);
@@ -25,16 +25,16 @@
  		temp_dest_dir = unescape_str (e_temp_dest_dir);
  		ensure_dir_exists (temp_dest_dir, 0700);
  
-@@ -188,13 +192,14 @@ fr_command_iso_extract (FRCommand  *comm
+@@ -195,13 +199,14 @@ fr_command_iso_extract (FRCommand  *comm
  		fr_process_add_arg (comm->process, "-i");
- 		fr_process_add_arg (comm->process, comm->e_filename);
+ 		fr_process_add_arg (comm->process, e_archive_filename);
  		fr_process_add_arg (comm->process, "-x");
 -		fr_process_add_arg (comm->process, path);
 +		fr_process_add_arg (comm->process, extract_path);
  		fr_process_add_arg (comm->process, ">");
  		fr_process_add_arg (comm->process, filename);
  		fr_process_end_command (comm->process);
- 	
+ 
  		g_free (e_temp_dest_dir);
  		g_free (temp_dest_dir);
 +		g_free (extract_path);
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 4dff6d837..2399b9936 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -54,18 +54,6 @@ share/gnome/help/file-roller/it/figures/file-roller_main_window.png
 share/gnome/help/file-roller/it/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/it/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/it/file-roller.xml
-share/gnome/help/file-roller/ja/figures/file-roller_home.png
-share/gnome/help/file-roller/ja/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/ja/figures/file-roller_main_window.png
-share/gnome/help/file-roller/ja/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/ja/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/ja/file-roller.xml
-share/gnome/help/file-roller/ko/figures/file-roller_home.png
-share/gnome/help/file-roller/ko/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/ko/figures/file-roller_main_window.png
-share/gnome/help/file-roller/ko/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/ko/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/ko/file-roller.xml
 share/gnome/help/file-roller/nl/figures/file-roller_home.png
 share/gnome/help/file-roller/nl/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/nl/figures/file-roller_main_window.png
@@ -90,39 +78,16 @@ share/gnome/help/file-roller/uk/figures/file-roller_main_window.png
 share/gnome/help/file-roller/uk/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/uk/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/uk/file-roller.xml
-share/gnome/help/file-roller/zh_CN/figures/file-roller_home.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/zh_CN/file-roller.xml
-share/gnome/help/file-roller/zh_HK/figures/file-roller_home.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_main_window.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/zh_HK/file-roller.xml
-share/gnome/help/file-roller/zh_TW/figures/file-roller_home.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_main_window.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/zh_TW/file-roller.xml
 share/gnome/omf/file-roller/file-roller-C.omf
 share/gnome/omf/file-roller/file-roller-bg.omf
 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-nl.omf
 share/gnome/omf/file-roller/file-roller-ru.omf
 share/gnome/omf/file-roller/file-roller-sv.omf
 share/gnome/omf/file-roller/file-roller-uk.omf
-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/icons/hicolor/16x16/apps/file-roller.png
 share/icons/hicolor/22x22/apps/file-roller.png
 share/icons/hicolor/32x32/apps/file-roller.png
@@ -206,12 +171,6 @@ share/locale/zh_CN/LC_MESSAGES/file-roller.mo
 share/locale/zh_HK/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
@@ -220,10 +179,6 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrm share/gnome/help/file-roller/ru
 @dirrm share/gnome/help/file-roller/nl/figures
 @dirrm share/gnome/help/file-roller/nl
-@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