Update to 2.11.2.

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

5 files changed, 29 insertions, 10 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 1ab43f9c0..7868d881c 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/fileroller/Makefile,v 1.72 2005/06/28 05:39:56 adamw Exp $
+#   $MCom: ports/archivers/fileroller/Makefile,v 1.73 2005/07/01 17:53:21 marcus Exp $
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.11.1
+PORTVERSION=	2.11.2
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -38,6 +38,8 @@ GCONF_SCHEMAS=	file-roller.schemas
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/src/fr-command-tar.c
+	@${FIND} ${WRKSRC} -name "fr-command-*.c" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|atoll|fr_atoll|g'
 
 post-install:
 	@-update-desktop-database
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index d20c2bba0..69067ec2d 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/file-roller-2.11.1.tar.bz2) = 23712722f476d7849654ea2edcb4eda5
-SIZE (gnome2/file-roller-2.11.1.tar.bz2) = 1312995
+MD5 (gnome2/file-roller-2.11.2.tar.bz2) = ff7887808791ae8bb935dad59528c34d
+SIZE (gnome2/file-roller-2.11.2.tar.bz2) = 1313605
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);
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 2659caaf1..c5c9eaaa8 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -103,6 +103,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/gl/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