Update gnome-vfs2* to 2.12.2:

* Correctly resolve nested symlinks without accessing
  invalid memory
* Synch xdgmime with upstream to fix handling of the
  mime cache
* Improve parsing of files which have names that match dates,
  years or times of day.
* Correctly return GNOME_VFS_ERROR_CANCELLED if an
  authentication was cancelled in the ftp, sftp and smb method
* Fix problem with multiple cd volumes
* Add logic for Win32 so we won't return crap like /x:/foo/bar.zap
  and fix handling of file overwrites.

5 files changed, 8 insertions, 87 deletions

diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index d07dfcb3277..e710da84875 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2005/12/31 12:32:45 wiz Exp $
-
-PKGREVISION=		2
+# $NetBSD: Makefile,v 1.54 2006/01/20 13:29:13 jmmv Exp $
 
 PKGCONFIG_OVERRIDE=	gnome-vfs-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gnome-vfs-module-2.0.pc.in
diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common
index efe12c0a94d..feda88f4a95 100644
--- a/sysutils/gnome-vfs2/Makefile.common
+++ b/sysutils/gnome-vfs2/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.28 2006/01/16 17:57:53 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.29 2006/01/20 13:29:13 jmmv Exp $
 #
 
-DISTNAME=		gnome-vfs-2.12.1.1
+DISTNAME=		gnome-vfs-2.12.2
 PKGNAME=		${DISTNAME:S/vfs/vfs2/}
 CATEGORIES?=		sysutils
 CATEGORIES+=		gnome
diff --git a/sysutils/gnome-vfs2/PLIST b/sysutils/gnome-vfs2/PLIST
index e9c3100ce28..d1ea47a0ba0 100644
--- a/sysutils/gnome-vfs2/PLIST
+++ b/sysutils/gnome-vfs2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2005/12/04 16:49:45 hira Exp $
+@comment $NetBSD: PLIST,v 1.19 2006/01/20 13:29:13 jmmv Exp $
 bin/gnomevfs-cat
 bin/gnomevfs-copy
 bin/gnomevfs-info
@@ -73,66 +73,6 @@ lib/libgnomevfs-2.la
 lib/pkgconfig/gnome-vfs-2.0.pc
 lib/pkgconfig/gnome-vfs-module-2.0.pc
 libexec/gnome-vfs-daemon
-share/doc/gnome-vfs-2.0/about.html
-share/doc/gnome-vfs-2.0/advanced-operations.html
-share/doc/gnome-vfs-2.0/data-types.html
-share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-dns-sd.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-drive.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html
-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
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-resolve.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html
-share/doc/gnome-vfs-2.0/gnome-vfs-file-and-dirs-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html
-share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html
-share/doc/gnome-vfs-2.0/home.png
-share/doc/gnome-vfs-2.0/index.html
-share/doc/gnome-vfs-2.0/index.sgml
-share/doc/gnome-vfs-2.0/left.png
-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/gconf/schemas/desktop_default_applications.schemas
@@ -218,7 +158,6 @@ ${PKGLOCALEDIR}/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
 @comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/examples/gnome-vfs-2.0/modules
 @dirrm share/examples/gnome-vfs-2.0
-@dirrm share/doc/gnome-vfs-2.0
 @dirrm lib/gnome-vfs-2.0/modules
 @dirrm lib/gnome-vfs-2.0/include
 @dirrm lib/gnome-vfs-2.0
diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
index 6718d3e1760..e543f70c189 100644
--- a/sysutils/gnome-vfs2/distinfo
+++ b/sysutils/gnome-vfs2/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.45 2006/01/01 17:31:53 jmmv Exp $
+$NetBSD: distinfo,v 1.46 2006/01/20 13:29:13 jmmv Exp $
 
-SHA1 (gnome-vfs-2.12.1.1.tar.bz2) = 48e484663f0d0f5e2a858d2f6e6a5a702e831734
-RMD160 (gnome-vfs-2.12.1.1.tar.bz2) = b96cd620ce60131c0ff467fd277d89ac76419e09
-Size (gnome-vfs-2.12.1.1.tar.bz2) = 1726588 bytes
+SHA1 (gnome-vfs-2.12.2.tar.bz2) = fa8248e18cb8b44f617a5b1bb776df37628828ea
+RMD160 (gnome-vfs-2.12.2.tar.bz2) = 831d83c791631e7273fdebec1047da6055757104
+Size (gnome-vfs-2.12.2.tar.bz2) = 1558218 bytes
 SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db
 SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5
-SHA1 (patch-ac) = b34fe25b6881aeb91ac2e36db82234347a0f655b
 SHA1 (patch-ad) = fe233b03b0fc97f7bd34b29d79fef38f900365f4
 SHA1 (patch-ae) = 572b40dfa035dab5ef374aa73d2acacfcb72d641
 SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56
diff --git a/sysutils/gnome-vfs2/patches/patch-ac b/sysutils/gnome-vfs2/patches/patch-ac
deleted file mode 100644
index 23fb631a579..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2005/11/19 16:24:57 kristerw Exp $
-
---- libgnomevfs/xdgmimecache.c.orig	2005-11-19 16:35:49.000000000 +0100
-+++ libgnomevfs/xdgmimecache.c	2005-11-19 16:36:26.000000000 +0100
-@@ -79,8 +79,8 @@
-   char   *buffer;
- };
- 
--#define GET_UINT16(cache,offset) (ntohs(*(uint16_t*)((cache) + (offset))))
--#define GET_UINT32(cache,offset) (ntohl(*(uint32_t*)((cache) + (offset))))
-+#define GET_UINT16(cache,offset) (ntohs(*(xdg_uint16_t*)((cache) + (offset))))
-+#define GET_UINT32(cache,offset) (ntohl(*(xdg_uint32_t*)((cache) + (offset))))
- 
- XdgMimeCache *
- _xdg_mime_cache_ref (XdgMimeCache *cache)