Update to 2.11.2.

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

2 files changed, 22 insertions, 6 deletions

diff --git a/archivers/file-roller/files/patch-src_file-utils.h b/archivers/file-roller/files/patch-src_file-utils.h
new file mode 100644
index 000000000..d3223290f
--- /dev/null
+++ b/archivers/file-roller/files/patch-src_file-utils.h
@@ -0,0 +1,16 @@
+--- src/file-utils.h.orig	Sun Jul  3 19:11:59 2005
++++ src/file-utils.h	Sun Jul  3 19:12:52 2005
+@@ -25,8 +25,13 @@
+ 
+ #include <sys/types.h>
+ #include <time.h>
++#include <stdlib.h>
++#include <limits.h>
+ #include <libgnomevfs/gnome-vfs-file-size.h>
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
++
++#undef fr_atoll
++#define fr_atoll(nptr) strtoll(nptr, (char **)NULL, 10)
+ 
+ 
+ #define FILENAME_MAX_LENGTH 30 /* FIXME: find out the best value */
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 5a046266d..c4e3bac83 100644
--- a/archivers/file-roller/files/patch-src_fr-command-tar.c
+++ b/archivers/file-roller/files/patch-src_fr-command-tar.c
@@ -1,13 +1,13 @@
---- src/fr-command-tar.c.orig	Fri Apr 22 13:11:56 2005
-+++ src/fr-command-tar.c	Fri Apr 22 13:16:00 2005
-@@ -221,6 +221,10 @@
+--- src/fr-command-tar.c.orig	Fri Jul  1 14:41:32 2005
++++ src/fr-command-tar.c	Sun Jul  3 19:03:01 2005
+@@ -222,6 +223,10 @@ begin_tar_command (FRCommand *comm)
+ #if defined (__SVR4) && defined (__sun)
  	if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) {
  		command = g_strdup ("/usr/sfw/bin/gtar");
- 	}
++	}
 +#elif defined(__FreeBSD__)
 +	if (g_file_test ("%%LOCALBASE%%/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) {
 +		command = g_strdup ("%%LOCALBASE%%/bin/gtar");
-+	}
+ 	}
  #endif
  	if (command != NULL)
- 		fr_process_begin_command (comm->process, command);