Update to new make macros and disable Kerberos because we haven't got it

set up right yet.

15 files changed, 28 insertions, 27 deletions

diff --git a/libexec/bugfiler/Makefile b/libexec/bugfiler/Makefile
index 98489ad..fb77633 100644
--- a/libexec/bugfiler/Makefile
+++ b/libexec/bugfiler/Makefile
@@ -5,8 +5,8 @@ CFLAGS+=-I${.CURDIR}
 SRCS=	bugfiler.c error.c gethead.c process.c redist.c reply.c
 BINOWN=	root
 BINMODE=4555
-MAN1=	sendbug.0
-MAN8=	bugfiler.0
+MAN1=	sendbug.1
+MAN8=	bugfiler.8
 
 beforeinstall:
 	install -c -o bin -g ${BINGRP} -m 555 \
diff --git a/libexec/comsat/Makefile b/libexec/comsat/Makefile
index 0e11b5f..14e793d 100644
--- a/libexec/comsat/Makefile
+++ b/libexec/comsat/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
 PROG=	comsat
-MAN8=	comsat.0
+MAN8=	comsat.8
 
 .include <bsd.prog.mk>
diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile
index e2ed65c..bd39992 100644
--- a/libexec/fingerd/Makefile
+++ b/libexec/fingerd/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
 PROG=	fingerd
-MAN8=	fingerd.0
+MAN8=	fingerd.8
 
 .include <bsd.prog.mk>
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index 946aab7..0a067be 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -3,7 +3,7 @@
 PROG=	ftpd
 CFLAGS+=-DSETPROCTITLE
 SRCS=	ftpd.c ftpcmd.c logwtmp.c popen.c
-MAN8=	ftpd.0
+MAN8=	ftpd.8
 CLEANFILES+=ftpcmd.c y.tab.h
 
 .include <bsd.prog.mk>
diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile
index 7f2eabe..b32320f 100644
--- a/libexec/getty/Makefile
+++ b/libexec/getty/Makefile
@@ -4,7 +4,7 @@ PROG=	getty
 SRCS=	main.c init.c subr.c ttydefaults.c
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
-MAN5=	gettytab.0 ttys.0
-MAN8=	getty.0
+MAN5=	gettytab.5 ttys.5
+MAN8=	getty.8
 
 .include <bsd.prog.mk>
diff --git a/libexec/kpasswdd/Makefile b/libexec/kpasswdd/Makefile
index a01cbf8..b7e6032 100644
--- a/libexec/kpasswdd/Makefile
+++ b/libexec/kpasswdd/Makefile
@@ -6,6 +6,6 @@ CFLAGS+=-DCRYPT -DKERBEROS -I${.CURDIR}/../../usr.bin/passwd
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
 LDADD=	-lkdb -lkrb -ldes
 .PATH:	${.CURDIR}/../../usr.bin/rlogin
-MAN8=	kpasswdd.0
+MAN8=	kpasswdd.8
 
 .include <bsd.prog.mk>
diff --git a/libexec/lfs_cleanerd/Makefile b/libexec/lfs_cleanerd/Makefile
index 6993cf7..58ddf94 100644
--- a/libexec/lfs_cleanerd/Makefile
+++ b/libexec/lfs_cleanerd/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	lfs_cleanerd
 CFLAGS+=-I/sys/ufs/lfs -I${.CURDIR} -DDIAGNOSTIC
-MAN8=	lfs_cleanerd.0
+MAN8=	lfs_cleanerd.8
 SRCS=	cleanerd.c lfs_cksum.c library.c misc.c print.c
 
 .PATH:	/sys/ufs/lfs
diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile
index e8556d8..2f22012 100644
--- a/libexec/mail.local/Makefile
+++ b/libexec/mail.local/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 
 PROG=	mail.local
-MAN8=	mail.local.0
+MAN8=	mail.local.8
 BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg
diff --git a/libexec/rbootd/Makefile b/libexec/rbootd/Makefile
index 9faa2bc..cd0c52e 100644
--- a/libexec/rbootd/Makefile
+++ b/libexec/rbootd/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	rbootd
 SRCS=	bpf.c conf.c parseconf.c rbootd.c rmpproto.c utils.c
-MAN8=	rbootd.0
+MAN8=	rbootd.8
 
 # XXX BROKEN:	afterinstall:
 XXXafterinstall:
diff --git a/libexec/rexecd/Makefile b/libexec/rexecd/Makefile
index aaedac5..b12d228 100644
--- a/libexec/rexecd/Makefile
+++ b/libexec/rexecd/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
 PROG=	rexecd
-MAN8=	rexecd.0
+MAN8=	rexecd.8
 
 .include <bsd.prog.mk>
diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile
index 639d3f6..7cc189a 100644
--- a/libexec/rlogind/Makefile
+++ b/libexec/rlogind/Makefile
@@ -1,11 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
 PROG=	rlogind
-CFLAGS+=-DKERBEROS -DCRYPT
-SRCS=	rlogind.c des_rw.c
-MAN8=	rlogind.0
-DPADD=	${LIBUTIL} ${LIBKRB} ${LIBDES}
-LDADD=	-lutil -lkrb -ldes
+#CFLAGS+=-DKERBEROS -DCRYPT
+SRCS=	rlogind.c #des_rw.c
+MAN8=	rlogind.8
+DPADD=	${LIBUTIL} #${LIBKRB} ${LIBDES}
+LDADD=	-lutil #-lkrb -ldes
 .PATH: ${.CURDIR}/../../usr.bin/rlogin
 
 .include <bsd.prog.mk>
diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile
index 0b448aa..47b80f2 100644
--- a/libexec/rshd/Makefile
+++ b/libexec/rshd/Makefile
@@ -1,11 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
 PROG=	rshd
-CFLAGS+=-DKERBEROS -DCRYPT
-SRCS=	rshd.c des_rw.c
-MAN8=	rshd.0
-DPADD=	${LIBKRB} ${LIBDES}
-LDADD=	-lkrb -ldes
+#CFLAGS+=-DKERBEROS -DCRYPT
+SRCS=	rshd.c #des_rw.c
+MAN8=	rshd.8
+#DPADD=	${LIBKRB} ${LIBDES}
+#LDADD=	-lkrb -ldes
 .PATH: ${.CURDIR}/../../usr.bin/rlogin
 
 .include <bsd.prog.mk>
diff --git a/libexec/talkd/Makefile b/libexec/talkd/Makefile
index 51f6806..4b4a8399 100644
--- a/libexec/talkd/Makefile
+++ b/libexec/talkd/Makefile
@@ -3,6 +3,6 @@
 PROG=	ntalkd
 SRCS=	talkd.c announce.c process.c table.c print.c ttymsg.c
 .PATH:  ${.CURDIR}/../../usr.bin/wall
-MAN8=	talkd.0
+MAN8=	talkd.8
 
 .include <bsd.prog.mk>
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index 4b1d530..7d3b4c5 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -3,13 +3,14 @@
 PROG=	telnetd
 CFLAGS+=-DLINEMODE -DKLUDGELINEMODE -DUSE_TERMIO -DDIAGNOSTICS
 CFLAGS+=-DOLD_ENVIRON -DENV_HACK
-CFLAGS+=-DAUTHENTICATION -DENCRYPTION -I${.CURDIR}/../../lib
+CFLAGS+=--I${.CURDIR}/../../lib
+#CFLAGS+=-DAUTHENTICATION -DENCRYPTION
 SRCS=	authenc.c global.c slc.c state.c sys_term.c telnetd.c \
 	termstat.c utility.c
 DPADD=	${LIBUTIL} ${LIBTERM}
 LDADD=	-lutil -ltermcap -ltelnet
-LDADD+=	-lkrb -ldes
-MAN8=	telnetd.0
+#LDADD+=	-lkrb -ldes
+MAN8=	telnetd.8
 
 # These are the sources that have encryption stuff in them.
 CRYPT_SRC= authenc.c ext.h state.c telnetd.c termstat.c
diff --git a/libexec/tftpd/Makefile b/libexec/tftpd/Makefile
index f94acc0..728e2a2 100644
--- a/libexec/tftpd/Makefile
+++ b/libexec/tftpd/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	tftpd
 SRCS=	tftpd.c tftpsubs.c
-MAN8=	tftpd.0
+MAN8=	tftpd.8
 CFLAGS+=-I${.CURDIR}/../../usr.bin/tftp
 .PATH:	${.CURDIR}/../../usr.bin/tftp