Get rid of update. Make man page installation work with our scheme

(and rename a few in the process).

43 files changed, 180 insertions, 52 deletions

diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile
index 40d12d2..8d94c66 100644
--- a/sbin/sysctl/Makefile
+++ b/sbin/sysctl/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	sysctl
-MAN8=	sysctl.0
+MAN8=	sysctl.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 48faf90..6a14503 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -9,22 +9,22 @@ SUBDIR=	XNSrouted accton amd arp chown chroot dev_mkdb diskpart \
 	sliplogin sysctl syslogd traceroute trpt trsp vipw
 
 .if   make(clean) || make(cleandir)
-SUBDIR+=bad144 config config.new eeprom iostat timed update
+SUBDIR+=bad144 config config.new eeprom iostat timed 
 .elif ${MACHINE} == "hp300"
-SUBDIR+=config iostat timed update
+SUBDIR+=config iostat timed 
 .elif ${MACHINE} == "i386"
 SUBDIR+=bad144 config timed
 # iostat
 .elif ${MACHINE} == "luna68k"
-SUBDIR+=config iostat timed update
+SUBDIR+=config iostat timed 
 .elif ${MACHINE} == "mips"
-SUBDIR+=config iostat timed update
+SUBDIR+=config iostat timed 
 .elif ${MACHINE} == "sparc"
-SUBDIR+=config.new eeprom timed update
+SUBDIR+=config.new eeprom timed 
 .elif ${MACHINE} == "tahoe"
-SUBDIR+=config iostat timed update
+SUBDIR+=config iostat timed 
 .elif ${MACHINE} == "vax"
-SUBDIR+=bad144 config iostat timed update
+SUBDIR+=bad144 config iostat timed 
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/XNSrouted/Makefile b/usr.sbin/XNSrouted/Makefile
index 1b3cf0e..0c9d6e3 100644
--- a/usr.sbin/XNSrouted/Makefile
+++ b/usr.sbin/XNSrouted/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	XNSrouted
-MAN8=	XNSrouted.0
+MAN8=	XNSrouted.8
 SRCS=	af.c if.c input.c main.c output.c startup.c tables.c timer.c trace.c
 DPADD=	${LIBCOMPAT}
 LDADD=	-lcompat
diff --git a/usr.sbin/arp/Makefile b/usr.sbin/arp/Makefile
index 33a11dd..a26439f 100644
--- a/usr.sbin/arp/Makefile
+++ b/usr.sbin/arp/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/18/94
 
 PROG=	arp
-MAN8=	arp.0
-CLEANFILES=arp4.0
+MAN8=	arp.8
+MAN4=	arp.4
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/arp/arp.4 b/usr.sbin/arp/arp.4
new file mode 100644
index 0000000..0cd7161
--- /dev/null
+++ b/usr.sbin/arp/arp.4
@@ -0,0 +1,124 @@
+.\" Copyright (c) 1985, 1986, 1988, 1994
+.\"	The Regents of the University of California.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"	@(#)arp4.4	6.5 (Berkeley) 4/18/94
+.\"
+.Dd April 18, 1994
+.Dt ARP 4
+.Os BSD 4
+.Sh NAME
+.Nm arp
+.Nd Address Resolution Protocol
+.Sh SYNOPSIS
+.Em "pseudo-device ether"
+.Sh DESCRIPTION
+The Address Resolution Protocol (ARP) is a protocol used to dynamically
+map between Internet host addresses and 10Mb/s Ethernet addresses.
+It is used by all the 10Mb/s Ethernet interface drivers.
+It is not specific to Internet protocols or to 10Mb/s Ethernet,
+but this implementation currently supports only that combination.
+.Pp
+ARP caches Internet-Ethernet address mappings. 
+When an interface requests a mapping for an address not in the cache,
+ARP queues the message which requires the mapping and broadcasts
+a message on the associated network requesting the address mapping.
+If a response is provided, the new mapping is cached and any pending
+message is transmitted.
+ARP will queue at most one packet while waiting for a response to a
+mapping request;
+only the most recently ``transmitted'' packet is kept.
+If the target host does not respond after several requests,
+the host is considered to be down for a short period (normally 20 seconds),
+allowing an error to be returned to transmission attempts during this
+interval.
+The error is
+.Li EHOSTDOWN
+for a non-responding destination host, and
+.Li EHOSTUNREACH
+for a non-responding router.
+.Pp
+The ARP cache is stored in the system routing table as
+dynamically-created host routes.
+The route to a directly-attached Ethernet network is installed as a
+.Dq cloning
+route (one with the
+.Li RTF_CLONING
+flag set),
+causing routes to individual hosts on that network to be created on
+demand.
+These routes time out periodically (normally 20 minutes after validated;
+entries are not validated when not in use).
+An entry for a host which is not responding is a
+.Dq reject
+route (one with the
+.Li RTF_REJECT
+flag set).
+.Pp
+ARP entries may be added, deleted or changed with the
+.Xr arp 8
+utility.
+Manually-added entries may be temporary or permanent,
+and may be
+.Dq published ,
+in which case the system will respond to ARP requests for that host
+as if it were the target of the request.
+.Pp
+In the past,
+ARP was used to negotiate the use of a trailer encapsulation.
+This is no longer supported.
+.Pp
+ARP watches passively for hosts impersonating the local host (i.e. a host
+which responds to an ARP mapping request for the local host's address).
+.Sh DIAGNOSTICS
+.Em "duplicate IP address %x!! sent from ethernet address: %x:%x:%x:%x:%x:%x."
+ARP has discovered another host on the local network which responds to
+mapping requests for its own Internet address with a different Ethernet
+address, generally indicating that two hosts are attempting to use the
+same Internet address.
+.Sh SEE ALSO
+.Xr inet 4 ,
+.Xr route 4 ,
+.Xr arp 8 ,
+.Xr ifconfig 8 ,
+.Xr route 8
+.sp
+.Rs
+.%A Plummer, D.
+.%B "An Ethernet Address Resolution Protocol"
+.%T RFC826
+.Re
+.Rs
+.%A Leffler, S.J.
+.%A Karels, M.J.
+.%B "Trailer Encapsulations
+.%T RFC893
+.Re
+
diff --git a/usr.sbin/bad144/Makefile b/usr.sbin/bad144/Makefile
index f3e10da..1b87ea2 100644
--- a/usr.sbin/bad144/Makefile
+++ b/usr.sbin/bad144/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	bad144
-MAN8=	bad144.0
-MANSUBDIR=/vax
+MAN8=	bad144.8
+MANSUBDIR=/i386
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile
index 084b4bc..9a4974c 100644
--- a/usr.sbin/chown/Makefile
+++ b/usr.sbin/chown/Makefile
@@ -2,8 +2,8 @@
 
 PROG=	chown
 CFLAGS+=-DSUPPORT_DOT
-MAN1=	chgrp.0
-MAN8=	chown.0
+MAN1=	chgrp.1
+MAN8=	chown.8
 LINKS=	${BINDIR}/chown /usr/bin/chgrp
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/chroot/Makefile b/usr.sbin/chroot/Makefile
index 086a7bc..69fe8b8 100644
--- a/usr.sbin/chroot/Makefile
+++ b/usr.sbin/chroot/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	chroot
-MAN8=	chroot.0
+MAN8=	chroot.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/config.new/Makefile b/usr.sbin/config.new/Makefile
index 6dc5a7e..f6931e1 100644
--- a/usr.sbin/config.new/Makefile
+++ b/usr.sbin/config.new/Makefile
@@ -1,13 +1,11 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/19/94
 
-PROG=	config
+PROG=	config.new
 SRCS=	files.c gram.y hash.c main.c mkheaders.c mkioconf.c mkmakefile.c \
 	mkswap.c pack.c scan.l sem.c util.c
 CFLAGS+=-I${.CURDIR} -I.
 CLEANFILES=gram.c scan.c y.tab.h
-MAN8=	config.new.0
-
-MLINKS+=config.new.0 config.0
+MAN8=	config.new.8
 
 .include <bsd.prog.mk>
 
diff --git a/usr.sbin/dev_mkdb/Makefile b/usr.sbin/dev_mkdb/Makefile
index 29c24f4..8737b50 100644
--- a/usr.sbin/dev_mkdb/Makefile
+++ b/usr.sbin/dev_mkdb/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	dev_mkdb
-MAN8=	dev_mkdb.0
+MAN8=	dev_mkdb.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/diskpart/Makefile b/usr.sbin/diskpart/Makefile
index 3f24518..bf623cb 100644
--- a/usr.sbin/diskpart/Makefile
+++ b/usr.sbin/diskpart/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	diskpart
-MAN8=	diskpart.0
+MAN8=	diskpart.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/edquota/Makefile b/usr.sbin/edquota/Makefile
index 38fa90c..1eb5de9 100644
--- a/usr.sbin/edquota/Makefile
+++ b/usr.sbin/edquota/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	edquota
-MAN8=	edquota.0
+MAN8=	edquota.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile
index 964b00d..0eecd6b 100644
--- a/usr.sbin/inetd/Makefile
+++ b/usr.sbin/inetd/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	inetd
-MAN8=	inetd.0
-MLINKS=	inetd.8 inetd.5
+MAN8=	inetd.8
+MLINKS=	inetd.8 inetd.conf.5
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/iostat/Makefile b/usr.sbin/iostat/Makefile
index e9287e3..3c43296 100644
--- a/usr.sbin/iostat/Makefile
+++ b/usr.sbin/iostat/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	iostat
 CFLAGS+=-I/sys -I${.CURDIR}/../../usr.bin/vmstat
-MAN8=	iostat.0
+MAN8=	iostat.8
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
 BINGRP=	kmem
diff --git a/usr.sbin/kgmon/Makefile b/usr.sbin/kgmon/Makefile
index e0ef616..20fcf68 100644
--- a/usr.sbin/kgmon/Makefile
+++ b/usr.sbin/kgmon/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	kgmon
-MAN8=	kgmon.0
+MAN8=	kgmon.8
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
 #
diff --git a/usr.sbin/kvm_mkdb/Makefile b/usr.sbin/kvm_mkdb/Makefile
index ea2b883..c158a48 100644
--- a/usr.sbin/kvm_mkdb/Makefile
+++ b/usr.sbin/kvm_mkdb/Makefile
@@ -2,6 +2,6 @@
 
 PROG=	kvm_mkdb
 SRCS=	kvm_mkdb.c nlist.c testdb.c
-MAN8=	kvm_mkdb.0
+MAN8=	kvm_mkdb.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile
index 10a3d69..4aeeab7 100644
--- a/usr.sbin/lpr/lpc/Makefile
+++ b/usr.sbin/lpr/lpc/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	lpc
 CFLAGS+=-I${.CURDIR}/../common_source
-MAN8=	lpc.0
+MAN8=	lpc.8
 SRCS=	lpc.c cmds.c cmdtab.c startdaemon.c common.c
 BINGRP=	daemon
 BINMODE=2555
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index da95bac..ee996d4 100644
--- a/usr.sbin/lpr/lpd/Makefile
+++ b/usr.sbin/lpr/lpd/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	lpd
 CFLAGS+=-I${.CURDIR}/../common_source
-MAN8=	lpd.0
+MAN8=	lpd.8
 SRCS=	lpd.c printjob.c recvjob.c displayq.c rmjob.c startdaemon.c \
 	lpdchar.c common.c
 .PATH:	${.CURDIR}/../common_source
diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile
index 1c730c1..0240b57 100644
--- a/usr.sbin/lpr/lpq/Makefile
+++ b/usr.sbin/lpr/lpq/Makefile
@@ -7,6 +7,7 @@ BINOWN=	root
 BINGRP=	daemon
 BINMODE=6555
 BINDIR=	/usr/bin
+MAN1=	lpq.1
 .PATH:	${.CURDIR}/../common_source
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile
index 9a3cbfd..eed68fd 100644
--- a/usr.sbin/lpr/lpr/Makefile
+++ b/usr.sbin/lpr/lpr/Makefile
@@ -7,6 +7,7 @@ BINOWN=	root
 BINGRP=	daemon
 BINMODE=6555
 BINDIR=	/usr/bin
+MAN1=	lpr.1
 .PATH:	${.CURDIR}/../common_source
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile
index d1362f5..77c57e5 100644
--- a/usr.sbin/lpr/lprm/Makefile
+++ b/usr.sbin/lpr/lprm/Makefile
@@ -7,6 +7,7 @@ BINOWN=	root
 BINGRP=	daemon
 BINMODE=6555
 BINDIR=	/usr/bin
+MAN1=	lprm.1
 .PATH:	${.CURDIR}/../common_source
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lptest/Makefile b/usr.sbin/lpr/lptest/Makefile
index 6ff8e7f..8492b69 100644
--- a/usr.sbin/lpr/lptest/Makefile
+++ b/usr.sbin/lpr/lptest/Makefile
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	lptest
+MAN1=	lptest.1
 
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile
index 70cea89..1f49dea 100644
--- a/usr.sbin/lpr/pac/Makefile
+++ b/usr.sbin/lpr/pac/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	pac
 CFLAGS+=-I${.CURDIR}/../common_source
-MAN8=	pac.0
+MAN8=	pac.8
 SRCS=	pac.c common.c
 .PATH:	${.CURDIR}/../common_source
 
diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile
index fb8b424..c736f13 100644
--- a/usr.sbin/mtree/Makefile
+++ b/usr.sbin/mtree/Makefile
@@ -3,6 +3,7 @@
 PROG=	mtree
 #CFLAGS+=-DDEBUG
 SRCS=	compare.c crc.c create.c misc.c mtree.c spec.c verify.c
+MAN8=	mtree.8
 .PATH:	${.CURDIR}/../../usr.bin/cksum
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/portmap/Makefile b/usr.sbin/portmap/Makefile
index 244a192..a3b8224 100644
--- a/usr.sbin/portmap/Makefile
+++ b/usr.sbin/portmap/Makefile
@@ -3,6 +3,6 @@
 PROG=	portmap
 DPADD=	${LIBRPC}
 LDADD=	-lrpc
-MAN8=	portmap.0
+MAN8=	portmap.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pstat/Makefile b/usr.sbin/pstat/Makefile
index 9969a64..5018d43 100644
--- a/usr.sbin/pstat/Makefile
+++ b/usr.sbin/pstat/Makefile
@@ -6,5 +6,6 @@ BINGRP=	kmem
 BINMODE=2555
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
+MAN8=	pstat.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile
index f1e9020..86116fec 100644
--- a/usr.sbin/pwd_mkdb/Makefile
+++ b/usr.sbin/pwd_mkdb/Makefile
@@ -2,6 +2,6 @@
 
 PROG=	pwd_mkdb
 SRCS=	pw_scan.c pwd_mkdb.c
-MAN8=	pwd_mkdb.0
+MAN8=	pwd_mkdb.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/quotaon/Makefile b/usr.sbin/quotaon/Makefile
index b2f571b..be3001e 100644
--- a/usr.sbin/quotaon/Makefile
+++ b/usr.sbin/quotaon/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	quotaon
-MAN8=	quotaon.0
+MAN8=	quotaon.8
 MLINKS=	quotaon.8 quotaoff.8
 LINKS=	${BINDIR}/quotaon ${BINDIR}/quotaoff
 
diff --git a/usr.sbin/repquota/Makefile b/usr.sbin/repquota/Makefile
index 9330509..eea7351 100644
--- a/usr.sbin/repquota/Makefile
+++ b/usr.sbin/repquota/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	repquota
-MAN8=	repquota.0
+MAN8=	repquota.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rmt/Makefile b/usr.sbin/rmt/Makefile
index c55ae71..7c7f40c 100644
--- a/usr.sbin/rmt/Makefile
+++ b/usr.sbin/rmt/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	rmt
-MAN8=	rmt.0
+MAN8=	rmt.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/routed/Makefile b/usr.sbin/routed/Makefile
index d9dd7f8..b2bdbf3 100644
--- a/usr.sbin/routed/Makefile
+++ b/usr.sbin/routed/Makefile
@@ -3,7 +3,7 @@
 PROG=	routed
 SRCS=	af.c if.c input.c main.c output.c startup.c tables.c timer.c \
 	trace.c inet.c
-MAN8=	routed.0
+MAN8=	routed.8
 #SUBDIR=	query trace
 DPADD=	${LIBCOMPAT}
 LDADD=	-lcompat
diff --git a/usr.sbin/rwhod/Makefile b/usr.sbin/rwhod/Makefile
index 5846743..0f884f5 100644
--- a/usr.sbin/rwhod/Makefile
+++ b/usr.sbin/rwhod/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	rwhod
-MAN8=	rwhod.0
+MAN8=	rwhod.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/makemap/Makefile b/usr.sbin/sendmail/makemap/Makefile
index 462583a..c4ac74e 100644
--- a/usr.sbin/sendmail/makemap/Makefile
+++ b/usr.sbin/sendmail/makemap/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/7/93
 
 PROG=	makemap
-MAN8=	makemap.0
+MAN8=	makemap.8
 CFLAGS+=-I${.CURDIR}/../src -DNDBM -DNEWDB
 
 .include "../../Makefile.inc"
diff --git a/usr.sbin/sendmail/src/Makefile b/usr.sbin/sendmail/src/Makefile
index 773318c4..71f44ed 100644
--- a/usr.sbin/sendmail/src/Makefile
+++ b/usr.sbin/sendmail/src/Makefile
@@ -21,9 +21,9 @@ SRCS=	alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
 	util.c version.c
 DPADD=	
 LDADD=	
-MAN1=	mailq.0 newaliases.0
-MAN5=	aliases.0
-MAN8=	sendmail.0 
+MAN1=	mailq.1 newaliases.1
+MAN5=	aliases.5
+MAN8=	sendmail.8
 LINKS=	/usr/sbin/sendmail /usr/bin/newaliases \
 	/usr/sbin/sendmail /usr/bin/mailq
 BINDIR=	/usr/sbin
diff --git a/usr.sbin/sliplogin/Makefile b/usr.sbin/sliplogin/Makefile
index b0fe83f..2299e65 100644
--- a/usr.sbin/sliplogin/Makefile
+++ b/usr.sbin/sliplogin/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 
 PROG=	sliplogin
-MAN8=	sliplogin.0
+MAN8=	sliplogin.8
 BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg
diff --git a/usr.sbin/sysctl/Makefile b/usr.sbin/sysctl/Makefile
index 40d12d2..8d94c66 100644
--- a/usr.sbin/sysctl/Makefile
+++ b/usr.sbin/sysctl/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	sysctl
-MAN8=	sysctl.0
+MAN8=	sysctl.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile
index b06fefb..5112bd4 100644
--- a/usr.sbin/syslogd/Makefile
+++ b/usr.sbin/syslogd/Makefile
@@ -3,7 +3,7 @@
 PROG=	syslogd
 SRCS=	syslogd.c ttymsg.c
 .PATH:	${.CURDIR}/../../usr.bin/wall
-MAN5=	syslog.conf.0
-MAN8=	syslogd.0
+MAN5=	syslog.conf.5
+MAN8=	syslogd.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/timed/timed/Makefile b/usr.sbin/timed/timed/Makefile
index 08b41f3..7edc521 100644
--- a/usr.sbin/timed/timed/Makefile
+++ b/usr.sbin/timed/timed/Makefile
@@ -7,7 +7,7 @@ SRCS=	acksend.c candidate.c correct.c master.c networkdelta.c readmsg.c \
 	slave.c timed.c byteorder.c measure.c cksum.c
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
-MAN8=	timed.0
+MAN8=	timed.8
 
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git a/usr.sbin/timed/timedc/Makefile b/usr.sbin/timed/timedc/Makefile
index a0b41ef..582ea96 100644
--- a/usr.sbin/timed/timedc/Makefile
+++ b/usr.sbin/timed/timedc/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	timedc
 SRCS=	cmds.c cmdtab.c timedc.c byteorder.c measure.c cksum.c
-MAN8=	timedc.0
+MAN8=	timedc.8
 BINOWN=	root
 BINMODE=4555
 .PATH:	${.CURDIR}/../timed
diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile
index 6f89a2c..7bbc57b 100644
--- a/usr.sbin/traceroute/Makefile
+++ b/usr.sbin/traceroute/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	traceroute
-MAN8=	traceroute.0
+MAN8=	traceroute.8
 BINOWN=	root
 BINMODE=4555
 
diff --git a/usr.sbin/trpt/Makefile b/usr.sbin/trpt/Makefile
index 9057f65..19b41da 100644
--- a/usr.sbin/trpt/Makefile
+++ b/usr.sbin/trpt/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	trpt
-MAN8=	trpt.0
+MAN8=	trpt.8
 BINGRP=	kmem
 BINMODE=2555
 
diff --git a/usr.sbin/trsp/Makefile b/usr.sbin/trsp/Makefile
index a0e4db6..2d0bcea 100644
--- a/usr.sbin/trsp/Makefile
+++ b/usr.sbin/trsp/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	trsp
-MAN8=	trsp.0
+MAN8=	trsp.8
 BINGRP=	kmem
 BINMODE=2555
 
diff --git a/usr.sbin/vipw/Makefile b/usr.sbin/vipw/Makefile
index 03a187e..e1c3978 100644
--- a/usr.sbin/vipw/Makefile
+++ b/usr.sbin/vipw/Makefile
@@ -2,6 +2,6 @@
 
 PROG=	vipw
 SRCS=	pw_util.c vipw.c
-MAN8=	vipw.0
+MAN8=	vipw.8
 
 .include <bsd.prog.mk>