Wed Dec 9 15:08:30 2009 UTC ()
Make samba dependency optional, but default on (so no change to package).

Based on patch by markand@malikania.org on pkgsrc-users, but with
a crucial missing line added.


(wiz)
diff -r1.20 -r1.21 pkgsrc/sysutils/gvfs/Makefile
diff -r1.10 -r1.11 pkgsrc/sysutils/gvfs/PLIST
cvs diff -r1.20 -r1.21 pkgsrc/sysutils/gvfs/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gvfs/Makefile 2009/10/31 14:46:51 1.20
+++ pkgsrc/sysutils/gvfs/Makefile 2009/12/09 15:08:30 1.21
@@ -1,75 +1,81 @@ @@ -1,75 +1,81 @@
1# $NetBSD: Makefile,v 1.20 2009/10/31 14:46:51 wiz Exp $ 1# $NetBSD: Makefile,v 1.21 2009/12/09 15:08:30 wiz Exp $
2# 2#
3 3
4DISTNAME= gvfs-1.2.3 4DISTNAME= gvfs-1.2.3
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gvfs/1.2/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gvfs/1.2/}
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 
20CONFIGURE_ARGS+= --with-samba-libs=${LOCALBASE}/lib/samba 
21CONFIGURE_ARGS+= --enable-http 19CONFIGURE_ARGS+= --enable-http
22CONFIGURE_ARGS+= --disable-bash-completion 20CONFIGURE_ARGS+= --disable-bash-completion
23 21
24.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
25 23
26PKG_OPTIONS_VAR= PKG_OPTIONS.gvfs 24PKG_OPTIONS_VAR= PKG_OPTIONS.gvfs
27PKG_SUPPORTED_OPTIONS+= avahi hal fuse 25PKG_SUPPORTED_OPTIONS+= avahi hal fuse samba
28PKG_SUGGESTED_OPTIONS+= avahi hal 26PKG_SUGGESTED_OPTIONS+= avahi hal samba
29PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} 27PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
30 28
31# XXX fuse.bl3.mk will fail if we include it and fuse is not available 29# XXX fuse.bl3.mk will fail if we include it and fuse is not available
32.if ${OPSYS} == "Linux" || (${OPSYS} == "NetBSD" && exists(/usr/include/fuse.h)) 30.if ${OPSYS} == "Linux" || (${OPSYS} == "NetBSD" && exists(/usr/include/fuse.h))
33PKG_SUGGESTED_OPTIONS+= fuse 31PKG_SUGGESTED_OPTIONS+= fuse
34.endif 32.endif
35 33
36.include "../../mk/bsd.options.mk" 34.include "../../mk/bsd.options.mk"
37 35
38.if !empty(PKG_OPTIONS:Mavahi) 36.if !empty(PKG_OPTIONS:Mavahi)
39.include "../../net/avahi/buildlink3.mk" 37.include "../../net/avahi/buildlink3.mk"
40CONFIGURE_ARGS+= --enable-avahi 38CONFIGURE_ARGS+= --enable-avahi
41PLIST.avahi= yes 39PLIST.avahi= yes
42.else 40.else
43CONFIGURE_ARGS+= --disable-avahi 41CONFIGURE_ARGS+= --disable-avahi
44.endif 42.endif
45 43
 44.if !empty(PKG_OPTIONS:Msamba)
 45CONFIGURE_ARGS+= --with-samba-includes=${LOCALBASE}/include
 46CONFIGURE_ARGS+= --with-samba-libs=${LOCALBASE}/lib/samba
 47.include "../../net/samba/buildlink3.mk"
 48PLIST.samba= yes
 49.else
 50CONFIGURE_ARGS+= --disable-samba
 51.endif
 52
46.if !empty(PKG_OPTIONS:Mhal) 53.if !empty(PKG_OPTIONS:Mhal)
47.include "../../misc/libcdio/buildlink3.mk" 54.include "../../misc/libcdio/buildlink3.mk"
48.include "../../sysutils/hal/buildlink3.mk" 55.include "../../sysutils/hal/buildlink3.mk"
49CONFIGURE_ARGS+= --enable-hal 56CONFIGURE_ARGS+= --enable-hal
50CONFIGURE_ARGS+= --enable-cdda 57CONFIGURE_ARGS+= --enable-cdda
51PLIST.hal= yes 58PLIST.hal= yes
52.else 59.else
53CONFIGURE_ARGS+= --disable-hal 60CONFIGURE_ARGS+= --disable-hal
54CONFIGURE_ARGS+= --disable-cdda 61CONFIGURE_ARGS+= --disable-cdda
55.endif 62.endif
56 63
57.if !empty(PKG_OPTIONS:Mfuse) 64.if !empty(PKG_OPTIONS:Mfuse)
58.include "../../mk/fuse.buildlink3.mk" 65.include "../../mk/fuse.buildlink3.mk"
59CONFIGURE_ARGS+= --enable-fuse 66CONFIGURE_ARGS+= --enable-fuse
60PLIST.fuse= yes 67PLIST.fuse= yes
61.else 68.else
62CONFIGURE_ARGS+= --disable-fuse 69CONFIGURE_ARGS+= --disable-fuse
63.endif 70.endif
64 71
65BUILDLINK_API_DEPENDS.glib2+= glib2>=2.17.6 72BUILDLINK_API_DEPENDS.glib2+= glib2>=2.17.6
66.include "../../devel/glib2/buildlink3.mk" 73.include "../../devel/glib2/buildlink3.mk"
67.include "../../sysutils/dbus/buildlink3.mk" 74.include "../../sysutils/dbus/buildlink3.mk"
68.include "../../archivers/libarchive/buildlink3.mk" 75.include "../../archivers/libarchive/buildlink3.mk"
69.include "../../net/samba/buildlink3.mk" 
70BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.25.1 76BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.25.1
71.include "../../net/libsoup24/buildlink3.mk" 77.include "../../net/libsoup24/buildlink3.mk"
72.include "../../textproc/libxml2/buildlink3.mk" 78.include "../../textproc/libxml2/buildlink3.mk"
73.include "../../devel/GConf/buildlink3.mk" 79.include "../../devel/GConf/buildlink3.mk"
74.include "../../security/gnome-keyring/buildlink3.mk" 80.include "../../security/gnome-keyring/buildlink3.mk"
75.include "../../mk/bsd.pkg.mk" 81.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/sysutils/gvfs/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/gvfs/PLIST 2009/06/14 21:28:47 1.10
+++ pkgsrc/sysutils/gvfs/PLIST 2009/12/09 15:08:30 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.10 2009/06/14 21:28:47 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.11 2009/12/09 15:08:30 wiz 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
@@ -26,45 +26,45 @@ ${PLIST.fuse}libexec/gvfs-fuse-daemon @@ -26,45 +26,45 @@ ${PLIST.fuse}libexec/gvfs-fuse-daemon
26${PLIST.hal}libexec/gvfs-hal-volume-monitor 26${PLIST.hal}libexec/gvfs-hal-volume-monitor
27libexec/gvfsd 27libexec/gvfsd
28libexec/gvfsd-archive 28libexec/gvfsd-archive
29libexec/gvfsd-burn 29libexec/gvfsd-burn
30${PLIST.hal}libexec/gvfsd-cdda 30${PLIST.hal}libexec/gvfsd-cdda
31libexec/gvfsd-computer 31libexec/gvfsd-computer
32libexec/gvfsd-dav 32libexec/gvfsd-dav
33${PLIST.avahi}libexec/gvfsd-dnssd 33${PLIST.avahi}libexec/gvfsd-dnssd
34libexec/gvfsd-ftp 34libexec/gvfsd-ftp
35libexec/gvfsd-http 35libexec/gvfsd-http
36libexec/gvfsd-localtest 36libexec/gvfsd-localtest
37libexec/gvfsd-network 37libexec/gvfsd-network
38libexec/gvfsd-sftp 38libexec/gvfsd-sftp
39libexec/gvfsd-smb 39${PLIST.samba}libexec/gvfsd-smb
40libexec/gvfsd-smb-browse 40${PLIST.samba}libexec/gvfsd-smb-browse
41libexec/gvfsd-trash 41libexec/gvfsd-trash
42share/dbus-1/services/gvfs-daemon.service 42share/dbus-1/services/gvfs-daemon.service
43${PLIST.hal}share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service 43${PLIST.hal}share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
44share/gvfs/mounts/archive.mount 44share/gvfs/mounts/archive.mount
45share/gvfs/mounts/burn.mount 45share/gvfs/mounts/burn.mount
46${PLIST.hal}share/gvfs/mounts/cdda.mount 46${PLIST.hal}share/gvfs/mounts/cdda.mount
47share/gvfs/mounts/computer.mount 47share/gvfs/mounts/computer.mount
48share/gvfs/mounts/dav.mount 48share/gvfs/mounts/dav.mount
49${PLIST.avahi}share/gvfs/mounts/dav+sd.mount 49${PLIST.avahi}share/gvfs/mounts/dav+sd.mount
50${PLIST.avahi}share/gvfs/mounts/dns-sd.mount 50${PLIST.avahi}share/gvfs/mounts/dns-sd.mount
51share/gvfs/mounts/ftp.mount 51share/gvfs/mounts/ftp.mount
52share/gvfs/mounts/http.mount 52share/gvfs/mounts/http.mount
53share/gvfs/mounts/localtest.mount 53share/gvfs/mounts/localtest.mount
54share/gvfs/mounts/network.mount 54share/gvfs/mounts/network.mount
55share/gvfs/mounts/sftp.mount 55share/gvfs/mounts/sftp.mount
56share/gvfs/mounts/smb-browse.mount 56${PLIST.samba}share/gvfs/mounts/smb-browse.mount
57share/gvfs/mounts/smb.mount 57${PLIST.samba}share/gvfs/mounts/smb.mount
58share/gvfs/mounts/trash.mount 58share/gvfs/mounts/trash.mount
59${PLIST.hal}share/gvfs/remote-volume-monitors/hal.monitor 59${PLIST.hal}share/gvfs/remote-volume-monitors/hal.monitor
60share/locale/ar/LC_MESSAGES/gvfs.mo 60share/locale/ar/LC_MESSAGES/gvfs.mo
61share/locale/as/LC_MESSAGES/gvfs.mo 61share/locale/as/LC_MESSAGES/gvfs.mo
62share/locale/be@latin/LC_MESSAGES/gvfs.mo 62share/locale/be@latin/LC_MESSAGES/gvfs.mo
63share/locale/bg/LC_MESSAGES/gvfs.mo 63share/locale/bg/LC_MESSAGES/gvfs.mo
64share/locale/bn_IN/LC_MESSAGES/gvfs.mo 64share/locale/bn_IN/LC_MESSAGES/gvfs.mo
65share/locale/ca/LC_MESSAGES/gvfs.mo 65share/locale/ca/LC_MESSAGES/gvfs.mo
66share/locale/cs/LC_MESSAGES/gvfs.mo 66share/locale/cs/LC_MESSAGES/gvfs.mo
67share/locale/da/LC_MESSAGES/gvfs.mo 67share/locale/da/LC_MESSAGES/gvfs.mo
68share/locale/de/LC_MESSAGES/gvfs.mo 68share/locale/de/LC_MESSAGES/gvfs.mo
69share/locale/el/LC_MESSAGES/gvfs.mo 69share/locale/el/LC_MESSAGES/gvfs.mo
70share/locale/en_GB/LC_MESSAGES/gvfs.mo 70share/locale/en_GB/LC_MESSAGES/gvfs.mo