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

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

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

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

diffstat:

 lib/libcom_err/compile_et/Makefile |  28 ++++++++++++++++++++++++----
 libexec/kadmind/Makefile           |  16 ++++++++++++----
 usr.sbin/kadmin/Makefile           |  13 +++++++++----
 3 files changed, 45 insertions(+), 12 deletions(-)

diffs (133 lines):

diff -r 8f28ef46b4ea -r 3a98760c3868 lib/libcom_err/compile_et/Makefile
--- a/lib/libcom_err/compile_et/Makefile        Thu Apr 05 23:25:17 2001 +0000
+++ b/lib/libcom_err/compile_et/Makefile        Thu Apr 05 23:25:23 2001 +0000
@@ -1,17 +1,27 @@
-# $NetBSD: Makefile,v 1.2 2000/06/16 22:46:44 thorpej Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2001/04/05 23:25:23 he Exp $
+
+NOMAN= noman
+
+.include <bsd.own.mk>
+
 DIST=          ${.CURDIR}/../../../crypto/dist
+
+# uncommon library functions
+.PATH: ${.CURDIR}/../../libc/string
+SRCS+= strlcpy.c strlcat.c
+
 .PATH: ${DIST}/heimdal/lib/com_err ${DIST}/heimdal/lib/roken
 
 HOSTPROG= compile_et
 
-SRCS=  compile_et.c parse.y lex.l \
+SRCS+= compile_et.c parse.y lex.l \
        getarg.c print_version.c warnerr.c strupr.c get_window_size.c
 
 YHEADER=       1
 
 BINDIR=        /usr/bin
 
-LIBROKEN!=     cd ${.CURDIR}/../../libroken && ${MAKE} print-objdir
+LIBROKEN!=     cd ${.CURDIR}/../../libroken && ${PRINTOBJDIR}
 
 HOST_CPPFLAGS+= -I.                            \
         -I${.CURDIR}/../../../include/heimdal  \
@@ -20,6 +30,16 @@
         -I${DIST}/heimdal/lib/roken            \
         -DHAVE_CONFIG_H
 
-NOMAN= noman
+DPSRCS=        print_version.h
+
+make-print-version.lo: ${.CURDIR}/../../../include/heimdal/version.h
+
+make-print-version: make-print-version.lo
+       ${HOST_CC} ${HOST_LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+
+print_version.h: make-print-version
+       ./make-print-version print_version.h
+
+CLEANFILES+=   print_version.h make-print-version make-print-version.lo
 
 .include <bsd.hostprog.mk>
diff -r 8f28ef46b4ea -r 3a98760c3868 libexec/kadmind/Makefile
--- a/libexec/kadmind/Makefile  Thu Apr 05 23:25:17 2001 +0000
+++ b/libexec/kadmind/Makefile  Thu Apr 05 23:25:23 2001 +0000
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2000/06/16 23:41:41 thorpej Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2001/04/05 23:25:23 he Exp $
+
+.include <bsd.own.mk>
+
 DIST=          ${.CURDIR}/../../crypto/dist
 .PATH: ${DIST}/heimdal/kadmin
 
@@ -9,7 +12,8 @@
 
 SRCS=  kadmind.c                               \
        server.c                                \
-       version4.c
+       version4.c                              \
+       kadm_conn.c
 
 CPPFLAGS+= -I.                                 \
        -I${DIST}/heimdal/kadmin                \
@@ -26,6 +30,8 @@
        -I${DIST}/openssl/crypto/des            \
        -DHAVE_CONFIG_H
 
+VERS!= cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+
 LDADD= -lkadm5srv                              \
        -lhdb                                   \
        -lkrb5                                  \
@@ -34,9 +40,11 @@
        -lcrypto                                \
        -lasn1                                  \
        -lcom_err                               \
+       -L${VERS} -lvers                        \
        -lroken                                 \
-       -lcrypt
+       -lcrypt                                 \
+       -lutil
 
-NOMAN=
+MAN=   kadmind.8
 
 .include <bsd.prog.mk>
diff -r 8f28ef46b4ea -r 3a98760c3868 usr.sbin/kadmin/Makefile
--- a/usr.sbin/kadmin/Makefile  Thu Apr 05 23:25:17 2001 +0000
+++ b/usr.sbin/kadmin/Makefile  Thu Apr 05 23:25:23 2001 +0000
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2000/06/17 00:04:36 thorpej Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2001/04/05 23:25:23 he Exp $
+
+.include <bsd.own.mk>
+
 DIST=          ${.CURDIR}/../../crypto/dist
 .PATH: ${DIST}/heimdal/kadmin
 
@@ -37,8 +40,9 @@
        -I${DIST}/openssl/crypto/des            \
        -DHAVE_CONFIG_H
 
-LDADD= -lkadm5clnt \
-       -lkadm5srv \
+VERS!= cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+
+LDADD= -lkadm5srv \
        -lhdb \
        -lkrb5 \
        -lcrypto \
@@ -46,9 +50,10 @@
        -lcom_err \
        -lsl \
        -ledit -ltermcap \
+       -L${VERS} -lvers \
        -lroken \
        -lcrypt
 
-NOMAN=
+MAN=   kadmin.8
 
 .include <bsd.prog.mk>