- Backout botched attempt to introduce MANSECT feature.

- MAN[1-9] -> MAN.

97 files changed, 101 insertions, 29 deletions

diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc
index 9802886..f870962 100644
--- a/sbin/Makefile.inc
+++ b/sbin/Makefile.inc
@@ -3,4 +3,3 @@
 
 BINDIR?=	/sbin
 NOSHARED?=	YES
-MANSECT?=	8
diff --git a/sbin/adjkerntz/Makefile b/sbin/adjkerntz/Makefile
index bb98aa3..cf40461 100644
--- a/sbin/adjkerntz/Makefile
+++ b/sbin/adjkerntz/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=   adjkerntz
+MAN=	adjkerntz.8
 CFLAGS+= -Wall
 
 .include <bsd.prog.mk>
diff --git a/sbin/atacontrol/Makefile b/sbin/atacontrol/Makefile
index 07ec668..717c53d 100644
--- a/sbin/atacontrol/Makefile
+++ b/sbin/atacontrol/Makefile
@@ -1,4 +1,5 @@
 #$FreeBSD$
 PROG=	atacontrol
+MAN=	atacontrol.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/atm/atm/Makefile b/sbin/atm/atm/Makefile
index 06c5612..a3b99d1 100644
--- a/sbin/atm/atm/Makefile
+++ b/sbin/atm/atm/Makefile
@@ -30,6 +30,7 @@
 PROG=	atm
 SRCS=	atm.c atm_fore200.c atm_eni.c atm_inet.c atm_print.c \
 	atm_set.c atm_show.c atm_subr.c
+MAN=	atm.8
 
 CFLAGS+=	-I${.CURDIR}/../../../sys
 LDADD+=		-latm
diff --git a/sbin/atm/fore_dnld/Makefile b/sbin/atm/fore_dnld/Makefile
index 069cbd3..576a35bf 100644
--- a/sbin/atm/fore_dnld/Makefile
+++ b/sbin/atm/fore_dnld/Makefile
@@ -28,6 +28,7 @@
 #
 
 PROG=	fore_dnld
+MAN=	fore_dnld.8
 SRCS=	fore_dnld.c pca200e.c
 
 CFLAGS+=	-I${.CURDIR}/../../../sys
diff --git a/sbin/atm/ilmid/Makefile b/sbin/atm/ilmid/Makefile
index 8ab1b29..a69f154 100644
--- a/sbin/atm/ilmid/Makefile
+++ b/sbin/atm/ilmid/Makefile
@@ -28,6 +28,7 @@
 #
 
 PROG=	ilmid
+MAN=	ilmid.8
 
 CFLAGS+=	-I${.CURDIR}/../../../sys
 LDADD+=		-latm
diff --git a/sbin/badsect/Makefile b/sbin/badsect/Makefile
index 1eaaa17..17bcc86 100644
--- a/sbin/badsect/Makefile
+++ b/sbin/badsect/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	badsect
+MAN=	badsect.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile
index 4e0e56d..9884d55 100644
--- a/sbin/bsdlabel/Makefile
+++ b/sbin/bsdlabel/Makefile
@@ -3,8 +3,7 @@
 
 PROG=	disklabel
 SRCS=	disklabel.c
-MAN8=	disklabel.8
-MAN5=	disklabel.5
+MAN=	disklabel.5 disklabel.8
 
 .if ${MACHINE} == "pc98"
 CFLAGS+= -DPC98
diff --git a/sbin/camcontrol/Makefile b/sbin/camcontrol/Makefile
index 121fcdb..c9afb13 100644
--- a/sbin/camcontrol/Makefile
+++ b/sbin/camcontrol/Makefile
@@ -3,6 +3,7 @@ MAINTAINER=ken@FreeBSD.ORG
 
 PROG=   camcontrol
 SRCS=   camcontrol.c modeedit.c util.c
+MAN=   camcontrol.8
 SDIR=	${.CURDIR}/../../sys
 
 CFLAGS+= -I${SDIR}
diff --git a/sbin/ccdconfig/Makefile b/sbin/ccdconfig/Makefile
index bd2785029..19e6fa3 100644
--- a/sbin/ccdconfig/Makefile
+++ b/sbin/ccdconfig/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	ccdconfig
+MAN=	ccdconfig.8
 
 CFLAGS+=	-I${.CURDIR}/../../sys
 LDADD+=		-lkvm
diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile
index e92f47b..c68c312 100644
--- a/sbin/clri/Makefile
+++ b/sbin/clri/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	clri
+MAN=	clri.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/comcontrol/Makefile b/sbin/comcontrol/Makefile
index 70a3f5d..d875756 100644
--- a/sbin/comcontrol/Makefile
+++ b/sbin/comcontrol/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	comcontrol
+MAN=	comcontrol.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/cxconfig/Makefile b/sbin/cxconfig/Makefile
index 47e2244..e851ec9 100644
--- a/sbin/cxconfig/Makefile
+++ b/sbin/cxconfig/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
-PROG = cxconfig
+PROG=	cxconfig
+MAN=	cxconfig.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index a88f532..8f257c5 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -13,8 +13,8 @@ SRCS+=	alloc.c bpf.c conflex.c convert.c dispatch.c errwarn.c ethernet.c \
 CFLAGS+= -I${DIST_DIR}/includes -I${DIST_DIR}
 CFLAGS+= -DCLIENT_PATH='"PATH=/sbin:/bin:/usr/sbin:/usr/bin"' -Dwarn=dhcp_warn
 
-MAN5=	dhclient.conf.5 dhclient.leases.5 dhcp-options.5
-MAN8=	dhclient.8 dhclient-script.8
+MAN=	dhclient.conf.5 dhclient.leases.5 dhcp-options.5
+MAN+=	dhclient.8 dhclient-script.8
 
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile
index 4e0e56d..9884d55 100644
--- a/sbin/disklabel/Makefile
+++ b/sbin/disklabel/Makefile
@@ -3,8 +3,7 @@
 
 PROG=	disklabel
 SRCS=	disklabel.c
-MAN8=	disklabel.8
-MAN5=	disklabel.5
+MAN=	disklabel.5 disklabel.8
 
 .if ${MACHINE} == "pc98"
 CFLAGS+= -DPC98
diff --git a/sbin/dmesg/Makefile b/sbin/dmesg/Makefile
index b0ca8e9..f73c99b 100644
--- a/sbin/dmesg/Makefile
+++ b/sbin/dmesg/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	dmesg
+MAN=	dmesg.8
 BINGRP=	kmem
 BINMODE=2555
 LDADD=	-lkvm
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 0266aa1..95e2b9a 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -20,6 +20,7 @@ CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
 SRCS=	itime.c main.c optr.c dumprmt.c tape.c traverse.c unctime.c
 BINGRP=	tty
 BINMODE=2555
+MAN=	dump.8
 MLINKS+=dump.8 rdump.8
 
 .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile
index d29a793..e1c5a7f 100644
--- a/sbin/dumpfs/Makefile
+++ b/sbin/dumpfs/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	dumpfs
+MAN=	dumpfs.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile
index e81650a..d11ccc7 100644
--- a/sbin/dumpon/Makefile
+++ b/sbin/dumpon/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 PROG=	dumpon
+MAN=	dumpon.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile
index a187ead..bcedf0d 100644
--- a/sbin/fdisk/Makefile
+++ b/sbin/fdisk/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 PROG=	fdisk
+MAN=	fdisk.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/fdisk_pc98/Makefile b/sbin/fdisk_pc98/Makefile
index ece927e..07dc227 100644
--- a/sbin/fdisk_pc98/Makefile
+++ b/sbin/fdisk_pc98/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	fdisk
+MAN=	fdisk.8
 
 CFLAGS	+= -DPC98
 
diff --git a/sbin/ffsinfo/Makefile b/sbin/ffsinfo/Makefile
index 2857449..6172ab9 100644
--- a/sbin/ffsinfo/Makefile
+++ b/sbin/ffsinfo/Makefile
@@ -10,6 +10,7 @@ MAINTAINER=	tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG
  
 PROG=   ffsinfo
 SRCS=   ffsinfo.c debug.c
+MAN=   ffsinfo.8
  
 GROWFS= ${.CURDIR}/../growfs
 CFLAGS+=-DFS_DEBUG -I${GROWFS}
diff --git a/sbin/fsck/Makefile b/sbin/fsck/Makefile
index 5d024a7..22de03c 100644
--- a/sbin/fsck/Makefile
+++ b/sbin/fsck/Makefile
@@ -3,5 +3,6 @@
 
 PROG=	fsck
 SRCS=	fsck.c fsutil.c preen.c
+MAN=	fsck.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile
index f185e80..de431f0 100644
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@@ -4,6 +4,7 @@
 PROG=	fsck_ffs
 LINKS+=	${BINDIR}/fsck_ffs ${BINDIR}/fsck_ufs
 LINKS+=	${BINDIR}/fsck_ffs ${BINDIR}/fsck_4.2bsd
+MAN=	fsck_ffs.8
 SRCS=	dir.c fsutil.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
 	pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c
 CFLAGS+=-W
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index b454e6a..9fc547c 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -3,6 +3,7 @@
 # $FreeBSD$
 
 PROG=	fsdb
+MAN=	fsdb.8
 SRCS=	fsdb.c fsdbutil.c \
 	dir.c fsutil.c inode.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
 	pass5.c preen.c setup.c utilities.c ffs_subr.c ffs_tables.c
diff --git a/sbin/fsirand/Makefile b/sbin/fsirand/Makefile
index 8b98d40..4b24233 100644
--- a/sbin/fsirand/Makefile
+++ b/sbin/fsirand/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	fsirand
+MAN=	fsirand.8
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
index 717c2a3..7dba7cb 100644
--- a/sbin/growfs/Makefile
+++ b/sbin/growfs/Makefile
@@ -11,6 +11,7 @@ MAINTAINER=	tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG
 
 PROG=   growfs
 SRCS=   growfs.c
+MAN=	growfs.8
 
 .if defined(GFSDBG)
 SRCS+=  debug.c
diff --git a/sbin/i386/cxconfig/Makefile b/sbin/i386/cxconfig/Makefile
index 47e2244..e851ec9 100644
--- a/sbin/i386/cxconfig/Makefile
+++ b/sbin/i386/cxconfig/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
-PROG = cxconfig
+PROG=	cxconfig
+MAN=	cxconfig.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/i386/fdisk/Makefile b/sbin/i386/fdisk/Makefile
index a187ead..bcedf0d 100644
--- a/sbin/i386/fdisk/Makefile
+++ b/sbin/i386/fdisk/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 PROG=	fdisk
+MAN=	fdisk.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/i386/nextboot/Makefile b/sbin/i386/nextboot/Makefile
index 245440a..18cfbe1 100644
--- a/sbin/i386/nextboot/Makefile
+++ b/sbin/i386/nextboot/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	nextboot
+MAN=	nextboot.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index 672cd23..ea2b49d 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -15,6 +15,7 @@ SRCS+=	ifvlan.c
 CFLAGS+=-DUSE_VLANS
 .endif
 
+MAN=	ifconfig.8
 DPADD=	${LIBIPX}
 LDADD=	-lipx
 COPTS=	-DNS -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings \
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index a04c65d..a48e90c 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	init
+MAN=	init.8
 MLINKS=	init.8 securelevel.8
 BINMODE=500
 INSTALLFLAGS=-fschg
diff --git a/sbin/ip6fw/Makefile b/sbin/ip6fw/Makefile
index 16edb46..d8bda20 100644
--- a/sbin/ip6fw/Makefile
+++ b/sbin/ip6fw/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 PROG=   ip6fw
+MAN=	ip6fw.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/ipf/Makefile b/sbin/ipf/Makefile
index 39a22b5..dd00cc6 100644
--- a/sbin/ipf/Makefile
+++ b/sbin/ipf/Makefile
@@ -3,9 +3,7 @@
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
 PROG=	ipf
-MAN4=	ipf.4
-MAN5=	ipf.5
-MAN8=	ipf.8
+MAN=	ipf.4 ipf.5 ipf.8
 SRCS=	ipf.c parse.c opt.c facpri.c common.c
 CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../contrib/ipfilter
 
diff --git a/sbin/ipfstat/Makefile b/sbin/ipfstat/Makefile
index 7f4ee0b..ed4d62e 100644
--- a/sbin/ipfstat/Makefile
+++ b/sbin/ipfstat/Makefile
@@ -3,6 +3,7 @@
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
 PROG=	ipfstat
+MAN=	ipfstat.8
 SRCS=	fils.c parse.c opt.c kmem.c facpri.c common.c
 CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DSTATETOP -I- -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
 
diff --git a/sbin/ipfw/Makefile b/sbin/ipfw/Makefile
index 5afb9b3..8cf939d 100644
--- a/sbin/ipfw/Makefile
+++ b/sbin/ipfw/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	ipfw
+MAN=	ipfw.8
 CFLAGS+=-Wall
 
 .include <bsd.prog.mk>
diff --git a/sbin/ipmon/Makefile b/sbin/ipmon/Makefile
index 9df9905..4426f29 100644
--- a/sbin/ipmon/Makefile
+++ b/sbin/ipmon/Makefile
@@ -3,8 +3,7 @@
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
 PROG=	ipmon
-MAN4=	ipl.4
-MAN8=	ipmon.8
+MAN=	ipl.4 ipmon.8
 SRCS=	ipmon.c
 
 CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
diff --git a/sbin/ipnat/Makefile b/sbin/ipnat/Makefile
index 87f8239..6d3644d 100644
--- a/sbin/ipnat/Makefile
+++ b/sbin/ipnat/Makefile
@@ -3,9 +3,7 @@
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
 PROG=	ipnat
-MAN1=	ipnat.1
-MAN4=	ipnat.4
-MAN5=	ipnat.5
+MAN=	ipnat.1 ipnat.4 ipnat.5
 MLINKS=	ipnat.5 ipnat.conf.5
 SRCS=	ipnat.c kmem.c natparse.c common.c
 CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
diff --git a/sbin/kget/Makefile b/sbin/kget/Makefile
index b96d496..f42176e 100644
--- a/sbin/kget/Makefile
+++ b/sbin/kget/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 #
 PROG=	kget
+MAN=	kget.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/kldload/Makefile b/sbin/kldload/Makefile
index 3230a38..5fcbc68 100644
--- a/sbin/kldload/Makefile
+++ b/sbin/kldload/Makefile
@@ -27,6 +27,7 @@
 #
 
 PROG=	kldload
+MAN=	kldload.8
 
 CFLAGS+=-I${.CURDIR}/../../sys
 
diff --git a/sbin/kldstat/Makefile b/sbin/kldstat/Makefile
index abb4cbd..fe0797d 100644
--- a/sbin/kldstat/Makefile
+++ b/sbin/kldstat/Makefile
@@ -27,6 +27,7 @@
 #
 
 PROG=	kldstat
+MAN=	kldstat.8
 
 CFLAGS+=-I${.CURDIR}/../../sys
 
diff --git a/sbin/kldunload/Makefile b/sbin/kldunload/Makefile
index 6666b3c..c0edca7 100644
--- a/sbin/kldunload/Makefile
+++ b/sbin/kldunload/Makefile
@@ -27,6 +27,7 @@
 #
 
 PROG=	kldunload
+MAN=	kldunload.8
 
 CFLAGS+=-I${.CURDIR}/../../sys
 
diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile
index 8a1d156..15c3808 100644
--- a/sbin/ldconfig/Makefile
+++ b/sbin/ldconfig/Makefile
@@ -4,6 +4,7 @@ PROG=	ldconfig
 SRCS=	elfhints.c ldconfig.c shlib.c support.c
 LDDIR?= ${.CURDIR}/../../libexec/rtld-aout
 CFLAGS+=-I${LDDIR} -DFREEBSD_AOUT
+MAN=	ldconfig.8
 
 .PATH: ${LDDIR}
 
diff --git a/sbin/md5/Makefile b/sbin/md5/Makefile
index 9ecc62a..3522128 100644
--- a/sbin/md5/Makefile
+++ b/sbin/md5/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PROG=	md5
-MAN1=	${PROG}.1
 
 LDADD+=	-lmd
 DPADD+= ${LIBMD}
diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile
index a0a8f09..3abf56b 100644
--- a/sbin/mdconfig/Makefile
+++ b/sbin/mdconfig/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=		mdconfig
+MAN=		mdconfig.8
 MLINKS=		mdconfig.8 vnconfig.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/mknod/Makefile b/sbin/mknod/Makefile
index 350bb42..63235b2 100644
--- a/sbin/mknod/Makefile
+++ b/sbin/mknod/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	mknod
+MAN=	mknod.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile
index 17413d9..acdc2b7 100644
--- a/sbin/mount/Makefile
+++ b/sbin/mount/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	mount
 SRCS=	mount.c mount_ufs.c getmntopts.c vfslist.c
+MAN=	mount.8
 # We do NOT install the getmntopts.3 man page.
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_cd9660/Makefile b/sbin/mount_cd9660/Makefile
index 2695ad4..7c56886 100644
--- a/sbin/mount_cd9660/Makefile
+++ b/sbin/mount_cd9660/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	mount_cd9660
 SRCS=	mount_cd9660.c getmntopts.c
+MAN=	mount_cd9660.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${MOUNT}
diff --git a/sbin/mount_ext2fs/Makefile b/sbin/mount_ext2fs/Makefile
index 49af28f..9e0c5d4 100644
--- a/sbin/mount_ext2fs/Makefile
+++ b/sbin/mount_ext2fs/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	mount_ext2fs
 SRCS=	mount_ext2fs.c getmntopts.c
+MAN=	mount_ext2fs.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${MOUNT}
diff --git a/sbin/mount_hpfs/Makefile b/sbin/mount_hpfs/Makefile
index e5e8c8b..de78daf 100644
--- a/sbin/mount_hpfs/Makefile
+++ b/sbin/mount_hpfs/Makefile
@@ -4,6 +4,7 @@
 
 PROG=	mount_hpfs
 SRCS=	mount_hpfs.c getmntopts.c
+MAN=	mount_hpfs.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT} -DHPFS
diff --git a/sbin/mount_msdos/Makefile b/sbin/mount_msdos/Makefile
index 1f9f486..49f63c5 100644
--- a/sbin/mount_msdos/Makefile
+++ b/sbin/mount_msdos/Makefile
@@ -4,6 +4,7 @@
 
 PROG=	mount_msdos
 SRCS=	mount_msdos.c getmntopts.c
+MAN=	mount_msdos.8
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile
index 1f9f486..49f63c5 100644
--- a/sbin/mount_msdosfs/Makefile
+++ b/sbin/mount_msdosfs/Makefile
@@ -4,6 +4,7 @@
 
 PROG=	mount_msdos
 SRCS=	mount_msdos.c getmntopts.c
+MAN=	mount_msdos.8
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile
index e7334e9..d392a1d 100644
--- a/sbin/mount_nfs/Makefile
+++ b/sbin/mount_nfs/Makefile
@@ -4,6 +4,7 @@
 
 PROG=	mount_nfs
 SRCS=	mount_nfs.c getmntopts.c mounttab.c
+MAN=	mount_nfs.8
 
 MOUNT=	${.CURDIR}/../mount
 UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.umntall
diff --git a/sbin/mount_ntfs/Makefile b/sbin/mount_ntfs/Makefile
index 78cde8c..c45b7d9 100644
--- a/sbin/mount_ntfs/Makefile
+++ b/sbin/mount_ntfs/Makefile
@@ -4,6 +4,7 @@
 
 PROG=	mount_ntfs
 SRCS=	mount_ntfs.c getmntopts.c
+MAN=	mount_ntfs.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
diff --git a/sbin/mount_null/Makefile b/sbin/mount_null/Makefile
index f7670ab..68b488d 100644
--- a/sbin/mount_null/Makefile
+++ b/sbin/mount_null/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	mount_null
 SRCS=	mount_null.c getmntopts.c
+MAN=	mount_null.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
diff --git a/sbin/mount_nullfs/Makefile b/sbin/mount_nullfs/Makefile
index f7670ab..68b488d 100644
--- a/sbin/mount_nullfs/Makefile
+++ b/sbin/mount_nullfs/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	mount_null
 SRCS=	mount_null.c getmntopts.c
+MAN=	mount_null.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
diff --git a/sbin/mount_nwfs/Makefile b/sbin/mount_nwfs/Makefile
index c6a4f10..f66b259 100644
--- a/sbin/mount_nwfs/Makefile
+++ b/sbin/mount_nwfs/Makefile
@@ -2,6 +2,7 @@
 
 PROG=	mount_nwfs
 SRCS=	mount_nwfs.c getmntopts.c
+MAN=	mount_nwfs.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -DNWFS -I${MOUNT}
diff --git a/sbin/mount_portal/Makefile b/sbin/mount_portal/Makefile
index 94938a3..00b96dc 100644
--- a/sbin/mount_portal/Makefile
+++ b/sbin/mount_portal/Makefile
@@ -4,6 +4,7 @@
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
 	pt_exec.c pt_file.c pt_tcp.c pt_tcplisten.c
+MAN=	mount_portal.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
diff --git a/sbin/mount_portalfs/Makefile b/sbin/mount_portalfs/Makefile
index 94938a3..00b96dc 100644
--- a/sbin/mount_portalfs/Makefile
+++ b/sbin/mount_portalfs/Makefile
@@ -4,6 +4,7 @@
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
 	pt_exec.c pt_file.c pt_tcp.c pt_tcplisten.c
+MAN=	mount_portal.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
diff --git a/sbin/mount_std/Makefile b/sbin/mount_std/Makefile
index 1e3bdbb..b780d09 100644
--- a/sbin/mount_std/Makefile
+++ b/sbin/mount_std/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	mount_std
 SRCS=	mount_std.c getmntopts.c
+MAN=	mount_std.8
 MLINKS=	mount_std.8 mount_devfs.8 \
 	mount_std.8 mount_fdesc.8 \
 	mount_std.8 mount_linprocfs.8 \
diff --git a/sbin/mount_umap/Makefile b/sbin/mount_umap/Makefile
index f78f2f3..9ae6798 100644
--- a/sbin/mount_umap/Makefile
+++ b/sbin/mount_umap/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	mount_umap
 SRCS=	mount_umap.c getmntopts.c
+MAN=	mount_umap.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
diff --git a/sbin/mount_umapfs/Makefile b/sbin/mount_umapfs/Makefile
index f78f2f3..9ae6798 100644
--- a/sbin/mount_umapfs/Makefile
+++ b/sbin/mount_umapfs/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	mount_umap
 SRCS=	mount_umap.c getmntopts.c
+MAN=	mount_umap.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
diff --git a/sbin/mount_union/Makefile b/sbin/mount_union/Makefile
index db8b51a..6b58c2d 100644
--- a/sbin/mount_union/Makefile
+++ b/sbin/mount_union/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	mount_union
 SRCS=	mount_union.c getmntopts.c
+MAN=	mount_union.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile
index db8b51a..6b58c2d 100644
--- a/sbin/mount_unionfs/Makefile
+++ b/sbin/mount_unionfs/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	mount_union
 SRCS=	mount_union.c getmntopts.c
+MAN=	mount_union.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
diff --git a/sbin/mountd/Makefile b/sbin/mountd/Makefile
index 0312e9b..5baf042 100644
--- a/sbin/mountd/Makefile
+++ b/sbin/mountd/Makefile
@@ -3,7 +3,6 @@
 
 PROG=	mountd
 CFLAGS+=-DNFS -DMFS -DCD9660 -DMSDOSFS
-MAN5=	exports.5 netgroup.5
-MAN8=	mountd.8
+MAN=	exports.5 netgroup.5 mountd.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/natd/Makefile b/sbin/natd/Makefile
index afa842e..0d6bb7b 100644
--- a/sbin/natd/Makefile
+++ b/sbin/natd/Makefile
@@ -7,5 +7,6 @@ SRCS		= natd.c icmp.c
 CFLAGS	       += -Wall
 LDADD		= -lalias
 DPADD		= ${LIBALIAS}
+MAN		= natd.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile
index 33c1aee..deae94b 100644
--- a/sbin/newfs/Makefile
+++ b/sbin/newfs/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	newfs
 SRCS=	getmntopts.c newfs.c mkfs.c
+MAN=	newfs.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+=-DMFS -DFSIRAND -I${MOUNT}
diff --git a/sbin/newfs_msdos/Makefile b/sbin/newfs_msdos/Makefile
index eac58b5..a1555da 100644
--- a/sbin/newfs_msdos/Makefile
+++ b/sbin/newfs_msdos/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	newfs_msdos
+MAN=	newfs_msdos.8
 
 .if ${MACHINE} == "pc98"
 CFLAGS+= -DPC98
diff --git a/sbin/nextboot/Makefile b/sbin/nextboot/Makefile
index 245440a..18cfbe1 100644
--- a/sbin/nextboot/Makefile
+++ b/sbin/nextboot/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	nextboot
+MAN=	nextboot.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/nfsd/Makefile b/sbin/nfsd/Makefile
index 3e0f8c5..5a89c6e 100644
--- a/sbin/nfsd/Makefile
+++ b/sbin/nfsd/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	nfsd
 CFLAGS+=-DNFS
+MAN=	nfsd.8
 
 .if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
 CFLAGS+=-DKERBEROS
diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile
index 5a221e6..7db85b4 100644
--- a/sbin/nfsiod/Makefile
+++ b/sbin/nfsiod/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	nfsiod
+MAN=	nfsiod.8
 CFLAGS+=-DNFS
 
 .include <bsd.prog.mk>
diff --git a/sbin/nologin/Makefile b/sbin/nologin/Makefile
index e30ea08..fae063b 100644
--- a/sbin/nologin/Makefile
+++ b/sbin/nologin/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/22/94
+# $FreeBSD$
 
-MAN8=	nologin.8
-MAN5=	nologin.5
+MAN=	nologin.5 nologin.8
 
 nologin depend lint tags:
 
diff --git a/sbin/nos-tun/Makefile b/sbin/nos-tun/Makefile
index 1286e59..82372b3 100644
--- a/sbin/nos-tun/Makefile
+++ b/sbin/nos-tun/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
-PROG=nos-tun
+PROG=	nos-tun
+MAN=	nos-tun.8
 
 .include <bsd.prog.mk>
 
diff --git a/sbin/pc98/fdisk/Makefile b/sbin/pc98/fdisk/Makefile
index ece927e..07dc227 100644
--- a/sbin/pc98/fdisk/Makefile
+++ b/sbin/pc98/fdisk/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	fdisk
+MAN=	fdisk.8
 
 CFLAGS	+= -DPC98
 
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index 1e14827..1cb5d07 100644
--- a/sbin/ping/Makefile
+++ b/sbin/ping/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	ping
+MAN=	ping.8
 BINMODE=4555
 COPTS+=	-Wall -Wmissing-prototypes
 .if ${MACHINE_ARCH} == "alpha"
diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile
index 30361ce..e688648 100644
--- a/sbin/ping6/Makefile
+++ b/sbin/ping6/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	ping6
+MAN=	ping6.8
 
 CFLAGS+=-DINET6 -DIPSEC
 
diff --git a/sbin/quotacheck/Makefile b/sbin/quotacheck/Makefile
index e23e220..e0c36e9 100644
--- a/sbin/quotacheck/Makefile
+++ b/sbin/quotacheck/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	quotacheck
 SRCS=	quotacheck.c preen.c utilities.c
+MAN=	quotacheck.8
 .PATH:	${.CURDIR}/../fsck_ffs
 
 .include <bsd.prog.mk>
diff --git a/sbin/reboot/Makefile b/sbin/reboot/Makefile
index a3ebbcc..486d880 100644
--- a/sbin/reboot/Makefile
+++ b/sbin/reboot/Makefile
@@ -1,9 +1,10 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
+# $FreeBSD$
 
 PROG=	reboot
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
-MAN8=	reboot.8 boot_i386.8
+MAN=	reboot.8 boot_i386.8
 MLINKS=	reboot.8 halt.8 reboot.8 fastboot.8 reboot.8 fasthalt.8
 
 ARCH!=	uname -m
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index 9ece20f..16169cb 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -9,6 +9,7 @@ SRCS=	main.c interactive.c restore.c dirs.c symtab.c tape.c utilities.c \
 	dumprmt.c
 BINGRP=	tty
 BINMODE=2555
+MAN=	restore.8
 MLINKS+=restore.8 rrestore.8
 .PATH:	${.CURDIR}/../dump
 
diff --git a/sbin/route/Makefile b/sbin/route/Makefile
index 72d5fed..ab3ab08 100644
--- a/sbin/route/Makefile
+++ b/sbin/route/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	route
+MAN=	route.8
 SRCS=	route.c keywords.h
 CFLAGS+=-I. -Wall -DNS
 CFLAGS+=-DINET6
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index 7758805..d15df54 100644
--- a/sbin/routed/Makefile
+++ b/sbin/routed/Makefile
@@ -4,6 +4,7 @@
 
 PROG=   routed
 SRCS=   if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c
+MAN=   routed.8
 SUBDIR= rtquery
 LDADD+= -lmd
 DPADD+= ${LIBMD}
diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index 321b995..5021b08 100644
--- a/sbin/routed/rtquery/Makefile
+++ b/sbin/routed/rtquery/Makefile
@@ -3,6 +3,7 @@
 # $FreeBSD$
 
 PROG=	rtquery
+MAN=	rtquery.8
 LDADD+=	-lmd
 DPADD+=	${LIBMD}
 #COPTS=	-g -DDEBUG -W -Wall -Wcast-align -Wcast-qual -Winline -Wpointer-arith -Wnested-externs -Wwrite-strings -Wunused
diff --git a/sbin/savecore/Makefile b/sbin/savecore/Makefile
index 8903b35..917c9c9 100644
--- a/sbin/savecore/Makefile
+++ b/sbin/savecore/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	savecore
 SRCS=	savecore.c zopen.c
+MAN=	savecore.8
 
 ZOPENPATH= ${.CURDIR}/../../usr.bin/compress
 .PATH:	${ZOPENPATH}
diff --git a/sbin/shutdown/Makefile b/sbin/shutdown/Makefile
index 56b1e5d..c758c79 100644
--- a/sbin/shutdown/Makefile
+++ b/sbin/shutdown/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	shutdown
+MAN=	shutdown.8
 BINGRP=	operator
 BINMODE=4550
 
diff --git a/sbin/slattach/Makefile b/sbin/slattach/Makefile
index 34c86cb..66e8102 100644
--- a/sbin/slattach/Makefile
+++ b/sbin/slattach/Makefile
@@ -3,6 +3,7 @@
 # $FreeBSD$
 
 PROG=	slattach
+MAN=	slattach.8
 MLINKS=	slattach.8 slip.8
 LDADD=	-lutil
 DPADD=	${LIBUTIL}
diff --git a/sbin/spppcontrol/Makefile b/sbin/spppcontrol/Makefile
index 2f6d010..b394c39 100644
--- a/sbin/spppcontrol/Makefile
+++ b/sbin/spppcontrol/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 PROG=	spppcontrol
+MAN=	spppcontrol.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/startslip/Makefile b/sbin/startslip/Makefile
index dc42bcc..87ad667 100644
--- a/sbin/startslip/Makefile
+++ b/sbin/startslip/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PROG=	startslip
-MAN1=	${PROG}.1
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile
index 35ba518..be803b2 100644
--- a/sbin/swapon/Makefile
+++ b/sbin/swapon/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	swapon
+MAN=	swapon.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile
index 7611731..6e525df 100644
--- a/sbin/sysctl/Makefile
+++ b/sbin/sysctl/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	sysctl
+MAN=	sysctl.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile
index 94d9759..7944a4c 100644
--- a/sbin/tunefs/Makefile
+++ b/sbin/tunefs/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	tunefs
+MAN=	tunefs.8
 
 .include <bsd.prog.mk>
diff --git a/sbin/umount/Makefile b/sbin/umount/Makefile
index 8c0293b..70313c6 100644
--- a/sbin/umount/Makefile
+++ b/sbin/umount/Makefile
@@ -4,6 +4,7 @@
 
 PROG=	umount
 SRCS=	umount.c vfslist.c mounttab.c
+MAN=	umount.8
 
 MOUNT=	${.CURDIR}/../mount
 UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.umntall
diff --git a/sbin/vinum/Makefile b/sbin/vinum/Makefile
index 61398e5..cc7fd32 100644
--- a/sbin/vinum/Makefile
+++ b/sbin/vinum/Makefile
@@ -2,6 +2,7 @@
 
 PROG=	vinum
 SRCS=	v.c list.c vinumparser.c vinumutil.c vext.h commands.c
+MAN=	vinum.8
 
 CFLAGS+=	-I${.CURDIR}/../../sys -Wall -DVINUMDEBUG
 
diff --git a/usr.sbin/mount_nwfs/Makefile b/usr.sbin/mount_nwfs/Makefile
index c6a4f10..f66b259 100644
--- a/usr.sbin/mount_nwfs/Makefile
+++ b/usr.sbin/mount_nwfs/Makefile
@@ -2,6 +2,7 @@
 
 PROG=	mount_nwfs
 SRCS=	mount_nwfs.c getmntopts.c
+MAN=	mount_nwfs.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -DNWFS -I${MOUNT}
diff --git a/usr.sbin/mount_portalfs/Makefile b/usr.sbin/mount_portalfs/Makefile
index 94938a3..00b96dc 100644
--- a/usr.sbin/mount_portalfs/Makefile
+++ b/usr.sbin/mount_portalfs/Makefile
@@ -4,6 +4,7 @@
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
 	pt_exec.c pt_file.c pt_tcp.c pt_tcplisten.c
+MAN=	mount_portal.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
diff --git a/usr.sbin/mountd/Makefile b/usr.sbin/mountd/Makefile
index 0312e9b..5baf042 100644
--- a/usr.sbin/mountd/Makefile
+++ b/usr.sbin/mountd/Makefile
@@ -3,7 +3,6 @@
 
 PROG=	mountd
 CFLAGS+=-DNFS -DMFS -DCD9660 -DMSDOSFS
-MAN5=	exports.5 netgroup.5
-MAN8=	mountd.8
+MAN=	exports.5 netgroup.5 mountd.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/nfsd/Makefile b/usr.sbin/nfsd/Makefile
index 3e0f8c5..5a89c6e 100644
--- a/usr.sbin/nfsd/Makefile
+++ b/usr.sbin/nfsd/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	nfsd
 CFLAGS+=-DNFS
+MAN=	nfsd.8
 
 .if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
 CFLAGS+=-DKERBEROS
diff --git a/usr.sbin/nologin/Makefile b/usr.sbin/nologin/Makefile
index e30ea08..fae063b 100644
--- a/usr.sbin/nologin/Makefile
+++ b/usr.sbin/nologin/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/22/94
+# $FreeBSD$
 
-MAN8=	nologin.8
-MAN5=	nologin.5
+MAN=	nologin.5 nologin.8
 
 nologin depend lint tags: