Update to 2.10.4:

version 2.10.4
--------------
	* New translations: gl, te
	* Updated translations: bg, hu, sl, vi, zh_TW

version 2.10.3
--------------
	* Fixed bug #162729: File Roller doesn't exit cleanly on invalid
	  archive extension.
	* Fixed bug #164894: crash on zip with incorrect filenames
	* Fixed bug #300895: Invalid read reported by valgrind.
	* Allow to open rar archives if rar OR unrar is available.
	* Display non valid utf8 filenames corretly.
	* Fixed creation of backups reselecting the original folder after
	  loading the backup options.

5 files changed, 9 insertions, 92 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index c2916b2925c..359a8af7e65 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2005/08/10 20:56:10 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2005/08/21 11:48:34 jmmv Exp $
 #
 
-DISTNAME=	file-roller-2.10.2
-PKGREVISION=	1
+DISTNAME=	file-roller-2.10.4
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.10/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,18 +22,6 @@ USE_PKGLOCALEDIR=	yes
 
 GCONF2_SCHEMAS=		file-roller.schemas
 
-EVAL_PREFIX+=		PREFIX.gtar=gtar
-PREFIX.gtar_DEFAULT=	${LOCALBASE}
-CPPFLAGS+=		-DFILEROLLER_TAR="\"${PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar\""
-
-EVAL_PREFIX+=		PREFIX.unzip=unzip
-PREFIX.unzip_DEFAULT=	${LOCALBASE}
-CPPFLAGS+=		-DFILEROLLER_UNZIP="\"${PREFIX.unzip}/bin/unzip\""
-
-EVAL_PREFIX+=		PREFIX.zip=zip
-PREFIX.zip_DEFAULT=	${LOCALBASE}
-CPPFLAGS+=		-DFILEROLLER_ZIP="\"${PREFIX.zip}/bin/zip\""
-
 BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
 BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
 BUILDLINK_DEPENDS.libglade2+=	libglade2>=2.4.0
diff --git a/archivers/file-roller/PLIST b/archivers/file-roller/PLIST
index 99f6b3673d9..cfe604dc289 100644
--- a/archivers/file-roller/PLIST
+++ b/archivers/file-roller/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2005/06/06 14:48:05 hira Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/08/21 11:48:34 jmmv Exp $
 bin/file-roller
 lib/bonobo/libfile-roller-component.la
 lib/bonobo/servers/File_Roller_Component.server
@@ -83,6 +83,7 @@ ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/file-roller.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/file-roller.mo
@@ -120,6 +121,7 @@ ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/sr@ije/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/file-roller.mo
+${PKGLOCALEDIR}/locale/te/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/tk/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/file-roller.mo
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 50e79795792..f81995177a2 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.16 2005/04/20 16:12:45 drochner Exp $
+$NetBSD: distinfo,v 1.17 2005/08/21 11:48:34 jmmv Exp $
 
-SHA1 (file-roller-2.10.2.tar.bz2) = 12befcfdc980229d683e5aa24044629b4e80516f
-RMD160 (file-roller-2.10.2.tar.bz2) = bac7293612619e4ed71bcbabae66b1f20a7e9916
-Size (file-roller-2.10.2.tar.bz2) = 1312427 bytes
-SHA1 (patch-aa) = 4d25ab05aa7261bac116d1a90e0269e0670e6da2
-SHA1 (patch-ab) = 68b1aae60cfe774c35382875bd37f611107ec3c7
+SHA1 (file-roller-2.10.4.tar.bz2) = 2b2ab70553a31a81902a4e59f8bb317b29b56caf
+RMD160 (file-roller-2.10.4.tar.bz2) = 222d8517a2d2ab867ca534b0f5916e721a050b9b
+Size (file-roller-2.10.4.tar.bz2) = 1307330 bytes
diff --git a/archivers/file-roller/patches/patch-aa b/archivers/file-roller/patches/patch-aa
deleted file mode 100644
index 9438e69e183..00000000000
--- a/archivers/file-roller/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/04/20 16:12:45 drochner Exp $
-
---- src/fr-command-tar.c.orig	2005-04-11 22:54:35.000000000 +0200
-+++ src/fr-command-tar.c
-@@ -212,6 +212,7 @@ add_compress_arg (FRCommand *comm)
- static void
- begin_tar_command (FRCommand *comm)
- {
-+#if 0
- 	char       *path = NULL;
- 	const char *prev_path = NULL;
- 	char       *temp = NULL;
-@@ -233,6 +234,8 @@ begin_tar_command (FRCommand *comm)
- 	temp = g_strdup_printf ("PATH=%s", prev_path);
- 	putenv (temp);
- 	g_free (temp);
-+#endif
-+	fr_process_begin_command (comm->process, FILEROLLER_TAR);
- }
- 
- 
diff --git a/archivers/file-roller/patches/patch-ab b/archivers/file-roller/patches/patch-ab
deleted file mode 100644
index 3aa88c84b14..00000000000
--- a/archivers/file-roller/patches/patch-ab
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/03/22 16:29:09 jmmv Exp $
-
---- src/fr-command-zip.c.orig	2005-03-07 13:29:37.000000000 +0100
-+++ src/fr-command-zip.c
-@@ -225,7 +225,7 @@ fr_command_zip_list (FRCommand *comm)
- 				      list__process_line,
- 				      comm);
- 
--	fr_process_begin_command (comm->process, "unzip");
-+	fr_process_begin_command (comm->process, FILEROLLER_UNZIP);
- 	fr_process_add_arg (comm->process, "-qq");
- 	fr_process_add_arg (comm->process, "-v");
- 	fr_process_add_arg (comm->process, "-l");
-@@ -268,7 +268,7 @@ fr_command_zip_add (FRCommand     *comm,
- 				      process_line__common,
- 				      comm);
- 
--	fr_process_begin_command (comm->process, "zip");
-+	fr_process_begin_command (comm->process, FILEROLLER_ZIP);
- 
- 	if (base_dir != NULL) 
- 		fr_process_set_working_dir (comm->process, base_dir);
-@@ -314,7 +314,7 @@ fr_command_zip_delete (FRCommand *comm,
- 				      process_line__common,
- 				      comm);
- 
--	fr_process_begin_command (comm->process, "zip");
-+	fr_process_begin_command (comm->process, FILEROLLER_ZIP);
- 	fr_process_add_arg (comm->process, "-d");
- 	add_filename_arg (comm);
- 
-@@ -343,7 +343,7 @@ fr_command_zip_extract (FRCommand  *comm
- 				      process_line__common,
- 				      comm);
- 
--	fr_process_begin_command (comm->process, "unzip");
-+	fr_process_begin_command (comm->process, FILEROLLER_UNZIP);
- 	
- 	if (dest_dir != NULL) {
- 		char *e_dest_dir = fr_command_escape (comm, dest_dir);
-@@ -381,7 +381,7 @@ static void
- fr_command_zip_test (FRCommand   *comm,
- 		     const char  *password)
- {
--	fr_process_begin_command (comm->process, "unzip");
-+	fr_process_begin_command (comm->process, FILEROLLER_UNZIP);
- 	fr_process_add_arg (comm->process, "-t");
- 	add_password_arg (comm, password, TRUE);
- 	add_filename_arg (comm);