[pkgsrc/trunk]: pkgsrc/sysutils/gvfs Make samba dependency optional, but defa...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/df03e96c3a1f
branches:  trunk
changeset: 568280:df03e96c3a1f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Dec 09 15:08:30 2009 +0000

description:
Make samba dependency optional, but default on (so no change to package).

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

diffstat:

 sysutils/gvfs/Makefile |  18 ++++++++++++------
 sysutils/gvfs/PLIST    |  10 +++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diffs (83 lines):

diff -r 1d6f36d39044 -r df03e96c3a1f sysutils/gvfs/Makefile
--- a/sysutils/gvfs/Makefile    Wed Dec 09 14:39:30 2009 +0000
+++ b/sysutils/gvfs/Makefile    Wed Dec 09 15:08:30 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/10/31 14:46:51 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2009/12/09 15:08:30 wiz Exp $
 #
 
 DISTNAME=      gvfs-1.2.3
@@ -16,16 +16,14 @@
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    intltool gmake pkg-config msgfmt
-CONFIGURE_ARGS+=       --with-samba-includes=${LOCALBASE}/include
-CONFIGURE_ARGS+=       --with-samba-libs=${LOCALBASE}/lib/samba
 CONFIGURE_ARGS+=       --enable-http
 CONFIGURE_ARGS+=       --disable-bash-completion
 
 .include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=        PKG_OPTIONS.gvfs
-PKG_SUPPORTED_OPTIONS+= avahi hal fuse
-PKG_SUGGESTED_OPTIONS+= avahi hal
+PKG_SUPPORTED_OPTIONS+= avahi hal fuse samba
+PKG_SUGGESTED_OPTIONS+= avahi hal samba
 PLIST_VARS+=           ${PKG_SUPPORTED_OPTIONS}
 
 # XXX fuse.bl3.mk will fail if we include it and fuse is not available
@@ -43,6 +41,15 @@
 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
+.include "../../net/samba/buildlink3.mk"
+PLIST.samba=           yes
+.else
+CONFIGURE_ARGS+=       --disable-samba
+.endif
+
 .if !empty(PKG_OPTIONS:Mhal)
 .include "../../misc/libcdio/buildlink3.mk"
 .include "../../sysutils/hal/buildlink3.mk"
@@ -66,7 +73,6 @@
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../archivers/libarchive/buildlink3.mk"
-.include "../../net/samba/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libsoup24+=      libsoup24>=2.25.1
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff -r 1d6f36d39044 -r df03e96c3a1f sysutils/gvfs/PLIST
--- a/sysutils/gvfs/PLIST       Wed Dec 09 14:39:30 2009 +0000
+++ b/sysutils/gvfs/PLIST       Wed Dec 09 15:08:30 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 21:28:47 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/12/09 15:08:30 wiz Exp $
 bin/gvfs-cat
 bin/gvfs-copy
 bin/gvfs-info
@@ -36,8 +36,8 @@
 libexec/gvfsd-localtest
 libexec/gvfsd-network
 libexec/gvfsd-sftp
-libexec/gvfsd-smb
-libexec/gvfsd-smb-browse
+${PLIST.samba}libexec/gvfsd-smb
+${PLIST.samba}libexec/gvfsd-smb-browse
 libexec/gvfsd-trash
 share/dbus-1/services/gvfs-daemon.service
 ${PLIST.hal}share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
@@ -53,8 +53,8 @@
 share/gvfs/mounts/localtest.mount
 share/gvfs/mounts/network.mount
 share/gvfs/mounts/sftp.mount
-share/gvfs/mounts/smb-browse.mount
-share/gvfs/mounts/smb.mount
+${PLIST.samba}share/gvfs/mounts/smb-browse.mount
+${PLIST.samba}share/gvfs/mounts/smb.mount
 share/gvfs/mounts/trash.mount
 ${PLIST.hal}share/gvfs/remote-volume-monitors/hal.monitor
 share/locale/ar/LC_MESSAGES/gvfs.mo