[src/netbsd-1-5]: src Pull up revisions 1.4-1.8 (requested by assar):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ecb9a22760f6
branches:  netbsd-1-5
changeset: 491157:ecb9a22760f6
user:      he <he%NetBSD.org@localhost>
date:      Thu Apr 05 23:25:31 2001 +0000

description:
Pull up revisions 1.4-1.8 (requested by assar):
  Upgrade Heimdal to version 0.3e.

diffstat:

 lib/libkadm5clnt/Makefile |  17 +++++++++++------
 usr.bin/kf/Makefile       |   8 +++++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diffs (76 lines):

diff -r 9d03d33eb412 -r ecb9a22760f6 lib/libkadm5clnt/Makefile
--- a/lib/libkadm5clnt/Makefile Thu Apr 05 23:25:28 2001 +0000
+++ b/lib/libkadm5clnt/Makefile Thu Apr 05 23:25:31 2001 +0000
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile,v 1.2.2.1 2000/06/21 06:36:24 thorpej Exp $
+# $NetBSD: Makefile,v 1.2.2.2 2001/04/05 23:25:31 he Exp $
+
+.include <bsd.own.mk>
+
 DIST=          ${.CURDIR}/../../crypto/dist
 .PATH: ${DIST}/heimdal/lib/kadm5
 
@@ -7,7 +10,7 @@
 
 LIB=   kadm5clnt
 
-COMPILEET!=    cd ${.CURDIR}/../libcom_err/compile_et && make print-objdir
+COMPILEET!=    cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
 
 kadm5_err.c kadm5_err.h: kadm5_err.et
        ${COMPILEET}/compile_et ${DIST}/heimdal/lib/kadm5/kadm5_err.et
@@ -17,6 +20,7 @@
 SRCS    =              \
        chpass_c.c      \
        common_glue.c   \
+       client_glue.c   \
        create_c.c      \
        delete_c.c      \
        destroy_c.c     \
@@ -32,15 +36,16 @@
        randkey_c.c     \
        rename_c.c      \
        send_recv.c     \
+       client_glue.c   \
        $(ERR_FILES)
 
 INCSDIR= /usr/include/kadm5
 
-INCS=  kadm5_err.h admin.h private.h
+INCS=  kadm5_err.h admin.h kadm5-protos.h private.h kadm5-private.h
 
-ASN1!= cd ${.CURDIR}/../libasn1 && ${MAKE} print-objdir
-KRB5!= cd ${.CURDIR}/../libkrb5 && ${MAKE} print-objdir
-HDB!=  cd ${.CURDIR}/../libhdb && ${MAKE} print-objdir
+ASN1!= cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR}
+KRB5!= cd ${.CURDIR}/../libkrb5 && ${PRINTOBJDIR}
+HDB!=  cd ${.CURDIR}/../libhdb && ${PRINTOBJDIR}
 
 CPPFLAGS+= -I.                                 \
         -I${ASN1}                              \
diff -r 9d03d33eb412 -r ecb9a22760f6 usr.bin/kf/Makefile
--- a/usr.bin/kf/Makefile       Thu Apr 05 23:25:28 2001 +0000
+++ b/usr.bin/kf/Makefile       Thu Apr 05 23:25:31 2001 +0000
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile,v 1.2.2.1 2000/07/02 16:53:24 assar Exp $
+# $NetBSD: Makefile,v 1.2.2.2 2001/04/05 23:25:31 he Exp $
+
+.include <bsd.own.mk>
+
 DIST=          ${.CURDIR}/../../crypto/dist
 .PATH: ${DIST}/heimdal/appl/kf
 
@@ -15,10 +18,13 @@
        -I${DESTDIR}/usr/include/krb5           \
        -DHAVE_CONFIG_H
 
+VERS!= cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+
 LDADD= -lkrb5 \
        -lcrypto \
        -lasn1 \
        -lcom_err \
+       -L${VERS} -lvers \
        -lroken \
        -lcrypt