Update Samba4* supplimentary libraries to the newer versions.

Made databases/ldb to depend on openldap-sasl-client, so it won't conflict with the corresponding requirement of net/samba4* ports.

11 files changed, 37 insertions, 24 deletions

diff --git a/databases/ldb/Makefile b/databases/ldb/Makefile
index ce79e1bb899e..c51186a683a3 100644
--- a/databases/ldb/Makefile
+++ b/databases/ldb/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=		ldb
-PORTVERSION=		1.1.26
+PORTVERSION=		1.1.29
 PORTREVISION=		0
 PORTEPOCH=		0
 CATEGORIES=		databases
@@ -20,6 +20,7 @@ WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 USE_OPENLDAP=		yes
+WANT_OPENLDAP_SASL=	yes
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
@@ -32,9 +33,9 @@ CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 OPTIONS_DEFINE=		MANPAGES
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
-BUILD_DEPENDS+=		talloc>=2.1.5:devel/talloc \
-			tevent>=0.9.27:devel/tevent \
-			tdb>=1.3.8,1:databases/tdb \
+BUILD_DEPENDS+=		talloc>=2.1.8:devel/talloc \
+			tevent>=0.9.31:devel/tevent \
+			tdb>=1.3.12,1:databases/tdb \
 			popt>=0:devel/popt
 RUN_DEPENDS:=		${BUILD_DEPENDS}
 
diff --git a/databases/ldb/distinfo b/databases/ldb/distinfo
index 4ba8bb0b11b5..6dd5bc450d13 100644
--- a/databases/ldb/distinfo
+++ b/databases/ldb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ldb-1.1.26.tar.gz) = 8843c7a72b980d9413ba6c494c039bccd10c524b37fda2917afb147745d8b2e6
-SIZE (ldb-1.1.26.tar.gz) = 1262660
+TIMESTAMP = 1483326847
+SHA256 (ldb-1.1.29.tar.gz) = 59d84f9a5b799f519ba7b2685bb46f5a26f1bbf05b7a144b2f5e017d01d80f97
+SIZE (ldb-1.1.29.tar.gz) = 1277551
diff --git a/databases/ldb/files/ldb.3 b/databases/ldb/files/ldb.3
index 4c594a9c8669..4dcdb734f67f 100644
--- a/databases/ldb/files/ldb.3
+++ b/databases/ldb/files/ldb.3
@@ -2,12 +2,12 @@
 .\"     Title: ldb
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/29/2013
+.\"      Date: 01/02/2017
 .\"    Manual: System Administration tools
 .\"    Source: LDB 1.1
 .\"  Language: English
 .\"
-.TH "LDB" "3" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDB" "3" "01/02/2017" "LDB 1\&.1" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/ldbadd.1 b/databases/ldb/files/ldbadd.1
index c92ecd0719c2..4e8a29148786 100644
--- a/databases/ldb/files/ldbadd.1
+++ b/databases/ldb/files/ldbadd.1
@@ -2,12 +2,12 @@
 .\"     Title: ldbadd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/29/2013
+.\"      Date: 01/02/2017
 .\"    Manual: System Administration tools
 .\"    Source: LDB 1.1
 .\"  Language: English
 .\"
-.TH "LDBADD" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBADD" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/ldbdel.1 b/databases/ldb/files/ldbdel.1
index 57f153762184..082b49d72617 100644
--- a/databases/ldb/files/ldbdel.1
+++ b/databases/ldb/files/ldbdel.1
@@ -2,12 +2,12 @@
 .\"     Title: ldbdel
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/29/2013
+.\"      Date: 01/02/2017
 .\"    Manual: System Administration tools
 .\"    Source: LDB 1.1
 .\"  Language: English
 .\"
-.TH "LDBDEL" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBDEL" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/ldbedit.1 b/databases/ldb/files/ldbedit.1
index e21b3e89535b..af36f14dce51 100644
--- a/databases/ldb/files/ldbedit.1
+++ b/databases/ldb/files/ldbedit.1
@@ -2,12 +2,12 @@
 .\"     Title: ldbedit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/29/2013
+.\"      Date: 01/02/2017
 .\"    Manual: System Administration tools
 .\"    Source: LDB 1.1
 .\"  Language: English
 .\"
-.TH "LDBEDIT" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBEDIT" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/ldbmodify.1 b/databases/ldb/files/ldbmodify.1
index d75e217ce25f..7da4ca9c2c90 100644
--- a/databases/ldb/files/ldbmodify.1
+++ b/databases/ldb/files/ldbmodify.1
@@ -2,12 +2,12 @@
 .\"     Title: ldbmodify
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/29/2013
+.\"      Date: 01/02/2017
 .\"    Manual: System Administration tools
 .\"    Source: LDB 1.1
 .\"  Language: English
 .\"
-.TH "LDBMODIFY" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBMODIFY" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/ldbrename.1 b/databases/ldb/files/ldbrename.1
index fc0506aae3ce..7aa030952773 100644
--- a/databases/ldb/files/ldbrename.1
+++ b/databases/ldb/files/ldbrename.1
@@ -2,12 +2,12 @@
 .\"     Title: ldbrename
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/29/2013
+.\"      Date: 01/02/2017
 .\"    Manual: System Administration tools
 .\"    Source: LDB 1.1
 .\"  Language: English
 .\"
-.TH "LDBRENAME" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBRENAME" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -31,7 +31,7 @@
 ldbrename \- Edit LDB databases using your favorite editor
 .SH "SYNOPSIS"
 .HP \w'\fBldbrename\fR\ 'u
-\fBldbrename\fR [\-h] [\-o\ options] {olddn} {newdb}
+\fBldbrename\fR [\-h] [\-o\ options] {olddn} {newdn}
 .SH "DESCRIPTION"
 .PP
 ldbrename is a utility that allows you to rename trees in an LDB database based by DN\&. This utility takes two arguments: the original DN name of the top element and the DN to change it to\&.
diff --git a/databases/ldb/files/ldbsearch.1 b/databases/ldb/files/ldbsearch.1
index 772fad30c7e8..a13f6a449187 100644
--- a/databases/ldb/files/ldbsearch.1
+++ b/databases/ldb/files/ldbsearch.1
@@ -2,12 +2,12 @@
 .\"     Title: ldbsearch
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/29/2013
+.\"      Date: 01/02/2017
 .\"    Manual: System Administration tools
 .\"    Source: LDB 1.1
 .\"  Language: English
 .\"
-.TH "LDBSEARCH" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBSEARCH" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py b/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py
index 994ee3637e97..95f250a86218 100644
--- a/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py
+++ b/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py
@@ -1,6 +1,6 @@
---- ./buildtools/wafsamba/samba_install.py.orig	2015-08-09 19:55:47.819170736 +0000
-+++ ./buildtools/wafsamba/samba_install.py	2015-08-09 19:56:18.727356203 +0000
-@@ -116,7 +116,7 @@
+--- buildtools/wafsamba/samba_install.py.orig	2015-12-10 11:01:40 UTC
++++ buildtools/wafsamba/samba_install.py
+@@ -118,7 +118,7 @@ def install_library(self):
                  inst_name    = bld.make_libname(t.target)
          elif self.vnum:
              vnum_base    = self.vnum.split('.')[0]
diff --git a/databases/ldb/files/patch-third_party__waf__wafadmin__Tools__cc.py b/databases/ldb/files/patch-third_party__waf__wafadmin__Tools__cc.py
new file mode 100644
index 000000000000..5695f3e03841
--- /dev/null
+++ b/databases/ldb/files/patch-third_party__waf__wafadmin__Tools__cc.py
@@ -0,0 +1,11 @@
+--- third_party/waf/wafadmin/Tools/cc.py.orig	2015-11-06 13:25:52 UTC
++++ third_party/waf/wafadmin/Tools/cc.py
+@@ -88,7 +88,7 @@ def c_hook(self, node):
+ 		raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self))
+ 	return task
+ 
+-cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
++cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
+ cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False)
+ cls.scan = ccroot.scan
+ cls.vars.append('CCDEPS')