Module Name: src
Committed By: christos
Date: Thu Jun 22 22:39:39 UTC 2023
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/libexec: Makefile.inc
src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile
src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile
src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile
src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile
src/crypto/external/bsd/heimdal/sbin: Makefile.inc
src/crypto/external/bsd/heimdal/sbin/hprop: Makefile
src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile
src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile
src/crypto/external/bsd/heimdal/sbin/kcm: Makefile
src/crypto/external/bsd/heimdal/sbin/kdc: Makefile
src/crypto/external/bsd/heimdal/sbin/kdigest: Makefile
src/crypto/external/bsd/heimdal/sbin/kimpersonate: Makefile
src/crypto/external/bsd/heimdal/sbin/kstash: Makefile
src/crypto/external/bsd/heimdal/sbin/ktutil: Makefile
Log Message:
fix sun2
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/heimdal/libexec/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/sbin/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/kcm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.7 src/crypto/external/bsd/heimdal/Makefile.inc:1.8
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.7 Tue Jun 20 13:23:01 2023
+++ src/crypto/external/bsd/heimdal/Makefile.inc Thu Jun 22 18:39:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2023/06/20 17:23:01 christos Exp $
+# $NetBSD: Makefile.inc,v 1.8 2023/06/22 22:39:37 christos Exp $
HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
HEIMDIST= ${HEIMBASE}/dist
@@ -22,6 +22,8 @@ DPLIBROKEN= roken ${HEIMBASE}/lib/librok
DPLIBSL= sl ${HEIMBASE}/lib/libsl
DPLIBVERS= vers ${HEIMBASE}/lib/libvers
DPLIBWIND= wind ${HEIMBASE}/lib/libwind
+KRB5LDADD= -lsqlite3 -lcrypto -lcrypt -lm
+KRB5DPADD= ${LIBSQLITE3} ${LIBCRYPTO} ${LIBCRYPT} ${LIBM}
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
Index: src/crypto/external/bsd/heimdal/libexec/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.7 src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.8
--- src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.7 Tue Jun 20 13:23:03 2023
+++ src/crypto/external/bsd/heimdal/libexec/Makefile.inc Thu Jun 22 18:39:37 2023
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.7 2023/06/20 17:23:03 christos Exp $
+# $NetBSD: Makefile.inc,v 1.8 2023/06/22 22:39:37 christos Exp $
BINDIR=/usr/libexec
-PROGDPLIBS+= ${DPLIBKRB5} ${DPLIBHEIMNTLM} ${DPLIBROKEN} ${DPLIBVERS}
+PROGDPLIBS += ${DPLIBKRB5} ${DPLIBHX509} ${DPLIBASN1} ${DPLIBCOM_ERR}
+PROGDPLIBS += ${DPLIBWIND} ${DPLIBHEIMBASE} ${DPLIBROKEN} ${DPLIBVERS}
Index: src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.4 src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.5
--- src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.4 Tue Jun 20 13:23:03 2023
+++ src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile Thu Jun 22 18:39:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:03 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:37 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -14,9 +14,10 @@ CPPFLAGS+= \
-I${HEIMDIST}/lib/krb5 \
-I${HEIMDIST}/lib/ipc
-PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKDC} ${DPLIBHDB}
-LDADD+=-lcrypto
-DPADD+=${LIBCRYPTO}
+PROGDPLIBS+= ${DPLIBKDC} ${DPLIBHDB} ${DPLIBHEIMNTLM}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
+
+LDADD+= ${KRB5LDADD}
+DPADD+= ${KRB5DPADD}
Index: src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.4 src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.5
--- src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.4 Tue Jun 20 13:23:03 2023
+++ src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile Thu Jun 22 18:39:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:03 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:37 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -18,3 +18,6 @@ PROGDPLIBS+= ${DPLIBHDB}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
+
+LDADD+= ${KRB5LDADD}
+DPADD+= ${KRB5DPADD}
Index: src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.4 src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.5
--- src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.4 Tue Jun 20 13:23:03 2023
+++ src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile Thu Jun 22 18:39:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:03 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:37 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -21,8 +21,9 @@ CPPFLAGS+= \
-I${DESTDIR}/usr/include/kadm5
PROGDPLIBS+= ${DPLIBKADM5SRV} ${DPLIBHDB}
-LDADD+= -lutil
-DPADD+= ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
+
+LDADD+= -lutil ${KRB5LDADD}
+DPADD+= ${LIBUTIL} ${KRB5DPADD}
Index: src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.4 src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.5
--- src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.4 Tue Jun 20 13:23:03 2023
+++ src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile Thu Jun 22 18:39:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:03 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:37 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -18,8 +18,9 @@ CPPFLAGS+= \
-I${DESTDIR}/usr/include/kadm5
PROGDPLIBS+= ${DPLIBKADM5SRV} ${DPLIBHDB}
-LDADD+= -lutil
-DPADD+= ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
+
+LDADD+= -lutil ${KRB5LDADD}
+DPADD+= ${LIBUTIL} ${KRB5DPADD}
Index: src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.6 src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.7
--- src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.6 Tue Jun 20 13:23:03 2023
+++ src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile Thu Jun 22 18:39:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/06/20 17:23:03 christos Exp $
+# $NetBSD: Makefile,v 1.7 2023/06/22 22:39:37 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -18,9 +18,10 @@ CPPFLAGS+= \
-I${HEIMDIST}/lib/asn1 \
-I${HEIMBASE}/include/krb5
-PROGDPLIBS+= ${DPLIBGSSAPI} ${DPLIBKADM5SRV} ${DPLIBHDB}
-LDADD+= -lutil
-DPADD+= ${LIBUTIL}
+PROGDPLIBS+= ${DPLIBGSSAPI} ${DPLIBKADM5SRV} ${DPLIBHDB} ${DPLIBHEIMNTLM}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
+
+LDADD+= -lutil ${KRB5LDADD}
+DPADD+= ${LIBUTIL} ${KRB5DPADD}
Index: src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.4 src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.5
--- src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.4 Tue Jun 20 13:23:03 2023
+++ src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile Thu Jun 22 18:39:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:03 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:38 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -13,8 +13,9 @@ CPPFLAGS+= -DINETD_SUPPORT
CPPFLAGS+= -I${HEIMDIST}/lib
PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKADM5SRV} ${DPLIBHDB}
-LDADD+= -lcrypto -lutil
-DPADD+= ${LIBCRYPTO} ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
+
+LDADD+= -lutil ${KRB5LDADD}
+DPADD+= ${LIBUTIL} ${KRB5DPADD}
Index: src/crypto/external/bsd/heimdal/sbin/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.6 src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.7
--- src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.6 Tue Jun 20 13:23:04 2023
+++ src/crypto/external/bsd/heimdal/sbin/Makefile.inc Thu Jun 22 18:39:38 2023
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.6 2023/06/20 17:23:04 christos Exp $
+# $NetBSD: Makefile.inc,v 1.7 2023/06/22 22:39:38 christos Exp $
BINDIR=/usr/sbin
-PROGDPLIBS += ${DPLIBKRB5} ${DPLIBHEIMBASE} ${DPLIBROKEN} ${DPLIBVERS}
+PROGDPLIBS += ${DPLIBKRB5} ${DPLIBHX509} ${DPLIBASN1} ${DPLIBCOM_ERR}
+PROGDPLIBS += ${DPLIBWIND} ${DPLIBHEIMBASE} ${DPLIBROKEN} ${DPLIBVERS}
Index: src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.4 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.5
--- src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.4 Tue Jun 20 13:23:04 2023
+++ src/crypto/external/bsd/heimdal/sbin/hprop/Makefile Thu Jun 22 18:39:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:04 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:38 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -21,8 +21,9 @@ CPPFLAGS+= \
-I${HEIMDIST}/lib/krb5 \
PROGDPLIBS+= ${DPLIBHDB}
-LDADD+= -lutil
-DPADD+= ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
+
+LDADD+= -lutil ${KRB5LDADD}
+DPADD+= ${LIBUTIL} ${KRB5DPADD}
Index: src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.4 src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.5
--- src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.4 Tue Jun 20 13:23:04 2023
+++ src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile Thu Jun 22 18:39:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:04 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:38 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -13,8 +13,9 @@ HEIMSRCS= iprop-log.c iprop-commands.in
CPPFLAGS+= -I${DESTDIR}/usr/include/kadm5 -I${HEIMDIST}/lib/krb5
PROGDPLIBS += ${DPLIBKADM5SRV} ${DPLIBHDB} ${DPLIBSL}
-LDADD+= -ledit -lterminfo
-DPADD+= ${LIBEDIT} ${LIBTERMINFO}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
+
+LDADD+= -ledit -lterminfo ${KRB5LDADD}
+DPADD+= ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD}
Index: src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.5 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.6
--- src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.5 Tue Jun 20 13:23:04 2023
+++ src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile Thu Jun 22 18:39:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:04 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/22 22:39:38 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -39,10 +39,7 @@ CPPFLAGS+= \
-I${HEIMBASE}/lib/libwind \
-I${DESTDIR}/usr/include/kadm5
-PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKADM5SRV} ${DPLIBHDB} ${DPLIBKADM5CLNT}
-PROGDPLIBS+= ${DPLIBSL}
-LDADD+= -lcrypto -lutil -ledit -lterminfo
-DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO}
+PROGDPLIBS+= ${DPLIBKADM5SRV} ${DPLIBHDB} ${DPLIBKADM5CLNT} ${DPLIBSL}
kadmin.8: kadmin.1
@${TOOL_SED} -e 's/KADMIN 1/KADMIN 8/' < ${.ALLSRC} > ${.TARGET}
@@ -51,3 +48,6 @@ CLEANFILES+=kadmin.8
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
+
+LDADD+= -lutil -ledit -lterminfo ${KRB5LDADD}
+DPADD+= ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD}
Index: src/crypto/external/bsd/heimdal/sbin/kcm/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kcm/Makefile:1.4 src/crypto/external/bsd/heimdal/sbin/kcm/Makefile:1.5
--- src/crypto/external/bsd/heimdal/sbin/kcm/Makefile:1.4 Tue Jun 20 13:23:04 2023
+++ src/crypto/external/bsd/heimdal/sbin/kcm/Makefile Thu Jun 22 18:39:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:04 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:38 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -29,8 +29,9 @@ CPPFLAGS+= \
-I${HEIMDIST}/lib/ipc
PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBHEIMNTLM}
-LDADD+= -lcrypto -lutil
-DPADD+= ${LIBCRYPTO} ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
+
+LDADD+= -lutil ${KRB5LDADD}
+DPADD+= ${LIBCRYPTO} ${KRB5DPADD}
Index: src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.4 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.5
--- src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.4 Tue Jun 20 13:23:04 2023
+++ src/crypto/external/bsd/heimdal/sbin/kdc/Makefile Thu Jun 22 18:39:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:04 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:38 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -20,10 +20,11 @@ CPPFLAGS+= \
-I${HEIMDIST}/lib
PROGDPLIBS+= ${DPLIBKDC} ${DPLIBHDB} ${DPLIBHEIMNTLM}
-LDADD+= -lutil
-DPADD+= ${LIBUTIL}
MAN= kdc.8
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
+
+LDADD+= -lutil ${KRB5LDADD}
+DPADD+= ${LIBUTIL} ${KRB5DPADD}
Index: src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.5 src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.6
--- src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.5 Tue Jun 20 13:23:05 2023
+++ src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile Thu Jun 22 18:39:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:05 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/22 22:39:38 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -11,8 +11,9 @@ MAN= kdigest.8
HEIMSRCS+= kdigest.c kdigest-commands.in
PROGDPLIBS+= ${DPLIBHEIMNTLM} ${DPLIBSL}
-LDADD+= -lcrypto -lutil -ledit -lterminfo
-DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
+
+LDADD+= -lutil -ledit -lterminfo ${KRB5LDADD}
+DPADD+= ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD}
Index: src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile:1.4 src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile:1.5
--- src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile:1.4 Tue Jun 20 13:23:05 2023
+++ src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile Thu Jun 22 18:39:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:05 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:38 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -9,7 +9,10 @@ PROG= kimpersonate
SRCS= kimpersonate.c
MAN= kimpersonate.8
-PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKAFS} ${DPLIBHEIMNTLM}
+PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBHEIMNTLM}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
+
+LDADD+= ${KRB5LDADD}
+DPADD+= ${KRB5DPADD}
Index: src/crypto/external/bsd/heimdal/sbin/kstash/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.4 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.5
--- src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.4 Tue Jun 20 13:23:05 2023
+++ src/crypto/external/bsd/heimdal/sbin/kstash/Makefile Thu Jun 22 18:39:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:05 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:39 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -23,8 +23,9 @@ CPPFLAGS+= -I${HEIMDIST}/lib/krb5 -I${DE
# -DHAVE_CONFIG_H
PROGDPLIBS+= ${DPLIBHDB}
-LDADD+=-lcrypto
-DPADD+=${LIBCRYPTO}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
+
+LDADD+=${KRB5LDADD}
+DPADD+=${KRB5DPADD}
Index: src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile:1.5 src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile:1.6
--- src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile:1.5 Tue Jun 20 13:23:05 2023
+++ src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile Thu Jun 22 18:39:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:05 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/22 22:39:39 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -27,8 +27,6 @@ SRCS= \
rename.c
PROGDPLIBS+= ${DPLIBKADM5CLNT} ${DPLIBSL}
-LDADD+= -lcrypto -ledit -lterminfo -lutil
-DPADD+= ${LIBCRYPTO} ${LIBEDIT} ${LIBTERMINFO} ${LIBUTIL}
ktutil.8: ktutil.1
@${TOOL_SED} -e 's/KTUTIL 1/KTUTIL 8/' < ${.ALLSRC} > ${.TARGET}
@@ -37,3 +35,6 @@ CLEANFILES+=ktutil.8
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
+
+LDADD+= -ledit -lterminfo -lutil ${KRB5LDADD}
+DPADD+= ${LIBEDIT} ${LIBTERMINFO} ${LIBUTIL} ${KRB5DPADD}
