From owner-svn-src-stable-9@FreeBSD.ORG  Sat Jan 14 19:38:25 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 57FFF106567A;
	Sat, 14 Jan 2012 19:38:25 +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 4336A8FC16;
	Sat, 14 Jan 2012 19:38:25 +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 q0EJcPl6046212;
	Sat, 14 Jan 2012 19:38:25 GMT (envelope-from ume@svn.freebsd.org)
Received: (from ume@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0EJcPc7046209;
	Sat, 14 Jan 2012 19:38:25 GMT (envelope-from ume@svn.freebsd.org)
Message-Id: <201201141938.q0EJcPc7046209@svn.freebsd.org>
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Sat, 14 Jan 2012 19:38:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230113 - in stable/9/kerberos5: . lib/libhdb
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Jan 2012 19:38:25 -0000

Author: ume
Date: Sat Jan 14 19:38:24 2012
New Revision: 230113
URL: http://svn.freebsd.org/changeset/base/230113

Log:
  MFC r228284, r228308:
    - Make heimdal buildable with WITH_OPENLDAP defined, again.
    - Our heimdal uses the deprecated OpenLDAP functions.
    - Don't support OpenLDAP during lib32 build.

Modified:
  stable/9/kerberos5/Makefile.inc
  stable/9/kerberos5/lib/libhdb/Makefile
Directory Properties:
  stable/9/kerberos5/   (props changed)

Modified: stable/9/kerberos5/Makefile.inc
==============================================================================
--- stable/9/kerberos5/Makefile.inc	Sat Jan 14 19:22:45 2012	(r230112)
+++ stable/9/kerberos5/Makefile.inc	Sat Jan 14 19:38:24 2012	(r230113)
@@ -6,11 +6,11 @@ KRB5DIR=	${.CURDIR}/../../../crypto/heim
 
 CFLAGS+=	-DHAVE_CONFIG_H -I${.CURDIR}/../../include
 
-.if defined(WITH_OPENLDAP)
+.if defined(WITH_OPENLDAP) && !defined(COMPAT_32BIT)
 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: stable/9/kerberos5/lib/libhdb/Makefile
==============================================================================
--- stable/9/kerberos5/lib/libhdb/Makefile	Sat Jan 14 19:22:45 2012	(r230112)
+++ stable/9/kerberos5/lib/libhdb/Makefile	Sat Jan 14 19:38:24 2012	(r230113)
@@ -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 \