Update to 2.10.0:

version 2.10.0
--------------
	* Updated translations: it, sr, sr@Latn, lt, hu.

version 2.9.92
--------------
	* Fixed bug #157698: Default new archive name as the first-added object.
	* Fixed bug #168477: Create Archive should leave status window in the
	  background while creating multiple folder archives.
	* Fixed bug #159952: file-roller compilation error.
	* Fixed bug #166658: Archives should only be processed if command-line
	  utility is present.
	* Fixed bug #144953: ISO reading assumes Joliet and Rock Ridge
          extensions.

version 2.9.91
--------------
	* Updated recent-files from libegg.

version 2.9.4
-------------
	* Fixed bug #100927: should use GNOME mouse click settings.

version 2.9.3
-------------
	* Fixed bug #132555: file-roller does not honor system-wide toolbar
	  setting.
	* Fixed bug #162188: RAR archives' directories are not recognized
          properly.
	* Fixed bug #162324: Cannot drag files from gthumb to file-roller

version 2.9.2
-------------
	* Fixed bug #152129: Unnecessary call to _window_update_sensitivity()
	* Fixed bug #154821: file-roller can't open archives with extension
          .lha
	* Fixed bug #154398: Remove some useless code.
	* Fixed bug #154233: load_icon_file optimization.
	* Fixed bug #161141: Time of modifcation incorrect
	* Fixed bug #161147: View->Toolbars inconsistent across multiple
	  instance.
	* Fixed bug #160617: "Create archive" context menu item does not
	  support single-file bz2 or gz
	* Fixed bug #160401: create archive doesn't work on read-only CD-ROM
	* Fixed bug #159906: the configure.in should update its gnome-vfs
	  requirement.
	* Fixed bug #160221: No more "extract here" entry in Nautilus
 	  context menu.
	* Use 'extract to...' if the archive location is write only.
	* Fixed loading of rar archives with directories.

version 2.9.1
-------------
        * Added a 'Open Recent' menu item on the toolbar.
	* Added password support and testing to RAR archives.
	* Fixed bug #145162] .omf.out and omf_timestamp files should not be in
	  cvs.
	* Fixed bug #159172: tooltips leaked.
	* Fixed bug #159464: Should not use deprecate mime API
	* Make logo icon to use the theme icon.

version 2.9.0
-------------
	* Added AR, Debian and 7-zip archives support.
	* Open the "open with" dialog if the file type does not
	  have a registered application; get rid of the internal viewer.
	* Make the text invisible for the password entries.
	* Removed Select All/Deselect All from the context menu.

4 files changed, 25 insertions, 16 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index aa32a0a2609..29200693f23 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2005/02/26 17:25:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.36 2005/03/22 16:29:09 jmmv Exp $
 #
 
-DISTNAME=	file-roller-2.8.4
+DISTNAME=	file-roller-2.10.0
 CATEGORIES=	archivers gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.8/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.10/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
@@ -36,6 +36,10 @@ 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
+
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -46,6 +50,7 @@ CPPFLAGS+=		-DFILEROLLER_ZIP="\"${PREFIX.zip}/bin/zip\""
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/archivers/file-roller/PLIST b/archivers/file-roller/PLIST
index e3ced52795d..798b10fca3e 100644
--- a/archivers/file-roller/PLIST
+++ b/archivers/file-roller/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.12 2004/10/28 19:09:13 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.13 2005/03/22 16:29:09 jmmv Exp $
 bin/file-roller
 lib/bonobo/libfile-roller-component.la
 lib/bonobo/servers/File_Roller_Component.server
+lib/nautilus/extensions-1.0/libnautilus-fileroller.la
 share/application-registry/file-roller.applications
 share/applications/file-roller.desktop
 share/file-roller/glade/file_roller.glade
@@ -44,10 +45,11 @@ 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/figures/file-roller_home.png
+share/gnome/help/file-roller/uk/figures/file-roller_leftarrow.png
+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/uk/legal.xml
 share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png
@@ -122,6 +124,7 @@ ${PKGLOCALEDIR}/locale/tk/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/file-roller.mo
+${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/file-roller.mo
 share/mime-info/file-roller.keys
@@ -177,4 +180,5 @@ share/pixmaps/file-roller.png
 @dirrm share/file-roller
 @comment in xdg-dirs: @dirrm share/applications
 @comment in xdg-dirs: @dirrm share/application-registry
+@comment in nautilus: @dirrm lib/nautilus/extensions-1.0
 @comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index ff339cd7392..d19c304e626 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2005/02/26 17:25:58 jmmv Exp $
+$NetBSD: distinfo,v 1.15 2005/03/22 16:29:09 jmmv Exp $
 
-SHA1 (file-roller-2.8.4.tar.bz2) = 2785366a17274a21babeffe62f54341214e08634
-RMD160 (file-roller-2.8.4.tar.bz2) = a40a764a4c807d18d7403651961049a548213931
-Size (file-roller-2.8.4.tar.bz2) = 1410279 bytes
+SHA1 (file-roller-2.10.0.tar.bz2) = 26d95ffacd765e92884972156aaf75d3f4c42dfb
+RMD160 (file-roller-2.10.0.tar.bz2) = ef387fc02b591f26950de49247c1f9e4c61fc341
+Size (file-roller-2.10.0.tar.bz2) = 1311026 bytes
 SHA1 (patch-aa) = ab3ba9f2acd38e24f55e5f4c0be903df7c5995c9
-SHA1 (patch-ab) = 849a501e0bb6b3babc6a1247945c81ba1310e274
+SHA1 (patch-ab) = 68b1aae60cfe774c35382875bd37f611107ec3c7
diff --git a/archivers/file-roller/patches/patch-ab b/archivers/file-roller/patches/patch-ab
index 4940d0eeb04..3aa88c84b14 100644
--- a/archivers/file-roller/patches/patch-ab
+++ b/archivers/file-roller/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2004/04/01 18:56:04 jmmv Exp $
+$NetBSD: patch-ab,v 1.3 2005/03/22 16:29:09 jmmv Exp $
 
---- src/fr-command-zip.c.orig	2004-03-08 10:20:07.000000000 +0100
+--- 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,
@@ -37,7 +37,7 @@ $NetBSD: patch-ab,v 1.2 2004/04/01 18:56:04 jmmv Exp $
 +	fr_process_begin_command (comm->process, FILEROLLER_UNZIP);
  	
  	if (dest_dir != NULL) {
- 		char *e_dest_dir = shell_escape (dest_dir);
+ 		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)