After the Great eBones Repository Copy (tm), make ebones actually

compile
1) remove rubbish no longer needed
2) correct existing Makefiles
3) add new makefiles where needed
4) correct code, header files and man pages where necessary

PLEASE NOTE - after this you will need to make install in eBones/include,
and mamake obj depend all install in eBones/lib before doing a
make obj depend all install in eBones/. (I am going 6to fix src/Makefile
next)
PS - I hate slow international links - apologies for all the typos

16 files changed, 67 insertions, 49 deletions

diff --git a/eBones/usr.sbin/Makefile b/eBones/usr.sbin/Makefile
new file mode 100644
index 0000000..4d583fc
--- /dev/null
+++ b/eBones/usr.sbin/Makefile
@@ -0,0 +1,7 @@
+#	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
+#	$Id$
+
+SUBDIR=	ext_srvtab kadmind kdb_destroy kdb_edit kdb_init kdb_util \
+	kerberos kprop ksrvutil kstash make_keypair
+
+.include <bsd.subdir.mk>
diff --git a/eBones/usr.sbin/ext_srvtab/Makefile b/eBones/usr.sbin/ext_srvtab/Makefile
index 7fb1f29..431b847 100644
--- a/eBones/usr.sbin/ext_srvtab/Makefile
+++ b/eBones/usr.sbin/ext_srvtab/Makefile
@@ -1,10 +1,11 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.3 1995/07/18 16:35:54 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:50:29 mark Exp $
 
 PROG=	ext_srvtab
-CFLAGS+=-DKERBEROS -I${.CURDIR}/../include  -Wall
-DPADD=	${LIBKDB} ${LIBKRB}
-LDADD+=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
+CFLAGS+=-DKERBEROS -I${.CURDIR}/../../include  -Wall
+DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD+=	-lkdb -lkrb -ldes
 MAN8=	ext_srvtab.8
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kadmind/Makefile b/eBones/usr.sbin/kadmind/Makefile
index f2e0357..38cb3cb 100644
--- a/eBones/usr.sbin/kadmind/Makefile
+++ b/eBones/usr.sbin/kadmind/Makefile
@@ -1,11 +1,11 @@
-#	$Id: Makefile,v 1.1 1995/07/18 16:36:59 mark Exp $
+#	$Id: Makefile,v 1.2 1995/09/07 20:50:44 mark Exp $
 
 PROG=	kadmind
 SRCS=	admin_server.c kadm_funcs.c kadm_ser_wrap.c kadm_server.c
-CFLAGS+=-DPOSIX -I${.CURDIR}/../include -I${KRBOBJDIR} \
-	-I${.CURDIR}/../libkadm -I${KADMOBJDIR} -Wall
-LDADD+=	-L${KADMOBJDIR} -lkadm -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \
-	-ldes -L${ACLOBJDIR} -lacl -lcom_err
+CFLAGS+=-DPOSIX -I${.CURDIR}/../../include -I${.CURDIR}/../../lib/libkadm -Wall
+DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD+=	-lkadm -lkdb -lkrb -ldes -lacl -lcom_err
 MAN8=	kadmind.8
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kadmind/admin_server.c b/eBones/usr.sbin/kadmind/admin_server.c
index 72980d4..6f8c7f7 100644
--- a/eBones/usr.sbin/kadmind/admin_server.c
+++ b/eBones/usr.sbin/kadmind/admin_server.c
@@ -35,7 +35,7 @@ static const char rcsid[] =
 #include <syslog.h>
 #include <com_err.h>
 #include <kadm.h>
-#include <kadm_err.h>
+#include <kerberosIV/kadm_err.h>
 #include <krb_db.h>
 #include "kadm_server.h"
 
diff --git a/eBones/usr.sbin/kadmind/kadm_funcs.c b/eBones/usr.sbin/kadmind/kadm_funcs.c
index b8ddaa0..b20a566 100644
--- a/eBones/usr.sbin/kadmind/kadm_funcs.c
+++ b/eBones/usr.sbin/kadmind/kadm_funcs.c
@@ -12,7 +12,7 @@
 static char rcsid_kadm_funcs_c[] =
 "Id: kadm_funcs.c,v 4.3 90/03/20 01:39:51 jon Exp ";
 static const char rcsid[] =
-	"$Id: kadm_funcs.c,v 1.1 1995/07/18 16:37:02 mark Exp $";
+	"$Id: kadm_funcs.c,v 1.2 1995/09/07 20:50:48 mark Exp $";
 #endif	lint
 #endif
 
@@ -26,7 +26,7 @@ the actual database manipulation code
 #include <com_err.h>
 #include <sys/param.h>
 #include <kadm.h>
-#include <kadm_err.h>
+#include <kerberosIV/kadm_err.h>
 #include <krb_db.h>
 #include "kadm_server.h"
 
diff --git a/eBones/usr.sbin/kadmind/kadm_ser_wrap.c b/eBones/usr.sbin/kadmind/kadm_ser_wrap.c
index 0fa1ace..b6f4782 100644
--- a/eBones/usr.sbin/kadmind/kadm_ser_wrap.c
+++ b/eBones/usr.sbin/kadmind/kadm_ser_wrap.c
@@ -26,8 +26,8 @@ unwraps wrapped packets and calls the appropriate server subroutine
 #include <netdb.h>
 #include <sys/socket.h>
 #include <kadm.h>
-#include <kadm_err.h>
-#include <krb_err.h>
+#include <kerberosIV/kadm_err.h>
+#include <kerberosIV/krb_err.h>
 #include "kadm_server.h"
 
 Kadm_Server server_parm;
diff --git a/eBones/usr.sbin/kadmind/kadm_server.c b/eBones/usr.sbin/kadmind/kadm_server.c
index c6cbc6a..c53af7b 100644
--- a/eBones/usr.sbin/kadmind/kadm_server.c
+++ b/eBones/usr.sbin/kadmind/kadm_server.c
@@ -16,7 +16,7 @@ static char rcsid_kadm_server_c[] =
 
 #include <string.h>
 #include <kadm.h>
-#include <kadm_err.h>
+#include <kerberosIV/kadm_err.h>
 #include "kadm_server.h"
 
 /*
diff --git a/eBones/usr.sbin/kdb_destroy/Makefile b/eBones/usr.sbin/kdb_destroy/Makefile
index f22f779..7e9cef0 100644
--- a/eBones/usr.sbin/kdb_destroy/Makefile
+++ b/eBones/usr.sbin/kdb_destroy/Makefile
@@ -1,8 +1,9 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.3 1995/07/18 16:37:22 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:51:07 mark Exp $
 
 PROG=	kdb_destroy
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
 MAN8=	kdb_destroy.8
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kdb_edit/Makefile b/eBones/usr.sbin/kdb_edit/Makefile
index a56efcf..a38714d 100644
--- a/eBones/usr.sbin/kdb_edit/Makefile
+++ b/eBones/usr.sbin/kdb_edit/Makefile
@@ -1,12 +1,12 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 2/14/91
-#	$Id: Makefile,v 1.3 1995/07/18 16:37:25 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:51:11 mark Exp $
 
 PROG=	kdb_edit
-CFLAGS+=-DKERBEROS -DDEBUG -I. -I${.CURDIR}/../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG -I. -I${.CURDIR}/../../include -Wall
 SRCS=	kdb_edit.c maketime.c
-.PATH:	${.CURDIR}/../kdb_edit
-DPADD=	${LIBKDB} ${LIBKRB}
-LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
+DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD=	-lkdb -lkrb -ldes
 MAN8=	kdb_edit.8
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kdb_init/Makefile b/eBones/usr.sbin/kdb_init/Makefile
index 4d6a110..f084232 100644
--- a/eBones/usr.sbin/kdb_init/Makefile
+++ b/eBones/usr.sbin/kdb_init/Makefile
@@ -1,10 +1,11 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.3 1995/07/18 16:37:34 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:51:18 mark Exp $
 
 PROG=	kdb_init
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include -Wall
-DPADD=	${LIBKDB} ${LIBKRB}
-LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
+DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD=	-lkdb -lkrb -ldes
 MAN8=	kdb_init.8
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kdb_util/Makefile b/eBones/usr.sbin/kdb_util/Makefile
index 134fd34..f04ae71 100644
--- a/eBones/usr.sbin/kdb_util/Makefile
+++ b/eBones/usr.sbin/kdb_util/Makefile
@@ -1,13 +1,14 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 2/14/91
-#	$Id: Makefile,v 1.3 1995/07/18 16:37:38 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:51:22 mark Exp $
 
 PROG=	kdb_util
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../kdb_edit \
-	-I${.CURDIR}/../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../kdb_edit \
+	-I${.CURDIR}/../../include -Wall
 SRCS=	kdb_util.c maketime.c
 .PATH:	${.CURDIR}/../kdb_edit
-DPADD=	${LIBKDB} ${LIBKRB}
-LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
+DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD=	-lkdb -lkrb -ldes
 MAN8=	kdb_util.8
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kerberos/Makefile b/eBones/usr.sbin/kerberos/Makefile
index 7db860e..b32ca4e 100644
--- a/eBones/usr.sbin/kerberos/Makefile
+++ b/eBones/usr.sbin/kerberos/Makefile
@@ -1,11 +1,12 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.3 1995/07/18 16:37:47 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:51:30 mark Exp $
 
 PROG=	kerberos
 SRCS=	kerberos.c cr_err_reply.c
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include -Wall
-DPADD=	${LIBKDB} ${LIBKRB}
-LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
+DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD=	-lkdb -lkrb -ldes
 NOMAN=	noman
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kprop/Makefile b/eBones/usr.sbin/kprop/Makefile
index 636eaa4..7f62e9e 100644
--- a/eBones/usr.sbin/kprop/Makefile
+++ b/eBones/usr.sbin/kprop/Makefile
@@ -1,10 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.1.1.1 1995/08/03 07:36:18 mark Exp $
+#	$Id: Makefile,v 1.2 1995/09/07 20:51:44 mark Exp $
 
 PROG=	kprop
-CFLAGS+=-I${.CURDIR}/../include -Wall
-DPADD=	${LIBKRB}
-LDADD=	-L${KRBOBJDIR} -lkrb -ldes
+CFLAGS+=-I${.CURDIR}/../../include -Wall
+DPADD=	${LIBKRB} ${LIBDES}
+LDADD=	-lkrb -ldes
 BINDIR=	/usr/sbin
 NOMAN=	noman
 
diff --git a/eBones/usr.sbin/ksrvutil/Makefile b/eBones/usr.sbin/ksrvutil/Makefile
index a95d9ae..dbe479f 100644
--- a/eBones/usr.sbin/ksrvutil/Makefile
+++ b/eBones/usr.sbin/ksrvutil/Makefile
@@ -1,9 +1,11 @@
-#	$Id: Makefile,v 1.1 1995/07/18 16:40:09 mark Exp $
+#	$Id: Makefile,v 1.2 1995/09/07 20:53:52 mark Exp $
 
 PROG=	ksrvutil
 SRCS=	ksrvutil.c
-CFLAGS+=	-I${.CURDIR}/../include -I${.CURDIR}/../libkadm -Wall
-LDADD+=	-L${KADMOBJDIR} -lkadm -L${KRBOBJDIR} -lkrb -ldes -lcom_err
+CFLAGS+=	-I${.CURDIR}/../../include -I${.CURDIR}/../../lib/libkadm -Wall
+DPADD=	${LIBKRB} ${LIBDES}
+LDADD+=	-lkadm -lkrb -ldes -lcom_err
 MAN8=	ksrvutil.8
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kstash/Makefile b/eBones/usr.sbin/kstash/Makefile
index 1387f8c..664b8c9 100644
--- a/eBones/usr.sbin/kstash/Makefile
+++ b/eBones/usr.sbin/kstash/Makefile
@@ -1,10 +1,11 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 3/5/91
-#	$Id: Makefile,v 1.3 1995/07/18 16:40:14 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:53:56 mark Exp $
 
 PROG=	kstash
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include -Wall
-DPADD=	${LIBKDB} ${LIBKRB}
-LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
+DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD=	-lkdb -lkrb -ldes
 MAN8=	kstash.8
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/make_keypair/Makefile b/eBones/usr.sbin/make_keypair/Makefile
index 7d435e7..a1c38b2 100644
--- a/eBones/usr.sbin/make_keypair/Makefile
+++ b/eBones/usr.sbin/make_keypair/Makefile
@@ -1,9 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/1/93
+#	$id$
 
 PROG=	make_keypair
 MAN8=	make_keypair.8
-CFLAGS+=-DKERBEROS -I${.CURDIR}/../include -I${.CURDIR}/../register -Wall
-DPADD=	${LIBKRB}
-LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
+CFLAGS+=-DKERBEROS -I${.CURDIR}/../../include \
+	-I${.CURDIR}/../../usr.bin/register -Wall
+DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD=	-lkdb -lkrb -ldes
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>