net/samba4: handle dbus dependency explicitly on Linux

This manifests as the snapper vfs files appearing depending on dbus
being present or not on Linux, causing PLIST mismatch. This option
actually disables this if desired. The default is still on, as
dbus is to be expected on modern Linux installs anyway.

4 files changed, 22 insertions, 7 deletions

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index b8aaad3a0ba..b716c157c6e 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.123 2021/05/24 19:53:36 wiz Exp $
+# $NetBSD: Makefile,v 1.124 2021/05/30 20:02:31 thor Exp $
 
 DISTNAME=	samba-4.14.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	https://download.samba.org/pub/samba/stable/
 
diff --git a/net/samba4/PLIST b/net/samba4/PLIST
index 5b0ec43ab27..f7616c08f9a 100644
--- a/net/samba4/PLIST
+++ b/net/samba4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2021/04/14 19:11:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.37 2021/05/30 20:02:31 thor Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/dumpmscat
@@ -799,6 +799,7 @@ lib/samba/vfs/recycle.${SOEXT}
 lib/samba/vfs/shadow_copy.${SOEXT}
 lib/samba/vfs/shadow_copy2.${SOEXT}
 lib/samba/vfs/shell_snap.${SOEXT}
+${PLIST.snapper}lib/samba/vfs/snapper.${SOEXT}
 lib/samba/vfs/streams_depot.${SOEXT}
 lib/samba/vfs/streams_xattr.${SOEXT}
 lib/samba/vfs/syncops.${SOEXT}
@@ -898,6 +899,7 @@ man/man8/vfs_recycle.8
 man/man8/vfs_shadow_copy.8
 man/man8/vfs_shadow_copy2.8
 man/man8/vfs_shell_snap.8
+${PLIST.snapper}man/man8/vfs_snapper.8
 man/man8/vfs_streams_depot.8
 man/man8/vfs_streams_xattr.8
 man/man8/vfs_syncops.8
diff --git a/net/samba4/PLIST.Linux b/net/samba4/PLIST.Linux
index bb83f62806e..11274a2180b 100644
--- a/net/samba4/PLIST.Linux
+++ b/net/samba4/PLIST.Linux
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Linux,v 1.4 2021/01/18 09:24:32 nia Exp $
+@comment $NetBSD: PLIST.Linux,v 1.5 2021/05/30 20:02:31 thor Exp $
 lib/libnss_winbind.so.2
 lib/libnss_wins.so
 lib/libnss_wins.so.2
@@ -6,9 +6,7 @@ lib/samba/vfs/btrfs.so
 lib/samba/vfs/fileid.so
 lib/samba/vfs/glusterfs_fuse.so
 lib/samba/vfs/gpfs.so
-lib/samba/vfs/snapper.so
 man/man8/vfs_btrfs.8
 man/man8/vfs_fileid.8
 man/man8/vfs_glusterfs_fuse.8
 man/man8/vfs_gpfs.8
-man/man8/vfs_snapper.8
diff --git a/net/samba4/options.mk b/net/samba4/options.mk
index 10d8ad3e59b..6aa604d49aa 100644
--- a/net/samba4/options.mk
+++ b/net/samba4/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2020/11/12 06:37:18 adam Exp $
+# $NetBSD: options.mk,v 1.13 2021/05/30 20:02:31 thor Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.samba4
 PKG_SUPPORTED_OPTIONS=	ads avahi fam ldap pam winbind # cups # cups option is broken for me.
@@ -15,6 +15,11 @@ PKG_SUPPORTED_OPTIONS+=	acl
 PKG_SUGGESTED_OPTIONS+=	ads
 .endif
 
+.if ${OPSYS} == "Linux"
+PKG_SUPPORTED_OPTIONS+=	snapper
+PKG_SUGGESTED_OPTIONS+=	snapper
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=		ads cups fam ldap pam winbind
@@ -108,3 +113,13 @@ CONFIGURE_ARGS+=	--enable-avahi
 .else
 CONFIGURE_ARGS+=	--disable-avahi
 .endif
+
+.if ${OPSYS} == "Linux"
+PLIST_VARS+=	snapper
+.  if !empty(PKG_OPTIONS:Msnapper)
+.include "../../sysutils/dbus/buildlink3.mk"
+PLIST.snapper=	yes
+.  else
+CONFIGURE_ARGS+=	--with-shared-modules='!vfs_snapper'
+.  endif
+.endif