Update gnome-vfs2 to 2.2.4. Changes are translation updates and bugfixes.

Most notably, this version fixes a series of fundamental, long outstanding
problems we had with GNOME2:

	* Nautilus works now

	* gnome-control-center no longer crashes

	* panel menus and entries are now correct

	* probably a ton of other gnome-vfs related problems

8 files changed, 13 insertions, 153 deletions

diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index 970c8d82e75..74d5eef4a1f 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/02/15 16:29:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2003/04/27 02:03:01 rh Exp $
 #
 
-DISTNAME=		gnome-vfs-2.2.2
+DISTNAME=		gnome-vfs-2.2.4
 PKGNAME=		${DISTNAME:S/vfs/vfs2/}
-PKGREVISION=		1
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/gnome-vfs2/PLIST b/sysutils/gnome-vfs2/PLIST
index 66a86001ef7..47ae7dd1131 100644
--- a/sysutils/gnome-vfs2/PLIST
+++ b/sysutils/gnome-vfs2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/02/14 20:10:02 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/04/27 02:03:01 rh Exp $
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h
@@ -210,15 +210,18 @@ ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
+${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gnome-vfs-2.0.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -233,6 +236,7 @@ ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -251,6 +255,7 @@ ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo
+${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
 @comment in GConf2: @dirrm share/gconf/schemas
diff --git a/sysutils/gnome-vfs2/buildlink2.mk b/sysutils/gnome-vfs2/buildlink2.mk
index a7684627b04..2106fda2a33 100644
--- a/sysutils/gnome-vfs2/buildlink2.mk
+++ b/sysutils/gnome-vfs2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/02/14 20:10:02 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/04/27 02:03:01 rh Exp $
 
 .if !defined(GNOME_VFS2_BUILDLINK2_MK)
 GNOME_VFS2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gnome-vfs2
-BUILDLINK_DEPENDS.gnome-vfs2?=	gnome-vfs2>=2.2.2
+BUILDLINK_DEPENDS.gnome-vfs2?=	gnome-vfs2>=2.2.4
 BUILDLINK_PKGSRCDIR.gnome-vfs2?=	../../sysutils/gnome-vfs2
 
 EVAL_PREFIX+=				BUILDLINK_PREFIX.gnome-vfs2=gnome-vfs2
diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
index faa2fa09141..2e487be2344 100644
--- a/sysutils/gnome-vfs2/distinfo
+++ b/sysutils/gnome-vfs2/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.6 2003/02/18 20:52:07 jmmv Exp $
+$NetBSD: distinfo,v 1.7 2003/04/27 02:03:01 rh Exp $
 
-SHA1 (gnome-vfs-2.2.2.tar.bz2) = 98c87820f17bd1b7fa75162f079e25ae515378b0
-Size (gnome-vfs-2.2.2.tar.bz2) = 988477 bytes
-SHA1 (patch-aa) = 31c919ba5d732a0b3f1950811adbc58ba9b50bb3
+SHA1 (gnome-vfs-2.2.4.tar.bz2) = 40518be379250cb8b6c611c2d585ea35403b3f53
+Size (gnome-vfs-2.2.4.tar.bz2) = 999711 bytes
 SHA1 (patch-ae) = fbe0fa8e2def2fec2cc55317a35638d8314287d2
 SHA1 (patch-ag) = 48a1a7e7b780bcf25f311abe0c48524c8fe9eaa4
 SHA1 (patch-ai) = 0cbdf095c4c55a770d13d443d904bb567fee3666
-SHA1 (patch-ak) = 37f441733d26817363440a34bba1a9b66b4bc132
-SHA1 (patch-al) = 8c27ab4e0f6af2b61e842cd19f3bf6d1e325d9f9
-SHA1 (patch-am) = 0e308fd9c5f842df4c75be2e36a06292f8e73cd6
diff --git a/sysutils/gnome-vfs2/patches/patch-aa b/sysutils/gnome-vfs2/patches/patch-aa
deleted file mode 100644
index 95c849bcb68..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/02/15 16:41:21 jmmv Exp $
-
-This patch is being tracked in bug #48255.
-See http://bugzilla.gnome.org/show_bug.cgi?id=48255 for more details.
-
---- libgnomevfs/gnome-vfs-job.h.orig	Thu Sep  5 18:37:46 2002
-+++ libgnomevfs/gnome-vfs-job.h	Thu Sep  5 18:37:51 2002
-@@ -37,7 +37,6 @@
- #include <libgnomevfs/gnome-vfs-async-ops.h>
- #include <libgnomevfs/gnome-vfs-module-callback.h>
- #include <libgnomevfs/gnome-vfs-module-callback-private.h>
--#include <semaphore.h>
- 
- typedef struct GnomeVFSJob GnomeVFSJob;
- 
diff --git a/sysutils/gnome-vfs2/patches/patch-ak b/sysutils/gnome-vfs2/patches/patch-ak
deleted file mode 100644
index c99683250ce..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-ak
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2003/02/15 16:29:33 jmmv Exp $
-
---- config.h.in.orig	Thu Jan 16 18:21:17 2003
-+++ config.h.in
-@@ -154,6 +157,9 @@
- 
- /* Define to 1 if you have the <sys/mount.h> header file. */
- #undef HAVE_SYS_MOUNT_H
-+
-+/* Define to 1 if you have the <sys/param.h> header file. */
-+#undef HAVE_SYS_PARAM_H
- 
- /* Define to 1 if you have the <sys/resource.h> header file. */
- #undef HAVE_SYS_RESOURCE_H
diff --git a/sysutils/gnome-vfs2/patches/patch-al b/sysutils/gnome-vfs2/patches/patch-al
deleted file mode 100644
index a019ed26add..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-al
+++ /dev/null
@@ -1,95 +0,0 @@
-$NetBSD: patch-al,v 1.2 2003/02/15 16:29:33 jmmv Exp $
-
-This patch is being tracked in bug #92844.
-See http://bugzilla.gnome.org/show_bug.cgi?id=92844 for more details.
-
---- modules/file-method.c.orig	2003-02-12 12:55:48.000000000 +0100
-+++ modules/file-method.c
-@@ -488,10 +488,10 @@ do_truncate (GnomeVFSMethod *method,
- 
- typedef struct {
- 	GnomeVFSURI *uri;
--	DIR *dir;
-+	GDir *dir;
- 	GnomeVFSFileInfoOptions options;
- 
--	struct dirent *current_entry;
-+	gchar *current_entry;
- 
- 	gchar *name_buffer;
- 	gchar *name_ptr;
-@@ -499,7 +499,7 @@ typedef struct {
- 
- static DirectoryHandle *
- directory_handle_new (GnomeVFSURI *uri,
--		      DIR *dir,
-+		      GDir *dir,
- 		      GnomeVFSFileInfoOptions options)
- {
- 	DirectoryHandle *result;
-@@ -511,9 +511,6 @@ directory_handle_new (GnomeVFSURI *uri,
- 	result->uri = gnome_vfs_uri_ref (uri);
- 	result->dir = dir;
- 
--	/* Reserve extra space for readdir_r, see man page */
--	result->current_entry = g_malloc (sizeof (struct dirent) + GET_PATH_MAX() + 1);
--
- 	full_name = get_path_from_uri (uri);
- 	g_assert (full_name != NULL); /* already done by caller */
- 	full_name_len = strlen (full_name);
-@@ -538,7 +535,6 @@ directory_handle_destroy (DirectoryHandl
- {
- 	gnome_vfs_uri_unref (directory_handle->uri);
- 	g_free (directory_handle->name_buffer);
--	g_free (directory_handle->current_entry);
- 	g_free (directory_handle);
- }
- 
-@@ -737,13 +733,13 @@ do_open_directory (GnomeVFSMethod *metho
- 		   GnomeVFSContext *context)
- {
- 	gchar *directory_name;
--	DIR *dir;
-+	GDir *dir;
- 
- 	directory_name = get_path_from_uri (uri);
- 	if (directory_name == NULL)
- 		return GNOME_VFS_ERROR_INVALID_URI;
- 
--	dir = opendir (directory_name);
-+	dir = g_dir_open (directory_name, 0, NULL);
- 	g_free (directory_name);
- 	if (dir == NULL)
- 		return gnome_vfs_result_from_errno ();
-@@ -764,7 +760,7 @@ do_close_directory (GnomeVFSMethod *meth
- 
- 	directory_handle = (DirectoryHandle *) method_handle;
- 
--	closedir (directory_handle->dir);
-+	g_dir_close (directory_handle->dir);
- 
- 	directory_handle_destroy (directory_handle);
- 
-@@ -784,20 +780,9 @@ do_read_directory (GnomeVFSMethod *metho
- 
- 	handle = (DirectoryHandle *) method_handle;
- 	
--	errno = 0;
--	if (readdir_r (handle->dir, handle->current_entry, &result) != 0) {
--		/* Work around a Solaris bug.
--		 * readdir64_r returns -1 instead of 0 at EOF.
--		 */
--		if (errno == 0) {
--			return GNOME_VFS_ERROR_EOF;
--		}
--		return gnome_vfs_result_from_errno ();
--	}
--	
--	if (result == NULL) {
-+	handle->current_entry = g_dir_read_name (handle->dir);
-+	if (handle->current_entry == NULL)
- 		return GNOME_VFS_ERROR_EOF;
--	}
- 
- 	file_info->name = g_strdup (result->d_name);
- 
diff --git a/sysutils/gnome-vfs2/patches/patch-am b/sysutils/gnome-vfs2/patches/patch-am
deleted file mode 100644
index 86efd3e5f57..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-am,v 1.3 2003/02/15 16:29:33 jmmv Exp $
-
-This patch is being tracked in bug #104413.
-See http://bugzilla.gnome.org/show_bug.cgi?id=104413 for more details.
-
---- configure.orig	Mon Jan 20 20:32:45 2003
-+++ configure
-@@ -12060,7 +12060,7 @@ esac
- 
- 
- 
--for ac_header in sys/resource.h sys/vfs.h sys/mount.h sys/statvfs.h
-+for ac_header in sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statvfs.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then