Work around build(or not) of vfs_snapper module, depending of the presence of

DBus in the system. As (it seems) this module is not highly demanded, remove it
from the build entirely.

3 files changed, 17 insertions, 8 deletions

diff --git a/net/samba42/Makefile b/net/samba42/Makefile
index e8c112d2cffc..d255fe43f01e 100644
--- a/net/samba42/Makefile
+++ b/net/samba42/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=		${SAMBA4_BASENAME}42
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		0
+PORTREVISION?=		1
 CATEGORIES?=		net
 MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=		${SAMBA4_DISTNAME}
diff --git a/net/samba42/files/patch-source3__wscript b/net/samba42/files/patch-source3__wscript
index 0e61bd51c387..d010d3f180f3 100644
--- a/net/samba42/files/patch-source3__wscript
+++ b/net/samba42/files/patch-source3__wscript
@@ -1,5 +1,5 @@
---- source3/wscript.orig	2014-10-01 09:17:32.000000000 +0000
-+++ source3/wscript	2014-11-03 14:35:41.486556970 +0000
+--- source3/wscript.orig	2014-12-20 15:07:55.000000000 +0000
++++ source3/wscript	2015-06-08 18:12:58.068891397 +0000
 @@ -34,6 +34,7 @@
      opt.SAMBA3_ADD_OPTION('utmp')
      opt.SAMBA3_ADD_OPTION('pthreadpool', with_name="enable", without_name="disable", default=True)
@@ -8,7 +8,7 @@
      opt.SAMBA3_ADD_OPTION('iconv')
      opt.SAMBA3_ADD_OPTION('acl-support')
      opt.SAMBA3_ADD_OPTION('dnsupdate')
-@@ -349,7 +350,9 @@
+@@ -342,7 +343,9 @@
  
      # Check if the compiler will optimize out functions
      conf.CHECK_CODE('''
@@ -19,7 +19,7 @@
      this_function_does_not_exist();
  } else {
      return 1;
-@@ -534,7 +537,7 @@
+@@ -527,7 +530,7 @@
              conf.CHECK_CODE('struct aiocb a; return aio_return(&a);', 'HAVE_AIO_RETURN', msg='Checking for aio_return', headers='aio.h', lib='aio rt')
              conf.CHECK_CODE('struct aiocb a; return aio_error(&a);', 'HAVE_AIO_ERROR', msg='Checking for aio_error', headers='aio.h', lib='aio rt')
              conf.CHECK_CODE('struct aiocb a; return aio_cancel(1, &a);', 'HAVE_AIO_CANCEL', msg='Checking for aio_cancel', headers='aio.h', lib='aio rt')
@@ -28,7 +28,7 @@
          if not conf.CONFIG_SET('HAVE_AIO'):
              conf.DEFINE('HAVE_NO_AIO', '1')
      else:
-@@ -855,6 +858,17 @@
+@@ -848,6 +851,17 @@
          conf.SET_TARGET_TYPE('avahi-common', 'EMPTY')
          conf.SET_TARGET_TYPE('avahi-client', 'EMPTY')
  
@@ -46,7 +46,7 @@
      if Options.options.with_iconv:
          conf.env.with_iconv = True
          if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'):
-@@ -1898,7 +1912,7 @@
+@@ -1603,7 +1617,7 @@
          default_static_modules.extend(TO_LIST('charset_macosxfs'))
  
      if conf.CONFIG_SET('HAVE_GPFS'):
@@ -55,3 +55,13 @@
  
      if conf.CONFIG_SET('HAVE_LINUX_IOCTL'):
  	default_shared_modules.extend(TO_LIST('vfs_btrfs'))
+@@ -1620,9 +1634,6 @@
+     if conf.CONFIG_SET('HAVE_VXFS'):
+         default_shared_modules.extend(TO_LIST('vfs_vxfs'))
+ 
+-    if conf.CONFIG_SET('HAVE_DBUS'):
+-	default_shared_modules.extend(TO_LIST('vfs_snapper'))
+-
+     explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',')
+     explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',')
+ 
diff --git a/net/samba42/pkg-plist b/net/samba42/pkg-plist
index bf0c8e7d6fae..b12fcf839107 100644
--- a/net/samba42/pkg-plist
+++ b/net/samba42/pkg-plist
@@ -427,7 +427,6 @@ lib/shared-modules/vfs/scannedonly.so
 lib/shared-modules/vfs/shadow_copy.so
 lib/shared-modules/vfs/shadow_copy2.so
 lib/shared-modules/vfs/smb_traffic_analyzer.so
-lib/shared-modules/vfs/snapper.so
 lib/shared-modules/vfs/streams_depot.so
 lib/shared-modules/vfs/streams_xattr.so
 lib/shared-modules/vfs/syncops.so