update to 1.6.2

This switches to the gnome-2.30 release branch

4 files changed, 20 insertions, 26 deletions

diff --git a/sysutils/gvfs/Makefile b/sysutils/gvfs/Makefile
index 8c2859f814d..123f273d588 100644
--- a/sysutils/gvfs/Makefile
+++ b/sysutils/gvfs/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2010/01/26 19:30:14 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/11 13:53:02 drochner Exp $
 #
 
-DISTNAME=	gvfs-1.4.3
-PKGREVISION=	1
+DISTNAME=	gvfs-1.6.2
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gvfs/1.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gvfs/1.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -77,5 +76,5 @@ BUILDLINK_API_DEPENDS.libsoup24+=	libsoup24>=2.25.1
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
-.include "../../security/gnome-keyring/buildlink3.mk"
+.include "../../security/libgnome-keyring/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gvfs/PLIST b/sysutils/gvfs/PLIST
index 5e16bf11680..3fc623ffaae 100644
--- a/sysutils/gvfs/PLIST
+++ b/sysutils/gvfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2009/12/09 18:53:49 drochner Exp $
+@comment $NetBSD: PLIST,v 1.13 2010/06/11 13:53:02 drochner Exp $
 bin/gvfs-cat
 bin/gvfs-copy
 bin/gvfs-info
@@ -62,6 +62,7 @@ share/gvfs/mounts/trash.mount
 ${PLIST.hal}share/gvfs/remote-volume-monitors/hal.monitor
 share/locale/ar/LC_MESSAGES/gvfs.mo
 share/locale/as/LC_MESSAGES/gvfs.mo
+share/locale/ast/LC_MESSAGES/gvfs.mo
 share/locale/be@latin/LC_MESSAGES/gvfs.mo
 share/locale/bg/LC_MESSAGES/gvfs.mo
 share/locale/bn/LC_MESSAGES/gvfs.mo
@@ -73,6 +74,7 @@ share/locale/da/LC_MESSAGES/gvfs.mo
 share/locale/de/LC_MESSAGES/gvfs.mo
 share/locale/el/LC_MESSAGES/gvfs.mo
 share/locale/en_GB/LC_MESSAGES/gvfs.mo
+share/locale/en@shaw/LC_MESSAGES/gvfs.mo
 share/locale/es/LC_MESSAGES/gvfs.mo
 share/locale/et/LC_MESSAGES/gvfs.mo
 share/locale/eu/LC_MESSAGES/gvfs.mo
@@ -84,6 +86,7 @@ share/locale/gu/LC_MESSAGES/gvfs.mo
 share/locale/he/LC_MESSAGES/gvfs.mo
 share/locale/hi/LC_MESSAGES/gvfs.mo
 share/locale/hu/LC_MESSAGES/gvfs.mo
+share/locale/id/LC_MESSAGES/gvfs.mo
 share/locale/it/LC_MESSAGES/gvfs.mo
 share/locale/ja/LC_MESSAGES/gvfs.mo
 share/locale/kn/LC_MESSAGES/gvfs.mo
@@ -96,6 +99,7 @@ share/locale/mk/LC_MESSAGES/gvfs.mo
 share/locale/ml/LC_MESSAGES/gvfs.mo
 share/locale/mr/LC_MESSAGES/gvfs.mo
 share/locale/nb/LC_MESSAGES/gvfs.mo
+share/locale/nds/LC_MESSAGES/gvfs.mo
 share/locale/nl/LC_MESSAGES/gvfs.mo
 share/locale/nn/LC_MESSAGES/gvfs.mo
 share/locale/or/LC_MESSAGES/gvfs.mo
diff --git a/sysutils/gvfs/distinfo b/sysutils/gvfs/distinfo
index 9e6453f16ae..d80fe361a71 100644
--- a/sysutils/gvfs/distinfo
+++ b/sysutils/gvfs/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2009/12/16 17:06:34 drochner Exp $
+$NetBSD: distinfo,v 1.15 2010/06/11 13:53:02 drochner Exp $
 
-SHA1 (gvfs-1.4.3.tar.bz2) = 3c28516893d6829b3bbae1768fb44e8a405c44e7
-RMD160 (gvfs-1.4.3.tar.bz2) = da1458101257f5496b4469acb7bc7c646fd9c652
-Size (gvfs-1.4.3.tar.bz2) = 1263024 bytes
-SHA1 (patch-aa) = 12462b0c8e53e0d14666efab24eca09104e92fec
+SHA1 (gvfs-1.6.2.tar.bz2) = b4ee3cb560d36d6ac7fe7bb1dded6b595c94fc81
+RMD160 (gvfs-1.6.2.tar.bz2) = 779c26d39e7bae51628131805a4734be440d711b
+Size (gvfs-1.6.2.tar.bz2) = 1330089 bytes
+SHA1 (patch-aa) = c41dce6f0865fd351fc683ac1ff5a4d18d8880a8
 SHA1 (patch-ac) = 2e5837362b63c05ca5748a7e8a610dc7d651a9fa
 SHA1 (patch-ad) = 8c8fe33189d182e769da5092fa309f01f56a1081
 SHA1 (patch-ae) = 07b631786e89f38f831a1cc926818c15520fcd3b
diff --git a/sysutils/gvfs/patches/patch-aa b/sysutils/gvfs/patches/patch-aa
index 3e3edb62c81..233df9ab395 100644
--- a/sysutils/gvfs/patches/patch-aa
+++ b/sysutils/gvfs/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2009/12/09 18:53:49 drochner Exp $
+$NetBSD: patch-aa,v 1.6 2010/06/11 13:53:02 drochner Exp $
 
---- configure.orig	2009-11-30 12:06:16.000000000 +0100
+--- configure.orig	2010-05-27 04:02:32.000000000 +0000
 +++ configure
-@@ -17863,7 +17863,7 @@ if test "x$enable_gdu" != "xno"; then
-   msg_gdu=yes
- fi
- 
--  if test "x$msg_gdu" == "xyes"; then
-+  if test "x$msg_gdu" = "xyes"; then
- 
- pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for GDU" >&5
-@@ -19679,7 +19679,7 @@ _ACEOF
+@@ -16082,7 +16082,7 @@ $as_echo "#define HAVE_SAMBA /**/" >>con
  
  		msg_samba="yes"
                  if test x$with_samba_libs != x/usr/lib; then
@@ -20,12 +11,12 @@ $NetBSD: patch-aa,v 1.5 2009/12/09 18:53:49 drochner Exp $
                  else
                  	SAMBA_LIBS="-lsmbclient"
                  fi
-@@ -20911,7 +20911,7 @@ _ACEOF
+@@ -16532,7 +16532,7 @@ _ACEOF
  fi
  
  
 -if test "$ac_cv_func_statfs" = yes ; then
 +if test "$ac_cv_func_statvfs" != yes -a "$ac_cv_func_statfs" = yes ; then
-   { $as_echo "$as_me:$LINENO: checking number of arguments to statfs()" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking number of arguments to statfs()" >&5
  $as_echo_n "checking number of arguments to statfs()... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext