update to 1.4.2

this switches to the gnome-2.28 release branch

8 files changed, 103 insertions, 16 deletions

diff --git a/sysutils/gvfs/Makefile b/sysutils/gvfs/Makefile
index b7d129c6582..43c80bec749 100644
--- a/sysutils/gvfs/Makefile
+++ b/sysutils/gvfs/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2009/12/09 15:08:30 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2009/12/09 18:53:49 drochner Exp $
 #
 
-DISTNAME=	gvfs-1.2.3
-PKGREVISION=	2
+DISTNAME=	gvfs-1.4.2
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gvfs/1.2/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gvfs/1.4/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/sysutils/gvfs/PLIST b/sysutils/gvfs/PLIST
index db8598d1ab6..5e16bf11680 100644
--- a/sysutils/gvfs/PLIST
+++ b/sysutils/gvfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/12/09 15:08:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/12/09 18:53:49 drochner Exp $
 bin/gvfs-cat
 bin/gvfs-copy
 bin/gvfs-info
@@ -13,6 +13,7 @@ bin/gvfs-open
 bin/gvfs-rename
 bin/gvfs-rm
 bin/gvfs-save
+bin/gvfs-set-attribute
 bin/gvfs-trash
 bin/gvfs-tree
 include/gvfs-client/gvfs/gvfsurimapper.h
@@ -20,8 +21,8 @@ include/gvfs-client/gvfs/gvfsuriutils.h
 lib/gio/modules/libgiogconf.la
 lib/gio/modules/libgioremote-volume-monitor.la
 lib/gio/modules/libgvfsdbus.la
-lib/libgvfscommon.la
 ${PLIST.avahi}lib/libgvfscommon-dnssd.la
+lib/libgvfscommon.la
 ${PLIST.fuse}libexec/gvfs-fuse-daemon
 ${PLIST.hal}libexec/gvfs-hal-volume-monitor
 libexec/gvfsd
@@ -34,19 +35,21 @@ ${PLIST.avahi}libexec/gvfsd-dnssd
 libexec/gvfsd-ftp
 libexec/gvfsd-http
 libexec/gvfsd-localtest
+libexec/gvfsd-metadata
 libexec/gvfsd-network
 libexec/gvfsd-sftp
 ${PLIST.samba}libexec/gvfsd-smb
 ${PLIST.samba}libexec/gvfsd-smb-browse
 libexec/gvfsd-trash
 share/dbus-1/services/gvfs-daemon.service
+share/dbus-1/services/gvfs-metadata.service
 ${PLIST.hal}share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
 share/gvfs/mounts/archive.mount
 share/gvfs/mounts/burn.mount
 ${PLIST.hal}share/gvfs/mounts/cdda.mount
 share/gvfs/mounts/computer.mount
-share/gvfs/mounts/dav.mount
 ${PLIST.avahi}share/gvfs/mounts/dav+sd.mount
+share/gvfs/mounts/dav.mount
 ${PLIST.avahi}share/gvfs/mounts/dns-sd.mount
 share/gvfs/mounts/ftp.mount
 share/gvfs/mounts/http.mount
@@ -61,8 +64,10 @@ share/locale/ar/LC_MESSAGES/gvfs.mo
 share/locale/as/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
 share/locale/bn_IN/LC_MESSAGES/gvfs.mo
 share/locale/ca/LC_MESSAGES/gvfs.mo
+share/locale/ca@valencia/LC_MESSAGES/gvfs.mo
 share/locale/cs/LC_MESSAGES/gvfs.mo
 share/locale/da/LC_MESSAGES/gvfs.mo
 share/locale/de/LC_MESSAGES/gvfs.mo
@@ -86,6 +91,7 @@ share/locale/ko/LC_MESSAGES/gvfs.mo
 share/locale/ku/LC_MESSAGES/gvfs.mo
 share/locale/lt/LC_MESSAGES/gvfs.mo
 share/locale/lv/LC_MESSAGES/gvfs.mo
+share/locale/mai/LC_MESSAGES/gvfs.mo
 share/locale/mk/LC_MESSAGES/gvfs.mo
 share/locale/ml/LC_MESSAGES/gvfs.mo
 share/locale/mr/LC_MESSAGES/gvfs.mo
@@ -114,4 +120,3 @@ share/locale/vi/LC_MESSAGES/gvfs.mo
 share/locale/zh_CN/LC_MESSAGES/gvfs.mo
 share/locale/zh_HK/LC_MESSAGES/gvfs.mo
 share/locale/zh_TW/LC_MESSAGES/gvfs.mo
-@pkgdir share/gvfs/remote-volume-monitors
diff --git a/sysutils/gvfs/distinfo b/sysutils/gvfs/distinfo
index 87fc0e9e338..b8017275038 100644
--- a/sysutils/gvfs/distinfo
+++ b/sysutils/gvfs/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.12 2009/05/26 19:21:45 wiz Exp $
+$NetBSD: distinfo,v 1.13 2009/12/09 18:53:49 drochner Exp $
 
-SHA1 (gvfs-1.2.3.tar.bz2) = c94d52b0bf2fe83d7e26c05ce9d65d240cd57be4
-RMD160 (gvfs-1.2.3.tar.bz2) = ea8469449073b9a0e50fde4301fa5bc4ff5bbe56
-Size (gvfs-1.2.3.tar.bz2) = 1041079 bytes
-SHA1 (patch-aa) = 0fa44ac3a58ba98609d877f7fec1c4e3ea46f9ed
+SHA1 (gvfs-1.4.2.tar.bz2) = d2d93e3de6213b96f3a5102964ed6f61955ce6f9
+RMD160 (gvfs-1.4.2.tar.bz2) = a57f67d733f132f179ce5df295fc3d5988becf3b
+Size (gvfs-1.4.2.tar.bz2) = 1262592 bytes
+SHA1 (patch-aa) = 12462b0c8e53e0d14666efab24eca09104e92fec
 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 80a7817c503..3e3edb62c81 100644
--- a/sysutils/gvfs/patches/patch-aa
+++ b/sysutils/gvfs/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2009/03/16 13:06:40 jmcneill Exp $
+$NetBSD: patch-aa,v 1.5 2009/12/09 18:53:49 drochner Exp $
 
---- configure.orig	2008-09-24 14:29:37.000000000 +0200
+--- configure.orig	2009-11-30 12:06:16.000000000 +0100
 +++ configure
-@@ -18337,7 +18337,7 @@ _ACEOF
+@@ -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
  
  		msg_samba="yes"
                  if test x$with_samba_libs != x/usr/lib; then
@@ -11,3 +20,12 @@ $NetBSD: patch-aa,v 1.4 2009/03/16 13:06:40 jmcneill Exp $
                  else
                  	SAMBA_LIBS="-lsmbclient"
                  fi
+@@ -20911,7 +20911,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_n "checking number of arguments to statfs()... " >&6; }
+   cat >conftest.$ac_ext <<_ACEOF
diff --git a/sysutils/gvfs/patches/patch-ad b/sysutils/gvfs/patches/patch-ad
new file mode 100644
index 00000000000..77583cf9338
--- /dev/null
+++ b/sysutils/gvfs/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2009/12/09 18:53:49 drochner Exp $
+
+--- daemon/gvfsbackendcdda.c.orig	2009-07-25 22:22:03.000000000 +0200
++++ daemon/gvfsbackendcdda.c
+@@ -194,7 +194,11 @@ find_udi_for_device (GVfsBackendCdda *cd
+   cdda_backend->hal_udi = NULL;
+ 
+   devices = libhal_manager_find_device_string_match (cdda_backend->hal_ctx,
++#ifdef __NetBSD__
++						     "block.netbsd.raw_device",
++#else
+                                                      "block.device",
++#endif
+                                                      cdda_backend->device_path,
+                                                      &num_devices,
+                                                      NULL);
diff --git a/sysutils/gvfs/patches/patch-ae b/sysutils/gvfs/patches/patch-ae
new file mode 100644
index 00000000000..615a6e9edb4
--- /dev/null
+++ b/sysutils/gvfs/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2009/12/09 18:53:49 drochner Exp $
+
+--- monitor/hal/ghalvolumemonitor.c.orig	2009-07-25 22:52:10.000000000 +0200
++++ monitor/hal/ghalvolumemonitor.c
+@@ -1323,7 +1323,11 @@ update_discs (GHalVolumeMonitor *monitor
+               GFile *foreign_mount_root;
+ 
+               /* the gvfsd-cdda backend uses URI's like these */
++#ifdef __NetBSD__
++	      device_basename = g_path_get_basename (hal_device_get_property_string (d, "block.netbsd.raw_device"));
++#else
+               device_basename = g_path_get_basename (hal_device_get_property_string (d, "block.device"));
++#endif
+               uri = g_strdup_printf ("cdda://%s", device_basename);
+               foreign_mount_root = g_file_new_for_uri (uri);
+               g_free (device_basename);
diff --git a/sysutils/gvfs/patches/patch-af b/sysutils/gvfs/patches/patch-af
new file mode 100644
index 00000000000..5ff7366b18d
--- /dev/null
+++ b/sysutils/gvfs/patches/patch-af
@@ -0,0 +1,13 @@
+$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] == '.');
+ 
diff --git a/sysutils/gvfs/patches/patch-ag b/sysutils/gvfs/patches/patch-ag
new file mode 100644
index 00000000000..4cfe46ecd84
--- /dev/null
+++ b/sysutils/gvfs/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1 2009/12/09 18:53:49 drochner Exp $
+
+--- monitor/hal/ghaldrive.c.orig	2009-10-25 16:52:31.000000000 +0100
++++ monitor/hal/ghaldrive.c
+@@ -377,7 +377,11 @@ g_hal_drive_new (GVolumeMonitor       *v
+   drive = g_object_new (G_TYPE_HAL_DRIVE, NULL);
+   drive->volume_monitor = volume_monitor;
+   g_object_add_weak_pointer (G_OBJECT (volume_monitor), (gpointer) &(drive->volume_monitor));
++#ifdef __NetBSD__
++  drive->device_path = g_strdup (hal_device_get_property_string (device, "block.netbsd.raw_device"));
++#else
+   drive->device_path = g_strdup (hal_device_get_property_string (device, "block.device"));
++#endif
+   drive->device = g_object_ref (device);
+   drive->pool = g_object_ref (pool);
+