Attachment #18806 for bug #33645

Lines 170-173 Link Here

(-)Makefile.inc (+11 lines)
170		170
171	.endif	171	.endif
172		172
		173	MANFILTER= sed -E -e'/^\.(Dt\|Nm\|Xr)/{' \
		174	-e's,KADMIN,K5ADMIN,g' -e's,kadmin,k5admin,g' \
		175	-e's,KADMIND,K5ADMIND,g' -e's,kadmind,k5admind,g' \
		176	-e's,KSTASH,K5STASH,g' -e's,kstash,k5stash,g' \
		177	-e's,KPASSWD,K5PASSWD,g' -e's,kpasswd,k5passwd,g' \
		178	-e's,KPASSWDD,K5PASSWDD,g' -e's,kpasswdd,k5passwdd,g' \
		179	-e's,KDESTROY,K5DESTROY,g' -e's,kdestroy,k5destroy,g' \
		180	-e's,KINIT,K5INIT,g' -e's,kinit,k5init,g' \
		181	-e's,KLIST,K5LIST,g' -e's,klist,k5list,g' \
		182	-e'}'
		183
173	.endif	184	.endif

Lines 30-40 Link Here

(-)libexec/k5admind/Makefile (-1 / +5 lines)
30	DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \	30	DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
31	${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \	31	${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
32	${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}	32	${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
33	NOMAN= yes	33	MAN= k5admind.8
		34	CLEANFILES= ${MAN}
34		35
35	.include <bsd.prog.mk>	36	.include <bsd.prog.mk>
36		37
37	.PATH: ${KRB5DIR}/kadmin	38	.PATH: ${KRB5DIR}/kadmin
		39
		40	k5admind.8: kadmind.8
		41	ln -sf ${.ALLSRC} ${.TARGET}
38		42
39	kadm5/private.h: kadm5	43	kadm5/private.h: kadm5
40	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}	44	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}

Lines 25-35 Link Here

(-)libexec/k5passwdd/Makefile (-1 / +5 lines)
25	-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err	25	-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
26	DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \	26	DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
27	${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}	27	${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
28	MAN= kpasswdd.8	28	MAN= k5passwdd.8
		29	CLEANFILES= ${MAN}
29		30
30	.include <bsd.prog.mk>	31	.include <bsd.prog.mk>
31		32
32	.PATH: ${KRB5DIR}/kpasswd	33	.PATH: ${KRB5DIR}/kpasswd
		34
		35	k5passwdd.8: kpasswdd.8
		36	ln -sf ${.ALLSRC} ${.TARGET}
33		37
34	kadm5/admin.h: kadm5	38	kadm5/admin.h: kadm5
35	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}	39	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}

Lines 50-60 Link Here

(-)usr.bin/k5admin/Makefile (-1 / +5 lines)
50	${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \	50	${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
51	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMD} ${LIBCOM_ERR} \	51	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMD} ${LIBCOM_ERR} \
52	${LIBSL} ${LIBREADLINE}	52	${LIBSL} ${LIBREADLINE}
53	NOMAN= yes	53	MAN= k5admin.8
		54	CLEANFILES= ${MAN}
54		55
55	.include <bsd.prog.mk>	56	.include <bsd.prog.mk>
56		57
57	.PATH: ${KRB5DIR}/kadmin	58	.PATH: ${KRB5DIR}/kadmin
		59
		60	k5admin.8: kadmin.8
		61	ln -sf ${.ALLSRC} ${.TARGET}
58		62
59	kadm5/private.h: kadm5	63	kadm5/private.h: kadm5
60	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}	64	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}




		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
		${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
MAN=		k5stash.8
CLEANFILES=	${MAN}

.include <bsd.prog.mk>

.PATH:	${KRB5DIR}/kdc

k5stash.8: kstash.8
	ln -sf ${.ALLSRC} ${.TARGET}

Return to bug 33645

Lines 24-31 Link Here

(-)usr.sbin/k5stash/Makefile (-1 / +5 lines)
24	-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err	24	-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
25	DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \	25	DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
26	${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}	26	${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
27	MAN= kstash.8	27	MAN= k5stash.8
		28	CLEANFILES= ${MAN}
28		29
29	.include <bsd.prog.mk>	30	.include <bsd.prog.mk>
30		31
31	.PATH: ${KRB5DIR}/kdc	32	.PATH: ${KRB5DIR}/kdc
		33
		34	k5stash.8: kstash.8
		35	ln -sf ${.ALLSRC} ${.TARGET}