[src/trunk]: src/external/bsd/openldap Update for building OpenLDAP 2.4.39.

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a0ecb0e52fc4
branches:  trunk
changeset: 329534:a0ecb0e52fc4
user:      tron <tron%NetBSD.org@localhost>
date:      Wed May 28 11:32:19 2014 +0000

description:
Update for building OpenLDAP 2.4.39.

diffstat:

 external/bsd/openldap/bin/Makefile.inc             |  4 ++--
 external/bsd/openldap/lib/liblber/shlib_version    |  4 ++--
 external/bsd/openldap/lib/libldap/Makefile         |  4 ++--
 external/bsd/openldap/lib/libldap/Makefile.libldap |  4 ++--
 external/bsd/openldap/lib/libldap/shlib_version    |  4 ++--
 external/bsd/openldap/lib/libldap_r/Makefile       |  4 ++--
 external/bsd/openldap/lib/libldap_r/shlib_version  |  4 ++--
 external/bsd/openldap/lib/liblutil/Makefile        |  4 ++--
 external/bsd/openldap/openldap.mk                  |  4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diffs (138 lines):

diff -r e42150a2fe68 -r a0ecb0e52fc4 external/bsd/openldap/bin/Makefile.inc
--- a/external/bsd/openldap/bin/Makefile.inc    Wed May 28 11:16:03 2014 +0000
+++ b/external/bsd/openldap/bin/Makefile.inc    Wed May 28 11:32:19 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.4 2013/09/11 23:04:10 joerg Exp $
+#      $NetBSD: Makefile.inc,v 1.5 2014/05/28 11:32:19 tron Exp $
 
 .include "../openldap.mk"
 
@@ -24,7 +24,7 @@
 LDADD+=        -L${LDAPOBJDIR.lutil} -llutil
 DPADD+=        ${LDAPLIB.lutil}
 
-LDADD+= -lldap
+LDADD+= -L${LDAPOBJDIR.ldap} -lldap
 DPADD+= ${LIBLDAP}
 LDADD+=        -llber
 DPADD+=        ${LIBLBER}
diff -r e42150a2fe68 -r a0ecb0e52fc4 external/bsd/openldap/lib/liblber/shlib_version
--- a/external/bsd/openldap/lib/liblber/shlib_version   Wed May 28 11:16:03 2014 +0000
+++ b/external/bsd/openldap/lib/liblber/shlib_version   Wed May 28 11:32:19 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: shlib_version,v 1.4 2010/12/12 16:19:54 adam Exp $
+#      $NetBSD: shlib_version,v 1.5 2014/05/28 11:32:19 tron Exp $
 #
 major=3
-minor=2
+minor=3
diff -r e42150a2fe68 -r a0ecb0e52fc4 external/bsd/openldap/lib/libldap/Makefile
--- a/external/bsd/openldap/lib/libldap/Makefile        Wed May 28 11:16:03 2014 +0000
+++ b/external/bsd/openldap/lib/libldap/Makefile        Wed May 28 11:32:19 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2011/05/26 12:56:26 joerg Exp $
+#      $NetBSD: Makefile,v 1.4 2014/05/28 11:32:19 tron Exp $
 
 USE_FORT?=     yes
 
@@ -11,7 +11,7 @@
 .PATH:         ${LDAP_SRCDIR}/man
 
 MAN=           ldap.3 ldap_abandon.3 ldap_add.3 ldap_bind.3 ldap_compare.3 \
-               ldap_delete.3 ldap_error.3 ldap_first_attribute.3 \
+               ldap_delete.3 ldap_dup.3 ldap_error.3 ldap_first_attribute.3 \
                ldap_first_entry.3 ldap_first_message.3 \
                ldap_first_reference.3 ldap_get_dn.3 ldap_get_values.3 \
                ldap_modify.3 ldap_modrdn.3 ldap_open.3 \
diff -r e42150a2fe68 -r a0ecb0e52fc4 external/bsd/openldap/lib/libldap/Makefile.libldap
--- a/external/bsd/openldap/lib/libldap/Makefile.libldap        Wed May 28 11:16:03 2014 +0000
+++ b/external/bsd/openldap/lib/libldap/Makefile.libldap        Wed May 28 11:32:19 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.libldap,v 1.6 2010/03/08 05:18:17 lukem Exp $
+#      $NetBSD: Makefile.libldap,v 1.7 2014/05/28 11:32:19 tron Exp $
 
 .include "../../openldap.mk"
 
@@ -15,7 +15,7 @@
                init.c options.c print.c string.c util-int.c schema.c \
                charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
                turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-               assertion.c deref.c
+               assertion.c deref.c fetch.c ldif.c
 
 .if ${MKCRYPTO} != "no"
 SRCS+=         tls2.c tls_o.c tls_g.c tls_m.c
diff -r e42150a2fe68 -r a0ecb0e52fc4 external/bsd/openldap/lib/libldap/shlib_version
--- a/external/bsd/openldap/lib/libldap/shlib_version   Wed May 28 11:16:03 2014 +0000
+++ b/external/bsd/openldap/lib/libldap/shlib_version   Wed May 28 11:32:19 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: shlib_version,v 1.5 2010/12/12 16:19:55 adam Exp $
+#      $NetBSD: shlib_version,v 1.6 2014/05/28 11:32:19 tron Exp $
 #
 major=4
-minor=2
+minor=3
diff -r e42150a2fe68 -r a0ecb0e52fc4 external/bsd/openldap/lib/libldap_r/Makefile
--- a/external/bsd/openldap/lib/libldap_r/Makefile      Wed May 28 11:16:03 2014 +0000
+++ b/external/bsd/openldap/lib/libldap_r/Makefile      Wed May 28 11:32:19 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2011/05/26 12:56:26 joerg Exp $
+#      $NetBSD: Makefile,v 1.5 2014/05/28 11:32:19 tron Exp $
 
 USE_FORT?=     yes
 CWARNFLAGS.clang=      -Wno-format-extra-args
@@ -10,7 +10,7 @@
 .PATH:         ${LDAP_DISTDIR}/libraries/libldap_r
 
 SRCS+=         threads.c rdwr.c rmutex.c tpool.c rq.c \
-               thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
+               thr_posix.c thr_cthreads.c thr_thr.c thr_nt.c \
                thr_pth.c thr_stub.c thr_debug.c
 
 CPPFLAGS+=     -DLDAP_R_COMPILE
diff -r e42150a2fe68 -r a0ecb0e52fc4 external/bsd/openldap/lib/libldap_r/shlib_version
--- a/external/bsd/openldap/lib/libldap_r/shlib_version Wed May 28 11:16:03 2014 +0000
+++ b/external/bsd/openldap/lib/libldap_r/shlib_version Wed May 28 11:32:19 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: shlib_version,v 1.5 2010/12/12 16:19:55 adam Exp $
+#      $NetBSD: shlib_version,v 1.6 2014/05/28 11:32:19 tron Exp $
 #
 major=4
-minor=2
+minor=3
diff -r e42150a2fe68 -r a0ecb0e52fc4 external/bsd/openldap/lib/liblutil/Makefile
--- a/external/bsd/openldap/lib/liblutil/Makefile       Wed May 28 11:16:03 2014 +0000
+++ b/external/bsd/openldap/lib/liblutil/Makefile       Wed May 28 11:32:19 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2010/12/12 16:10:43 adam Exp $
+#      $NetBSD: Makefile,v 1.5 2014/05/28 11:32:19 tron Exp $
 
 USE_FORT?=     yes
 
@@ -13,7 +13,7 @@
 
 SRCS=          base64.c entropy.c sasl.c signal.c hash.c passfile.c \
                md5.c passwd.c sha1.c getpass.c lockf.c utils.c uuid.c \
-               sockpair.c avl.c tavl.c ldif.c fetch.c meter.c \
+               sockpair.c avl.c tavl.c meter.c \
                getpeereid.c detach.c
 
 .include <bsd.lib.mk>
diff -r e42150a2fe68 -r a0ecb0e52fc4 external/bsd/openldap/openldap.mk
--- a/external/bsd/openldap/openldap.mk Wed May 28 11:16:03 2014 +0000
+++ b/external/bsd/openldap/openldap.mk Wed May 28 11:32:19 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: openldap.mk,v 1.5 2010/12/12 16:10:42 adam Exp $
+#      $NetBSD: openldap.mk,v 1.6 2014/05/28 11:32:19 tron Exp $
 
 .include <bsd.own.mk>
 
@@ -16,7 +16,7 @@
 CPPFLAGS+=     -I${LDAP_SRCDIR}/include
 CPPFLAGS+=     -I${LDAP_DISTDIR}/include
 
-.for _LIB in lutil             # XXX lber ldap ldap_r lunicode rewrite
+.for _LIB in lutil ldap                # XXX lber ldap_r lunicode rewrite
 .if !defined(LDAPOBJDIR.${_LIB})
 LDAPOBJDIR.${_LIB}!=   cd ${LDAP_SRCDIR}/lib/lib${_LIB} && ${PRINTOBJDIR}
 .MAKEOVERRIDES+=       LDAPOBJDIR.${_LIB}