diff options
22 files changed, 70 insertions, 42 deletions
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile index b8f171b..824112c 100644 --- a/gnu/usr.bin/cvs/cvs/Makefile +++ b/gnu/usr.bin/cvs/cvs/Makefile @@ -28,8 +28,8 @@ LDADD+= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) CFLAGS+=-DHAVE_KERBEROS -DHAVE_KRB_GET_ERR_TEXT -LDADD+= -lkrb -ldes -DPADD+= ${LIBKRB} ${LIBDES} +LDADD+= -lkrb -ldes -lcom_err +DPADD+= ${LIBKRB} ${LIBDES} ${LIBCOM_ERR} DISTRIBUTION= krb # XXX do we want to mess with this? It's probably not really worth it for # the public freebsd stuff, but others might want it. It's an optional diff --git a/kerberos5/libexec/telnetd/Makefile b/kerberos5/libexec/telnetd/Makefile index 8c3917a..cb00951 100644 --- a/kerberos5/libexec/telnetd/Makefile +++ b/kerberos5/libexec/telnetd/Makefile @@ -14,9 +14,9 @@ SRCS= global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c authenc.c DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \ - ${LIBCRYPT} + ${LIBCRYPT} ${LIBCOM_ERR} LDADD= -lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \ - -L${KRBOBJDIR} -lkrb -lcrypt + -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err .include <bsd.prog.mk> diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile index 20bbb27..bac9afd 100644 --- a/kerberos5/usr.bin/telnet/Makefile +++ b/kerberos5/usr.bin/telnet/Makefile @@ -9,9 +9,10 @@ CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \ SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \ telnet.c terminal.c tn3270.c utilities.c -DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT} +DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT} \ + ${LIBCOM_ERR} LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \ - -L${KRBOBJDIR} -lkrb -lcrypt + -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err .include <bsd.prog.mk> diff --git a/kerberosIV/Makefile b/kerberosIV/Makefile index 5d94416..95f45cf 100644 --- a/kerberosIV/Makefile +++ b/kerberosIV/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +MAINTAINER= markm@FreeBSD.org + SUBDIR= include lib libexec usr.bin usr.sbin SDIR= ${.CURDIR}/.. diff --git a/kerberosIV/libexec/kauthd/Makefile b/kerberosIV/libexec/kauthd/Makefile index 559ad78..96041f1 100644 --- a/kerberosIV/libexec/kauthd/Makefile +++ b/kerberosIV/libexec/kauthd/Makefile @@ -8,8 +8,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/kafs \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/appl/kauth -LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} +LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -lcom_err +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/libexec/kipd/Makefile b/kerberosIV/libexec/kipd/Makefile index 8ac9cbd..fa750be 100644 --- a/kerberosIV/libexec/kipd/Makefile +++ b/kerberosIV/libexec/kipd/Makefile @@ -7,8 +7,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/appl/kip -LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} +LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -lcom_err +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/libexec/kpropd/Makefile b/kerberosIV/libexec/kpropd/Makefile index 7a21ba3..02cda9a 100644 --- a/kerberosIV/libexec/kpropd/Makefile +++ b/kerberosIV/libexec/kpropd/Makefile @@ -10,8 +10,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/slave \ -I${INCLOBJDIR} \ -I${.CURDIR}/../include -LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} +LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -lcom_err +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/libexec/telnetd/Makefile b/kerberosIV/libexec/telnetd/Makefile index 8c3917a..cb00951 100644 --- a/kerberosIV/libexec/telnetd/Makefile +++ b/kerberosIV/libexec/telnetd/Makefile @@ -14,9 +14,9 @@ SRCS= global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c authenc.c DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \ - ${LIBCRYPT} + ${LIBCRYPT} ${LIBCOM_ERR} LDADD= -lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \ - -L${KRBOBJDIR} -lkrb -lcrypt + -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err .include <bsd.prog.mk> diff --git a/kerberosIV/usr.bin/kauth/Makefile b/kerberosIV/usr.bin/kauth/Makefile index bfa9bc2..f38cc47 100644 --- a/kerberosIV/usr.bin/kauth/Makefile +++ b/kerberosIV/usr.bin/kauth/Makefile @@ -9,8 +9,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/appl/kauth LDADD= -L${ROKENOBJDIR} -lroken -L${KAFSOBJDIR} -lkafs \ - -L${KRBOBJDIR} -lkrb -ldes -lcrypt -DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} + -L${KRBOBJDIR} -lkrb -ldes -lcrypt -lcom_err +DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ + ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.bin/kdestroy/Makefile b/kerberosIV/usr.bin/kdestroy/Makefile index 3a4824a..3923592 100644 --- a/kerberosIV/usr.bin/kdestroy/Makefile +++ b/kerberosIV/usr.bin/kdestroy/Makefile @@ -11,8 +11,10 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/kuser LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt -DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} + -L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -lcom_err +DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ + ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.bin/kinit/Makefile b/kerberosIV/usr.bin/kinit/Makefile index 2554c8d..5970e65 100644 --- a/kerberosIV/usr.bin/kinit/Makefile +++ b/kerberosIV/usr.bin/kinit/Makefile @@ -10,8 +10,8 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/kuser LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KRBOBJDIR} -lkrb -ldes -lcrypt -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} + -L${KRBOBJDIR} -lkrb -ldes -lcrypt -lcom_err +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.bin/klist/Makefile b/kerberosIV/usr.bin/klist/Makefile index 03ae469..857f220 100644 --- a/kerberosIV/usr.bin/klist/Makefile +++ b/kerberosIV/usr.bin/klist/Makefile @@ -11,8 +11,10 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/kuser LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt -DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} + -L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -lcom_err +DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ + ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.bin/telnet/Makefile b/kerberosIV/usr.bin/telnet/Makefile index 20bbb27..bac9afd 100644 --- a/kerberosIV/usr.bin/telnet/Makefile +++ b/kerberosIV/usr.bin/telnet/Makefile @@ -9,9 +9,10 @@ CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \ SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \ telnet.c terminal.c tn3270.c utilities.c -DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT} +DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT} \ + ${LIBCOM_ERR} LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \ - -L${KRBOBJDIR} -lkrb -lcrypt + -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/ext_srvtab/Makefile b/kerberosIV/usr.sbin/ext_srvtab/Makefile index 0685d55..dc78c15 100644 --- a/kerberosIV/usr.sbin/ext_srvtab/Makefile +++ b/kerberosIV/usr.sbin/ext_srvtab/Makefile @@ -11,8 +11,10 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/krb \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -lcom_err +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ + ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kdb_destroy/Makefile b/kerberosIV/usr.sbin/kdb_destroy/Makefile index a9ec515..80ff59f 100644 --- a/kerberosIV/usr.sbin/kdb_destroy/Makefile +++ b/kerberosIV/usr.sbin/kdb_destroy/Makefile @@ -11,8 +11,10 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/admin \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${CRYPT} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -lcom_err +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ + ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kdb_edit/Makefile b/kerberosIV/usr.sbin/kdb_edit/Makefile index 3db4b70..73b4511 100644 --- a/kerberosIV/usr.sbin/kdb_edit/Makefile +++ b/kerberosIV/usr.sbin/kdb_edit/Makefile @@ -11,8 +11,10 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/admin \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -lcom_err +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ + ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kdb_init/Makefile b/kerberosIV/usr.sbin/kdb_init/Makefile index e15dae4..4899930 100644 --- a/kerberosIV/usr.sbin/kdb_init/Makefile +++ b/kerberosIV/usr.sbin/kdb_init/Makefile @@ -11,8 +11,10 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/admin \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -lcom_err +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ + ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kdb_util/Makefile b/kerberosIV/usr.sbin/kdb_util/Makefile index 3216250..a0eb41f 100644 --- a/kerberosIV/usr.sbin/kdb_util/Makefile +++ b/kerberosIV/usr.sbin/kdb_util/Makefile @@ -11,8 +11,10 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/admin \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -lcom_err +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ + ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kerberos/Makefile b/kerberosIV/usr.sbin/kerberos/Makefile index 1f3300b..61239ba 100644 --- a/kerberosIV/usr.sbin/kerberos/Makefile +++ b/kerberosIV/usr.sbin/kerberos/Makefile @@ -15,8 +15,10 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRBOBJDIR} \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -lcom_err +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ + ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kip/Makefile b/kerberosIV/usr.sbin/kip/Makefile index 5fbe1d2..eadaf2e 100644 --- a/kerberosIV/usr.sbin/kip/Makefile +++ b/kerberosIV/usr.sbin/kip/Makefile @@ -9,8 +9,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/kadmin \ -I${KRBOBJDIR} \ -I${.CURDIR}/../include -LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} +LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -lcom_err +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kprop/Makefile b/kerberosIV/usr.sbin/kprop/Makefile index eb81251..71ae73f 100644 --- a/kerberosIV/usr.sbin/kprop/Makefile +++ b/kerberosIV/usr.sbin/kprop/Makefile @@ -10,8 +10,9 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/slave \ -I${INCLOBJDIR} \ -I${.CURDIR}/../include -LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} +LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -lcom_err +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kstash/Makefile b/kerberosIV/usr.sbin/kstash/Makefile index c46dc20..6d6dea1 100644 --- a/kerberosIV/usr.sbin/kstash/Makefile +++ b/kerberosIV/usr.sbin/kstash/Makefile @@ -11,8 +11,10 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/kdb \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ + -lcom_err +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \ + ${LIBCOM_ERR} .include <bsd.prog.mk> |
