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

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

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

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

diffstat:

 lib/libhdb/Makefile     |  30 +++++++++++++++++-------------
 libexec/hpropd/Makefile |  11 ++++++++---
 2 files changed, 25 insertions(+), 16 deletions(-)

diffs (112 lines):

diff -r e19bb46a5644 -r 9d03d33eb412 lib/libhdb/Makefile
--- a/lib/libhdb/Makefile       Thu Apr 05 23:25:25 2001 +0000
+++ b/lib/libhdb/Makefile       Thu Apr 05 23:25:28 2001 +0000
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2000/06/16 22:46:46 thorpej Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2001/04/05 23:25:28 he Exp $
+
+.include <bsd.own.mk>
+
 DIST=          ${.CURDIR}/../../crypto/dist
 .PATH: ${DIST}/heimdal/lib/hdb
 
@@ -7,7 +10,7 @@
 
 LIB=   hdb
 
-COMPILEET!=    cd ${.CURDIR}/../libcom_err/compile_et && make print-objdir
+COMPILEET!=    cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
 
 hdb_err.c hdb_err.h: hdb_err.et
        ${COMPILEET}/compile_et ${DIST}/heimdal/lib/hdb/hdb_err.et
@@ -16,15 +19,18 @@
 
 gen_files = asn1_Key.x asn1_Event.x asn1_HDBFlags.x asn1_hdb_entry.x asn1_Salt.x
 
-DPSRCS=        hdb_err.h
+DPSRCS=        hdb_asn1.h hdb_err.h
 
 BUILT_SOURCES = $(gen_files:.x=.c) hdb_err.c
 
-SRCS=  \
-           keytab.c                    \
-           hdb.c                       \
+SRCS=                                  \
            common.c                    \
            db.c                        \
+           db3.c                       \
+           hdb-ldap.c                  \
+           hdb.c                       \
+           keytab.c                    \
+           mkey.c                      \
            ndbm.c                      \
            print.c                     \
            $(BUILT_SOURCES)
@@ -33,15 +39,13 @@
 
 INCSDIR= /usr/include/krb5
 
-$(gen_files) asn1.h: asn1_files
+ASN1COMPILE!=  cd ${.CURDIR}/../libasn1/asn1_compile && ${PRINTOBJDIR}
 
-ASN1COMPILE!=  cd ${.CURDIR}/../libasn1/asn1_compile && ${MAKE} print-objdir
-
-asn1_files: hdb.asn1
+asn1_files hdb_asn1.hx: hdb.asn1
        ${ASN1COMPILE}/asn1_compile ${DIST}/heimdal/lib/hdb/hdb.asn1 hdb_asn1
 
-ASN1!= cd ${.CURDIR}/../libasn1 && ${MAKE} print-objdir
-KRB5!= cd ${.CURDIR}/../libkrb5 && ${MAKE} print-objdir
+ASN1!= cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR}
+KRB5!= cd ${.CURDIR}/../libkrb5 && ${PRINTOBJDIR}
 
 CPPFLAGS+= -I.                                 \
         -I${DIST}/heimdal/lib/hdb              \
@@ -60,7 +64,7 @@
 $(gen_files) hdb_asn1.h: asn1_files
 
 hdb_asn1.h: hdb_asn1.hx
-$(SRCS:.c=.o): hdb_err.h hdb_asn1.h
+$(SRCS): hdb_err.h hdb_asn1.h
 
 CLEANFILES = $(gen_files) $(BUILT_SOURCES) hdb_asn1.h hdb_asn1.hx asn1_files hdb_err.h
 
diff -r e19bb46a5644 -r 9d03d33eb412 libexec/hpropd/Makefile
--- a/libexec/hpropd/Makefile   Thu Apr 05 23:25:25 2001 +0000
+++ b/libexec/hpropd/Makefile   Thu Apr 05 23:25:28 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:28 he Exp $
+
+.include <bsd.own.mk>
+
 DIST=          ${.CURDIR}/../../crypto/dist
 .PATH: ${DIST}/heimdal/kdc
 
@@ -7,8 +10,7 @@
 
 PROG= hpropd
 
-SRCS=  hpropd.c                                \
-       hprop-common.c
+SRCS=  hpropd.c
 
 CPPFLAGS+= -I.                                 \
        -I${DIST}/heimdal/kdc                   \
@@ -24,6 +26,8 @@
        -I${DIST}/openssl/crypto/des            \
        -DHAVE_CONFIG_H
 
+VERS!= cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+
 LDADD= -lhdb                                   \
        -lkrb5                                  \
        -lkdb                                   \
@@ -31,6 +35,7 @@
        -lcrypto                                \
        -lasn1                                  \
        -lcom_err                               \
+       -L${VERS} -lvers                        \
        -lroken                                 \
        -lcrypt