From owner-svn-src-all@FreeBSD.ORG  Mon Dec  5 16:38:52 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C11ED106564A;
	Mon,  5 Dec 2011 16:38:52 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B174F8FC12;
	Mon,  5 Dec 2011 16:38:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pB5GcqYe047945;
	Mon, 5 Dec 2011 16:38:52 GMT (envelope-from ume@svn.freebsd.org)
Received: (from ume@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB5GcqPo047942;
	Mon, 5 Dec 2011 16:38:52 GMT (envelope-from ume@svn.freebsd.org)
Message-Id: <201112051638.pB5GcqPo047942@svn.freebsd.org>
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Mon, 5 Dec 2011 16:38:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228284 - in head/kerberos5: . lib/libhdb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Dec 2011 16:38:52 -0000

Author: ume
Date: Mon Dec  5 16:38:52 2011
New Revision: 228284
URL: http://svn.freebsd.org/changeset/base/228284

Log:
  - Make heimdal buildable with WITH_OPENLDAP defined, again.
  - Our heimdal uses the deprecated OpenLDAP functions.

Modified:
  head/kerberos5/Makefile.inc
  head/kerberos5/lib/libhdb/Makefile

Modified: head/kerberos5/Makefile.inc
==============================================================================
--- head/kerberos5/Makefile.inc	Mon Dec  5 16:08:18 2011	(r228283)
+++ head/kerberos5/Makefile.inc	Mon Dec  5 16:38:52 2011	(r228284)
@@ -10,7 +10,7 @@ CFLAGS+=	-DHAVE_CONFIG_H -I${.CURDIR}/..
 OPENLDAPBASE?=	/usr/local
 LDAPLDADD=	-lldap -llber
 LDAPDPADD=	${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;}
-LDAPCFLAGS=	-I${OPENLDAPBASE}/include -DOPENLDAP=1
+LDAPCFLAGS=	-I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1
 LDAPLDFLAGS=	-L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib
 .endif
 

Modified: head/kerberos5/lib/libhdb/Makefile
==============================================================================
--- head/kerberos5/lib/libhdb/Makefile	Mon Dec  5 16:08:18 2011	(r228283)
+++ head/kerberos5/lib/libhdb/Makefile	Mon Dec  5 16:38:52 2011	(r228284)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 LIB=	hdb
-LDFLAGS=	-Wl,--no-undefined
-LDADD=	-lasn1 -lcom_err -lkrb5 -lroken
-DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN}
+LDFLAGS=	-Wl,--no-undefined ${LDAPLDFLAGS}
+LDADD=	-lasn1 -lcom_err -lkrb5 -lroken ${LDAPLDADD}
+DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} ${LDAPDPADD}
 
 INCS=	hdb-private.h \
 	hdb-protos.h \