From owner-svn-ports-all@FreeBSD.ORG Mon Jun 8 18:25:06 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 88A2EE9D; Mon, 8 Jun 2015 18:25:06 +0000 (UTC) (envelope-from timur@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7621C1B79; Mon, 8 Jun 2015 18:25:06 +0000 (UTC) (envelope-from timur@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t58IP6rC064462; Mon, 8 Jun 2015 18:25:06 GMT (envelope-from timur@FreeBSD.org) Received: (from timur@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t58IP52X064458; Mon, 8 Jun 2015 18:25:05 GMT (envelope-from timur@FreeBSD.org) Message-Id: <201506081825.t58IP52X064458@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: timur set sender to timur@FreeBSD.org using -f From: "Timur I. Bakeyev" Date: Mon, 8 Jun 2015 18:25:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r388851 - in head/net/samba42: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Jun 2015 18:25:06 -0000 Author: timur Date: Mon Jun 8 18:25:05 2015 New Revision: 388851 URL: https://svnweb.freebsd.org/changeset/ports/388851 Log: 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. Modified: head/net/samba42/Makefile head/net/samba42/files/patch-source3__wscript head/net/samba42/pkg-plist Modified: head/net/samba42/Makefile ============================================================================== --- head/net/samba42/Makefile Mon Jun 8 18:20:24 2015 (r388850) +++ head/net/samba42/Makefile Mon Jun 8 18:25:05 2015 (r388851) @@ -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} Modified: head/net/samba42/files/patch-source3__wscript ============================================================================== --- head/net/samba42/files/patch-source3__wscript Mon Jun 8 18:20:24 2015 (r388850) +++ head/net/samba42/files/patch-source3__wscript Mon Jun 8 18:25:05 2015 (r388851) @@ -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=',') + Modified: head/net/samba42/pkg-plist ============================================================================== --- head/net/samba42/pkg-plist Mon Jun 8 18:20:24 2015 (r388850) +++ head/net/samba42/pkg-plist Mon Jun 8 18:25:05 2015 (r388851) @@ -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