diff options
author | markm <markm@FreeBSD.org> | 2000-02-28 19:15:32 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 2000-02-28 19:15:32 +0000 |
commit | 5dffca5013c0de6e26b8856753725a833d02a04a (patch) | |
tree | 5368efeae9834c3c39f215909a745290ce92165f /kerberos5/usr.bin | |
parent | 37dce23afc624dfc2ebae4614ddd17d5e376a901 (diff) | |
download | FreeBSD-src-5dffca5013c0de6e26b8856753725a833d02a04a.zip FreeBSD-src-5dffca5013c0de6e26b8856753725a833d02a04a.tar.gz |
Remove largescale evidence of crack-smoking.
Where a k4 applet has a k5 namesake, rename the k5 version
from k<app> to k5<app>. (Repo copy done).
Do some repairs to dependancies to support make world properly.
Diffstat (limited to 'kerberos5/usr.bin')
-rw-r--r-- | kerberos5/usr.bin/Makefile | 2 | ||||
-rw-r--r-- | kerberos5/usr.bin/k5admin/Makefile | 2 | ||||
-rw-r--r-- | kerberos5/usr.bin/k5auth/Makefile | 2 | ||||
-rw-r--r-- | kerberos5/usr.bin/k5destroy/Makefile | 5 | ||||
-rw-r--r-- | kerberos5/usr.bin/k5init/Makefile | 5 | ||||
-rw-r--r-- | kerberos5/usr.bin/k5list/Makefile | 5 | ||||
-rw-r--r-- | kerberos5/usr.bin/k5passwd/Makefile | 5 | ||||
-rw-r--r-- | kerberos5/usr.bin/kadmin/Makefile | 2 | ||||
-rw-r--r-- | kerberos5/usr.bin/kauth/Makefile | 22 | ||||
-rw-r--r-- | kerberos5/usr.bin/kdestroy/Makefile | 5 | ||||
-rw-r--r-- | kerberos5/usr.bin/kinit/Makefile | 5 | ||||
-rw-r--r-- | kerberos5/usr.bin/klist/Makefile | 5 | ||||
-rw-r--r-- | kerberos5/usr.bin/kpasswd/Makefile | 5 |
13 files changed, 36 insertions, 34 deletions
diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile index 4a0d3f3..ec85d88 100644 --- a/kerberos5/usr.bin/Makefile +++ b/kerberos5/usr.bin/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= kadmin kauth kdestroy kinit klist kpasswd +SUBDIR= k5admin k5auth k5destroy k5init k5list k5passwd .include <bsd.subdir.mk> diff --git a/kerberos5/usr.bin/k5admin/Makefile b/kerberos5/usr.bin/k5admin/Makefile index 8e247eb..04bbfbb 100644 --- a/kerberos5/usr.bin/k5admin/Makefile +++ b/kerberos5/usr.bin/k5admin/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= kadmin +PROG= k5admin SRCS= kadmin.c ank.c cpw.c del.c del_enctype.c get.c rename.c util.c \ ext.c mod.c init.c dump.c load.c random_password.c \ krb5_err.h heim_err.h hdb_err.h \ diff --git a/kerberos5/usr.bin/k5auth/Makefile b/kerberos5/usr.bin/k5auth/Makefile index dbec434..36e8426 100644 --- a/kerberos5/usr.bin/k5auth/Makefile +++ b/kerberos5/usr.bin/k5auth/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= kauth +PROG= k5auth SRCS= kauth.c rkinit.c encdata.c marshall.c roken.h CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/lib/roken \ diff --git a/kerberos5/usr.bin/k5destroy/Makefile b/kerberos5/usr.bin/k5destroy/Makefile index 797005d..607d4c4 100644 --- a/kerberos5/usr.bin/k5destroy/Makefile +++ b/kerberos5/usr.bin/k5destroy/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= kdestroy +PROG= k5destroy SRCS= kdestroy.c krb5_err.h heim_err.h CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/lib/roken \ @@ -22,3 +22,6 @@ DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ .include <bsd.prog.mk> .PATH: ${KRB5DIR}/kuser + +k5destroy.1: kdestroy.1 + ln -sf ${.OODATE} ${.TARGET} diff --git a/kerberos5/usr.bin/k5init/Makefile b/kerberos5/usr.bin/k5init/Makefile index 8618f35..824b3a3 100644 --- a/kerberos5/usr.bin/k5init/Makefile +++ b/kerberos5/usr.bin/k5init/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= kinit +PROG= k5init SRCS= kinit.c kinit_options.c asn1_err.h krb5_err.h heim_err.h CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/lib/roken \ @@ -22,3 +22,6 @@ DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ .include <bsd.prog.mk> .PATH: ${KRB5DIR}/kuser + +k5init.1: kinit.1 + ln -sf ${.OODATE} ${.TARGET} diff --git a/kerberos5/usr.bin/k5list/Makefile b/kerberos5/usr.bin/k5list/Makefile index e40949d..b3798f4 100644 --- a/kerberos5/usr.bin/k5list/Makefile +++ b/kerberos5/usr.bin/k5list/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= klist +PROG= k5list SRCS= klist.c krb5_err.h heim_err.h CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/lib/roken \ @@ -22,3 +22,6 @@ DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ .include <bsd.prog.mk> .PATH: ${KRB5DIR}/kuser + +k5list.1: klist.1 + ln -sf ${.OODATE} ${.TARGET} diff --git a/kerberos5/usr.bin/k5passwd/Makefile b/kerberos5/usr.bin/k5passwd/Makefile index 298645b..9bd3e2d 100644 --- a/kerberos5/usr.bin/k5passwd/Makefile +++ b/kerberos5/usr.bin/k5passwd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= kpasswd +PROG= k5passwd SRCS= kpasswd.c krb5_err.h heim_err.h CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/lib/asn1 \ @@ -21,3 +21,6 @@ DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \ .include <bsd.prog.mk> .PATH: ${KRB5DIR}/kpasswd + +k5passwd.1: kpasswd.1 + ln -sf ${.OODATE} ${.TARGET} diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile index 8e247eb..04bbfbb 100644 --- a/kerberos5/usr.bin/kadmin/Makefile +++ b/kerberos5/usr.bin/kadmin/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= kadmin +PROG= k5admin SRCS= kadmin.c ank.c cpw.c del.c del_enctype.c get.c rename.c util.c \ ext.c mod.c init.c dump.c load.c random_password.c \ krb5_err.h heim_err.h hdb_err.h \ diff --git a/kerberos5/usr.bin/kauth/Makefile b/kerberos5/usr.bin/kauth/Makefile deleted file mode 100644 index dbec434..0000000 --- a/kerberos5/usr.bin/kauth/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# $FreeBSD$ - -PROG= kauth -SRCS= kauth.c rkinit.c encdata.c marshall.c roken.h -CFLAGS+= -I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/appl/kauth \ - -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) -_krb4libs= -lkrb -lkafs -_krb4deps= ${LIBKRB} ${LIBKAFS} -.endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} -NOMAN= yes - -.include <bsd.prog.mk> - -.PATH: ${KRB5DIR}/appl/kauth diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile index 797005d..607d4c4 100644 --- a/kerberos5/usr.bin/kdestroy/Makefile +++ b/kerberos5/usr.bin/kdestroy/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= kdestroy +PROG= k5destroy SRCS= kdestroy.c krb5_err.h heim_err.h CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/lib/roken \ @@ -22,3 +22,6 @@ DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ .include <bsd.prog.mk> .PATH: ${KRB5DIR}/kuser + +k5destroy.1: kdestroy.1 + ln -sf ${.OODATE} ${.TARGET} diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile index 8618f35..824b3a3 100644 --- a/kerberos5/usr.bin/kinit/Makefile +++ b/kerberos5/usr.bin/kinit/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= kinit +PROG= k5init SRCS= kinit.c kinit_options.c asn1_err.h krb5_err.h heim_err.h CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/lib/roken \ @@ -22,3 +22,6 @@ DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ .include <bsd.prog.mk> .PATH: ${KRB5DIR}/kuser + +k5init.1: kinit.1 + ln -sf ${.OODATE} ${.TARGET} diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile index e40949d..b3798f4 100644 --- a/kerberos5/usr.bin/klist/Makefile +++ b/kerberos5/usr.bin/klist/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= klist +PROG= k5list SRCS= klist.c krb5_err.h heim_err.h CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/lib/roken \ @@ -22,3 +22,6 @@ DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ .include <bsd.prog.mk> .PATH: ${KRB5DIR}/kuser + +k5list.1: klist.1 + ln -sf ${.OODATE} ${.TARGET} diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile index 298645b..9bd3e2d 100644 --- a/kerberos5/usr.bin/kpasswd/Makefile +++ b/kerberos5/usr.bin/kpasswd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= kpasswd +PROG= k5passwd SRCS= kpasswd.c krb5_err.h heim_err.h CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/lib/asn1 \ @@ -21,3 +21,6 @@ DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \ .include <bsd.prog.mk> .PATH: ${KRB5DIR}/kpasswd + +k5passwd.1: kpasswd.1 + ln -sf ${.OODATE} ${.TARGET} |