From owner-p4-projects@FreeBSD.ORG Fri Aug 18 15:44:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C783516A4DF; Fri, 18 Aug 2006 15:44:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7237B16A4DD for ; Fri, 18 Aug 2006 15:44:15 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E49D843D4C for ; Fri, 18 Aug 2006 15:44:14 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7IFiEY2008060 for ; Fri, 18 Aug 2006 15:44:14 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7IFiEfd008057 for perforce@freebsd.org; Fri, 18 Aug 2006 15:44:14 GMT (envelope-from bushman@freebsd.org) Date: Fri, 18 Aug 2006 15:44:14 GMT Message-Id: <200608181544.k7IFiEfd008057@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104490 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2006 15:44:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=104490 Change 104490 by bushman@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 + 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 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 + ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libldap/libldap/Makefile#2 (text+ko) ==== @@ -3,7 +3,8 @@ .include 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 ==== //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"