[pkgsrc/trunk]: pkgsrc/security/heimdal also set KRB5_CONFIG in the case wher...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5a29740ea75
branches:  trunk
changeset: 540613:c5a29740ea75
user:      markd <markd%pkgsrc.org@localhost>
date:      Fri Apr 04 21:10:45 2008 +0000

description:
also set KRB5_CONFIG in the case where using builtin but
/usr/bin/krb5-config exists.  Fixes build of imap-uw package with the
kerberos option on NetBSD-current and possibly other platforms.

diffstat:

 security/heimdal/builtin.mk |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 3c9386abb7b8 -r c5a29740ea75 security/heimdal/builtin.mk
--- a/security/heimdal/builtin.mk       Fri Apr 04 21:10:24 2008 +0000
+++ b/security/heimdal/builtin.mk       Fri Apr 04 21:10:45 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.11 2006/08/29 23:46:09 markd Exp $
+# $NetBSD: builtin.mk,v 1.12 2008/04/04 21:10:45 markd Exp $
 
 BUILTIN_PKG:=  heimdal
 
@@ -104,8 +104,8 @@
 MAKE_ENV+=     KRB5_CONFIG=${KRB5_CONFIG:Q}
 .  endif
 
-.  if !empty(USE_BUILTIN.heimdal:M[yY][eE][sS]) && \
-      !empty(SH_KRB5_CONFIG:M__nonexistent__)
+.  if !empty(USE_BUILTIN.heimdal:M[yY][eE][sS])
+.    if !empty(SH_KRB5_CONFIG:M__nonexistent__)
 BUILDLINK_TARGETS+=    fake-krb5-config
 
 fake-krb5-config:
@@ -117,6 +117,9 @@
        ${CHMOD} a+x $${dst}
 
 KRB5_CONFIG?=  ${BUILDLINK_DIR}/bin/krb5-config
+.    else
+KRB5_CONFIG?=  ${SH_KRB5_CONFIG}
+.    endif
 CONFIGURE_ENV+=        KRB5_CONFIG=${KRB5_CONFIG:Q}
 MAKE_ENV+=     KRB5_CONFIG=${KRB5_CONFIG:Q}
 .  endif