update to 2.14.2

xhanges:
* fix timout error string
* Use less connections for smb
* fix crash on cd eject
* ftp: handle anon login failure better
* Handle more parameter expansions in desktop files
* Hide automountable drives in various places, except in computer://
* ftp: handler files larger than 2 gig better
* Fix some locking issues in the mime code

3 files changed, 18 insertions, 21 deletions

diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common
index d4a8242d9c9..34614577931 100644
--- a/sysutils/gnome-vfs2/Makefile.common
+++ b/sysutils/gnome-vfs2/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.35 2006/04/27 21:14:34 drochner Exp $
+# $NetBSD: Makefile.common,v 1.36 2006/05/31 18:32:40 drochner Exp $
 #
 
-GNOME_VFS2_VERSION=	2.14.1
+GNOME_VFS2_VERSION=	2.14.2
 
 DISTNAME=		gnome-vfs-${GNOME_VFS2_VERSION}
 PKGNAME=		${DISTNAME:S/vfs/vfs2/}
diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
index 5bf4d169cce..3796639f159 100644
--- a/sysutils/gnome-vfs2/distinfo
+++ b/sysutils/gnome-vfs2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.52 2006/04/27 21:14:34 drochner Exp $
+$NetBSD: distinfo,v 1.53 2006/05/31 18:32:40 drochner Exp $
 
-SHA1 (gnome-vfs-2.14.1.tar.bz2) = 9cffc2b5c95ad6e082276343a4fcf73fd2bca176
-RMD160 (gnome-vfs-2.14.1.tar.bz2) = bdd11adbc4063021aeec3b14dae66db6eeec0035
-Size (gnome-vfs-2.14.1.tar.bz2) = 1813793 bytes
+SHA1 (gnome-vfs-2.14.2.tar.bz2) = ffd2e5f229495f55587d8499e5f2b8b8a76e5448
+RMD160 (gnome-vfs-2.14.2.tar.bz2) = e0a67e3576d72a86c898208a93ad8ee52f72f870
+Size (gnome-vfs-2.14.2.tar.bz2) = 1816194 bytes
 SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db
 SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5
 SHA1 (patch-ad) = 5df81a0bf979f710912b42883658c10d198cca87
-SHA1 (patch-ae) = 841dd04980013448d478bfbe61cbc9e4ac0a0376
+SHA1 (patch-ae) = 7b4f3182d676278e96f0e0cb4c145c915d8ffe3e
 SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56
 SHA1 (patch-ah) = 0927ade189c14472e5768b7e4775854de519f19c
 SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2
diff --git a/sysutils/gnome-vfs2/patches/patch-ae b/sysutils/gnome-vfs2/patches/patch-ae
index 37d2d4f5df2..1eb716d3676 100644
--- a/sysutils/gnome-vfs2/patches/patch-ae
+++ b/sysutils/gnome-vfs2/patches/patch-ae
@@ -1,20 +1,17 @@
-$NetBSD: patch-ae,v 1.10 2006/04/27 18:37:24 rillig Exp $
+$NetBSD: patch-ae,v 1.11 2006/05/31 18:32:40 drochner Exp $
 
-The following bug covers the removal of the gnome-mime-data dependency:
-http://bugzilla.gnome.org/show_bug.cgi?id=336952
-
---- configure.orig	Mon Mar 13 10:26:09 2006
-+++ configure	Wed Apr 26 16:55:02 2006
-@@ -25487,7 +25487,7 @@ fi
+--- configure.orig	2006-05-30 12:06:32.000000000 +0200
++++ configure
+@@ -24466,7 +24466,7 @@ fi
  
  
  
--for ac_func in getdtablesize open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod
-+for ac_func in getdtablesize login_tty open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod
+-for ac_func in getdtablesize open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll
++for ac_func in getdtablesize login_tty open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -26424,9 +26424,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -25746,9 +25746,11 @@ cat >>conftest.$ac_ext <<_ACEOF
  int
  main ()
  {
@@ -26,7 +23,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=336952
    return 0;
  }
  _ACEOF
-@@ -36756,12 +36758,12 @@ if test -n "$PKG_CONFIG"; then
+@@ -36078,12 +36080,12 @@ if test -n "$PKG_CONFIG"; then
          pkg_cv_LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
@@ -42,7 +39,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=336952
  else
    pkg_failed=yes
  fi
-@@ -36774,12 +36776,12 @@ if test -n "$PKG_CONFIG"; then
+@@ -36096,12 +36098,12 @@ if test -n "$PKG_CONFIG"; then
          pkg_cv_LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
@@ -58,7 +55,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=336952
  else
    pkg_failed=yes
  fi
-@@ -36798,14 +36800,14 @@ else
+@@ -36120,14 +36122,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -76,7 +73,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=336952
  
  $LIBGNOMEVFS_PKG_ERRORS
  
-@@ -36816,7 +36818,7 @@ Alternatively, you may set the environme
+@@ -36138,7 +36140,7 @@ Alternatively, you may set the environme
  and LIBGNOMEVFS_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5