Add fuse option, enable it by default where available. Bump PKGREVISION.

4 files changed, 34 insertions, 7 deletions

diff --git a/sysutils/gvfs/Makefile b/sysutils/gvfs/Makefile
index 929fa1d3458..4158d25a1cc 100644
--- a/sysutils/gvfs/Makefile
+++ b/sysutils/gvfs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2008/12/20 20:11:54 jmcneill Exp $
+# $NetBSD: Makefile,v 1.14 2009/03/02 02:00:51 jmcneill Exp $
 #
 
 DISTNAME=	gvfs-1.0.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gvfs/1.0/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,9 +23,15 @@ CONFIGURE_ARGS+=	--enable-http
 .include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=        PKG_OPTIONS.gvfs
-PKG_SUPPORTED_OPTIONS+= avahi hal
+PKG_SUPPORTED_OPTIONS+= avahi hal fuse
 PKG_SUGGESTED_OPTIONS+= avahi hal
 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))
+PKG_SUGGESTED_OPTIONS+=	fuse
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mavahi)
@@ -47,8 +53,13 @@ CONFIGURE_ARGS+=	--disable-hal
 CONFIGURE_ARGS+=	--disable-cdda
 .endif
 
-# Not yet; will cause the package to fail if fuse is not present
-#.include "../../mk/fuse.buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mfuse)
+.include "../../mk/fuse.buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-fuse
+PLIST.fuse=		yes
+.else
+CONFIGURE_ARGS+=	--disable-fuse
+.endif
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.17.6
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/sysutils/gvfs/PLIST b/sysutils/gvfs/PLIST
index 7613359fa10..e8de2260ec6 100644
--- a/sysutils/gvfs/PLIST
+++ b/sysutils/gvfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2008/12/20 20:11:54 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/03/02 02:00:51 jmcneill Exp $
 bin/gvfs-cat
 bin/gvfs-copy
 bin/gvfs-info
@@ -21,6 +21,7 @@ lib/gio/modules/libgiogconf.la
 lib/gio/modules/libgioremote-volume-monitor.la
 lib/gio/modules/libgvfsdbus.la
 lib/libgvfscommon.la
+${PLIST.fuse}libexec/gvfs-fuse-daemon
 ${PLIST.hal}libexec/gvfs-hal-volume-monitor
 libexec/gvfsd
 libexec/gvfsd-archive
diff --git a/sysutils/gvfs/distinfo b/sysutils/gvfs/distinfo
index 5a3aaee4e0f..6c055c4b552 100644
--- a/sysutils/gvfs/distinfo
+++ b/sysutils/gvfs/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2008/11/24 15:09:02 wiz Exp $
+$NetBSD: distinfo,v 1.8 2009/03/02 02:00:51 jmcneill Exp $
 
 SHA1 (gvfs-1.0.3.tar.bz2) = 2beb736acc7b38e99c9fcb0585de6918fad5e7b7
 RMD160 (gvfs-1.0.3.tar.bz2) = 2d12e1f6690773e3aad5d59c826c509fa40a9443
 Size (gvfs-1.0.3.tar.bz2) = 920742 bytes
 SHA1 (patch-aa) = c21578643eaedf8b614b4d0e55a6ddb8b8217784
 SHA1 (patch-ab) = 6e8d4959f36df50e42b233becc80b14dac706112
+SHA1 (patch-ac) = 6ee347b43bcf98cf80c552463890a624a4d21f2f
diff --git a/sysutils/gvfs/patches/patch-ac b/sysutils/gvfs/patches/patch-ac
new file mode 100644
index 00000000000..c97432819ba
--- /dev/null
+++ b/sysutils/gvfs/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2009/03/02 02:00:51 jmcneill Exp $
+
+--- client/gvfsfusedaemon.c.orig	2008-10-20 05:02:26.000000000 -0400
++++ client/gvfsfusedaemon.c
+@@ -26,7 +26,9 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
++#if !defined(__NetBSD__)
+ #include <sys/vfs.h>
++#endif
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <stdlib.h>