From owner-svn-ports-head@freebsd.org  Tue Feb 20 23:17:53 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02103F0FAC6;
 Tue, 20 Feb 2018 23:17:53 +0000 (UTC)
 (envelope-from timur@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id AA30176E46;
 Tue, 20 Feb 2018 23:17:52 +0000 (UTC)
 (envelope-from timur@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A4D7710522;
 Tue, 20 Feb 2018 23:17:52 +0000 (UTC)
 (envelope-from timur@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1KNHq8l040318;
 Tue, 20 Feb 2018 23:17:52 GMT (envelope-from timur@FreeBSD.org)
Received: (from timur@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1KNHnwN040287;
 Tue, 20 Feb 2018 23:17:49 GMT (envelope-from timur@FreeBSD.org)
Message-Id: <201802202317.w1KNHnwN040287@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: timur set sender to
 timur@FreeBSD.org using -f
From: "Timur I. Bakeyev" <timur@FreeBSD.org>
Date: Tue, 20 Feb 2018 23:17:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r462465 - in head: databases/ldb databases/ldb/files
 databases/ldb12 databases/ldb12/files databases/ldb13 databases/ldb13/files
 databases/tdb databases/tdb/files devel/talloc devel/tal...
X-SVN-Group: ports-head
X-SVN-Commit-Author: timur
X-SVN-Commit-Paths: in head: databases/ldb databases/ldb/files databases/ldb12
 databases/ldb12/files databases/ldb13 databases/ldb13/files databases/tdb
 databases/tdb/files devel/talloc devel/talloc/files devel/tevent de...
X-SVN-Commit-Revision: 462465
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Feb 2018 23:17:53 -0000

Author: timur
Date: Tue Feb 20 23:17:49 2018
New Revision: 462465
URL: https://svnweb.freebsd.org/changeset/ports/462465

Log:
  Update supplimentary Samba libs to the latest versions.
  
  Sponsored by:	iXsystems Inc.

Added:
  head/databases/ldb/files/patch-buildtools__wafsamba__wscript   (contents, props changed)
  head/databases/ldb/files/patch-common__ldb_modules.c   (contents, props changed)
  head/databases/ldb12/files/patch-buildtools__wafsamba__wscript   (contents, props changed)
  head/databases/ldb12/files/patch-common__ldb_modules.c   (contents, props changed)
  head/databases/ldb13/files/patch-buildtools__wafsamba__wscript   (contents, props changed)
  head/databases/ldb13/files/patch-common__ldb_modules.c   (contents, props changed)
  head/databases/tdb/files/patch-buildtools__wafsamba__wscript   (contents, props changed)
  head/devel/talloc/files/patch-buildtools__wafsamba__wscript   (contents, props changed)
  head/devel/talloc/files/patch-talloc.c   (contents, props changed)
  head/devel/tevent/files/patch-buildtools__wafsamba__wscript   (contents, props changed)
Modified:
  head/databases/ldb/Makefile
  head/databases/ldb/files/patch-buildtools__wafsamba__samba_autoconf.py
  head/databases/ldb12/Makefile
  head/databases/ldb12/files/patch-buildtools__wafsamba__samba_autoconf.py
  head/databases/ldb12/files/patch-buildtools__wafsamba__samba_python.py
  head/databases/ldb13/Makefile
  head/databases/ldb13/distinfo
  head/databases/ldb13/files/patch-buildtools__wafsamba__samba_autoconf.py
  head/databases/ldb13/files/patch-buildtools__wafsamba__samba_python.py
  head/databases/tdb/Makefile
  head/databases/tdb/files/patch-buildtools__wafsamba__samba_autoconf.py
  head/databases/tdb/files/patch-buildtools__wafsamba__samba_python.py
  head/devel/talloc/Makefile
  head/devel/talloc/distinfo
  head/devel/talloc/files/patch-buildtools__wafsamba__samba_autoconf.py
  head/devel/talloc/files/patch-buildtools__wafsamba__samba_python.py
  head/devel/talloc/files/patch-wscript
  head/devel/tevent/Makefile
  head/devel/tevent/distinfo
  head/devel/tevent/files/patch-buildtools__wafsamba__samba_autoconf.py
  head/devel/tevent/files/patch-buildtools__wafsamba__samba_python.py

Modified: head/databases/ldb/Makefile
==============================================================================
--- head/databases/ldb/Makefile	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/databases/ldb/Makefile	Tue Feb 20 23:17:49 2018	(r462465)
@@ -22,8 +22,13 @@ LDB_DEPENDS=		talloc>=2.1.8:devel/talloc \
 			tdb>=1.3.12,1:databases/tdb \
 			popt>=0:devel/popt
 
-CONFLICTS=		ldb1[23]-1.*
+CONFLICTS_INSTALL=	ldb1[23]-1.*
 
+#FLAVORS=		default nopython
+#nopython_PKGNAMESUFFIX=	-nopython
+#nopython_CONFLICTS=	ldb
+#default_CONFLICTS=	ldb-nopython
+
 USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		buildtools/bin/waf
@@ -38,7 +43,7 @@ CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!
 			--with-privatelibdir=${PREFIX}/lib/ldb
 
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
-			--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
+			--with-openldap=${LOCALBASE} \
 			--disable-rpath \
 			--without-gettext
 
@@ -143,13 +148,13 @@ post-install:
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so
 .else
-.for file in		include/pyldb.h \
+.for f in		include/pyldb.h \
 			lib/libpyldb-util.so \
 			lib/libpyldb-util.so.1 \
 			lib/ldb/libpytalloc-util.so.2
 				${RM} ${STAGEDIR}${PREFIX}/${file}
 .endfor
-.for file in		${PYTHON_SITELIBDIR}/ldb.so \
+.for f in		${PYTHON_SITELIBDIR}/ldb.so \
 			${PYTHON_SITELIBDIR}/_ldb_text.py \
 			${PYTHON_SITELIBDIR}/_tdb_text.py \
 			${PYTHON_SITELIBDIR}/_tevent.so \

Modified: head/databases/ldb/files/patch-buildtools__wafsamba__samba_autoconf.py
==============================================================================
--- head/databases/ldb/files/patch-buildtools__wafsamba__samba_autoconf.py	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/databases/ldb/files/patch-buildtools__wafsamba__samba_autoconf.py	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,6 +1,47 @@
 --- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
 +++ buildtools/wafsamba/samba_autoconf.py
-@@ -873,7 +873,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
+@@ -548,7 +548,7 @@ def library_flags(self, libs):
+ 
+ 
+ @conf
+-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
++def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
+     '''check if a set of libraries exist as system libraries
+ 
+     returns the sublist of libs that do exist as a syslib or []
+@@ -568,11 +568,29 @@ int foo()
+             ret.append(lib)
+             continue
+ 
++        if msg is None:
++            msg = 'Checking for library %s' % lib
++
+         (ccflags, ldflags, cpppath) = library_flags(conf, lib)
++
+         if shlib:
+-            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(features='c cshlib',
++                             fragment=fragment,
++                             lib=lib,
++                             uselib_store=lib,
++                             ccflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+         else:
+-            res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(lib=lib,
++                             uselib_store=lib,
++                             ccflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+ 
+         if not res:
+             if mandatory:
+@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
          conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
  
      if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:

Added: head/databases/ldb/files/patch-buildtools__wafsamba__wscript
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/ldb/files/patch-buildtools__wafsamba__wscript	Tue Feb 20 23:17:49 2018	(r462465)
@@ -0,0 +1,22 @@
+--- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
++++ buildtools/wafsamba/wscript
+@@ -74,12 +74,17 @@ def set_options(opt):
+                    help=("private library directory [PREFIX/lib/%s]" % Utils.g_module.APPNAME),
+                    action="store", dest='PRIVATELIBDIR', default=None)
+ 
++    opt.add_option('--with-openldap',
++                   help='additional directory to search for OpenLDAP libs',
++                   action='store', dest='ldap_open', default=None,
++                   match = ['Checking for library lber', 'Checking for library ldap'])
++
+     opt.add_option('--with-libiconv',
+                    help='additional directory to search for libiconv',
+-                   action='store', dest='iconv_open', default='/usr/local',
++                   action='store', dest='iconv_open', default=None,
+                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
+     opt.add_option('--without-gettext',
+-                   help=("Disable use of gettext"),
++                   help=("disable use of gettext"),
+                    action="store_true", dest='disable_gettext', default=False)
+ 
+     gr = opt.option_group('developer options')

Added: head/databases/ldb/files/patch-common__ldb_modules.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/ldb/files/patch-common__ldb_modules.c	Tue Feb 20 23:17:49 2018	(r462465)
@@ -0,0 +1,11 @@
+--- common/ldb_modules.c.orig	2018-02-14 01:18:43 UTC
++++ common/ldb_modules.c
+@@ -1103,7 +1103,7 @@ static int ldb_modules_load_dir(const ch
+ */
+ void ldb_set_modules_dir(struct ldb_context *ldb, const char *path)
+ {
+-	int ret = ldb_modules_load_path(path, LDB_VERSION);
++	int ret = ldb_modules_load_dir(path, LDB_VERSION);
+ 	if (ret != LDB_SUCCESS) {
+ 		ldb_asprintf_errstring(ldb, "Failed to load modules from: %s\n", path);
+ 	}

Modified: head/databases/ldb12/Makefile
==============================================================================
--- head/databases/ldb12/Makefile	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/databases/ldb12/Makefile	Tue Feb 20 23:17:49 2018	(r462465)
@@ -19,13 +19,18 @@ BUILD_DEPENDS=		${LDB_DEPENDS}
 RUN_DEPENDS=		${LDB_DEPENDS}
 
 LDB_DEPENDS=		talloc>=2.1.10:devel/talloc \
-			tevent>=0.9.33:devel/tevent \
+			tevent>=0.9.34:devel/tevent \
 			tdb>=1.3.15:databases/tdb \
 			cmocka>=1.1.1:sysutils/cmocka \
 			popt>=0:devel/popt
 
-CONFLICTS=		ldb-1.1.* ldb13-1.3.*
+CONFLICTS_INSTALL=	ldb-1.1.* ldb13-1.3.*
 
+#FLAVORS=		default nopython
+#nopython_PKGNAMESUFFIX=	-nopython
+#nopython_CONFLICTS=	ldb
+#default_CONFLICTS=	ldb-nopython
+
 USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		buildtools/bin/waf
@@ -40,7 +45,7 @@ CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!
 			--with-privatelibdir=${PREFIX}/lib/ldb
 
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
-			--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
+			--with-openldap=${LOCALBASE} \
 			--disable-rpath \
 			--without-gettext
 
@@ -113,7 +118,7 @@ PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO
 
 PLIST_FILES+=		lib/libpyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.so \
 			lib/libpyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.so.1 \
-			%%SAMBA4_PYTHON3_SITELIBDIR%%/ldb.so \
+			%%SAMBA4_PYTHON3_SITELIBDIR%%/ldb.%%SAMBA4_PYTHON3_SO_ABI%%.so \
 			%%SAMBA4_PYTHON3_SITELIBDIR%%/_ldb_text.py  \
 			%%PKGCONFIGDIR%%/pyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.pc
 .endif
@@ -173,7 +178,7 @@ post-install:
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so
 .if defined(SAMBA4_PYTHON3)
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/ldb.so
+			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/ldb.${SAMBA4_PYTHON3_SO_ABI}.so
 .endif
 .endif
 

Modified: head/databases/ldb12/files/patch-buildtools__wafsamba__samba_autoconf.py
==============================================================================
--- head/databases/ldb12/files/patch-buildtools__wafsamba__samba_autoconf.py	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/databases/ldb12/files/patch-buildtools__wafsamba__samba_autoconf.py	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,6 +1,47 @@
 --- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
 +++ buildtools/wafsamba/samba_autoconf.py
-@@ -873,7 +873,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
+@@ -548,7 +548,7 @@ def library_flags(self, libs):
+ 
+ 
+ @conf
+-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
++def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
+     '''check if a set of libraries exist as system libraries
+ 
+     returns the sublist of libs that do exist as a syslib or []
+@@ -568,11 +568,29 @@ int foo()
+             ret.append(lib)
+             continue
+ 
++        if msg is None:
++            msg = 'Checking for library %s' % lib
++
+         (ccflags, ldflags, cpppath) = library_flags(conf, lib)
++
+         if shlib:
+-            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(features='c cshlib',
++                             fragment=fragment,
++                             lib=lib,
++                             uselib_store=lib,
++                             ccflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+         else:
+-            res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(lib=lib,
++                             uselib_store=lib,
++                             ccflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+ 
+         if not res:
+             if mandatory:
+@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
          conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
  
      if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:

Modified: head/databases/ldb12/files/patch-buildtools__wafsamba__samba_python.py
==============================================================================
--- head/databases/ldb12/files/patch-buildtools__wafsamba__samba_python.py	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/databases/ldb12/files/patch-buildtools__wafsamba__samba_python.py	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,6 +1,6 @@
---- buildtools/wafsamba/samba_python.py.orig	2017-04-28 08:57:26 UTC
+--- buildtools/wafsamba/samba_python.py.orig	2018-01-13 09:07:51 UTC
 +++ buildtools/wafsamba/samba_python.py
-@@ -76,17 +76,31 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
+@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
  
  def _check_python_headers(conf, mandatory):
      try:
@@ -19,12 +19,16 @@
      if conf.env['PYTHON_VERSION'] > '3':
 -        abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
 -        conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-+        override_PYTHON3_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
-+        if override_PYTHON3_SO_ABI_FLAG is not None:
-+            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON3_SO_ABI_FLAG
++        '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG,
++           while environment variable is PYTHON3_SO_ABI_FLAG'''
++        override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
++        if override_PYTHON_SO_ABI_FLAG is not None:
++            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG
++            conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
 +        if not conf.env['PYTHON_SO_ABI_FLAG']:
 +            if conf.env['PYTHON_SO_ABI']:
 +                conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI']
++                conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
 +            else:
 +                abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
 +                conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''

Added: head/databases/ldb12/files/patch-buildtools__wafsamba__wscript
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/ldb12/files/patch-buildtools__wafsamba__wscript	Tue Feb 20 23:17:49 2018	(r462465)
@@ -0,0 +1,22 @@
+--- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
++++ buildtools/wafsamba/wscript
+@@ -74,12 +74,17 @@ def set_options(opt):
+                    help=("private library directory [PREFIX/lib/%s]" % Utils.g_module.APPNAME),
+                    action="store", dest='PRIVATELIBDIR', default=None)
+ 
++    opt.add_option('--with-openldap',
++                   help='additional directory to search for OpenLDAP libs',
++                   action='store', dest='ldap_open', default=None,
++                   match = ['Checking for library lber', 'Checking for library ldap'])
++
+     opt.add_option('--with-libiconv',
+                    help='additional directory to search for libiconv',
+-                   action='store', dest='iconv_open', default='/usr/local',
++                   action='store', dest='iconv_open', default=None,
+                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
+     opt.add_option('--without-gettext',
+-                   help=("Disable use of gettext"),
++                   help=("disable use of gettext"),
+                    action="store_true", dest='disable_gettext', default=False)
+ 
+     gr = opt.option_group('developer options')

Added: head/databases/ldb12/files/patch-common__ldb_modules.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/ldb12/files/patch-common__ldb_modules.c	Tue Feb 20 23:17:49 2018	(r462465)
@@ -0,0 +1,11 @@
+--- common/ldb_modules.c.orig	2018-02-14 01:18:43 UTC
++++ common/ldb_modules.c
+@@ -1103,7 +1103,7 @@ static int ldb_modules_load_dir(const ch
+ */
+ void ldb_set_modules_dir(struct ldb_context *ldb, const char *path)
+ {
+-	int ret = ldb_modules_load_path(path, LDB_VERSION);
++	int ret = ldb_modules_load_dir(path, LDB_VERSION);
+ 	if (ret != LDB_SUCCESS) {
+ 		ldb_asprintf_errstring(ldb, "Failed to load modules from: %s\n", path);
+ 	}

Modified: head/databases/ldb13/Makefile
==============================================================================
--- head/databases/ldb13/Makefile	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/databases/ldb13/Makefile	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=		ldb
-PORTVERSION=		1.3.0
+PORTVERSION=		1.3.1
 PORTREVISION=		0
 PORTEPOCH=		0
 CATEGORIES=		databases
@@ -18,14 +18,19 @@ IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON
 BUILD_DEPENDS=		${LDB_DEPENDS}
 RUN_DEPENDS=		${LDB_DEPENDS}
 
-LDB_DEPENDS=		talloc>=2.1.10:devel/talloc \
-			tevent>=0.9.33:devel/tevent \
+LDB_DEPENDS=		talloc>=2.1.11:devel/talloc \
+			tevent>=0.9.35:devel/tevent \
 			tdb>=1.3.15:databases/tdb \
 			cmocka>=1.1.1:sysutils/cmocka \
 			popt>=0:devel/popt
 
 CONFLICTS_INSTALL=	ldb-1.1.* ldb12-1.2.*
 
+#FLAVORS=		default nopython
+#nopython_PKGNAMESUFFIX=	-nopython
+#nopython_CONFLICTS=	ldb
+#default_CONFLICTS=	ldb-nopython
+
 USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		buildtools/bin/waf
@@ -40,7 +45,7 @@ CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!
 			--with-privatelibdir=${PREFIX}/lib/ldb
 
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
-			--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
+			--with-openldap=${LOCALBASE} \
 			--disable-rpath \
 			--without-gettext
 
@@ -113,7 +118,7 @@ PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO
 
 PLIST_FILES+=		lib/libpyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.so \
 			lib/libpyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.so.1 \
-			%%SAMBA4_PYTHON3_SITELIBDIR%%/ldb.so \
+			%%SAMBA4_PYTHON3_SITELIBDIR%%/ldb.%%SAMBA4_PYTHON3_SO_ABI%%.so \
 			%%SAMBA4_PYTHON3_SITELIBDIR%%/_ldb_text.py  \
 			%%PKGCONFIGDIR%%/pyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.pc
 .endif
@@ -173,7 +178,7 @@ post-install:
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so
 .if defined(SAMBA4_PYTHON3)
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/ldb.so
+			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/ldb.${SAMBA4_PYTHON3_SO_ABI}.so
 .endif
 .endif
 

Modified: head/databases/ldb13/distinfo
==============================================================================
--- head/databases/ldb13/distinfo	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/databases/ldb13/distinfo	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509845308
-SHA256 (ldb-1.3.0.tar.gz) = 44b53e5a3bc45c8dc837a7e0e00a78e87911da5959ad1b026a62f5b9b4d5590d
-SIZE (ldb-1.3.0.tar.gz) = 1359144
+TIMESTAMP = 1516159739
+SHA256 (ldb-1.3.1.tar.gz) = b19f2c9f55ae0f46aa5ebaea0bf1a47ec1ac135e1d78af0f6318cf50bf62cbd2
+SIZE (ldb-1.3.1.tar.gz) = 1361723

Modified: head/databases/ldb13/files/patch-buildtools__wafsamba__samba_autoconf.py
==============================================================================
--- head/databases/ldb13/files/patch-buildtools__wafsamba__samba_autoconf.py	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/databases/ldb13/files/patch-buildtools__wafsamba__samba_autoconf.py	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,6 +1,47 @@
 --- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
 +++ buildtools/wafsamba/samba_autoconf.py
-@@ -873,7 +873,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
+@@ -548,7 +548,7 @@ def library_flags(self, libs):
+ 
+ 
+ @conf
+-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
++def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
+     '''check if a set of libraries exist as system libraries
+ 
+     returns the sublist of libs that do exist as a syslib or []
+@@ -568,11 +568,29 @@ int foo()
+             ret.append(lib)
+             continue
+ 
++        if msg is None:
++            msg = 'Checking for library %s' % lib
++
+         (ccflags, ldflags, cpppath) = library_flags(conf, lib)
++
+         if shlib:
+-            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(features='c cshlib',
++                             fragment=fragment,
++                             lib=lib,
++                             uselib_store=lib,
++                             ccflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+         else:
+-            res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(lib=lib,
++                             uselib_store=lib,
++                             ccflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+ 
+         if not res:
+             if mandatory:
+@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
          conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
  
      if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:

Modified: head/databases/ldb13/files/patch-buildtools__wafsamba__samba_python.py
==============================================================================
--- head/databases/ldb13/files/patch-buildtools__wafsamba__samba_python.py	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/databases/ldb13/files/patch-buildtools__wafsamba__samba_python.py	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,6 +1,6 @@
---- buildtools/wafsamba/samba_python.py.orig	2017-04-28 08:57:26 UTC
+--- buildtools/wafsamba/samba_python.py.orig	2018-01-13 09:07:51 UTC
 +++ buildtools/wafsamba/samba_python.py
-@@ -76,17 +76,31 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
+@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
  
  def _check_python_headers(conf, mandatory):
      try:
@@ -19,12 +19,16 @@
      if conf.env['PYTHON_VERSION'] > '3':
 -        abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
 -        conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-+        override_PYTHON3_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
-+        if override_PYTHON3_SO_ABI_FLAG is not None:
-+            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON3_SO_ABI_FLAG
++        '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG,
++           while environment variable is PYTHON3_SO_ABI_FLAG'''
++        override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
++        if override_PYTHON_SO_ABI_FLAG is not None:
++            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG
++            conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
 +        if not conf.env['PYTHON_SO_ABI_FLAG']:
 +            if conf.env['PYTHON_SO_ABI']:
 +                conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI']
++                conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
 +            else:
 +                abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
 +                conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''

Added: head/databases/ldb13/files/patch-buildtools__wafsamba__wscript
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/ldb13/files/patch-buildtools__wafsamba__wscript	Tue Feb 20 23:17:49 2018	(r462465)
@@ -0,0 +1,22 @@
+--- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
++++ buildtools/wafsamba/wscript
+@@ -74,12 +74,17 @@ def set_options(opt):
+                    help=("private library directory [PREFIX/lib/%s]" % Utils.g_module.APPNAME),
+                    action="store", dest='PRIVATELIBDIR', default=None)
+ 
++    opt.add_option('--with-openldap',
++                   help='additional directory to search for OpenLDAP libs',
++                   action='store', dest='ldap_open', default=None,
++                   match = ['Checking for library lber', 'Checking for library ldap'])
++
+     opt.add_option('--with-libiconv',
+                    help='additional directory to search for libiconv',
+-                   action='store', dest='iconv_open', default='/usr/local',
++                   action='store', dest='iconv_open', default=None,
+                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
+     opt.add_option('--without-gettext',
+-                   help=("Disable use of gettext"),
++                   help=("disable use of gettext"),
+                    action="store_true", dest='disable_gettext', default=False)
+ 
+     gr = opt.option_group('developer options')

Added: head/databases/ldb13/files/patch-common__ldb_modules.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/ldb13/files/patch-common__ldb_modules.c	Tue Feb 20 23:17:49 2018	(r462465)
@@ -0,0 +1,11 @@
+--- common/ldb_modules.c.orig	2018-02-14 01:18:43 UTC
++++ common/ldb_modules.c
+@@ -1103,7 +1103,7 @@ static int ldb_modules_load_dir(const ch
+ */
+ void ldb_set_modules_dir(struct ldb_context *ldb, const char *path)
+ {
+-	int ret = ldb_modules_load_path(path, LDB_VERSION);
++	int ret = ldb_modules_load_dir(path, LDB_VERSION);
+ 	if (ret != LDB_SUCCESS) {
+ 		ldb_asprintf_errstring(ldb, "Failed to load modules from: %s\n", path);
+ 	}

Modified: head/databases/tdb/Makefile
==============================================================================
--- head/databases/tdb/Makefile	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/databases/tdb/Makefile	Tue Feb 20 23:17:49 2018	(r462465)
@@ -2,7 +2,7 @@
 
 PORTNAME=		tdb
 PORTVERSION=		1.3.15
-PORTREVISION=		1
+PORTREVISION=		2
 PORTEPOCH=		1
 CATEGORIES=		databases
 MASTER_SITES=		SAMBA
@@ -14,6 +14,13 @@ LICENSE=		GPLv3
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
+#FLAVORS=		default nopython debug
+#nopython_PKGNAMESUFFIX=	-nopython
+#debug_PKGNAMESUFFIX=	-debug
+#nopython_CONFLICTS=	tdb tdb-debug
+#debug_CONFLICTS=	tdb tdb-nopython
+#default_CONFLICTS=	tdb-nopython rdb-debug
+
 USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		buildtools/bin/waf
@@ -23,7 +30,6 @@ PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
-			--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
 			--disable-rpath \
 			--without-gettext
 
@@ -43,6 +49,10 @@ PLIST_FILES+=		include/tdb.h \
 			lib/libtdb.so.1 \
 			%%PKGCONFIGDIR%%/tdb.pc
 
+.if defined(SAMBA4_DEBUG)
+CFLAGS+=		-DTDB_TRACE=1
+.endif
+
 .if defined(NO_PYTHON)
 USES+=			python:2.7,build
 CONFIGURE_ARGS+=	--disable-python
@@ -72,7 +82,7 @@ CONFIGURE_ARGS+=	--extra-python=${LOCALBASE}/bin/${SAM
 PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
 			SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
 
-PLIST_FILES+=		%%SAMBA4_PYTHON3_SITELIBDIR%%/tdb.so \
+PLIST_FILES+=		%%SAMBA4_PYTHON3_SITELIBDIR%%/tdb.%%SAMBA4_PYTHON3_SO_ABI%%.so \
 			%%SAMBA4_PYTHON3_SITELIBDIR%%/_tdb_text.py
 .endif
 .endif
@@ -125,7 +135,7 @@ post-install:
 .if !defined(NO_PYTHON)
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tdb.so
 .if defined(SAMBA4_PYTHON3)
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/tdb.so
+			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/tdb.${SAMBA4_PYTHON3_SO_ABI}.so
 .endif
 .endif
 

Modified: head/databases/tdb/files/patch-buildtools__wafsamba__samba_autoconf.py
==============================================================================
--- head/databases/tdb/files/patch-buildtools__wafsamba__samba_autoconf.py	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/databases/tdb/files/patch-buildtools__wafsamba__samba_autoconf.py	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,6 +1,47 @@
 --- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
 +++ buildtools/wafsamba/samba_autoconf.py
-@@ -873,7 +873,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
+@@ -548,7 +548,7 @@ def library_flags(self, libs):
+ 
+ 
+ @conf
+-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
++def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
+     '''check if a set of libraries exist as system libraries
+ 
+     returns the sublist of libs that do exist as a syslib or []
+@@ -568,11 +568,29 @@ int foo()
+             ret.append(lib)
+             continue
+ 
++        if msg is None:
++            msg = 'Checking for library %s' % lib
++
+         (ccflags, ldflags, cpppath) = library_flags(conf, lib)
++
+         if shlib:
+-            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(features='c cshlib',
++                             fragment=fragment,
++                             lib=lib,
++                             uselib_store=lib,
++                             ccflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+         else:
+-            res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(lib=lib,
++                             uselib_store=lib,
++                             ccflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+ 
+         if not res:
+             if mandatory:
+@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
          conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
  
      if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:

Modified: head/databases/tdb/files/patch-buildtools__wafsamba__samba_python.py
==============================================================================
--- head/databases/tdb/files/patch-buildtools__wafsamba__samba_python.py	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/databases/tdb/files/patch-buildtools__wafsamba__samba_python.py	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,6 +1,6 @@
---- buildtools/wafsamba/samba_python.py.orig	2017-04-28 08:57:26 UTC
+--- buildtools/wafsamba/samba_python.py.orig	2018-01-13 09:07:51 UTC
 +++ buildtools/wafsamba/samba_python.py
-@@ -76,17 +76,31 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
+@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
  
  def _check_python_headers(conf, mandatory):
      try:
@@ -19,12 +19,16 @@
      if conf.env['PYTHON_VERSION'] > '3':
 -        abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
 -        conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-+        override_PYTHON3_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
-+        if override_PYTHON3_SO_ABI_FLAG is not None:
-+            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON3_SO_ABI_FLAG
++        '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG,
++           while environment variable is PYTHON3_SO_ABI_FLAG'''
++        override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
++        if override_PYTHON_SO_ABI_FLAG is not None:
++            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG
++            conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
 +        if not conf.env['PYTHON_SO_ABI_FLAG']:
 +            if conf.env['PYTHON_SO_ABI']:
 +                conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI']
++                conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
 +            else:
 +                abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
 +                conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''

Added: head/databases/tdb/files/patch-buildtools__wafsamba__wscript
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/tdb/files/patch-buildtools__wafsamba__wscript	Tue Feb 20 23:17:49 2018	(r462465)
@@ -0,0 +1,15 @@
+--- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
++++ buildtools/wafsamba/wscript
+@@ -76,10 +76,10 @@ def set_options(opt):
+ 
+     opt.add_option('--with-libiconv',
+                    help='additional directory to search for libiconv',
+-                   action='store', dest='iconv_open', default='/usr/local',
++                   action='store', dest='iconv_open', default=None,
+                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
+     opt.add_option('--without-gettext',
+-                   help=("Disable use of gettext"),
++                   help=("disable use of gettext"),
+                    action="store_true", dest='disable_gettext', default=False)
+ 
+     gr = opt.option_group('developer options')

Modified: head/devel/talloc/Makefile
==============================================================================
--- head/devel/talloc/Makefile	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/devel/talloc/Makefile	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=		talloc
-PORTVERSION=		2.1.10
-PORTREVISION=		1
+PORTVERSION=		2.1.11
+PORTREVISION=		0
 CATEGORIES=		devel
 MASTER_SITES=		SAMBA
 
@@ -13,6 +13,11 @@ LICENSE=		LGPL3
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
+#FLAVORS=		default nopython
+#nopython_PKGNAMESUFFIX=	-nopython
+#nopython_CONFLICTS=	talloc
+#default_CONFLICTS=	talloc-nopython
+
 USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		buildtools/bin/waf
@@ -22,7 +27,6 @@ PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
-			--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
 			--disable-rpath \
 			--without-gettext
 
@@ -70,7 +74,7 @@ PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO
 
 PLIST_FILES+=		lib/libpytalloc-util.%%SAMBA4_PYTHON3_SO_ABI%%.so \
 			lib/libpytalloc-util.%%SAMBA4_PYTHON3_SO_ABI%%.so.2 \
-			%%SAMBA4_PYTHON3_SITELIBDIR%%/talloc.so \
+			%%SAMBA4_PYTHON3_SITELIBDIR%%/talloc.%%SAMBA4_PYTHON3_SO_ABI%%.so \
 			%%PKGCONFIGDIR%%/pytalloc-util.%%SAMBA4_PYTHON3_SO_ABI%%.pc
 .endif
 .endif
@@ -125,7 +129,7 @@ post-install:
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/talloc.so
 .if defined(SAMBA4_PYTHON3)
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/talloc.so
+			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/talloc.${SAMBA4_PYTHON3_SO_ABI}.so
 .endif
 .endif
 

Modified: head/devel/talloc/distinfo
==============================================================================
--- head/devel/talloc/distinfo	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/devel/talloc/distinfo	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504145176
-SHA256 (talloc-2.1.10.tar.gz) = c985e94bebd6ec2f6af3d95dcc3fcb192a2ddb7781a021d70ee899e26221f619
-SIZE (talloc-2.1.10.tar.gz) = 441645
+TIMESTAMP = 1516159871
+SHA256 (talloc-2.1.11.tar.gz) = 639eb35556a0af999123c4d883e79be05ff9f00ab4f9e4ac2e5775f9c5eeeed3
+SIZE (talloc-2.1.11.tar.gz) = 443320

Modified: head/devel/talloc/files/patch-buildtools__wafsamba__samba_autoconf.py
==============================================================================
--- head/devel/talloc/files/patch-buildtools__wafsamba__samba_autoconf.py	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/devel/talloc/files/patch-buildtools__wafsamba__samba_autoconf.py	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,6 +1,47 @@
 --- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
 +++ buildtools/wafsamba/samba_autoconf.py
-@@ -873,7 +873,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
+@@ -548,7 +548,7 @@ def library_flags(self, libs):
+ 
+ 
+ @conf
+-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
++def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
+     '''check if a set of libraries exist as system libraries
+ 
+     returns the sublist of libs that do exist as a syslib or []
+@@ -568,11 +568,29 @@ int foo()
+             ret.append(lib)
+             continue
+ 
++        if msg is None:
++            msg = 'Checking for library %s' % lib
++
+         (ccflags, ldflags, cpppath) = library_flags(conf, lib)
++
+         if shlib:
+-            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(features='c cshlib',
++                             fragment=fragment,
++                             lib=lib,
++                             uselib_store=lib,
++                             ccflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+         else:
+-            res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(lib=lib,
++                             uselib_store=lib,
++                             ccflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+ 
+         if not res:
+             if mandatory:
+@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
          conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
  
      if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:

Modified: head/devel/talloc/files/patch-buildtools__wafsamba__samba_python.py
==============================================================================
--- head/devel/talloc/files/patch-buildtools__wafsamba__samba_python.py	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/devel/talloc/files/patch-buildtools__wafsamba__samba_python.py	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,6 +1,6 @@
---- buildtools/wafsamba/samba_python.py.orig	2017-04-28 08:57:26 UTC
+--- buildtools/wafsamba/samba_python.py.orig	2018-01-13 09:07:51 UTC
 +++ buildtools/wafsamba/samba_python.py
-@@ -76,17 +76,31 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
+@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
  
  def _check_python_headers(conf, mandatory):
      try:
@@ -19,12 +19,16 @@
      if conf.env['PYTHON_VERSION'] > '3':
 -        abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
 -        conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-+        override_PYTHON3_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
-+        if override_PYTHON3_SO_ABI_FLAG is not None:
-+            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON3_SO_ABI_FLAG
++        '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG,
++           while environment variable is PYTHON3_SO_ABI_FLAG'''
++        override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
++        if override_PYTHON_SO_ABI_FLAG is not None:
++            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG
++            conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
 +        if not conf.env['PYTHON_SO_ABI_FLAG']:
 +            if conf.env['PYTHON_SO_ABI']:
 +                conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI']
++                conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
 +            else:
 +                abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
 +                conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''

Added: head/devel/talloc/files/patch-buildtools__wafsamba__wscript
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/talloc/files/patch-buildtools__wafsamba__wscript	Tue Feb 20 23:17:49 2018	(r462465)
@@ -0,0 +1,15 @@
+--- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
++++ buildtools/wafsamba/wscript
+@@ -76,10 +76,10 @@ def set_options(opt):
+ 
+     opt.add_option('--with-libiconv',
+                    help='additional directory to search for libiconv',
+-                   action='store', dest='iconv_open', default='/usr/local',
++                   action='store', dest='iconv_open', default=None,
+                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
+     opt.add_option('--without-gettext',
+-                   help=("Disable use of gettext"),
++                   help=("disable use of gettext"),
+                    action="store_true", dest='disable_gettext', default=False)
+ 
+     gr = opt.option_group('developer options')

Added: head/devel/talloc/files/patch-talloc.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/talloc/files/patch-talloc.c	Tue Feb 20 23:17:49 2018	(r462465)
@@ -0,0 +1,20 @@
+--- talloc.c.orig	2018-01-13 09:07:51 UTC
++++ talloc.c
+@@ -387,6 +387,9 @@ void talloc_lib_init(void) __attribute__
+ void talloc_lib_init(void)
+ {
+ 	uint32_t random_value;
++#if defined(HAVE_ARC4RANDOM)
++	random_value = arc4random();
++#else
+ #if defined(HAVE_GETAUXVAL) && defined(AT_RANDOM)
+ 	uint8_t *p;
+ 	/*
+@@ -420,6 +423,7 @@ void talloc_lib_init(void)
+ 		 */
+ 		random_value = ((uintptr_t)talloc_lib_init & 0xFFFFFFFF);
+ 	}
++#endif /* HAVE_ARC4RANDOM */
+ 	talloc_magic = random_value & ~TALLOC_FLAG_MASK;
+ }
+ #else

Modified: head/devel/talloc/files/patch-wscript
==============================================================================
--- head/devel/talloc/files/patch-wscript	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/devel/talloc/files/patch-wscript	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,6 +1,6 @@
---- wscript.orig	2017-07-22 22:23:56 UTC
+--- wscript.orig	2018-01-13 09:07:51 UTC
 +++ wscript
-@@ -46,7 +46,7 @@ def configure(conf):
+@@ -46,13 +46,14 @@ def configure(conf):
      conf.env.TALLOC_COMPAT1 = False
      if conf.env.standalone_talloc:
          conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
@@ -9,3 +9,10 @@
          conf.env.TALLOC_VERSION = VERSION
  
      conf.CHECK_XSLTPROC_MANPAGES()
+ 
+     conf.CHECK_HEADERS('sys/auxv.h')
+     conf.CHECK_FUNCS('getauxval')
++    conf.CHECK_FUNCS('arc4random')
+ 
+     conf.SAMBA_CONFIG_H()
+ 

Modified: head/devel/tevent/Makefile
==============================================================================
--- head/devel/tevent/Makefile	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/devel/tevent/Makefile	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=		tevent
-PORTVERSION=		0.9.34
-PORTREVISION=		1
+PORTVERSION=		0.9.35
+PORTREVISION=		0
 PORTEPOCH=		0
 CATEGORIES=		devel
 MASTER_SITES=		SAMBA
@@ -14,9 +14,14 @@ LICENSE=		LGPL3
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
-BUILD_DEPENDS=		talloc>=2.1.10:devel/talloc
-RUN_DEPENDS=		talloc>=2.1.10:devel/talloc
+BUILD_DEPENDS=		talloc>=2.1.11:devel/talloc
+RUN_DEPENDS=		talloc>=2.1.11:devel/talloc
 
+#FLAVORS=		default nopython
+#nopython_PKGNAMESUFFIX=	-nopython
+#nopython_CONFLICTS=	tevent
+#default_CONFLICTS=	tevent-nopython
+
 USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		buildtools/bin/waf
@@ -28,7 +33,6 @@ PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;
 CONFIGURE_ARGS+=	--bundled-libraries=!talloc
 
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
-			--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
 			--disable-rpath \
 			--without-gettext
 
@@ -73,7 +77,7 @@ CONFIGURE_ARGS+=	--extra-python=${LOCALBASE}/bin/${SAM
 PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
 			SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
 
-PLIST_FILES+=		%%SAMBA4_PYTHON3_SITELIBDIR%%/_tevent.so \
+PLIST_FILES+=		%%SAMBA4_PYTHON3_SITELIBDIR%%/_tevent.%%SAMBA4_PYTHON3_SO_ABI%%.so \
 			%%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.py  \
 			%%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.pyc \
 			%%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.pyo
@@ -108,16 +112,18 @@ pre-configure:
 				${FALSE}; \
 			fi
 
+.if !defined(NO_PYTHON)
 post-build:
 			${PYTHON_CMD} -m py_compile ${BUILD_WRKSRC}/tevent.py
 			${PYTHON_CMD} -O -m py_compile ${BUILD_WRKSRC}/tevent.py
+.endif
 
 post-install:
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtevent.so
 .if !defined(NO_PYTHON)
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tevent.so
 .if defined(SAMBA4_PYTHON3)
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/_tevent.so
+			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/_tevent.${SAMBA4_PYTHON3_SO_ABI}.so
 .endif
 .endif
 

Modified: head/devel/tevent/distinfo
==============================================================================
--- head/devel/tevent/distinfo	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/devel/tevent/distinfo	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1510686207
-SHA256 (tevent-0.9.34.tar.gz) = 73213ef8b27f4a0164e375140a177a751e06fe190a90f3178e24f206b4747b8a
-SIZE (tevent-0.9.34.tar.gz) = 590260
+TIMESTAMP = 1516161103
+SHA256 (tevent-0.9.35.tar.gz) = 25a3a9d264eb3af9a688c38512f248fc1640fd86d663d3346dbfa18feb5c16e9
+SIZE (tevent-0.9.35.tar.gz) = 591546

Modified: head/devel/tevent/files/patch-buildtools__wafsamba__samba_autoconf.py
==============================================================================
--- head/devel/tevent/files/patch-buildtools__wafsamba__samba_autoconf.py	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/devel/tevent/files/patch-buildtools__wafsamba__samba_autoconf.py	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,6 +1,47 @@
 --- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
 +++ buildtools/wafsamba/samba_autoconf.py
-@@ -873,7 +873,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
+@@ -548,7 +548,7 @@ def library_flags(self, libs):
+ 
+ 
+ @conf
+-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
++def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
+     '''check if a set of libraries exist as system libraries
+ 
+     returns the sublist of libs that do exist as a syslib or []
+@@ -568,11 +568,29 @@ int foo()
+             ret.append(lib)
+             continue
+ 
++        if msg is None:
++            msg = 'Checking for library %s' % lib
++
+         (ccflags, ldflags, cpppath) = library_flags(conf, lib)
++
+         if shlib:
+-            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(features='c cshlib',
++                             fragment=fragment,
++                             lib=lib,
++                             uselib_store=lib,
++                             ccflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+         else:
+-            res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(lib=lib,
++                             uselib_store=lib,
++                             ccflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+ 
+         if not res:
+             if mandatory:
+@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
          conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
  
      if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:

Modified: head/devel/tevent/files/patch-buildtools__wafsamba__samba_python.py
==============================================================================
--- head/devel/tevent/files/patch-buildtools__wafsamba__samba_python.py	Tue Feb 20 22:58:19 2018	(r462464)
+++ head/devel/tevent/files/patch-buildtools__wafsamba__samba_python.py	Tue Feb 20 23:17:49 2018	(r462465)
@@ -1,6 +1,6 @@
---- buildtools/wafsamba/samba_python.py.orig	2017-04-28 08:57:26 UTC
+--- buildtools/wafsamba/samba_python.py.orig	2018-01-13 09:07:51 UTC
 +++ buildtools/wafsamba/samba_python.py
-@@ -76,17 +76,31 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
+@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
  
  def _check_python_headers(conf, mandatory):
      try:
@@ -19,12 +19,16 @@
      if conf.env['PYTHON_VERSION'] > '3':

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***