Mon Mar 2 02:00:51 2009 UTC ()
Add fuse option, enable it by default where available. Bump PKGREVISION.


(jmcneill)
diff -r1.13 -r1.14 pkgsrc/sysutils/gvfs/Makefile
diff -r1.6 -r1.7 pkgsrc/sysutils/gvfs/PLIST
diff -r1.7 -r1.8 pkgsrc/sysutils/gvfs/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/gvfs/patches/patch-ac
cvs diff -r1.13 -r1.14 pkgsrc/sysutils/gvfs/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gvfs/Makefile 2008/12/20 20:11:54 1.13
+++ pkgsrc/sysutils/gvfs/Makefile 2009/03/02 02:00:51 1.14
@@ -1,63 +1,74 @@ @@ -1,63 +1,74 @@
1# $NetBSD: Makefile,v 1.13 2008/12/20 20:11:54 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.14 2009/03/02 02:00:51 jmcneill Exp $
2# 2#
3 3
4DISTNAME= gvfs-1.0.3 4DISTNAME= gvfs-1.0.3
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gvfs/1.0/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gvfs/1.0/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.gnome.org/ 11HOMEPAGE= http://www.gnome.org/
12COMMENT= Userspace virtual filesystem 12COMMENT= Userspace virtual filesystem
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_TOOLS+= intltool gmake pkg-config msgfmt 18USE_TOOLS+= intltool gmake pkg-config msgfmt
19CONFIGURE_ARGS+= --with-samba-includes=${LOCALBASE}/include 19CONFIGURE_ARGS+= --with-samba-includes=${LOCALBASE}/include
20CONFIGURE_ARGS+= --with-samba-libs=${LOCALBASE}/lib/samba 20CONFIGURE_ARGS+= --with-samba-libs=${LOCALBASE}/lib/samba
21CONFIGURE_ARGS+= --enable-http 21CONFIGURE_ARGS+= --enable-http
22 22
23.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
24 24
25PKG_OPTIONS_VAR= PKG_OPTIONS.gvfs 25PKG_OPTIONS_VAR= PKG_OPTIONS.gvfs
26PKG_SUPPORTED_OPTIONS+= avahi hal 26PKG_SUPPORTED_OPTIONS+= avahi hal fuse
27PKG_SUGGESTED_OPTIONS+= avahi hal 27PKG_SUGGESTED_OPTIONS+= avahi hal
28PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} 28PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
 29
 30# XXX fuse.bl3.mk will fail if we include it and fuse is not available
 31.if ${OPSYS} == "Linux" || (${OPSYS} == "NetBSD" && exists(/usr/include/fuse.h))
 32PKG_SUGGESTED_OPTIONS+= fuse
 33.endif
 34
29.include "../../mk/bsd.options.mk" 35.include "../../mk/bsd.options.mk"
30 36
31.if !empty(PKG_OPTIONS:Mavahi) 37.if !empty(PKG_OPTIONS:Mavahi)
32.include "../../net/avahi/buildlink3.mk" 38.include "../../net/avahi/buildlink3.mk"
33CONFIGURE_ARGS+= --enable-avahi 39CONFIGURE_ARGS+= --enable-avahi
34PLIST.avahi= yes 40PLIST.avahi= yes
35.else 41.else
36CONFIGURE_ARGS+= --disable-avahi 42CONFIGURE_ARGS+= --disable-avahi
37.endif 43.endif
38 44
39.if !empty(PKG_OPTIONS:Mhal) 45.if !empty(PKG_OPTIONS:Mhal)
40.include "../../misc/libcdio/buildlink3.mk" 46.include "../../misc/libcdio/buildlink3.mk"
41.include "../../sysutils/hal/buildlink3.mk" 47.include "../../sysutils/hal/buildlink3.mk"
42CONFIGURE_ARGS+= --enable-hal 48CONFIGURE_ARGS+= --enable-hal
43CONFIGURE_ARGS+= --enable-cdda 49CONFIGURE_ARGS+= --enable-cdda
44PLIST.hal= yes 50PLIST.hal= yes
45.else 51.else
46CONFIGURE_ARGS+= --disable-hal 52CONFIGURE_ARGS+= --disable-hal
47CONFIGURE_ARGS+= --disable-cdda 53CONFIGURE_ARGS+= --disable-cdda
48.endif 54.endif
49 55
50# Not yet; will cause the package to fail if fuse is not present 56.if !empty(PKG_OPTIONS:Mfuse)
51#.include "../../mk/fuse.buildlink3.mk" 57.include "../../mk/fuse.buildlink3.mk"
 58CONFIGURE_ARGS+= --enable-fuse
 59PLIST.fuse= yes
 60.else
 61CONFIGURE_ARGS+= --disable-fuse
 62.endif
52 63
53BUILDLINK_API_DEPENDS.glib2+= glib2>=2.17.6 64BUILDLINK_API_DEPENDS.glib2+= glib2>=2.17.6
54.include "../../devel/glib2/buildlink3.mk" 65.include "../../devel/glib2/buildlink3.mk"
55.include "../../sysutils/dbus/buildlink3.mk" 66.include "../../sysutils/dbus/buildlink3.mk"
56.include "../../archivers/libarchive/buildlink3.mk" 67.include "../../archivers/libarchive/buildlink3.mk"
57.include "../../net/samba/buildlink3.mk" 68.include "../../net/samba/buildlink3.mk"
58BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.23.91 69BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.23.91
59.include "../../net/libsoup24/buildlink3.mk" 70.include "../../net/libsoup24/buildlink3.mk"
60.include "../../textproc/libxml2/buildlink3.mk" 71.include "../../textproc/libxml2/buildlink3.mk"
61.include "../../devel/GConf/buildlink3.mk" 72.include "../../devel/GConf/buildlink3.mk"
62.include "../../security/gnome-keyring/buildlink3.mk" 73.include "../../security/gnome-keyring/buildlink3.mk"
63.include "../../mk/bsd.pkg.mk" 74.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/gvfs/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/gvfs/PLIST 2008/12/20 20:11:54 1.6
+++ pkgsrc/sysutils/gvfs/PLIST 2009/03/02 02:00:51 1.7
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1@comment $NetBSD: PLIST,v 1.6 2008/12/20 20:11:54 jmcneill Exp $ 1@comment $NetBSD: PLIST,v 1.7 2009/03/02 02:00:51 jmcneill Exp $
2bin/gvfs-cat 2bin/gvfs-cat
3bin/gvfs-copy 3bin/gvfs-copy
4bin/gvfs-info 4bin/gvfs-info
5bin/gvfs-less 5bin/gvfs-less
6bin/gvfs-ls 6bin/gvfs-ls
7bin/gvfs-mkdir 7bin/gvfs-mkdir
8bin/gvfs-monitor-dir 8bin/gvfs-monitor-dir
9bin/gvfs-monitor-file 9bin/gvfs-monitor-file
10bin/gvfs-mount 10bin/gvfs-mount
11bin/gvfs-move 11bin/gvfs-move
12bin/gvfs-open 12bin/gvfs-open
13bin/gvfs-rename 13bin/gvfs-rename
14bin/gvfs-rm 14bin/gvfs-rm
15bin/gvfs-save 15bin/gvfs-save
16bin/gvfs-trash 16bin/gvfs-trash
17bin/gvfs-tree 17bin/gvfs-tree
18include/gvfs-client/gvfs/gvfsurimapper.h 18include/gvfs-client/gvfs/gvfsurimapper.h
19include/gvfs-client/gvfs/gvfsuriutils.h 19include/gvfs-client/gvfs/gvfsuriutils.h
20lib/gio/modules/libgiogconf.la 20lib/gio/modules/libgiogconf.la
21lib/gio/modules/libgioremote-volume-monitor.la 21lib/gio/modules/libgioremote-volume-monitor.la
22lib/gio/modules/libgvfsdbus.la 22lib/gio/modules/libgvfsdbus.la
23lib/libgvfscommon.la 23lib/libgvfscommon.la
 24${PLIST.fuse}libexec/gvfs-fuse-daemon
24${PLIST.hal}libexec/gvfs-hal-volume-monitor 25${PLIST.hal}libexec/gvfs-hal-volume-monitor
25libexec/gvfsd 26libexec/gvfsd
26libexec/gvfsd-archive 27libexec/gvfsd-archive
27libexec/gvfsd-burn 28libexec/gvfsd-burn
28${PLIST.hal}libexec/gvfsd-cdda 29${PLIST.hal}libexec/gvfsd-cdda
29libexec/gvfsd-computer 30libexec/gvfsd-computer
30libexec/gvfsd-dav 31libexec/gvfsd-dav
31${PLIST.avahi}libexec/gvfsd-dnssd 32${PLIST.avahi}libexec/gvfsd-dnssd
32libexec/gvfsd-ftp 33libexec/gvfsd-ftp
33libexec/gvfsd-http 34libexec/gvfsd-http
34libexec/gvfsd-localtest 35libexec/gvfsd-localtest
35libexec/gvfsd-network 36libexec/gvfsd-network
36libexec/gvfsd-sftp 37libexec/gvfsd-sftp
cvs diff -r1.7 -r1.8 pkgsrc/sysutils/gvfs/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/gvfs/distinfo 2008/11/24 15:09:02 1.7
+++ pkgsrc/sysutils/gvfs/distinfo 2009/03/02 02:00:51 1.8
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.7 2008/11/24 15:09:02 wiz Exp $ 1$NetBSD: distinfo,v 1.8 2009/03/02 02:00:51 jmcneill Exp $
2 2
3SHA1 (gvfs-1.0.3.tar.bz2) = 2beb736acc7b38e99c9fcb0585de6918fad5e7b7 3SHA1 (gvfs-1.0.3.tar.bz2) = 2beb736acc7b38e99c9fcb0585de6918fad5e7b7
4RMD160 (gvfs-1.0.3.tar.bz2) = 2d12e1f6690773e3aad5d59c826c509fa40a9443 4RMD160 (gvfs-1.0.3.tar.bz2) = 2d12e1f6690773e3aad5d59c826c509fa40a9443
5Size (gvfs-1.0.3.tar.bz2) = 920742 bytes 5Size (gvfs-1.0.3.tar.bz2) = 920742 bytes
6SHA1 (patch-aa) = c21578643eaedf8b614b4d0e55a6ddb8b8217784 6SHA1 (patch-aa) = c21578643eaedf8b614b4d0e55a6ddb8b8217784
7SHA1 (patch-ab) = 6e8d4959f36df50e42b233becc80b14dac706112 7SHA1 (patch-ab) = 6e8d4959f36df50e42b233becc80b14dac706112
 8SHA1 (patch-ac) = 6ee347b43bcf98cf80c552463890a624a4d21f2f
File Added: pkgsrc/sysutils/gvfs/patches/patch-ac
$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>