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.
2000-02-28 19:15:32 +00:00 · 2000-02-28 19:15:32 +00:00 · 079654e8e2
commit 079654e8e2
parent fe5fd0173b
29 changed files with 62 additions and 148 deletions
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@ -133,7 +133,7 @@ CLEANFILES+=kadm5_err.h kadm5_err.c kadm5_err.et
 beforeinstall: ${INCLUDES}
 .for INC in ${INCLUDES}
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${INC} ${DESTDIR}/usr/include/${INC}
+		${INC} ${DESTDIR}/usr/include
 .endfor
 .endif

--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@ -27,11 +27,15 @@ GEN=	asn1_APOptions.x asn1_AP_REP.x asn1_AP_REQ.x asn1_AS_REP.x \
 	asn1_TGS_REQ.x asn1_Ticket.x asn1_TicketFlags.x \
 	asn1_TransitedEncoding.x

+INCLUDES=asn1.h asn1_err.h 
+
 .include <bsd.lib.mk>

 .PATH:		${KRB5DIR}/lib/asn1
 .PATH:		${KRB5DIR}/lib/roken

+build-tools:	make-print-version asn1_compile
+
 beforedepend all: roken.h

 .for I in ${GEN}
@ -68,7 +72,7 @@ print_version.h: make-print-version
 	./make-print-version print_version.h

 make-print-version: make-print-version.c
-	${CC} ${CFLAGS} -o ${.TARGET} ${.OODATE}
+	${CC} ${CFLAGS} -static -o ${.TARGET} ${.OODATE}

 CLEANFILES+=	${GEN} asn1_compile lex.o parse.o parse.c parse.h \
 		hdb_asn1.h make-print-version print_version.h print_version.o
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@ -19,6 +19,8 @@ GEN=	asn1_Key.x asn1_Event.x asn1_HDBFlags.x asn1_hdb_entry.x asn1_Salt.x
 .PATH:	${KRB5DIR}/lib/asn1
 .PATH:	${KRB5DIR}/lib/roken

+build-tools:	make-print-version asn1_compile
+
 .for I in ${GEN}
 ${I:S/.x/.c/}:  ${I}
 	cmp -s ${.OODATE} ${.TARGET} 2> /dev/null || cp ${.OODATE} ${.TARGET}
@ -51,7 +53,7 @@ print_version.h: make-print-version
 	./make-print-version print_version.h

 make-print-version: make-print-version.c
-	${CC} ${CFLAGS} -o ${.TARGET} ${.OODATE}
+	${CC} ${CFLAGS} -static -o ${.TARGET} ${.OODATE}

 CLEANFILES+=	${GEN} asn1_compile lex.o parse.o parse.c parse.h \
 		hdb_asn1.h make-print-version print_version.h print_version.o
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@ -30,7 +30,9 @@ SRCS=	add_et_list.c addr_families.c address.c aname_to_localname.c \
 	verify_init.c verify_user.c version.c warn.c write_message.c \
 	krb5_err.c krb5_err.h heim_err.c heim_err.h \
 	rc4_enc.c rc4_skey.c
-INCLUDES=krb5.h
+
+INCLUDES=${KRB5DIR}/lib/krb5/krb5.h ${.CURDIR}/../../include/krb5-types.h \
+	${KRB5DIR}/lib/krb5/krb5-protos.h heim_err.h krb5_err.h 

 .include <bsd.lib.mk>

--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@ -25,12 +25,12 @@ beforedepend all:	print_version.h

 .PATH:		${KRB5DIR}/lib/roken

-build-tools:	make-print-version
+build-tools:	make-print-version make-roken

 print_version.h: make-print-version
 	./make-print-version print_version.h

 make-print-version: make-print-version.c
-	${CC} ${CFLAGS} -o ${.TARGET} ${.OODATE}
+	${CC} ${CFLAGS} -static -o ${.TARGET} ${.OODATE}

 CLEANFILES+=	make-print-version print_version.h
--- a/kerberos5/lib/libsl/Makefile
+++ b/kerberos5/lib/libsl/Makefile
@ -11,6 +11,10 @@ NOPIC=	yes

 install:

+beforeinstall:
+
 .include <bsd.lib.mk>

 .PATH:	${KRB5DIR}/lib/sl
+
+build-tools:	make-roken
--- a/kerberos5/libexec/Makefile
+++ b/kerberos5/libexec/Makefile
@ -1,5 +1,5 @@
 # $FreeBSD$

-SUBDIR=	ipropd-master ipropd-slave hpropd kadmind kdc kpasswdd
+SUBDIR=	ipropd-master ipropd-slave hpropd k5admind kdc k5passwdd

 .include <bsd.subdir.mk>
--- a/kerberos5/libexec/k5admind/Makefile
+++ b/kerberos5/libexec/k5admind/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PROG=		kadmind
+PROG=		k5admind
 SRCS=		kadmind.c server.c version4.c \
 		kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
--- a/kerberos5/libexec/k5passwdd/Makefile
+++ b/kerberos5/libexec/k5passwdd/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PROG=		kpasswdd
+PROG=		k5passwdd
 SRCS=		kpasswdd.c krb5_err.h heim_err.h hdb_err.h kadm5/admin.h 
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/asn1 \
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PROG=		kadmind
+PROG=		k5admind
 SRCS=		kadmind.c server.c version4.c \
 		kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PROG=		kpasswdd
+PROG=		k5passwdd
 SRCS=		kpasswdd.c krb5_err.h heim_err.h hdb_err.h kadm5/admin.h 
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/asn1 \
--- 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>
--- 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 \
--- 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 \
--- 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}
--- 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}
--- 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}
--- 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}
--- 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 \
--- a/kerberos5/usr.bin/kauth/Makefile
+++ b/kerberos5/usr.bin/kauth/Makefile
@ -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
--- 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}
--- 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}
--- 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}
--- 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}
--- a/kerberos5/usr.sbin/Makefile
+++ b/kerberos5/usr.sbin/Makefile
@ -1,5 +1,5 @@
 # $FreeBSD$

-SUBDIR=	kadmin kstash ktutil
+SUBDIR=	k5stash ktutil

 .include <bsd.subdir.mk>
--- a/kerberos5/usr.sbin/k5admin/Makefile
+++ b/kerberos5/usr.sbin/k5admin/Makefile
@ -1,50 +0,0 @@
-# $FreeBSD$
-
-PROG=		kadmin
-SRCS=		kadmin.c dump.c load.c ank.c del.c del_enctype.c init.c cpw.c \
-		get.c ext.c random_password.c mod.c rename.c util.c \
-		kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h \
-		krb5_err.h heim_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/lib/hdb \
-		-I${KRB5DIR}/lib/sl \
-		-I${KRB5DIR}/kadmin \
-		-I${ASN1OBJDIR} \
-		-I${HDBOBJDIR} \
-		-I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-		-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-		-L${HDBOBJDIR} -lhdb -L${SLOBJDIR} -lsl \
-		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err -lreadline
-DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-		${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} \
-		${LIBREADLINE}
-NOMAN=		yes
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB5DIR}/kadmin
-
-kadm5/private.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
-
-kadm5/admin.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
-
-kadm5/kadm5_err.h: kadm5 kadm5_err.h
-	cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
-
-kadm5:
-	mkdir ${.TARGET}
-
-CLEANFILES+=	kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
-CLEANDIRS+=	kadm5
--- a/kerberos5/usr.sbin/k5stash/Makefile
+++ b/kerberos5/usr.sbin/k5stash/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PROG=		kstash
+PROG=		k5stash
 SRCS=		kstash.c hdb_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \
--- a/kerberos5/usr.sbin/kadmin/Makefile
+++ b/kerberos5/usr.sbin/kadmin/Makefile
@ -1,50 +0,0 @@
-# $FreeBSD$
-
-PROG=		kadmin
-SRCS=		kadmin.c dump.c load.c ank.c del.c del_enctype.c init.c cpw.c \
-		get.c ext.c random_password.c mod.c rename.c util.c \
-		kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h \
-		krb5_err.h heim_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/lib/hdb \
-		-I${KRB5DIR}/lib/sl \
-		-I${KRB5DIR}/kadmin \
-		-I${ASN1OBJDIR} \
-		-I${HDBOBJDIR} \
-		-I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-		-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-		-L${HDBOBJDIR} -lhdb -L${SLOBJDIR} -lsl \
-		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err -lreadline
-DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-		${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} \
-		${LIBREADLINE}
-NOMAN=		yes
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB5DIR}/kadmin
-
-kadm5/private.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
-
-kadm5/admin.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
-
-kadm5/kadm5_err.h: kadm5 kadm5_err.h
-	cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
-
-kadm5:
-	mkdir ${.TARGET}
-
-CLEANFILES+=	kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
-CLEANDIRS+=	kadm5
--- a/kerberos5/usr.sbin/kstash/Makefile
+++ b/kerberos5/usr.sbin/kstash/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PROG=		kstash
+PROG=		k5stash
 SRCS=		kstash.c hdb_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \