diff options
| author | wiz <wiz@pkgsrc.org> | 2009-12-09 15:08:30 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2009-12-09 15:08:30 +0000 |
| commit | 438f7e6069fbeafd4081400562cc5fa3f08e7c8a (patch) | |
| tree | d0a960e82523af14f414c606ff408cdf9386630e /sysutils/gvfs | |
| parent | 4bb7360257b40756b6ae96d1a18cfa2d587bb2f3 (diff) | |
| download | pkgsrc-438f7e6069fbeafd4081400562cc5fa3f08e7c8a.tar.gz | |
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.
Diffstat (limited to 'sysutils/gvfs')
| -rw-r--r-- | sysutils/gvfs/Makefile | 18 | ||||
| -rw-r--r-- | sysutils/gvfs/PLIST | 10 |
2 files changed, 17 insertions, 11 deletions
diff --git a/sysutils/gvfs/Makefile b/sysutils/gvfs/Makefile index 2bd163fe70d..b7d129c6582 100644 --- a/sysutils/gvfs/Makefile +++ b/sysutils/gvfs/Makefile @@ -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 @@ PKG_DESTDIR_SUPPORT= user-destdir 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 @@ PLIST.avahi= yes 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 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.17.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 --git a/sysutils/gvfs/PLIST b/sysutils/gvfs/PLIST index 28d745cfcba..db8598d1ab6 100644 --- a/sysutils/gvfs/PLIST +++ b/sysutils/gvfs/PLIST @@ -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-http 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/http.mount 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 |