From owner-p4-projects@FreeBSD.ORG  Wed Jan 24 15:02:19 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 56D5216A482; Wed, 24 Jan 2007 15:02:19 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 01C7216A47C
	for <perforce@freebsd.org>; Wed, 24 Jan 2007 15:02:19 +0000 (UTC)
	(envelope-from bushman@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id E749D13C4B8
	for <perforce@freebsd.org>; Wed, 24 Jan 2007 15:02:18 +0000 (UTC)
	(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 l0OF2IIC006735
	for <perforce@freebsd.org>; Wed, 24 Jan 2007 15:02:18 GMT
	(envelope-from bushman@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0OF2Ieb006732
	for perforce@freebsd.org; Wed, 24 Jan 2007 15:02:18 GMT
	(envelope-from bushman@freebsd.org)
Date: Wed, 24 Jan 2007 15:02:18 GMT
Message-Id: <200701241502.l0OF2Ieb006732@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bushman@freebsd.org using -f
From: Michael Bushkov <bushman@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 113480 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Jan 2007 15:02:19 -0000

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

Change 113480 by bushman@bushman_nss_ldap_cached on 2007/01/24 15:01:17

	build_port.sh addes, which facilitates nss_ldap_bsd port making
	some port-specific changes in the nss_ldap Makefile

Affected files ...

.. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/build_port.sh#1 add
.. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/Makefile#2 edit
.. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.5#2 delete
.. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap_bsd.5#1 branch

Differences ...

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

@@ -2,26 +2,29 @@
 
 .include <bsd.own.mk>
 
-LIB=		nss_ldap
+LIB=		nss_ldap_bsd
 SHLIB_MAJOR=	1
-SHLIB_NAME=	nss_ldap.so.${SHLIB_MAJOR}
-SHLIBDIR?=	/lib
+SHLIB_NAME=	nss_ldap_bsd.so.${SHLIB_MAJOR}
+SHLIBDIR?=	${PREFIX}/lib
+LIBDIR=		${PREFIX}/lib
+MANDIR?=	${PREFIX}/man/man
 
 SRCS=	nss_ldap.c ldap_group.c ldap_passwd.c ldap_serv.c ldapconn.c\
 	ldapconf.c ldapschema.c ldapsearch.c ldaptls.c ldaputil.c
 
-CFLAGS+=-DINET6
+CFLAGS+=-DINET6 -I${PREFIX]/include\
+	-DNSS_LDAP_CONF_PATH=\"${PREFIX}/etc/nss_ldap.conf\"
+LDFLAGS+= -L${PREFIX}/lib
 LDADD+= -lldap
 
-.if ${MK_OPENSSL} != "no"
 CFLAGS+=	-DNSS_LDAP_START_TLS_ENABLED -DNSS_LDAP_SSL_ENABLED
-.endif
 
-CFLAGS+=        ${OPENLDAP_CFLAGS}
-LDFLAGS+=       ${OPENLDAP_LDFLAGS}
-LDADD+=         ${OPENLDAP_LDADD}
+USE_OPENSSL=	yes
+USE_OPENLDAP=	yes
+WANT_OPENLDAP_SASL= yes
 
 INCS=
-MAN=		nss_ldap.5
+MAN=	nss_ldap_bsd.5
+NO_MANCOMPRESS=
 
 .include <bsd.lib.mk>