Update gvfs to 1.6.7.

pkgsrc changes:
 * set LICENSE as gnu-lgpl-v2 from COPYING.
 * drop -DG_DISABLE_DEPREATED in whole build instead of just in a directory
   by patch-ah, because much deprecated warnings will be appeared with recent
   glib2.
 * fix specify to configure of samba location.

Major changes in 1.6.7
======================
This is a convenient release for people who want to have old
gnome 2.32 and new glib:
 * Do not build app lookup extension if we have glib >= 2.27.1

Other fixes:
* build: Adapt autogen.sh to libtool-2.4
* build: Bump fuse requirement for ATOMIC_O_TRUNC support

4 files changed, 34 insertions, 29 deletions

diff --git a/sysutils/gvfs/Makefile b/sysutils/gvfs/Makefile
index a53085ebc80..5994a84ec0e 100644
--- a/sysutils/gvfs/Makefile
+++ b/sysutils/gvfs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2013/05/09 07:40:31 adam Exp $
+# $NetBSD: Makefile,v 1.52 2013/05/10 14:37:42 obache Exp $
 #
 
-DISTNAME=	gvfs-1.6.6
-PKGREVISION=	19
+DISTNAME=	gvfs-1.6.7
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gvfs/1.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +9,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Userspace virtual filesystem
+LICENSE=	gnu-lgpl-v2
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
@@ -40,8 +40,8 @@ CONFIGURE_ARGS+=	--disable-avahi
 .endif
 
 .if !empty(PKG_OPTIONS:Msamba)
-CONFIGURE_ARGS+=	--with-samba-includes=${LOCALBASE}/include
-CONFIGURE_ARGS+=	--with-samba-libs=${LOCALBASE}/lib/samba
+CONFIGURE_ARGS+=	--with-samba-includes=${BUILDLINK_PREFIX.samba}/include
+CONFIGURE_ARGS+=	--with-samba-libs=${BUILDLINK_PREFIX.samba}/lib
 .include "../../net/samba/buildlink3.mk"
 PLIST.samba=		yes
 .else
@@ -67,11 +67,13 @@ PLIST.fuse=		yes
 CONFIGURE_ARGS+=	--disable-fuse
 .endif
 
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.17.6
+BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
+
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.23.4
 .include "../../devel/glib2/modules.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../archivers/libarchive/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libsoup24+=	libsoup24>=2.25.1
+BUILDLINK_API_DEPENDS.libsoup24+=	libsoup24>=2.26.0
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
diff --git a/sysutils/gvfs/distinfo b/sysutils/gvfs/distinfo
index 47f86478023..1e06f4c333b 100644
--- a/sysutils/gvfs/distinfo
+++ b/sysutils/gvfs/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.21 2012/05/30 13:52:18 obache Exp $
+$NetBSD: distinfo,v 1.22 2013/05/10 14:37:42 obache Exp $
 
-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 (gvfs-1.6.7.tar.bz2) = 285a810772dce8b37289cbe0aaab8354f2b6717a
+RMD160 (gvfs-1.6.7.tar.bz2) = e833fdbc9dc503cdde8e0ab5a7a8fa5403ec1aa1
+Size (gvfs-1.6.7.tar.bz2) = 1404372 bytes
+SHA1 (patch-aa) = 37691e13b1c2edbcf1af301bfae22c6b1943efdf
 SHA1 (patch-ac) = 2168ed0d5883747e9b4e1b938ee818e6aefb8e56
 SHA1 (patch-ad) = 8c8fe33189d182e769da5092fa309f01f56a1081
 SHA1 (patch-ae) = 07b631786e89f38f831a1cc926818c15520fcd3b
 SHA1 (patch-ag) = 8474aed53e07f2c3899bafc278d886c41ccd04a5
-SHA1 (patch-ah) = 39c6fe4fe7640e8c073da5857ba33fb7083d4a72
 SHA1 (patch-ai) = 2246232efe91c36be8c577c1db16e80ebb45a515
diff --git a/sysutils/gvfs/patches/patch-aa b/sysutils/gvfs/patches/patch-aa
index 9a9645a7df0..5cd43b09a99 100644
--- a/sysutils/gvfs/patches/patch-aa
+++ b/sysutils/gvfs/patches/patch-aa
@@ -1,8 +1,24 @@
-$NetBSD: patch-aa,v 1.8 2010/11/16 13:57:28 drochner Exp $
+$NetBSD: patch-aa,v 1.9 2013/05/10 14:37:42 obache Exp $
 
---- configure.orig	2010-05-27 04:02:32.000000000 +0000
+* killed -DG_DISABLED_DEPRECATED, so msg_gconf_gio will be built even with
+  gio-2.0>2.27.1
+* add RPATH for samba
+*
+
+--- configure.orig	2011-03-21 16:02:39.000000000 +0000
 +++ configure
-@@ -16082,7 +16082,7 @@ $as_echo "#define HAVE_SAMBA /**/" >>con
+@@ -15633,8 +15633,8 @@ fi
+ 
+ msg_gconf_gio=no
+ if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 <= 2.27.1\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "gio-2.0 <= 2.27.1") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+@@ -16928,7 +16928,7 @@ $as_echo "#define HAVE_SAMBA /**/" >>con
  
  		msg_samba="yes"
                  if test x$with_samba_libs != x/usr/lib; then
@@ -11,7 +27,7 @@ $NetBSD: patch-aa,v 1.8 2010/11/16 13:57:28 drochner Exp $
                  else
                  	SAMBA_LIBS="-lsmbclient"
                  fi
-@@ -16532,7 +16532,7 @@ _ACEOF
+@@ -17376,7 +17376,7 @@ _ACEOF
  fi
  
  
diff --git a/sysutils/gvfs/patches/patch-ah b/sysutils/gvfs/patches/patch-ah
deleted file mode 100644
index da7d5762e58..00000000000
--- a/sysutils/gvfs/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2011/03/11 20:02:41 drochner Exp $
-
---- gconf/Makefile.in.orig	2010-11-12 16:19:13.000000000 +0000
-+++ gconf/Makefile.in
-@@ -315,7 +315,6 @@ libgiogconf_la_CFLAGS = \
- 	$(GCONF_CFLAGS)                         \
- 	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"	\
- 	-DGVFS_LOCALEDIR=\""$(localedir)"\"	\
--	-DG_DISABLE_DEPRECATED			\
- 	$(NULL)
- 
- libgiogconf_la_LDFLAGS = \