PERFORCE change 104490 for review

[Michael Bushkov]

http://perforce.freebsd.org/chv.cgi?CH=104490

Change 104490 by bushman at bushman_nss_ldap_cached on 2006/08/18 15:43:38

	Kerberos stuff now uses in-tree OpenLDAP, if it is enabled. Manual pages and headers are properly installed. liblber is installed along with libldap.

Affected files ...

.. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/Makefile.inc#2 edit
.. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libldap/liblber/Makefile#2 edit
.. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libldap/libldap/Makefile#2 edit
.. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.libnames.mk#3 edit

Differences ...

==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/Makefile.inc#2 (text+ko) ====

@@ -1,17 +1,18 @@
 # $FreeBSD: src/kerberos5/Makefile.inc,v 1.27 2006/07/28 06:33:27 yar Exp $
 
+.include <bsd.own.mk>
+
 NO_LINT=
 
 KRB5DIR=	${.CURDIR}/../../../crypto/heimdal
 
 CFLAGS+=	-DHAVE_CONFIG_H -I${.CURDIR}/../../include
 
-.if defined(WITH_OPENLDAP)
-OPENLDAPBASE?=	/usr/local
-LDAPLDADD=	-lldap -llber
-LDAPDPADD=	${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;}
-LDAPCFLAGS=	-I${OPENLDAPBASE}/include -DOPENLDAP=1
-LDAPLDFLAGS=	-L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib
+.if ${MK_OPENLDAP} != "no"
+LDAPLDADD=      -lldap -llber
+LDAPDPADD=      ${LIBLDAP} ${LIBLBER}
+LDAPCFLAGS=     -DOPENLDAP=1
+LDAPLDFLAGS=    
 .endif
 
 LIBVERS=	${.OBJDIR}/../../lib/libvers/libvers.a

==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libldap/liblber/Makefile#2 (text+ko) ====

@@ -3,11 +3,11 @@
 .include <bsd.own.mk>
 
 OPENLDAP=	${.CURDIR}/../../../contrib/openldap
-.PATH:		${OPENLDAP}/include ${OPENLDAP}/libraries/liblber
+.PATH:		${OPENLDAP}/include ${OPENLDAP}/libraries/liblber \
+		${OPENLDAP}/doc/man/man3 ${.CURDIR}/../include
 
 LIB=	lber
-NO_PROFILE=
-#INTERNALLIB=
+SHLIB_MAJOR= 2
 
 SRCS=	assert.c \
 	bprint.c \
@@ -23,4 +23,8 @@
 CFLAGS+= -I${.CURDIR}/../include -I${OPENLDAP}/include \
 	-I${OPENLDAP}/libraries/liblber
 
+INCS=	lber.h lber_types.h
+MAN=	lber-decode.3 lber-encode.3 lber-memory.3 lber-types.3
+
 .include <bsd.lib.mk>
+

==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libldap/libldap/Makefile#2 (text+ko) ====

@@ -3,7 +3,8 @@
 .include <bsd.own.mk>
 
 OPENLDAP=	${.CURDIR}/../../../contrib/openldap
-.PATH:  ${OPENLDAP}/include ${OPENLDAP}/libraries/libldap
+.PATH:  	${OPENLDAP}/include ${OPENLDAP}/libraries/libldap \
+		${OPENLDAP}/doc/man/man3 ${.CURDIR}/../include
 
 LIB=	ldap
 SHLIB_MAJOR=	2
@@ -75,5 +76,15 @@
 LDFLAGS+=	${OPENLDAP_LDFLAGS}
 LDADD+=		${OPENLDAP_LDADD}
 
+INCS=	ldap.h ldap_cdefs.h ldap_features.h ldap_schema.h ldap_utf8.h
+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_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 ldap_parse_reference.3 \
+	ldap_parse_result.3 ldap_result.3 ldap_schema.3 \
+	ldap_search.3 ldap_sort.3 ldap_url.3
+
 .include <bsd.lib.mk>
 

==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.libnames.mk#3 (text+ko) ====

@@ -70,6 +70,7 @@
 LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
 LIBL?=		${DESTDIR}${LIBDIR}/libl.a
 .if ${MK_OPENLDAP} != "no"
+LIBLBER?=	${DESTDIR}${LIBDIR}/liblber.a
 LIBLDAP?=       ${DESTDIR}${LIBDIR}/libldap.a
 .endif
 LIBLN?=		"don't use LIBLN, use LIBL"