Update gnome-vfs2, gnome-vfs2-cdda and gnome-vfs2-smb to 2.10.0:

gnome-vfs 2.10.0
    * Translation updates

    Note: The handling of dav:// and http:// changed with this release.
     If you use http:// the http-method will be in http-only
     mode and won't try to retrive file information through webdav.
     Be sure to use dav:// and davs:// for webdav resources!

gnome-vfs 2.9.93

    * Bugs fixed:
	+ smb-method: fix browsing of (non-domain) workgroups and
                      browsing of Windows machines not on a domain

gnome-vfs 2.9.92

    * Bugs fixed:
	+ Fix some tests
	+ smb-method: Fix crashes when user specified in uri
	+ smb-method: Some authentication fixes
	+ sftp-method: fix memory leaks
	+ Make GnomeVFSSocket handle cancellation earlier
	+ ftp-method: Fix access rights
	+ Return OK on read/writes of 0 bytes, even at eof
	+ Make gnome_vfs_read_entire_file nul-terminate the string
	  to fix some apps that depended on this
	+ Get right mime description for folders.

gnome-vfs 2.9.91

    Note: The handling of dav:// and http:// changed with this release.
     If you use http:// the http-mehtod will be in http-only
     mode and won't try to retrive file information through webdav.
     Be sure to use dav:// and davs:// for webdav resources!

    * Features:
	+ Browse for the new sftp-ssh service

    * Bugs fixed:
	+ fix gnomevfs-copy to have cp semantics so it
	  won't override directories
	+ fix copying data to FAT 16 file systems
	+ sftp-method: clear up closed ssh connections and processes
	+ sftp-method: increased timeout for initiating connections
	+ http-method: work around broken icecast server
	+ http-method: update to neon version 0.24.7
	+ http-method: fix a possible crasher and plug a few leaks
	+ ftp-method: fix directory listings for windows ftp servers
	+ smb-method: fix connection cache lookups
	+ fix gnome_vfs_uri_extract_short_name to never return NULL
	+ better default folder handler mechanism
	+ fix bad grammar in http-proxy schema file
	+ various doc and translation updates
	+ build fixes

gnome-vfs 2.9.90

    * Features:
	+ support for joliet cdrom labels
	+ allow eject of unmounted volumes
	+ use posix_fadvice when doing large copies
	  to avoid bad cache behaviour
	+ Better smb authentication behaviour,
	  now uses the same password on all the shares
	  on a server.
	+ Update to the API for no auto login that was
	  commited to samba
	+ Support setgid directories in gnome-vfs-xfer

    * Bugs fixed:
	+ sftp: fix crash
	+ fix deadlock in gnome-vfs daemon with hal enabled

gnome-vfs 2.9.3

    * Features:
	+ gnomevfs-mv program added
	+ Added GNOME_VFS_OPEN_TRUNCATE open flag

    * Bugs fixed:
	+ smb: New mechanism for handling authentication

	  NOTE: This should work a lot better then before, but unless
	  you first apply the samba patch from
	  https://bugzilla.samba.org/show_bug.cgi?id=2092
	  there can be problems with logging in as a user on shares
	  that support anonymous logins.

	+ sftp: Honour force_replace flag in move
	+ use right icon name field in mime files
	+ fix mimetype detection for names with a dot in
	+ build fixes on IA64

gnome-vfs 2.9.2

    * Features:
	+ Deprecate parts of GnomeVFSMimeApplication structure
	+ AIX support
	+ Better mime detection
	+ New HAL support for volumes/drives

    * Bugs fixed:
	+ Fix memory leak
	+ Detect mime data changed in mime monitor
	+ Fix EOF problem in sftp method

gnome-vfs 2.9.1

    * Features:
        + removed the vfolder and cdemenu methods
	+ Updated the mime handler APIs, deprecated some old APIs

    * Bugs fixed:
        + Fixed bogus gcc warnings

8 files changed, 25 insertions, 104 deletions

diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index 37b5c825520..936eed68cb6 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,20 +1,13 @@
-# $NetBSD: Makefile,v 1.47 2005/03/18 19:28:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.48 2005/03/22 15:56:41 jmmv Exp $
 #
 
 PKGCONFIG_OVERRIDE=	gnome-vfs-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gnome-vfs-module-2.0.pc.in
 
-OWN_DIRS=		${PKG_SYSCONFDIR}/modules ${PKG_SYSCONFDIR}/vfolders
+OWN_DIRS=		${PKG_SYSCONFDIR}/modules
 
 EGFILES+=		modules/default-modules.conf
 EGFILES+=		modules/ssl-modules.conf
-EGFILES+=		vfolders/applications-all-users.vfolder-info
-EGFILES+=		vfolders/favorites.vfolder-info
-EGFILES+=		vfolders/network.vfolder-info
-EGFILES+=		vfolders/preferences-all-users.vfolder-info
-EGFILES+=		vfolders/server-settings.vfolder-info
-EGFILES+=		vfolders/start-here.vfolder-info
-EGFILES+=		vfolders/system-settings.vfolder-info
 
 GCONF2_SCHEMAS=		desktop_default_applications.schemas
 GCONF2_SCHEMAS+=	desktop_gnome_url_handlers.schemas
@@ -24,6 +17,8 @@ GCONF2_SCHEMAS+=	system_smb.schemas
 
 LDFLAGS.Darwin+=	-lresolv
 
+BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
+
 .include "Makefile.common"
 
 .include "../../devel/GConf2/schemas.mk"
diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common
index b820e508f1f..2b6cf4a3a62 100644
--- a/sysutils/gnome-vfs2/Makefile.common
+++ b/sysutils/gnome-vfs2/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.10 2005/02/26 17:23:01 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.11 2005/03/22 15:56:41 jmmv Exp $
 #
 
-DISTNAME=		gnome-vfs-2.8.4
+DISTNAME=		gnome-vfs-2.10.0
 PKGNAME=		${DISTNAME:S/vfs/vfs2/}
 CATEGORIES?=		sysutils
 CATEGORIES+=		gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/2.8/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/2.10/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -18,6 +18,7 @@ DISTINFO_FILE=		${.CURDIR}/../../sysutils/gnome-vfs2/distinfo
 PATCHDIR=		${.CURDIR}/../../sysutils/gnome-vfs2/patches
 
 GNU_CONFIGURE=		YES
+LIBTOOL_REQD=		1.5.14
 USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 USE_GNU_TOOLS+=		make
@@ -70,7 +71,7 @@ SUBST_STAGE.libs=       pre-configure
 SUBST_FILES.libs=       modules/Makefile.in
 SUBST_SED.libs=         -e 's|../libgnomevfs/libgnomevfs-2.la|${BUILDLINK_PREFIX.gnome-vfs2}/lib/libgnomevfs-2.la|g'
 
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.8.3
+BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gnome-vfs-2.0\/modules$$/ \
diff --git a/sysutils/gnome-vfs2/PLIST b/sysutils/gnome-vfs2/PLIST
index 7f77acf9389..eb6ff7c95a6 100644
--- a/sysutils/gnome-vfs2/PLIST
+++ b/sysutils/gnome-vfs2/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.14 2005/02/26 17:23:01 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/03/22 15:56:41 jmmv Exp $
 bin/gnomevfs-cat
 bin/gnomevfs-copy
 bin/gnomevfs-info
 bin/gnomevfs-ls
 bin/gnomevfs-mkdir
+bin/gnomevfs-mv
 bin/gnomevfs-rm
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h
@@ -20,6 +21,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h
@@ -65,7 +67,6 @@ lib/gnome-vfs-2.0/modules/libnetwork.la
 lib/gnome-vfs-2.0/modules/libnntp.la
 lib/gnome-vfs-2.0/modules/libsftp.la
 lib/gnome-vfs-2.0/modules/libtar.la
-lib/gnome-vfs-2.0/modules/libvfolder-desktop.la
 lib/gnome-vfs-2.0/modules/libvfs-pipe.la
 lib/gnome-vfs-2.0/modules/libvfs-test.la
 lib/gnome-vfs-2.0/modules/libvfs-translate.la
@@ -96,6 +97,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database-deprecated.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html
@@ -129,17 +131,11 @@ share/doc/gnome-vfs-2.0/mime-registry.html
 share/doc/gnome-vfs-2.0/modules.html
 share/doc/gnome-vfs-2.0/networking.html
 share/doc/gnome-vfs-2.0/right.png
+share/doc/gnome-vfs-2.0/style.css
 share/doc/gnome-vfs-2.0/up.png
 share/doc/gnome-vfs-2.0/volumes.html
 share/examples/gnome-vfs-2.0/modules/default-modules.conf
 share/examples/gnome-vfs-2.0/modules/ssl-modules.conf
-share/examples/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info
-share/examples/gnome-vfs-2.0/vfolders/favorites.vfolder-info
-share/examples/gnome-vfs-2.0/vfolders/network.vfolder-info
-share/examples/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info
-share/examples/gnome-vfs-2.0/vfolders/server-settings.vfolder-info
-share/examples/gnome-vfs-2.0/vfolders/start-here.vfolder-info
-share/examples/gnome-vfs-2.0/vfolders/system-settings.vfolder-info
 share/gconf/schemas/desktop_default_applications.schemas
 share/gconf/schemas/desktop_gnome_url_handlers.schemas
 share/gconf/schemas/system_dns_sd.schemas
@@ -213,12 +209,12 @@ ${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/xh/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
 ${PKGLOCALEDIR}/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
 @comment in GConf2: @dirrm share/gconf/schemas
-@dirrm share/examples/gnome-vfs-2.0/vfolders
 @dirrm share/examples/gnome-vfs-2.0/modules
 @dirrm share/examples/gnome-vfs-2.0
 @dirrm share/doc/gnome-vfs-2.0
diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
index de8ee4ba937..dea210b6f56 100644
--- a/sysutils/gnome-vfs2/distinfo
+++ b/sysutils/gnome-vfs2/distinfo
@@ -1,21 +1,18 @@
-$NetBSD: distinfo,v 1.33 2005/02/26 17:23:01 jmmv Exp $
+$NetBSD: distinfo,v 1.34 2005/03/22 15:56:41 jmmv Exp $
 
-SHA1 (gnome-vfs-2.8.4.tar.bz2) = cb88f0c828f0750cc64336f314c84fe32bd21842
-RMD160 (gnome-vfs-2.8.4.tar.bz2) = c1037fca36955adaece9a1a78958d87217fcaf15
-Size (gnome-vfs-2.8.4.tar.bz2) = 1892413 bytes
+SHA1 (gnome-vfs-2.10.0.tar.bz2) = ae6524a48a6acc43db58cc1d0c63132977e5fbf3
+RMD160 (gnome-vfs-2.10.0.tar.bz2) = 528962e887c8e6690a710c13e0910f69fbe1ae4d
+Size (gnome-vfs-2.10.0.tar.bz2) = 1901027 bytes
 SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db
 SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5
 SHA1 (patch-ad) = 326e835c7fd1d2e25ac2ae4736347d38ffe8ea06
 SHA1 (patch-ae) = 32fe1a4e82d96bf80f3364704e7369a4ee778e0f
-SHA1 (patch-af) = 2bfce4e7612e8e1322f870e256d2ba9b587d79ff
+SHA1 (patch-af) = ebbd81c92403cd429a807f9a89c81971d1c4fb88
 SHA1 (patch-ag) = 78f7d50beaeab8b33c554e6cfaf510cdba3b00ba
-SHA1 (patch-ai) = bbe89dcefd6ac8d825465e4d9b316b9fad70ce19
 SHA1 (patch-am) = 95dac9be508330e58da933b6dc745fceb51135c0
-SHA1 (patch-an) = d2fab7ac496964856bfa9352c5e0ada7f406ed86
 SHA1 (patch-ao) = 38bd5859bff41642c2d1a26c16d90d780387b2d0
 SHA1 (patch-ap) = f13b6a4e0740a211e87bd820a266b2ce038f932c
 SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b
 SHA1 (patch-ar) = 99c99d0d90ed7a0d804b349f532d3a17c780d506
-SHA1 (patch-as) = 1ac0cc66541c1e7ce62d205a05cc6cb446cec39d
 SHA1 (patch-at) = b75ad2f2accb0ca8986f8c4e2771028fceca41b4
 SHA1 (patch-au) = e3c681dd445d0774981a50eb22ae14ff4db5902c
diff --git a/sysutils/gnome-vfs2/patches/patch-af b/sysutils/gnome-vfs2/patches/patch-af
index 2f7cf9b0a6e..0459d4fcdf2 100644
--- a/sysutils/gnome-vfs2/patches/patch-af
+++ b/sysutils/gnome-vfs2/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.6 2004/11/09 16:04:52 sketch Exp $
+$NetBSD: patch-af,v 1.7 2005/03/22 15:56:41 jmmv Exp $
 
---- libgnomevfs/gnome-vfs-cdrom.c.orig	Sun Oct 24 16:56:46 2004
-+++ libgnomevfs/gnome-vfs-cdrom.c	Sun Oct 24 16:56:17 2004
+--- libgnomevfs/gnome-vfs-cdrom.c.orig	2005-02-10 11:00:21.000000000 +0100
++++ libgnomevfs/gnome-vfs-cdrom.c
 @@ -37,6 +37,8 @@
  
  #ifdef __linux__
@@ -11,19 +11,7 @@ $NetBSD: patch-af,v 1.6 2004/11/09 16:04:52 sketch Exp $
  #endif
  
  #ifdef HAVE_SYS_CDIO_H
-@@ -87,8 +89,9 @@
- 	}
- 
- 	return type;
--#elif defined(HAVE_SYS_MNTCTL_H)
--	return CDS_NO_INFO;
-+#elif defined(__linux__)
-+	*fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
-+	return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT);
- #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 	struct ioc_toc_header header;
- #if defined(__FreeBSD__) || defined(__DragonFly__)
-@@ -143,6 +146,7 @@
+@@ -143,6 +145,7 @@ _gnome_vfs_get_cdrom_type (const char *v
  #endif /* defined(__FreeBSD__) */
  	return type;
  #else
@@ -31,7 +19,7 @@ $NetBSD: patch-af,v 1.6 2004/11/09 16:04:52 sketch Exp $
  	*fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
  	if (*fd  < 0) {
  		return -1;
-@@ -153,6 +157,7 @@
+@@ -153,6 +156,7 @@ _gnome_vfs_get_cdrom_type (const char *v
  		return -1;
  	}
  	return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT);
diff --git a/sysutils/gnome-vfs2/patches/patch-ai b/sysutils/gnome-vfs2/patches/patch-ai
deleted file mode 100644
index 7da8e07bcd2..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.9 2004/11/28 13:00:17 recht Exp $
-
---- modules/vfolder/Makefile.in.orig	Thu Oct 28 16:16:58 2004
-+++ modules/vfolder/Makefile.in	Sat Nov 27 20:52:43 2004
-@@ -276,7 +276,7 @@
- 
- 
- ###  Default .vfolder-info files
--vfolderdir = $(sysconfdir)/gnome-vfs-2.0/vfolders
-+vfolderdir = $(datadir)/examples/gnome-vfs-2.0/vfolders
- vfolder_DATA = \
- 	applications-all-users.vfolder-info 	\
- 	network.vfolder-info			\
diff --git a/sysutils/gnome-vfs2/patches/patch-an b/sysutils/gnome-vfs2/patches/patch-an
deleted file mode 100644
index bd65a865b40..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-an
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/09/22 08:37:27 jmmv Exp $
-
---- libgnomevfs/gnome-vfs-dns-sd.c.orig	2004-08-16 15:10:01.000000000 +0200
-+++ libgnomevfs/gnome-vfs-dns-sd.c
-@@ -48,6 +48,16 @@
- 
- #define DNS_REPLY_SIZE (64*1024)
- 
-+#if !defined(NS_MAXDNAME) && !defined(NS_HFIXEDSZ)
-+#  define NS_MAXDNAME MAXDNAME
-+#  define NS_HFIXEDSZ HFIXEDSZ
-+#  define ns_c_in C_IN
-+#  define ns_t_any T_ANY
-+#  define ns_t_ptr T_PTR
-+#  define ns_t_srv T_SRV
-+#  define ns_t_txt T_TXT
-+#endif
-+
- /* Unicast DNS browsing: */
- 
- typedef struct {
diff --git a/sysutils/gnome-vfs2/patches/patch-as b/sysutils/gnome-vfs2/patches/patch-as
deleted file mode 100644
index f844e909c9e..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-as
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-as,v 1.1 2005/01/11 12:32:53 jmmv Exp $
-
---- libgnomevfs/eggdirfuncs.c.orig	2004-07-22 05:54:52.000000000 +0200
-+++ libgnomevfs/eggdirfuncs.c
-@@ -106,7 +106,7 @@ egg_get_secondary_data_dirs (void)
-   data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
- 
-   if (!data_dirs || !data_dirs[0])
--    data_dirs = "/usr/local/share/:/usr/share/";
-+    data_dirs = PREFIX "/share/";
- 
-   data_dir_vector = g_strsplit (data_dirs, ":", 0);
- 
-@@ -132,7 +132,7 @@ egg_get_secondary_configuration_dirs (vo
-   conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
- 
-   if (!conf_dirs || !conf_dirs[0])
--    conf_dirs = "/etc/xdg";
-+    conf_dirs = PKG_SYSCONFDIR "/xdg";
- 
-   conf_dir_vector = g_strsplit (conf_dirs, ":", 0);
-