update to 1.6.6

This switches to the gnome-2.32 release branch.

5 files changed, 23 insertions, 40 deletions

diff --git a/sysutils/gvfs/Makefile b/sysutils/gvfs/Makefile
index 7227453eb76..268a289fe5e 100644
--- a/sysutils/gvfs/Makefile
+++ b/sysutils/gvfs/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2010/11/15 22:58:35 abs Exp $
+# $NetBSD: Makefile,v 1.30 2010/11/16 13:57:28 drochner Exp $
 #
 
-DISTNAME=	gvfs-1.4.3
-PKGREVISION=	3
+DISTNAME=	gvfs-1.6.6
 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
@@ -27,7 +26,7 @@ PKG_SUGGESTED_OPTIONS+= hal samba
 PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
 
 # XXX fuse.bl3.mk will fail if we include it and fuse is not available
-.if ${OPSYS} == "Linux" || (${OPSYS} == "NetBSD" && exists(/usr/include/fuse.h))
+.if ${OPSYS} == "Linux" #|| (${OPSYS} == "NetBSD" && exists(/usr/include/fuse.h))
 PKG_SUGGESTED_OPTIONS+=	fuse
 .endif
 
diff --git a/sysutils/gvfs/PLIST b/sysutils/gvfs/PLIST
index 78817b5a8de..f2c9ffa9b1d 100644
--- a/sysutils/gvfs/PLIST
+++ b/sysutils/gvfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2010/06/19 13:57:47 drochner Exp $
+@comment $NetBSD: PLIST,v 1.15 2010/11/16 13:57:28 drochner Exp $
 bin/gvfs-cat
 bin/gvfs-copy
 bin/gvfs-info
@@ -60,8 +60,10 @@ ${PLIST.samba}share/gvfs/mounts/smb-browse.mount
 ${PLIST.samba}share/gvfs/mounts/smb.mount
 share/gvfs/mounts/trash.mount
 ${PLIST.hal}share/gvfs/remote-volume-monitors/hal.monitor
+share/locale/af/LC_MESSAGES/gvfs.mo
 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 +75,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,8 +87,10 @@ 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/kk/LC_MESSAGES/gvfs.mo
 share/locale/kn/LC_MESSAGES/gvfs.mo
 share/locale/ko/LC_MESSAGES/gvfs.mo
 share/locale/ku/LC_MESSAGES/gvfs.mo
@@ -96,6 +101,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
@@ -115,6 +121,7 @@ share/locale/ta/LC_MESSAGES/gvfs.mo
 share/locale/te/LC_MESSAGES/gvfs.mo
 share/locale/th/LC_MESSAGES/gvfs.mo
 share/locale/tr/LC_MESSAGES/gvfs.mo
+share/locale/ug/LC_MESSAGES/gvfs.mo
 share/locale/uk/LC_MESSAGES/gvfs.mo
 share/locale/vi/LC_MESSAGES/gvfs.mo
 share/locale/zh_CN/LC_MESSAGES/gvfs.mo
diff --git a/sysutils/gvfs/distinfo b/sysutils/gvfs/distinfo
index 4b8bee5d545..a20a8bed661 100644
--- a/sysutils/gvfs/distinfo
+++ b/sysutils/gvfs/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.16 2010/06/19 13:57:47 drochner Exp $
+$NetBSD: distinfo,v 1.17 2010/11/16 13:57:28 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.6.tar.bz2) = 066800558370187abd838c358349bb73f1579f8b
+RMD160 (gvfs-1.6.6.tar.bz2) = 705934a0a3f520a41237374abeb0182d01398903
+Size (gvfs-1.6.6.tar.bz2) = 1387796 bytes
+SHA1 (patch-aa) = c41dce6f0865fd351fc683ac1ff5a4d18d8880a8
 SHA1 (patch-ac) = 2e5837362b63c05ca5748a7e8a610dc7d651a9fa
 SHA1 (patch-ad) = 8c8fe33189d182e769da5092fa309f01f56a1081
 SHA1 (patch-ae) = 07b631786e89f38f831a1cc926818c15520fcd3b
-SHA1 (patch-af) = 0ead507e28ad22405825999149e5ba8ac95e6173
 SHA1 (patch-ag) = 8474aed53e07f2c3899bafc278d886c41ccd04a5
diff --git a/sysutils/gvfs/patches/patch-aa b/sysutils/gvfs/patches/patch-aa
index 7d2ce8bb1c8..9a9645a7df0 100644
--- a/sysutils/gvfs/patches/patch-aa
+++ b/sysutils/gvfs/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2010/06/19 13:57:47 drochner Exp $
+$NetBSD: patch-aa,v 1.8 2010/11/16 13:57:28 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.7 2010/06/19 13:57:47 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
diff --git a/sysutils/gvfs/patches/patch-af b/sysutils/gvfs/patches/patch-af
deleted file mode 100644
index 5ff7366b18d..00000000000
--- a/sysutils/gvfs/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2009/12/09 18:53:49 drochner Exp $
-
---- daemon/gvfsftpdircache.c.orig	2009-10-22 12:12:01.000000000 +0200
-+++ daemon/gvfsftpdircache.c
-@@ -586,7 +586,7 @@ g_vfs_ftp_dir_cache_funcs_process (GInpu
-                                        type == 'l' ? G_FILE_TYPE_SYMBOLIC_LINK :
-                                        G_FILE_TYPE_DIRECTORY);
- 
--      if (unix)
-+      if (is_unix)
-         g_file_info_set_is_hidden (info, result.fe_fnlen > 0 &&
-                                          result.fe_fname[0] == '.');
-