diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile
index b8a270c5dd01..1c5538ba2cb8 100644
--- a/sbin/setkey/Makefile
+++ b/sbin/setkey/Makefile
@@ -56,6 +56,7 @@ DPADD+= ${LIBIPSEC}
LDADD+= -lipsec
CLEANFILES+= scriptdump y.tab.h
+MAN= setkey.8
LOCALPREFIX= /usr/local
scriptdump: scriptdump.pl
diff --git a/usr.sbin/IPXrouted/Makefile b/usr.sbin/IPXrouted/Makefile
index 6df3e5ca43c8..f8949f181b65 100644
--- a/usr.sbin/IPXrouted/Makefile
+++ b/usr.sbin/IPXrouted/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= IPXrouted
+MAN= IPXrouted.8
SRCS= af.c if.c input.c main.c output.c startup.c tables.c timer.c trace.c
SRCS+= sap_input.c sap_tables.c sap_output.c
DPADD= ${LIBCOMPAT} ${LIBIPX}
diff --git a/usr.sbin/Makefile.inc b/usr.sbin/Makefile.inc
index 7faec2b08340..4347591cf563 100644
--- a/usr.sbin/Makefile.inc
+++ b/usr.sbin/Makefile.inc
@@ -2,4 +2,3 @@
# $FreeBSD$
BINDIR?= /usr/sbin
-MANSECT?= 8
diff --git a/usr.sbin/ac/Makefile b/usr.sbin/ac/Makefile
index d56a8d734bf8..0fac2fbdbab9 100644
--- a/usr.sbin/ac/Makefile
+++ b/usr.sbin/ac/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= ac
+MAN= ac.8
# If "CONSOLE_TTY" is not defined, this program is compatible with the
# traditional implementation (using SunOS 4.x as the sample traditional
diff --git a/usr.sbin/accton/Makefile b/usr.sbin/accton/Makefile
index 92ed49d4e73d..ea9b4f43565a 100644
--- a/usr.sbin/accton/Makefile
+++ b/usr.sbin/accton/Makefile
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= accton
+MAN= accton.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/acpiconf/Makefile b/usr.sbin/acpi/acpiconf/Makefile
index 1f8c02f3cb7e..5f862a2c621e 100644
--- a/usr.sbin/acpi/acpiconf/Makefile
+++ b/usr.sbin/acpi/acpiconf/Makefile
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= acpiconf
+MAN= acpiconf.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/acpidump/Makefile b/usr.sbin/acpi/acpidump/Makefile
index 73a0e7370c6c..f63f558e5623 100644
--- a/usr.sbin/acpi/acpidump/Makefile
+++ b/usr.sbin/acpi/acpidump/Makefile
@@ -3,6 +3,7 @@
PROG= acpidump
SRCS= acpi.c acpi_user.c asl_dump.c aml_dump.c acpidump.c
+MAN= acpidump.8
#DEBUG_FLAGS= -g
.include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/amldb/Makefile b/usr.sbin/acpi/amldb/Makefile
index e528e44c6225..f5aa849a8243 100644
--- a/usr.sbin/acpi/amldb/Makefile
+++ b/usr.sbin/acpi/amldb/Makefile
@@ -4,6 +4,7 @@
PROG= amldb
SRCS= amldb.c debug.c region.c
SRCS+= aml_parse.c aml_name.c aml_amlmem.c aml_memman.c aml_store.c aml_obj.c aml_evalobj.c aml_common.c
+MAN= amldb.8
#DEBUG_FLAGS= -g
CFLAGS+= -I${.CURDIR}
diff --git a/usr.sbin/adduser/Makefile b/usr.sbin/adduser/Makefile
index 62e911d7a31b..5a4db550d3e7 100644
--- a/usr.sbin/adduser/Makefile
+++ b/usr.sbin/adduser/Makefile
@@ -3,7 +3,7 @@
MAINTAINER= wosch
SCRIPTS= adduser.perl rmuser.perl
-MAN8= adduser.8 rmuser.8
+MAN= adduser.8 rmuser.8
beforeinstall:
.for script in ${SCRIPTS}
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index a3525e055426..485ace6df4dc 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -9,6 +9,7 @@
.PATH: ${.CURDIR}/../../../contrib/amd/amd
PROG= amd
+MAN= amd.8
SRCS= conf_parse.y conf_tok.l
SRCS+= am_ops.c amd.c amfs_auto.c amfs_direct.c amfs_error.c
diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile
index 87948833b7dd..660c4323f13b 100644
--- a/usr.sbin/amd/amq/Makefile
+++ b/usr.sbin/amd/amq/Makefile
@@ -9,6 +9,7 @@
.PATH: ${.CURDIR}/../../../contrib/amd/amq
PROG= amq
+MAN= amq.8
SRCS= amq.c amq_clnt.c amq_xdr.c
diff --git a/usr.sbin/amd/fixmount/Makefile b/usr.sbin/amd/fixmount/Makefile
index 4ba5a6fe6016..1730122547f2 100644
--- a/usr.sbin/amd/fixmount/Makefile
+++ b/usr.sbin/amd/fixmount/Makefile
@@ -10,6 +10,7 @@
${.CURDIR}/../../../contrib/amd/conf/checkmount
PROG= fixmount
+MAN= fixmount.8
SRCS= fixmount.c
diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile
index e4d936c8865e..634062665e45 100644
--- a/usr.sbin/amd/fsinfo/Makefile
+++ b/usr.sbin/amd/fsinfo/Makefile
@@ -9,6 +9,7 @@
.PATH: ${.CURDIR}/../../../contrib/amd/fsinfo
PROG= fsinfo
+MAN= fsinfo.8
SRCS= fsi_gram.y fsi_lex.l
SRCS+= fsi_analyze.c fsi_dict.c fsi_util.c fsinfo.c wr_atab.c
diff --git a/usr.sbin/amd/hlfsd/Makefile b/usr.sbin/amd/hlfsd/Makefile
index 48fa6f8bbcce..93606ab702ca 100644
--- a/usr.sbin/amd/hlfsd/Makefile
+++ b/usr.sbin/amd/hlfsd/Makefile
@@ -9,6 +9,7 @@
.PATH: ${.CURDIR}/../../../contrib/amd/hlfsd
PROG= hlfsd
+MAN= hlfsd.8
SRCS= hlfsd.c homedir.c nfs_prot_svc.c stubs.c
diff --git a/usr.sbin/amd/mk-amd-map/Makefile b/usr.sbin/amd/mk-amd-map/Makefile
index c50e2979c425..66efcf5551b8 100644
--- a/usr.sbin/amd/mk-amd-map/Makefile
+++ b/usr.sbin/amd/mk-amd-map/Makefile
@@ -9,5 +9,6 @@
.PATH: ${.CURDIR}/../../../contrib/amd/mk-amd-map
PROG= mk-amd-map
+MAN= mk-amd-map.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/amd/pawd/Makefile b/usr.sbin/amd/pawd/Makefile
index 8c74b99d642b..b4fd43e5f4b3 100644
--- a/usr.sbin/amd/pawd/Makefile
+++ b/usr.sbin/amd/pawd/Makefile
@@ -11,8 +11,6 @@
BINDIR= /usr/bin
PROG= pawd
-MAN1= pawd.1
-
SRCS= pawd.c amq_clnt.c amq_xdr.c
CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq
diff --git a/usr.sbin/amd/scripts/Makefile b/usr.sbin/amd/scripts/Makefile
index 130b6bb30f0d..4c069d766d62 100644
--- a/usr.sbin/amd/scripts/Makefile
+++ b/usr.sbin/amd/scripts/Makefile
@@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../../contrib/amd/scripts
-MAN5= amd.conf.5
+MAN= amd.conf.5
.include <bsd.prog.mk>
diff --git a/usr.sbin/amd/wire-test/Makefile b/usr.sbin/amd/wire-test/Makefile
index b9d064b9a325..61734d7496d8 100644
--- a/usr.sbin/amd/wire-test/Makefile
+++ b/usr.sbin/amd/wire-test/Makefile
@@ -9,6 +9,7 @@
.PATH: ${.CURDIR}/../../../contrib/amd/wire-test
PROG= wire-test
+MAN= wire-test.8
DPADD+= ${LIBAMU}
LDADD+= ${LIBAMU}
diff --git a/usr.sbin/ancontrol/Makefile b/usr.sbin/ancontrol/Makefile
index 9c2774cb2629..6e6ea9e9173a 100644
--- a/usr.sbin/ancontrol/Makefile
+++ b/usr.sbin/ancontrol/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= ancontrol
+MAN= ancontrol.8
CFLAGS+= -I${.CURDIR}/../../sys -DANCACHE -Wall
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index 14d76e473381..5ab8df17ab90 100644
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -2,6 +2,7 @@
PROG= apm
LINKS= ${BINDIR}/apm ${BINDIR}/zzz
+MAN= apm.8
MLINKS= apm.8 apmconf.8 apm.8 zzz.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
index fad1ddf48131..2d1327c2bbe8 100644
--- a/usr.sbin/apmd/Makefile
+++ b/usr.sbin/apmd/Makefile
@@ -6,6 +6,8 @@ SRCS= apmd.c apmdlex.l apmdparse.y y.tab.h
DPADD= ${LIBL}
LDADD= -ll
+MAN= apmd.8
+
YFLAGS+=-v
CFLAGS+=-I. -I${.CURDIR} -Wall #-DYY_STACK_USED
# for debug:
diff --git a/usr.sbin/arp/Makefile b/usr.sbin/arp/Makefile
index dc57b134bcc6..5eb0c7baefc5 100644
--- a/usr.sbin/arp/Makefile
+++ b/usr.sbin/arp/Makefile
@@ -1,8 +1,8 @@
# @(#)Makefile 8.2 (Berkeley) 4/18/94
+# $FreeBSD$
PROG= arp
-MAN8= arp.8
-MAN4= arp.4
+MAN= arp.4 arp.8
COPTS+= -Wall
.include <bsd.prog.mk>
diff --git a/usr.sbin/atm/atmarpd/Makefile b/usr.sbin/atm/atmarpd/Makefile
index 1f96f75c6dd8..973b59abaedc 100644
--- a/usr.sbin/atm/atmarpd/Makefile
+++ b/usr.sbin/atm/atmarpd/Makefile
@@ -30,6 +30,7 @@
PROG= atmarpd
SRCS= atmarpd.c atmarp_config.c atmarp_log.c atmarp_scsp.c \
atmarp_subr.c atmarp_timer.c
+MAN= atmarpd.8
CFLAGS+= -I${.CURDIR}/../../../sys
LDADD+= -latm -lmd
diff --git a/usr.sbin/atm/scspd/Makefile b/usr.sbin/atm/scspd/Makefile
index 1fde8cf4b883..7740c2500866 100644
--- a/usr.sbin/atm/scspd/Makefile
+++ b/usr.sbin/atm/scspd/Makefile
@@ -33,6 +33,7 @@ SRCS= scspd.c scsp_cafsm.c scsp_config.c scsp_config_lex.c \
scsp_hfsm.c scsp_if.c scsp_input.c scsp_log.c scsp_msg.c \
scsp_output.c scsp_print.c scsp_socket.c scsp_subr.c \
scsp_timer.c
+MAN= scspd.8
CFLAGS+= -I. -I${.CURDIR}/../../../sys -I${.CURDIR}
LDADD+= -latm -lmd
diff --git a/usr.sbin/boot0cfg/Makefile b/usr.sbin/boot0cfg/Makefile
index af1302b33c79..f1e97d36142e 100644
--- a/usr.sbin/boot0cfg/Makefile
+++ b/usr.sbin/boot0cfg/Makefile
@@ -3,5 +3,6 @@
MAINTAINER= rnordier
PROG= boot0cfg
+MAN= boot0cfg.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/boot98cfg/Makefile b/usr.sbin/boot98cfg/Makefile
index db5ea4ff3ed8..efeb4027171b 100644
--- a/usr.sbin/boot98cfg/Makefile
+++ b/usr.sbin/boot98cfg/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG= boot98cfg
+MAN= boot98cfg.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile
index 7a702b994c02..89b879a46d28 100644
--- a/usr.sbin/bootparamd/bootparamd/Makefile
+++ b/usr.sbin/bootparamd/bootparamd/Makefile
@@ -4,8 +4,7 @@
PROG= bootparamd
SRCS= bootparamd.c main.c ${GENSRCS}
GENSRCS=bootparam_prot.h bootparam_prot_svc.c bootparam_prot_xdr.c
-MAN5= bootparams.5
-MAN8= bootparamd.8
+MAN= bootparams.5 bootparamd.8
CFLAGS+= -DTFTP_DIR=\"/tftpboot\" -I.
CLEANFILES= ${GENSRCS}
diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile
index 621bbaf71d9b..197dbc5dca87 100644
--- a/usr.sbin/btxld/Makefile
+++ b/usr.sbin/btxld/Makefile
@@ -4,6 +4,7 @@ MAINTAINER= rnordier
PROG= btxld
SRCS= btxld.c elfh.c
+MAN= btxld.8
CFLAGS+= -Wall
diff --git a/usr.sbin/burncd/Makefile b/usr.sbin/burncd/Makefile
index 2749bc85e665..11e07c79d0c7 100644
--- a/usr.sbin/burncd/Makefile
+++ b/usr.sbin/burncd/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG= burncd
+MAN= burncd.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile
index 4560eacac0f4..ba3290240ce9 100644
--- a/usr.sbin/cdcontrol/Makefile
+++ b/usr.sbin/cdcontrol/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
PROG= cdcontrol
-MAN1= ${PROG}.1
CFLAGS+= -Wall
DPADD += ${LIBEDIT} ${LIBTERMCAP}
diff --git a/usr.sbin/chkgrp/Makefile b/usr.sbin/chkgrp/Makefile
index 42def0ced81b..a7bfc548ced1 100644
--- a/usr.sbin/chkgrp/Makefile
+++ b/usr.sbin/chkgrp/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG= chkgrp
+MAN= chkgrp.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile
index dab5e9ff0b48..b3d988b1cfe0 100644
--- a/usr.sbin/chown/Makefile
+++ b/usr.sbin/chown/Makefile
@@ -3,8 +3,7 @@
PROG= chown
CFLAGS+=-DSUPPORT_DOT
-MAN1= chgrp.1
-MAN8= chown.8
+MAN= chgrp.1 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 771e4c07cc14..652de797cec4 100644
--- a/usr.sbin/chroot/Makefile
+++ b/usr.sbin/chroot/Makefile
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= chroot
+MAN= chroot.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/ckdist/Makefile b/usr.sbin/ckdist/Makefile
index 74ee6873b291..74c4c5402f74 100644
--- a/usr.sbin/ckdist/Makefile
+++ b/usr.sbin/ckdist/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
PROG= ckdist
-MAN1= ${PROG}.1
.PATH: ${.CURDIR}/../../usr.bin/cksum
diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile
index df2c7428ad73..ca8e04400669 100644
--- a/usr.sbin/config/Makefile
+++ b/usr.sbin/config/Makefile
@@ -6,6 +6,7 @@ CFLAGS+=-I. -I${.CURDIR}
CFLAGS+=${BDECFLAGS}
SRCS= config.y main.c lang.l mkmakefile.c mkheaders.c \
mkoptions.c y.tab.h
+MAN= config.8
DPADD= ${LIBL}
LDADD= -ll
diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile
index a9b7071a379d..e9bb9cdb98b1 100644
--- a/usr.sbin/cron/cron/Makefile
+++ b/usr.sbin/cron/cron/Makefile
@@ -5,5 +5,6 @@ SRCS= cron.c database.c do_command.c job.c user.c popen.c
CFLAGS+=-DLOGIN_CAP
DPADD= ${LIBCRON} ${LIBUTIL}
LDADD= ${LIBCRON} -lutil
+MAN= cron.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile
index ce8d5d38aa8b..9ce35411a10b 100644
--- a/usr.sbin/cron/crontab/Makefile
+++ b/usr.sbin/cron/crontab/Makefile
@@ -4,8 +4,7 @@ PROG= crontab
CFLAGS+=-I${.CURDIR}/../cron
DPADD= ${LIBCRON} ${LIBUTIL}
LDADD= ${LIBCRON} -lutil
-MAN1= crontab.1
-MAN5= crontab.5
+MAN= crontab.1 crontab.5
BINDIR= /usr/bin
BINOWN= root
diff --git a/usr.sbin/ctm/ctm/Makefile b/usr.sbin/ctm/ctm/Makefile
index 5fb80d5a4784..6fb1e5a2684d 100644
--- a/usr.sbin/ctm/ctm/Makefile
+++ b/usr.sbin/ctm/ctm/Makefile
@@ -15,8 +15,7 @@ SRCS= ctm.c ctm_input.c ctm_pass1.c ctm_pass2.c ctm_pass3.c \
ctm_passb.c ctm_syntax.c ctm_ed.c
LDADD+= -lmd
DPADD+= ${LIBMD}
-MAN1= ctm.1
-MAN5= ctm.5
+MAN= ctm.1 ctm.5
CFLAGS+= -Wall
.if exists(${.CURDIR}/../../Makefile.inc)
diff --git a/usr.sbin/ctm/ctm_rmail/Makefile b/usr.sbin/ctm/ctm_rmail/Makefile
index 499e2fe8ca10..a00eaa546f53 100644
--- a/usr.sbin/ctm/ctm_rmail/Makefile
+++ b/usr.sbin/ctm/ctm_rmail/Makefile
@@ -2,7 +2,6 @@
PROG= ctm_rmail
SRCS= ctm_rmail.c error.c
-MAN1= ${PROG}.1
CFLAGS+= -Wall
MLINKS+= ctm_rmail.1 ctm_smail.1
MLINKS+= ctm_rmail.1 ctm_dequeue.1
diff --git a/usr.sbin/dev_mkdb/Makefile b/usr.sbin/dev_mkdb/Makefile
index 933f9e195dde..d0b9c299e3b2 100644
--- a/usr.sbin/dev_mkdb/Makefile
+++ b/usr.sbin/dev_mkdb/Makefile
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= dev_mkdb
+MAN= dev_mkdb.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/diskpart/Makefile b/usr.sbin/diskpart/Makefile
index 75b9ddc8e710..ab20d853f067 100644
--- a/usr.sbin/diskpart/Makefile
+++ b/usr.sbin/diskpart/Makefile
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= diskpart
+MAN= diskpart.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/dpt/dpt_ctlinfo/Makefile b/usr.sbin/dpt/dpt_ctlinfo/Makefile
index 59b42af5025c..c4b05c2bfa68 100644
--- a/usr.sbin/dpt/dpt_ctlinfo/Makefile
+++ b/usr.sbin/dpt/dpt_ctlinfo/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= dpt_ctlinfo
+MAN= dpt_ctlinfo.8
CFLAGS+=-Wall -I${.CURDIR}/../../../sys
BINMODE=500
diff --git a/usr.sbin/dpt/dpt_ctls/Makefile b/usr.sbin/dpt/dpt_ctls/Makefile
index 03d3f26a7cb8..c29ddb28e75a 100644
--- a/usr.sbin/dpt/dpt_ctls/Makefile
+++ b/usr.sbin/dpt/dpt_ctls/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= dpt_ctls
+MAN= dpt_ctls.8
CFLAGS+=-Wall -I${.CURDIR}/../../../sys
BINMODE=500
diff --git a/usr.sbin/dpt/dpt_dm/Makefile b/usr.sbin/dpt/dpt_dm/Makefile
index a4dbe5f18a12..a026ae5121fa 100644
--- a/usr.sbin/dpt/dpt_dm/Makefile
+++ b/usr.sbin/dpt/dpt_dm/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= dpt_dm
+MAN= dpt_dm.8
CFLAGS+=-Wall -I${.CURDIR}/../../../sys
BINMODE=500
diff --git a/usr.sbin/dpt/dpt_led/Makefile b/usr.sbin/dpt/dpt_led/Makefile
index d709f25684ce..e1472585b895 100644
--- a/usr.sbin/dpt/dpt_led/Makefile
+++ b/usr.sbin/dpt/dpt_led/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= dpt_led
+MAN= dpt_led.8
CFLAGS+=-Wall -I${.CURDIR}/../../../sys
BINMODE=500
diff --git a/usr.sbin/dpt/dpt_sig/Makefile b/usr.sbin/dpt/dpt_sig/Makefile
index 6d29c5678ab9..1a1039e51f19 100644
--- a/usr.sbin/dpt/dpt_sig/Makefile
+++ b/usr.sbin/dpt/dpt_sig/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= dpt_sig
+MAN= dpt_sig.8
CFLAGS+=-Wall -I${.CURDIR}/../../../sys
BINMODE=500
diff --git a/usr.sbin/dpt/dpt_softc/Makefile b/usr.sbin/dpt/dpt_softc/Makefile
index a21215f17cb4..4a7e1ad54f94 100644
--- a/usr.sbin/dpt/dpt_softc/Makefile
+++ b/usr.sbin/dpt/dpt_softc/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= dpt_softc
+MAN= dpt_softc.8
CFLAGS+=-Wall -I${.CURDIR}/../../../sys
BINMODE=500
diff --git a/usr.sbin/dpt/dpt_sysinfo/Makefile b/usr.sbin/dpt/dpt_sysinfo/Makefile
index 7c8e431508c8..a116adf3d3b0 100644
--- a/usr.sbin/dpt/dpt_sysinfo/Makefile
+++ b/usr.sbin/dpt/dpt_sysinfo/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= dpt_sysinfo
+MAN= dpt_sysinfo.8
CFLAGS+=-Wall -I${.CURDIR}/../../../sys
BINMODE=500
diff --git a/usr.sbin/edquota/Makefile b/usr.sbin/edquota/Makefile
index bf31c73fec00..b8c35ae5ce37 100644
--- a/usr.sbin/edquota/Makefile
+++ b/usr.sbin/edquota/Makefile
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= edquota
+MAN= edquota.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/elf2exe/Makefile b/usr.sbin/elf2exe/Makefile
index 1f983aabcfbb..f222cebf302d 100644
--- a/usr.sbin/elf2exe/Makefile
+++ b/usr.sbin/elf2exe/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= elf2exe
+MAN= elf2exe.8
CFLAGS+= -Wall
MANSUBDIR=/${MACHINE_ARCH}
diff --git a/usr.sbin/extattrctl/Makefile b/usr.sbin/extattrctl/Makefile
index 16d227d95103..9a0a22aeaf75 100644
--- a/usr.sbin/extattrctl/Makefile
+++ b/usr.sbin/extattrctl/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG= extattrctl
+MAN= extattrctl.8
LDADD= ${LIBUTIL}
CFLAGS+= -g -Wall
diff --git a/usr.sbin/faithd/Makefile b/usr.sbin/faithd/Makefile
index 36f296c3c4be..c63b09793712 100644
--- a/usr.sbin/faithd/Makefile
+++ b/usr.sbin/faithd/Makefile
@@ -15,6 +15,7 @@
PROG= faithd
SRCS= faithd.c tcp.c ftp.c rsh.c
+MAN= faithd.8
#CFLAGS+= -DFAITH4
CFLAGS+= -Wall
diff --git a/usr.sbin/fdcontrol/Makefile b/usr.sbin/fdcontrol/Makefile
index d9b80395e93d..62b5583ced45 100644
--- a/usr.sbin/fdcontrol/Makefile
+++ b/usr.sbin/fdcontrol/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG = fdcontrol
+MAN = fdcontrol.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/fdformat/Makefile b/usr.sbin/fdformat/Makefile
index e3d629a15b05..3c0d4ec42531 100644
--- a/usr.sbin/fdformat/Makefile
+++ b/usr.sbin/fdformat/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
PROG= fdformat
-MAN1= ${PROG}.1
# the -I's seem to be confusing, but necessery this way
# (so the right <unistd.h> will be found in /usr/include, and the
diff --git a/usr.sbin/fdwrite/Makefile b/usr.sbin/fdwrite/Makefile
index 74392d1a8c35..fbea90c5d37b 100644
--- a/usr.sbin/fdwrite/Makefile
+++ b/usr.sbin/fdwrite/Makefile
@@ -11,7 +11,6 @@
#
PROG= fdwrite
-MAN1= ${PROG}.1
CFLAGS+=-Wall
.include <bsd.prog.mk>
diff --git a/usr.sbin/getextattr/Makefile b/usr.sbin/getextattr/Makefile
index 1a0b9aebec5e..13c01576419b 100644
--- a/usr.sbin/getextattr/Makefile
+++ b/usr.sbin/getextattr/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG= getextattr
+MAN= getextattr.8
LDADD= ${LIBUTIL}
CFLAGS+= -Wall
diff --git a/usr.sbin/gifconfig/Makefile b/usr.sbin/gifconfig/Makefile
index a48bacf19c60..b4f3fa1d64c3 100644
--- a/usr.sbin/gifconfig/Makefile
+++ b/usr.sbin/gifconfig/Makefile
@@ -14,6 +14,7 @@
# $FreeBSD$
PROG= gifconfig
+MAN= gifconfig.8
CFLAGS+=-DINET6
diff --git a/usr.sbin/i4b/dtmfdecode/Makefile b/usr.sbin/i4b/dtmfdecode/Makefile
index 0623e128e162..3413ad203608 100644
--- a/usr.sbin/i4b/dtmfdecode/Makefile
+++ b/usr.sbin/i4b/dtmfdecode/Makefile
@@ -7,13 +7,11 @@
#---------------------------------------------------------------------------
PROG = dtmfdecode
-SRC = dtmfdecode.c
# libm is only necessary if USE_COS is defined in the source
#LDADD += -lm
CFLAGS += -Wall -DDEBUG
-MAN1 = dtmfdecode.1
test: ${PROG}
uudecode -p < dtmfsounds.al.uu | ./${PROG}
diff --git a/usr.sbin/i4b/g711conv/Makefile b/usr.sbin/i4b/g711conv/Makefile
index c02dd5f8ca57..f5f86c300637 100644
--- a/usr.sbin/i4b/g711conv/Makefile
+++ b/usr.sbin/i4b/g711conv/Makefile
@@ -7,8 +7,6 @@
#---------------------------------------------------------------------------
PROG = g711conv
-SRC = g711conv.c
CFLAGS += -Wall
-MAN1 = g711conv.1
.include <bsd.prog.mk>
diff --git a/usr.sbin/i4b/isdnd/Makefile b/usr.sbin/i4b/isdnd/Makefile
index 2ad8edb1a4b7..9502465f9ef3 100644
--- a/usr.sbin/i4b/isdnd/Makefile
+++ b/usr.sbin/i4b/isdnd/Makefile
@@ -15,8 +15,7 @@ COPTS += -DDEBUG
# enable rtprio usage
COPTS += -DUSE_RTPRIO
-MAN8 = isdnd.8
-MAN5 = isdnd.rc.5 isdnd.rates.5 isdnd.acct.5
+MAN = isdnd.rc.5 isdnd.rates.5 isdnd.acct.5 isdnd.8
.if !defined(I4B_WITHOUT_CURSES)
COPTS += -DUSE_CURSES
diff --git a/usr.sbin/i4b/isdndebug/Makefile b/usr.sbin/i4b/isdndebug/Makefile
index 2cc230fe8e62..94b1ade5d460 100644
--- a/usr.sbin/i4b/isdndebug/Makefile
+++ b/usr.sbin/i4b/isdndebug/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG = isdndebug
SRCS = main.c
+MAN = isdndebug.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/i4b/isdndecode/Makefile b/usr.sbin/i4b/isdndecode/Makefile
index 5b86b709bb4d..c91596fa5d77 100644
--- a/usr.sbin/i4b/isdndecode/Makefile
+++ b/usr.sbin/i4b/isdndecode/Makefile
@@ -2,6 +2,7 @@
PROG = isdndecode
SRCS = main.c layer1.c layer2.c layer3.c \
layer3_subr.c facility.c pcause.c
+MAN = isdndecode.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/i4b/isdnmonitor/Makefile b/usr.sbin/i4b/isdnmonitor/Makefile
index 6c2abd7877e1..aff25e877ebb 100644
--- a/usr.sbin/i4b/isdnmonitor/Makefile
+++ b/usr.sbin/i4b/isdnmonitor/Makefile
@@ -2,6 +2,7 @@
PROG = isdnmonitor
SRCS = main.c curses.c
+MAN = isdnmonitor.8
# compile debug support
COPTS += -DDEBUG
diff --git a/usr.sbin/i4b/isdnphone/Makefile b/usr.sbin/i4b/isdnphone/Makefile
index 47fe1378b840..3df28e75c6bb 100644
--- a/usr.sbin/i4b/isdnphone/Makefile
+++ b/usr.sbin/i4b/isdnphone/Makefile
@@ -2,6 +2,7 @@
PROG = isdnphone
SRCS = main.c display.c audio.c isdn.c
+MAN = isdnphone.8
DPADD = ${LIBCURSES}
LDADD = -lcurses
diff --git a/usr.sbin/i4b/isdntel/Makefile b/usr.sbin/i4b/isdntel/Makefile
index dd0b1559ffad..0772bc6128df 100644
--- a/usr.sbin/i4b/isdntel/Makefile
+++ b/usr.sbin/i4b/isdntel/Makefile
@@ -4,5 +4,6 @@ PROG = isdntel
SRCS = main.c display.c files.c alias.c
DPADD = ${LIBNCURSES}
LDADD = -lncurses
+MAN = isdntel.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/i4b/isdntelctl/Makefile b/usr.sbin/i4b/isdntelctl/Makefile
index 989418c4aec5..dabc8b840165 100644
--- a/usr.sbin/i4b/isdntelctl/Makefile
+++ b/usr.sbin/i4b/isdntelctl/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG = isdntelctl
SRCS = main.c
+MAN = isdntelctl.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/i4b/isdntest/Makefile b/usr.sbin/i4b/isdntest/Makefile
index 119167fc9295..2988b1d94b95 100644
--- a/usr.sbin/i4b/isdntest/Makefile
+++ b/usr.sbin/i4b/isdntest/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG = isdntest
SRCS = main.c
+MAN = isdntest.8
install:
@echo isdntest is not installed automatically
diff --git a/usr.sbin/i4b/isdntrace/Makefile b/usr.sbin/i4b/isdntrace/Makefile
index c0be08003434..fe844e63291e 100644
--- a/usr.sbin/i4b/isdntrace/Makefile
+++ b/usr.sbin/i4b/isdntrace/Makefile
@@ -2,6 +2,7 @@
PROG = isdntrace
SRCS = q921.c q931.c q931_util.c q932_fac.c 1tr6.c trace.c \
pcause_1tr6.c pcause_q850.c unknownl3.c
+MAN = isdntrace.8
#CFLAGS += -Wall -g
.include <bsd.prog.mk>
diff --git a/usr.sbin/i4b/ispppcontrol/Makefile b/usr.sbin/i4b/ispppcontrol/Makefile
index a311294f5247..3158aaca8559 100644
--- a/usr.sbin/i4b/ispppcontrol/Makefile
+++ b/usr.sbin/i4b/ispppcontrol/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG = ispppcontrol
+MAN = ispppcontrol.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/i4b/man/Makefile b/usr.sbin/i4b/man/Makefile
index 7e3e6513f6b4..2600080fcff0 100644
--- a/usr.sbin/i4b/man/Makefile
+++ b/usr.sbin/i4b/man/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-MAN4 = i4b.4 i4bctl.4 i4bipr.4 i4bq921.4 i4bq931.4 i4brbch.4 i4btel.4 \
+MAN = i4b.4 i4bctl.4 i4bipr.4 i4bq921.4 i4bq931.4 i4brbch.4 i4btel.4 \
i4btrc.4 isic.4 i4bisppp.4 iwic.4 ifpi.4 ifpnp.4 ihfc.4 itjc.4
.include <bsd.prog.mk>
diff --git a/usr.sbin/ifmcstat/Makefile b/usr.sbin/ifmcstat/Makefile
index 35af6bd0fb69..d4b3adbc7cbd 100644
--- a/usr.sbin/ifmcstat/Makefile
+++ b/usr.sbin/ifmcstat/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= ifmcstat
+MAN= ifmcstat.8
BINGRP= kmem
BINMODE=2555
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile
index 13be67f4ccdc..f0be070c144d 100644
--- a/usr.sbin/inetd/Makefile
+++ b/usr.sbin/inetd/Makefile
@@ -5,6 +5,7 @@ MAINTAINER= dwmalone
PROG= inetd
SRCS= inetd.c builtins.c
+MAN= inetd.8
MLINKS= inetd.8 inetd.conf.5
COPTS+= -Wall -DLOGIN_CAP
diff --git a/usr.sbin/iostat/Makefile b/usr.sbin/iostat/Makefile
index f6e277e6aee1..d3a1f19bfecf 100644
--- a/usr.sbin/iostat/Makefile
+++ b/usr.sbin/iostat/Makefile
@@ -4,6 +4,7 @@
MAINTAINER=ken@FreeBSD.ORG
PROG= iostat
+MAN= iostat.8
CFLAGS+=-I${.CURDIR}/../../sys
DPADD= ${LIBKVM} ${LIBDEVSTAT}
LDADD= -lkvm -ldevstat
diff --git a/usr.sbin/ipftest/Makefile b/usr.sbin/ipftest/Makefile
index 8d015b898356..728baa088bec 100644
--- a/usr.sbin/ipftest/Makefile
+++ b/usr.sbin/ipftest/Makefile
@@ -4,7 +4,6 @@
${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
PROG= ipftest
-MAN1= ipftest.1
SRCS= opt_ipfilter.h \
ipt.c parse.c fil.c ipft_sn.c ipft_ef.c ipft_td.c ipft_pc.c opt.c \
ipft_tx.c misc.c ip_frag.c ip_state.c ip_nat.c ip_proxy.c \
diff --git a/usr.sbin/ipresend/Makefile b/usr.sbin/ipresend/Makefile
index d7f33807d651..180faad577bf 100644
--- a/usr.sbin/ipresend/Makefile
+++ b/usr.sbin/ipresend/Makefile
@@ -4,7 +4,6 @@
${.CURDIR}/../../contrib/ipfilter
PROG= ipresend
-MAN1= ipresend.1
SRCS= ipresend.c ip.c resend.c opt.c ipft_ef.c ipft_hx.c ipft_sn.c ipft_td.c ipft_tx.c sbpf.c 44arp.c ipft_pc.c
CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
diff --git a/usr.sbin/ipsend/Makefile b/usr.sbin/ipsend/Makefile
index f356fa8e0d23..dc35972fce22 100644
--- a/usr.sbin/ipsend/Makefile
+++ b/usr.sbin/ipsend/Makefile
@@ -5,10 +5,9 @@
${.CURDIR}/../../contrib/ipfilter
PROG= ipsend
-MAN1= ipsend.1
-MAN5= ipsend.5
SRCS= ipsend.c ip.c ipsopt.c sbpf.c sock.c 44arp.c iplang_y.y iplang_l.l \
y.tab.h
+MAN= ipsend.1 ipsend.5
CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
-DUSE_INET6 \
diff --git a/usr.sbin/iptest/Makefile b/usr.sbin/iptest/Makefile
index b86e42f1fc4c..6639fa9ea81a 100644
--- a/usr.sbin/iptest/Makefile
+++ b/usr.sbin/iptest/Makefile
@@ -4,7 +4,6 @@
${.CURDIR}/../../contrib/ipfilter
PROG= iptest
-MAN1= iptest.1
SRCS= iptest.c iptests.c ip.c sbpf.c 44arp.c sock.c
CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile
index c1aba992b4ca..36dcc5b2af10 100644
--- a/usr.sbin/jail/Makefile
+++ b/usr.sbin/jail/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG= jail
+MAN= jail.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/kbdcontrol/Makefile b/usr.sbin/kbdcontrol/Makefile
index 9873d9aacecd..da863552a467 100644
--- a/usr.sbin/kbdcontrol/Makefile
+++ b/usr.sbin/kbdcontrol/Makefile
@@ -3,8 +3,7 @@
PROG= kbdcontrol
SRCS= kbdcontrol.c lex.l
CFLAGS+= -I${.CURDIR}
-MAN1= kbdcontrol.1
-MAN5= kbdmap.5
+MAN= kbdcontrol.1 kbdmap.5
MLINKS= kbdmap.5 keymap.5
DPADD= ${LIBL}
LDADD= -ll
diff --git a/usr.sbin/kbdmap/Makefile b/usr.sbin/kbdmap/Makefile
index 8d867668284a..17413d3ed4e8 100644
--- a/usr.sbin/kbdmap/Makefile
+++ b/usr.sbin/kbdmap/Makefile
@@ -6,7 +6,7 @@ MAINTAINER= wosch
SCRIPT= ${.CURDIR}/kbdmap.pl
LINKS= ${BINDIR}/kbdmap ${BINDIR}/vidfont
-MAN1= kbdmap.1
+MAN= kbdmap.1
MLINKS= kbdmap.1 vidfont.1
all:
diff --git a/usr.sbin/kernbb/Makefile b/usr.sbin/kernbb/Makefile
index 62358a8215b3..bb18ba37ba8c 100644
--- a/usr.sbin/kernbb/Makefile
+++ b/usr.sbin/kernbb/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= kernbb
+MAN= kernbb.8
DPADD= ${LIBKVM}
LDADD= -lkvm
diff --git a/usr.sbin/keyadmin/Makefile b/usr.sbin/keyadmin/Makefile
index 556cb6c1c82c..c068d894a92b 100644
--- a/usr.sbin/keyadmin/Makefile
+++ b/usr.sbin/keyadmin/Makefile
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= keyadmin
+MAN= keyadmin.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/keyserv/Makefile b/usr.sbin/keyserv/Makefile
index 169a9d5fbf04..50feeaeb75a3 100644
--- a/usr.sbin/keyserv/Makefile
+++ b/usr.sbin/keyserv/Makefile
@@ -3,6 +3,8 @@
PROG= keyserv
SRCS= keyserv.c setkey.c crypt_svc.c crypt_server.c crypt.h
+MAN= keyserv.8
+
CFLAGS+= -DKEYSERV_RANDOM -DBROKEN_DES -I.
.if $(OBJFORMAT) == elf
CFLAGS+= -DOBJFORMAT_ELF
diff --git a/usr.sbin/kgmon/Makefile b/usr.sbin/kgmon/Makefile
index 67af4e972bbb..f5eff5d4172f 100644
--- a/usr.sbin/kgmon/Makefile
+++ b/usr.sbin/kgmon/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= kgmon
+MAN= kgmon.8
DPADD= ${LIBKVM}
LDADD= -lkvm
#
diff --git a/usr.sbin/kgzip/Makefile b/usr.sbin/kgzip/Makefile
index 46f7ce3ac1b4..0db61e72a5e0 100644
--- a/usr.sbin/kgzip/Makefile
+++ b/usr.sbin/kgzip/Makefile
@@ -4,6 +4,7 @@ MAINTAINER= rnordier
PROG= kgzip
SRCS= kgzip.c aouthdr.c elfhdr.c kgzcmp.c kgzld.c xio.c
+MAN= kgzip.8
CFLAGS+=-pedantic \
-W -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
diff --git a/usr.sbin/lastlogin/Makefile b/usr.sbin/lastlogin/Makefile
index 8681e7d57555..e8ed16e1f227 100644
--- a/usr.sbin/lastlogin/Makefile
+++ b/usr.sbin/lastlogin/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= lastlogin
+MAN= lastlogin.8
CFLAGS+=-Wall
.include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile
index f2a7e3fef864..54c3182d448a 100644
--- a/usr.sbin/lpr/chkprintcap/Makefile
+++ b/usr.sbin/lpr/chkprintcap/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= chkprintcap
+MAN= chkprintcap.8
CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
.PATH: ${.CURDIR}/../common_source
DPADD= ${LIBLPR}
diff --git a/usr.sbin/lpr/lp/Makefile b/usr.sbin/lpr/lp/Makefile
index 9522fc3796a6..df12501153cd 100644
--- a/usr.sbin/lpr/lp/Makefile
+++ b/usr.sbin/lpr/lp/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
-BINDIR = /usr/bin
-MAN1 = lp.1
+BINDIR= /usr/bin
+MAN= lp.1
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile
index b8b417e1623d..2c6ceae5449a 100644
--- a/usr.sbin/lpr/lpc/Makefile
+++ b/usr.sbin/lpr/lpc/Makefile
@@ -3,6 +3,7 @@
PROG= lpc
CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
+MAN= lpc.8
SRCS= lpc.c cmds.c cmdtab.c
BINGRP= daemon
BINMODE=2555
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index b2e5c7d61fd0..1131262537ff 100644
--- a/usr.sbin/lpr/lpd/Makefile
+++ b/usr.sbin/lpr/lpd/Makefile
@@ -3,6 +3,7 @@
PROG= lpd
CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
+MAN= lpd.8
SRCS= lpd.c printjob.c recvjob.c lpdchar.c modes.c
DPADD= ${LIBLPR}
LDADD= ${LIBLPR}
diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile
index 695a1bdfdb97..24afb7ab101a 100644
--- a/usr.sbin/lpr/lpq/Makefile
+++ b/usr.sbin/lpr/lpq/Makefile
@@ -2,7 +2,6 @@
# $FreeBSD$
PROG= lpq
-MAN1= ${PROG}.1
CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
DPADD= ${LIBLPR}
LDADD= ${LIBLPR}
diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile
index e82347cb933e..ae5fa174d9dc 100644
--- a/usr.sbin/lpr/lpr/Makefile
+++ b/usr.sbin/lpr/lpr/Makefile
@@ -6,8 +6,7 @@ CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
BINGRP= daemon
BINMODE=6555
BINDIR= /usr/bin
-MAN1= lpr.1
-MAN5= printcap.5
+MAN= lpr.1 printcap.5
.PATH: ${.CURDIR}/../common_source
DPADD= ${LIBLPR}
LDADD= ${LIBLPR}
diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile
index b8fae07d6720..abeac25b290e 100644
--- a/usr.sbin/lpr/lprm/Makefile
+++ b/usr.sbin/lpr/lprm/Makefile
@@ -2,7 +2,6 @@
# $FreeBSD$
PROG= lprm
-MAN1= ${PROG}.1
CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
.PATH: ${.CURDIR}/../common_source
DPADD= ${LIBLPR}
diff --git a/usr.sbin/lpr/lptest/Makefile b/usr.sbin/lpr/lptest/Makefile
index 723580eba1c0..c02d7bdf2e34 100644
--- a/usr.sbin/lpr/lptest/Makefile
+++ b/usr.sbin/lpr/lptest/Makefile
@@ -2,6 +2,5 @@
# $FreeBSD$
PROG= lptest
-MAN1= ${PROG}.1
.include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile
index a8f0888d2e7d..3a9c5ebf151f 100644
--- a/usr.sbin/lpr/pac/Makefile
+++ b/usr.sbin/lpr/pac/Makefile
@@ -3,6 +3,7 @@
PROG= pac
CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
+MAN= pac.8
.PATH: ${.CURDIR}/../common_source
DPADD= ${LIBLPR}
LDADD= ${LIBLPR}
diff --git a/usr.sbin/lptcontrol/Makefile b/usr.sbin/lptcontrol/Makefile
index 8069d07099e6..d4e0c968daef 100644
--- a/usr.sbin/lptcontrol/Makefile
+++ b/usr.sbin/lptcontrol/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= lptcontrol
+MAN= lptcontrol.8
CFLAGS+= -Wall
.include <bsd.prog.mk>
diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile
index d86f6471574e..850ad428f6aa 100644
--- a/usr.sbin/mailstats/Makefile
+++ b/usr.sbin/mailstats/Makefile
@@ -7,6 +7,7 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/mailstats
PROG= mailstats
+MAN= mailstats.8
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -DNOT_SENDMAIL
.if exists(${.OBJDIR}/../../lib/libsmutil)
diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile
index 63723e4fa668..0cb27dcfb437 100644
--- a/usr.sbin/mailwrapper/Makefile
+++ b/usr.sbin/mailwrapper/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= mailwrapper
+MAN= mailwrapper.8
DPADD+= ${LIBUTIL}
LDADD+= -lutil
diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile
index 1b587bf576b7..5425555ff1dd 100644
--- a/usr.sbin/makemap/Makefile
+++ b/usr.sbin/makemap/Makefile
@@ -7,6 +7,7 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/makemap
PROG= makemap
+MAN= makemap.8
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include
CFLAGS+=-DNEWDB -DNOT_SENDMAIL
diff --git a/usr.sbin/manctl/Makefile b/usr.sbin/manctl/Makefile
index 187edd313a4b..294dc5123aeb 100644
--- a/usr.sbin/manctl/Makefile
+++ b/usr.sbin/manctl/Makefile
@@ -1,7 +1,7 @@
# Makefile
# $FreeBSD$
-MAN8= manctl.8
+MAN= manctl.8
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.sbin/memcontrol/Makefile b/usr.sbin/memcontrol/Makefile
index d90d63bf5c0d..0e61be7a7128 100644
--- a/usr.sbin/memcontrol/Makefile
+++ b/usr.sbin/memcontrol/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG= memcontrol
+MAN= memcontrol.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile
index 3ee0ee010fc3..c7e758cf0a39 100644
--- a/usr.sbin/mergemaster/Makefile
+++ b/usr.sbin/mergemaster/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
MAINTAINER= dougb@FreeBSD.org
-MAN8= mergemaster.8
+MAN= mergemaster.8
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.sbin/mixer/Makefile b/usr.sbin/mixer/Makefile
index 8eb63ae03ba8..0beb1c7c0c36 100644
--- a/usr.sbin/mixer/Makefile
+++ b/usr.sbin/mixer/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG = mixer
+MAN= mixer.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/mld6query/Makefile b/usr.sbin/mld6query/Makefile
index 1de76b220382..c774f9f16c6f 100644
--- a/usr.sbin/mld6query/Makefile
+++ b/usr.sbin/mld6query/Makefile
@@ -16,6 +16,7 @@
PROG= mld6query
SRCS= mld6.c
+MAN= mld6query.8
CFLAGS+= -DINET6 -DIPSEC
diff --git a/usr.sbin/mlxcontrol/Makefile b/usr.sbin/mlxcontrol/Makefile
index 9dfe890dd5e4..094d7451e226 100644
--- a/usr.sbin/mlxcontrol/Makefile
+++ b/usr.sbin/mlxcontrol/Makefile
@@ -2,6 +2,7 @@
PROG= mlxcontrol
SRCS= command.c config.c interface.c util.c
+MAN= mlxcontrol.8
CFLAGS+= -I${.CURDIR}/../../sys
.include <bsd.prog.mk>
diff --git a/usr.sbin/moused/Makefile b/usr.sbin/moused/Makefile
index 357729e08593..c9c1b313519f 100644
--- a/usr.sbin/moused/Makefile
+++ b/usr.sbin/moused/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= moused
+MAN= moused.8
#BINMODE=4555
#INSTALLFLAGS=-fschg
diff --git a/usr.sbin/mptable/Makefile b/usr.sbin/mptable/Makefile
index a37086a569d9..cff7602f1e66 100644
--- a/usr.sbin/mptable/Makefile
+++ b/usr.sbin/mptable/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
PROG= mptable
-MAN1= mptable.1
.include <bsd.prog.mk>
diff --git a/usr.sbin/mrouted/map-mbone/Makefile b/usr.sbin/mrouted/map-mbone/Makefile
index 22abcb43e878..66b0f5d234ac 100644
--- a/usr.sbin/mrouted/map-mbone/Makefile
+++ b/usr.sbin/mrouted/map-mbone/Makefile
@@ -9,5 +9,6 @@ DPADD= ${LIBMROUTED}
LDADD= ${LIBMROUTED}
SRCS= mapper.c
+MAN= map-mbone.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/mrouted/mrinfo/Makefile b/usr.sbin/mrouted/mrinfo/Makefile
index caf106b3bfe0..701a1932962d 100644
--- a/usr.sbin/mrouted/mrinfo/Makefile
+++ b/usr.sbin/mrouted/mrinfo/Makefile
@@ -8,6 +8,7 @@ CFLAGS+= -I$S
DPADD= ${LIBMROUTED}
LDADD= ${LIBMROUTED}
+MAN= mrinfo.8
BINMODE=4555
.include <bsd.prog.mk>
diff --git a/usr.sbin/mrouted/mrouted/Makefile b/usr.sbin/mrouted/mrouted/Makefile
index efcc1d64624e..c6855f4b2583 100644
--- a/usr.sbin/mrouted/mrouted/Makefile
+++ b/usr.sbin/mrouted/mrouted/Makefile
@@ -10,6 +10,7 @@ YFLAGS=
SRCS= config.c cfparse.y main.c route.c vif.c prune.c callout.c rsrr.c \
ipip.c icmp.c vers.c igmp.c inet.c kern.c
CLEANFILES+= vers.c
+MAN= mrouted.8
vers.c: $S/VERSION
rm -f vers.c ; \
diff --git a/usr.sbin/mrouted/mtrace/Makefile b/usr.sbin/mrouted/mtrace/Makefile
index ee9c203b07e5..325999465629 100644
--- a/usr.sbin/mrouted/mtrace/Makefile
+++ b/usr.sbin/mrouted/mtrace/Makefile
@@ -6,6 +6,7 @@ S= ${.CURDIR}/..
.PATH: $S
CFLAGS+= -I$S
+MAN= mtrace.8
BINMODE=4555
.include <bsd.prog.mk>
diff --git a/usr.sbin/mtest/Makefile b/usr.sbin/mtest/Makefile
index 8ab0477092bd..95bbe12184a6 100644
--- a/usr.sbin/mtest/Makefile
+++ b/usr.sbin/mtest/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG= mtest
+MAN= mtest.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile
index 15f7856362e2..08a9a97723b7 100644
--- a/usr.sbin/mtree/Makefile
+++ b/usr.sbin/mtree/Makefile
@@ -5,6 +5,7 @@ PROG= mtree
SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c \
strtofflags.c
.PATH: ${.CURDIR}/../../usr.bin/cksum ${.CURDIR}/../../lib/libc/gen
+MAN= mtree.8
.if !defined(WORLD)
DPADD+= ${LIBMD}
diff --git a/usr.sbin/named.reload/Makefile b/usr.sbin/named.reload/Makefile
index f5b7b33a075d..514f8e567828 100644
--- a/usr.sbin/named.reload/Makefile
+++ b/usr.sbin/named.reload/Makefile
@@ -2,7 +2,7 @@
.include "${.CURDIR}/../named/Makefile.inc"
-MAN8= named.reload.8
+MAN= named.reload.8
CLEANFILES+= named.reload
all: named.reload
diff --git a/usr.sbin/named.restart/Makefile b/usr.sbin/named.restart/Makefile
index e0c4bcb037ba..8c52d21de99b 100644
--- a/usr.sbin/named.restart/Makefile
+++ b/usr.sbin/named.restart/Makefile
@@ -2,7 +2,7 @@
.include "${.CURDIR}/../named/Makefile.inc"
-MAN8= named.restart.8
+MAN= named.restart.8
CLEANFILES+= named.restart
all: named.restart
diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile
index e29ce4526d0d..5df94e5a51da 100644
--- a/usr.sbin/named/Makefile
+++ b/usr.sbin/named/Makefile
@@ -26,8 +26,7 @@ LIBISC:= ${LIBISCDIR}/libisc.a
DPADD+= ${LIBISC}
LDADD+= ${LIBISC}
-MAN5= named.conf.5
-MAN8= named.8 named-bootconf.8 nsupdate.8
+MAN= named.conf.5 named.8 named-bootconf.8 nsupdate.8
DOCDIR= /usr/share/doc/bind
HTMLS= acl.html address_list.html comments.html config.html controls.html \
diff --git a/usr.sbin/ndc/Makefile b/usr.sbin/ndc/Makefile
index 6db054f29897..0e01f48824bf 100644
--- a/usr.sbin/ndc/Makefile
+++ b/usr.sbin/ndc/Makefile
@@ -9,5 +9,6 @@ USE_LIBBIND= true
PROG= ndc
SRCS= pathnames.h \
ndc.c
+MAN= ndc.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/ndp/Makefile b/usr.sbin/ndp/Makefile
index 3f4cb460ba98..84d283cd2279 100644
--- a/usr.sbin/ndp/Makefile
+++ b/usr.sbin/ndp/Makefile
@@ -17,6 +17,7 @@
PROG= ndp
SRCS= ndp.c gmt2local.c
+MAN= ndp.8
CFLAGS+=-DINET6
CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../contrib/tcpdump
diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile
index c230c85dcd07..7c97dfe141d9 100644
--- a/usr.sbin/newsyslog/Makefile
+++ b/usr.sbin/newsyslog/Makefile
@@ -2,4 +2,6 @@
PROG= newsyslog
+MAN= newsyslog.8
+
.include <bsd.prog.mk>
diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile
index 78a42dbc7c54..1d54ea80cad2 100644
--- a/usr.sbin/ngctl/Makefile
+++ b/usr.sbin/ngctl/Makefile
@@ -4,6 +4,7 @@
PROG= ngctl
SRCS= main.c mkpeer.c config.c connect.c name.c show.c list.c \
msg.c debug.c shutdown.c rmhook.c status.c types.c
+MAN= ngctl.8
DPADD+= ${LIBNETGRAPH}
LDADD+= -lnetgraph
COPTS+= -Wall
diff --git a/usr.sbin/nghook/Makefile b/usr.sbin/nghook/Makefile
index 552a2cd9d283..37f65159b96a 100644
--- a/usr.sbin/nghook/Makefile
+++ b/usr.sbin/nghook/Makefile
@@ -3,6 +3,7 @@
PROG= nghook
SRCS= main.c
+MAN= nghook.8
DPADD= ${LIBNETGRAPH}
LDADD= -lnetgraph
COPTS+= -Wall
diff --git a/usr.sbin/nslookup/Makefile b/usr.sbin/nslookup/Makefile
index acfca5f71eb9..ed279bfa9076 100644
--- a/usr.sbin/nslookup/Makefile
+++ b/usr.sbin/nslookup/Makefile
@@ -8,6 +8,7 @@ USE_LIBBIND= yes
PROG= nslookup
SRCS= main.c getinfo.c debug.c send.c skip.c list.c subr.c commands.l
+MAN= nslookup.8
CFLAGS+=-D_PATH_HELPFILE=\"${DESTHELP}/nslookup.help\"
CFLAGS+=-I${.CURDIR}/../../contrib/bind/bin/nslookup
diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile
index 3004b0ac6fe1..9d8595c2c944 100644
--- a/usr.sbin/ntp/doc/Makefile
+++ b/usr.sbin/ntp/doc/Makefile
@@ -21,8 +21,8 @@ HTMLS= accopt.htm assoc.htm audio.htm authopt.htm biblio.htm build.htm \
pps.htm prefer.htm qth.htm quick.htm rdebug.htm refclock.htm \
release.htm tickadj.htm vxworks.htm y2k.htm
-MAN5= ntp.conf.5 ntp.keys.5
-MAN8= ntpd.8 ntpdate.8 ntpdc.8 ntpq.8 ntptime.8 ntptrace.8
+MAN= ntp.conf.5 ntp.keys.5
+MAN+= ntpd.8 ntpdate.8 ntpdc.8 ntpq.8 ntptime.8 ntptrace.8
beforeinstall:
.for file in ${HTMLS}
diff --git a/usr.sbin/pccard/pccardc/Makefile b/usr.sbin/pccard/pccardc/Makefile
index 8c3e4c577b1c..3306ab32e875 100644
--- a/usr.sbin/pccard/pccardc/Makefile
+++ b/usr.sbin/pccard/pccardc/Makefile
@@ -6,6 +6,7 @@
PROG= pccardc
SRCS= beep.c dumpcis.c enabler.c pccardc.c pccardmem.c power.c printcis.c \
rdattr.c rdmap.c rdreg.c readcis.c wrattr.c wrreg.c
+MAN= pccardc.8
CFLAGS+= -I${.CURDIR}/../pccardd
diff --git a/usr.sbin/pccard/pccardd/Makefile b/usr.sbin/pccard/pccardd/Makefile
index aa1e58e04545..c82ce9a5da8d 100644
--- a/usr.sbin/pccard/pccardd/Makefile
+++ b/usr.sbin/pccard/pccardd/Makefile
@@ -3,8 +3,7 @@
PROG= pccardd
SRCS= pccardd.c cardd.c file.c util.c readcis.c printcis.c server.c
-MAN8= pccardd.8
-MAN5= pccard.conf.5
+MAN= pccard.conf.5 pccardd.8
DPADD= ${LIBUTIL}
LDADD= -lutil
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../pccardc
diff --git a/usr.sbin/pciconf/Makefile b/usr.sbin/pciconf/Makefile
index eb21d047d106..a32dfd47c2ee 100644
--- a/usr.sbin/pciconf/Makefile
+++ b/usr.sbin/pciconf/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= pciconf
+MAN= pciconf.8
CFLAGS+= -I${.CURDIR}/../../sys
.include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/cursor/Makefile b/usr.sbin/pcvt/cursor/Makefile
index 56cdbb2e336f..fb068782e417 100644
--- a/usr.sbin/pcvt/cursor/Makefile
+++ b/usr.sbin/pcvt/cursor/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
PROG= cursor
-MAN1= ${PROG}.1
.include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/fontedit/Makefile b/usr.sbin/pcvt/fontedit/Makefile
index db978b04b713..4851169f28de 100644
--- a/usr.sbin/pcvt/fontedit/Makefile
+++ b/usr.sbin/pcvt/fontedit/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
PROG= fontedit
-MAN1= ${PROG}.1
.include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/ispcvt/Makefile b/usr.sbin/pcvt/ispcvt/Makefile
index 107e99b90df3..994b4062d2d1 100644
--- a/usr.sbin/pcvt/ispcvt/Makefile
+++ b/usr.sbin/pcvt/ispcvt/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG= ispcvt
+MAN= ispcvt.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/kcon/Makefile b/usr.sbin/pcvt/kcon/Makefile
index 1c21884919a4..dbc94f9b03ac 100644
--- a/usr.sbin/pcvt/kcon/Makefile
+++ b/usr.sbin/pcvt/kcon/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
PROG= kcon
-MAN1= ${PROG}.1
DEVICE= /dev/ttyv0
CFLAGS+= -I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\"
diff --git a/usr.sbin/pcvt/keycap/Makefile b/usr.sbin/pcvt/keycap/Makefile
index 6a294e094b4e..4b989e15141f 100644
--- a/usr.sbin/pcvt/keycap/Makefile
+++ b/usr.sbin/pcvt/keycap/Makefile
@@ -6,12 +6,12 @@ CAPPATH = $(CAPDIR)/keycap.pcvt
KEYCAPSRC= keycap.src
CFLAGS += -DKEYCAP_PATH=\"$(CAPPATH)\"
SRCS = keycap.c
-MAN3 = keycap.3
+MAN = keycap.3
MLINKS+= keycap.3 kgetent.3 \
keycap.3 kgetnum.3 \
keycap.3 kgetflag.3 \
keycap.3 kgetstr.3
-MAN5 = man5/keycap.5
+MAN += man5/keycap.5
#CLEANFILES+= keycap.0 man5/keycap.0
beforeinstall:
diff --git a/usr.sbin/pcvt/loadfont/Makefile b/usr.sbin/pcvt/loadfont/Makefile
index f1709b5cef97..50646a7a7f0c 100644
--- a/usr.sbin/pcvt/loadfont/Makefile
+++ b/usr.sbin/pcvt/loadfont/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
PROG= loadfont
-MAN1= ${PROG}.1
.include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/scon/Makefile b/usr.sbin/pcvt/scon/Makefile
index 8c096e53b3c4..dc7d02a06598 100644
--- a/usr.sbin/pcvt/scon/Makefile
+++ b/usr.sbin/pcvt/scon/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
PROG= scon
-MAN1= ${PROG}.1
.include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/userkeys/Makefile b/usr.sbin/pcvt/userkeys/Makefile
index ed42145fa9a5..66fe02217239 100644
--- a/usr.sbin/pcvt/userkeys/Makefile
+++ b/usr.sbin/pcvt/userkeys/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
PROG= vt220keys
-MAN1= ${PROG}.1
.include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/vgaio/Makefile b/usr.sbin/pcvt/vgaio/Makefile
index 99200a18f823..57318db991a6 100644
--- a/usr.sbin/pcvt/vgaio/Makefile
+++ b/usr.sbin/pcvt/vgaio/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG= vgaio
+MAN= vgaio.8
SRCS= vgaio.y lex.l y.tab.h
YACC= yacc
diff --git a/usr.sbin/pcvt/vttest/Makefile b/usr.sbin/pcvt/vttest/Makefile
index 5c892243f2a8..440962e60eed 100644
--- a/usr.sbin/pcvt/vttest/Makefile
+++ b/usr.sbin/pcvt/vttest/Makefile
@@ -3,6 +3,5 @@
PROG= vttest
CFLAGS+= -traditional -DUSEMYSTTY
SRCS= main.c esc.c
-MAN1= ${PROG}.1
.include <bsd.prog.mk>
diff --git a/usr.sbin/periodic/Makefile b/usr.sbin/periodic/Makefile
index 48a128688c94..612264026f53 100644
--- a/usr.sbin/periodic/Makefile
+++ b/usr.sbin/periodic/Makefile
@@ -2,7 +2,7 @@
#
# $FreeBSD$
-MAN8= periodic.8
+MAN= periodic.8
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.sbin/pim6dd/Makefile b/usr.sbin/pim6dd/Makefile
index a35c7108af40..4f1fd56cd544 100644
--- a/usr.sbin/pim6dd/Makefile
+++ b/usr.sbin/pim6dd/Makefile
@@ -84,7 +84,6 @@ SRCS= mld6.c mld6_proto.c\
CFLAGS+=-Wall
CFLAGS+=-DINET6 -DPIM -DIOCTL_OK_ON_RAW_SOCKET -DHAVE_GETIFADDRS
-MAN5= pim6dd.conf.5
-MAN8= pim6dd.8
+MAN= pim6dd.conf.5 pim6dd.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/pim6sd/Makefile b/usr.sbin/pim6sd/Makefile
index 905321cb5b46..a3db48d614f4 100644
--- a/usr.sbin/pim6sd/Makefile
+++ b/usr.sbin/pim6sd/Makefile
@@ -90,9 +90,7 @@ CFLAGS+=-DHAVE_STDARG_H
DPADD= ${LIBY} ${LIBL}
LDADD= -ly -ll
-MAN1= pim6stat.1
-MAN5= pim6sd.conf.5
-MAN8= pim6sd.8
+MAN= pim6stat.1 pim6sd.conf.5 pim6sd.8
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.sbin/pim6sd/mtrace6/Makefile b/usr.sbin/pim6sd/mtrace6/Makefile
index f4fd32e2cacb..b9c1637b5386 100644
--- a/usr.sbin/pim6sd/mtrace6/Makefile
+++ b/usr.sbin/pim6sd/mtrace6/Makefile
@@ -80,4 +80,6 @@ PROG= mtrace6
CFLAGS+=-Wall
CFLAGS+= -I$(.CURDIR)/.. -DHAVE_GETIFADDRS
+MAN= mtrace6.8
+
.include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc
index d157361e80cd..ac13ed56e771 100644
--- a/usr.sbin/pkg_install/Makefile.inc
+++ b/usr.sbin/pkg_install/Makefile.inc
@@ -6,7 +6,5 @@ LIBINSTALL= ${.OBJDIR}/../lib/libinstall.a
LIBINSTALL= ${.CURDIR}/../lib/libinstall.a
.endif
-MANSECT?= 1
-
# Inherit BINDIR from one level up.
.include "../Makefile.inc"
diff --git a/usr.sbin/pkg_install/update/Makefile b/usr.sbin/pkg_install/update/Makefile
index bc08a120a96d..2e3888081133 100644
--- a/usr.sbin/pkg_install/update/Makefile
+++ b/usr.sbin/pkg_install/update/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-MAN1= pkg_update.1
+MAN= pkg_update.1
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.sbin/pkg_install/version/Makefile b/usr.sbin/pkg_install/version/Makefile
index 787f493e7a52..0fb044adcd4c 100644
--- a/usr.sbin/pkg_install/version/Makefile
+++ b/usr.sbin/pkg_install/version/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
MAINTAINER= bmah@FreeBSD.org
-MAN1= pkg_version.1
+MAN= pkg_version.1
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.sbin/pnpinfo/Makefile b/usr.sbin/pnpinfo/Makefile
index 77f1e84ad8ba..2ce01d3dbd90 100644
--- a/usr.sbin/pnpinfo/Makefile
+++ b/usr.sbin/pnpinfo/Makefile
@@ -4,6 +4,7 @@ PROG= pnpinfo
SRCS= pnpinfo.c
CFLAGS+=-I${.CURDIR}/../../sys
+MAN= pnpinfo.8
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index 308df80cf535..e83f301249d7 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -17,6 +17,7 @@ BINMODE=4554
BINOWN= root
.endif
BINGRP= network
+MAN= ppp.8
.if defined(RELEASE_CRUNCH)
CFLAGS+=-DRELEASE_CRUNCH
diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile
index 224799dd60a3..820a7c08d98e 100644
--- a/usr.sbin/pppctl/Makefile
+++ b/usr.sbin/pppctl/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= pppctl
+MAN= pppctl.8
CFLAGS+=-Wall
LDADD+= -lc_r -ledit -ltermcap
DPADD+= ${LIBC_R} ${LIBEDIT} ${LIBTERMCAP}
diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile
index ff1047528aea..ebcb5a6d6d8d 100644
--- a/usr.sbin/pppd/Makefile
+++ b/usr.sbin/pppd/Makefile
@@ -5,6 +5,7 @@ CFLAGS+= -DHAVE_PATHS_H
PROG= pppd
SRCS= main.c magic.c fsm.c lcp.c ipcp.c ipxcp.c upap.c chap.c ccp.c \
demand.c auth.c options.c sys-bsd.c
+MAN= pppd.8
BINMODE=4555
# as per handbook policies section
diff --git a/usr.sbin/pppstats/Makefile b/usr.sbin/pppstats/Makefile
index 0fdd2844af38..121023b3d0fa 100644
--- a/usr.sbin/pppstats/Makefile
+++ b/usr.sbin/pppstats/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= pppstats
+MAN= pppstats.8
#as per policies in handbook
MAINTAINER= peter@freebsd.org
diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile
index b282b7bf8b91..1e7074a509da 100644
--- a/usr.sbin/praliases/Makefile
+++ b/usr.sbin/praliases/Makefile
@@ -7,6 +7,7 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/praliases
PROG= praliases
+MAN= praliases.8
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include
CFLAGS+=-DNEWDB -DNOT_SENDMAIL
diff --git a/usr.sbin/prefix/Makefile b/usr.sbin/prefix/Makefile
index 574b210bb2c5..4681577ebb29 100644
--- a/usr.sbin/prefix/Makefile
+++ b/usr.sbin/prefix/Makefile
@@ -3,6 +3,7 @@
# $FreeBSD$
PROG= prefix
+MAN= prefix.8
CFLAGS+=-DINET6
diff --git a/usr.sbin/procctl/Makefile b/usr.sbin/procctl/Makefile
index c8ec4e7aa8b6..880b93a13fe0 100644
--- a/usr.sbin/procctl/Makefile
+++ b/usr.sbin/procctl/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG= procctl
+MAN= procctl.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/pstat/Makefile b/usr.sbin/pstat/Makefile
index 9b6ed4f43da3..72a86aaf78db 100644
--- a/usr.sbin/pstat/Makefile
+++ b/usr.sbin/pstat/Makefile
@@ -7,6 +7,7 @@ BINGRP= kmem
BINMODE=2555
DPADD= ${LIBKVM}
LDADD= -lkvm
+MAN= pstat.8
LINKS= ${BINDIR}/pstat ${BINDIR}/swapinfo
MLINKS= pstat.8 swapinfo.8
diff --git a/usr.sbin/pw/Makefile b/usr.sbin/pw/Makefile
index bb82d3aa0fa3..fc4d2eec62b7 100644
--- a/usr.sbin/pw/Makefile
+++ b/usr.sbin/pw/Makefile
@@ -5,9 +5,7 @@ SRCS= pw.c pw_conf.c pw_user.c pw_group.c pw_log.c pw_nis.c pw_vpw.c \
grupd.c pwupd.c fileupd.c edgroup.c psdate.c \
bitmap.c cpdir.c rm_r.c
-MAN= pw.8 pw.conf.5
-MAN5= pw.conf.5
-MAN8= pw.8
+MAN= pw.conf.5 pw.8
#RND= -DUSE_MD5RAND
CFLAGS+= -W -Wall $(CDB) $(RND)
diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile
index b1b8792e3bd6..a4b518bc6bd1 100644
--- a/usr.sbin/pwd_mkdb/Makefile
+++ b/usr.sbin/pwd_mkdb/Makefile
@@ -6,5 +6,6 @@ CFLAGS+= -I${.CURDIR}/../../lib/libc/gen # for pw_scan.h
PROG= pwd_mkdb
SRCS= pw_scan.c pwd_mkdb.c
+MAN= pwd_mkdb.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile
index 248cd63a660d..c5c6cc207021 100644
--- a/usr.sbin/quot/Makefile
+++ b/usr.sbin/quot/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG= quot
+MAN= quot.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/quotaon/Makefile b/usr.sbin/quotaon/Makefile
index 5dd3077b7002..222840b75db1 100644
--- a/usr.sbin/quotaon/Makefile
+++ b/usr.sbin/quotaon/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= quotaon
+MAN= quotaon.8
MLINKS= quotaon.8 quotaoff.8
LINKS= ${BINDIR}/quotaon ${BINDIR}/quotaoff
diff --git a/usr.sbin/rarpd/Makefile b/usr.sbin/rarpd/Makefile
index 05c7419407eb..7cf9693f5132 100644
--- a/usr.sbin/rarpd/Makefile
+++ b/usr.sbin/rarpd/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= rarpd
+MAN= rarpd.8
CFLAGS+= -DTFTP_DIR=\"/tftpboot\"
diff --git a/usr.sbin/raycontrol/Makefile b/usr.sbin/raycontrol/Makefile
index 253d4502dd1c..c2925ba96d8d 100644
--- a/usr.sbin/raycontrol/Makefile
+++ b/usr.sbin/raycontrol/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG= raycontrol
+MAN= raycontrol.8
CFLAGS+=-I${.CURDIR}/../../sys
diff --git a/usr.sbin/repquota/Makefile b/usr.sbin/repquota/Makefile
index fb5eb7e3a721..208abd6553a7 100644
--- a/usr.sbin/repquota/Makefile
+++ b/usr.sbin/repquota/Makefile
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= repquota
+MAN= repquota.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/rip6query/Makefile b/usr.sbin/rip6query/Makefile
index bb600cada16e..7abda92f1894 100644
--- a/usr.sbin/rip6query/Makefile
+++ b/usr.sbin/rip6query/Makefile
@@ -3,6 +3,7 @@
# $FreeBSD$
PROG= rip6query
+MAN= rip6query.8
CFLAGS+=-DINET6 -I${.CURDIR}/../route6d
diff --git a/usr.sbin/rmt/Makefile b/usr.sbin/rmt/Makefile
index 96f0181ba3a9..8a678b6fa8b1 100644
--- a/usr.sbin/rmt/Makefile
+++ b/usr.sbin/rmt/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= rmt
+MAN= rmt.8
# called from /usr/src/etc/Makefile
etc-rmt:
diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile
index e1d70f1dcc02..d7975cc0c273 100644
--- a/usr.sbin/route6d/Makefile
+++ b/usr.sbin/route6d/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= route6d
+MAN= route6d.8
CFLAGS+= -Dss_len=__ss_len -Dss_family=__ss_family -DINET6 \
-DHAVE_GETIFADDRS
diff --git a/usr.sbin/rpc.lockd/Makefile b/usr.sbin/rpc.lockd/Makefile
index 765c83aa4a83..6f089b4546fb 100644
--- a/usr.sbin/rpc.lockd/Makefile
+++ b/usr.sbin/rpc.lockd/Makefile
@@ -3,6 +3,7 @@
PROG= rpc.lockd
SRCS= nlm_prot_svc.c lockd.c lock_proc.c lockd_lock.c
+MAN= rpc.lockd.8
MLINKS= rpc.lockd.8 lockd.8
CFLAGS+= -I. -I${DESTDIR}/usr/include/rpcsvc
diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile
index ca0d44f160a7..d35762fa035d 100644
--- a/usr.sbin/rpc.statd/Makefile
+++ b/usr.sbin/rpc.statd/Makefile
@@ -2,6 +2,7 @@
PROG = rpc.statd
SRCS = file.c sm_inter_svc.c sm_inter.h statd.c procs.c
+MAN = rpc.statd.8
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
diff --git a/usr.sbin/rpc.umntall/Makefile b/usr.sbin/rpc.umntall/Makefile
index 16916d874b52..211a69a02be5 100644
--- a/usr.sbin/rpc.umntall/Makefile
+++ b/usr.sbin/rpc.umntall/Makefile
@@ -3,5 +3,6 @@
PROG= rpc.umntall
SRCS= rpc.umntall.c mounttab.c
+MAN= rpc.umntall.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile
index 66c4514c4dd6..8b7aebf9e6c6 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile
+++ b/usr.sbin/rpc.yppasswdd/Makefile
@@ -11,6 +11,8 @@ RPCDIR= ${DESTDIR}/usr/include/rpcsvc
.PATH: ${.CURDIR}/../../usr.sbin/ypserv ${.CURDIR}/../../usr.bin/chpass \
${.CURDIR}/../../libexec/ypxfr ${RPCDIR}
+MAN= rpc.yppasswdd.8
+
CFLAGS+= -I${.CURDIR}/../../usr.sbin/vipw -I${.CURDIR}/../../usr.sbin/ypserv \
-I${.CURDIR}/../../libexec/ypxfr -I${.CURDIR}/../../usr.bin/chpass \
-I${.CURDIR} -I.
diff --git a/usr.sbin/rpc.ypxfrd/Makefile b/usr.sbin/rpc.ypxfrd/Makefile
index f23d4f36ee44..57590321ab19 100644
--- a/usr.sbin/rpc.ypxfrd/Makefile
+++ b/usr.sbin/rpc.ypxfrd/Makefile
@@ -8,6 +8,8 @@ RPCDIR= ${.CURDIR}/../../include/rpcsvc
.PATH: ${.CURDIR}/../../usr.sbin/ypserv
+MAN= rpc.ypxfrd.8
+
CFLAGS+= -I. -DXFRBLOCKSIZE=65535
DPADD= ${LIBRPCSVC}
diff --git a/usr.sbin/rpcbind/Makefile b/usr.sbin/rpcbind/Makefile
index 87d70e775063..1a4617ad49ea 100644
--- a/usr.sbin/rpcbind/Makefile
+++ b/usr.sbin/rpcbind/Makefile
@@ -3,6 +3,7 @@
PROG= rpcbind
CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DINET6 -DLIBWRAP
+MAN= rpcbind.8
SRCS= check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \
rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c \
rpc_generic.c
diff --git a/usr.sbin/rrenumd/Makefile b/usr.sbin/rrenumd/Makefile
index 81f915657336..17922114fef5 100644
--- a/usr.sbin/rrenumd/Makefile
+++ b/usr.sbin/rrenumd/Makefile
@@ -21,8 +21,7 @@ CFLAGS+= -DINET6 -DIPSEC -I. -I${.CURDIR}
LDADD= -lipsec -lcompat -ll -ly
DPADD= ${LIBIPSEC} ${LIBCOMPAT} ${LIBL} ${LIBY}
-MAN5= rrenumd.conf.5
-MAN8= rrenumd.8
+MAN= rrenumd.conf.5 rrenumd.8
SRCS+=y.tab.h
y.tab.h: parser.y
diff --git a/usr.sbin/rtadvd/Makefile b/usr.sbin/rtadvd/Makefile
index 32e64252308f..9b0aa5f82f5a 100644
--- a/usr.sbin/rtadvd/Makefile
+++ b/usr.sbin/rtadvd/Makefile
@@ -20,7 +20,6 @@ CFLAGS+=-DINET6
LDADD+= -lcompat
DPADD+= ${LIBCOMPAT}
-MAN5= rtadvd.conf.5
-MAN8= rtadvd.8
+MAN= rtadvd.conf.5 rtadvd.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/rtprio/Makefile b/usr.sbin/rtprio/Makefile
index 3280dbe43d8e..ebc7bd1a37cc 100644
--- a/usr.sbin/rtprio/Makefile
+++ b/usr.sbin/rtprio/Makefile
@@ -3,7 +3,6 @@
PROG= rtprio
LINKS= ${BINDIR}/rtprio ${BINDIR}/idprio
-MAN1= ${PROG}.1
MLINKS= rtprio.1 idprio.1
.include <bsd.prog.mk>
diff --git a/usr.sbin/rtsold/Makefile b/usr.sbin/rtsold/Makefile
index 88a55d638903..9181ed5c1eae 100644
--- a/usr.sbin/rtsold/Makefile
+++ b/usr.sbin/rtsold/Makefile
@@ -19,6 +19,7 @@ CFLAGS+=-DINET6 -DHAVE_GETIFADDRS
LDADD= -lkvm
DPADD= ${LIBKVM}
+MAN= rtsold.8
MLINKS= rtsold.8 rtsol.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/rwhod/Makefile b/usr.sbin/rwhod/Makefile
index 4485e2d64ea1..c5020528d165 100644
--- a/usr.sbin/rwhod/Makefile
+++ b/usr.sbin/rwhod/Makefile
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= rwhod
+MAN= rwhod.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile
index 34e98fdeb443..c6868b50ade8 100644
--- a/usr.sbin/sa/Makefile
+++ b/usr.sbin/sa/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= sa
+MAN= sa.8
SRCS= main.c pdb.c usrdb.c
.include <bsd.prog.mk>
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index 7149dd4079a6..36ce9772142e 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= sysinstall
+MAN= sysinstall.8
CLEANFILES+= makedevs.c rtermcap rtermcap.tmp dumpnlist
CLEANFILES+= keymap.tmp keymap.h
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index 6496715ac897..6bb35f96e637 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -31,9 +31,7 @@ SRCS= alias.c arpadate.c bf_torek.c clock.c collect.c conf.c control.c \
version.c
DPADD= ${LIBUTIL} ${LIBWRAP}
LDADD= -lutil -lwrap
-MAN1= mailq.1 newaliases.1
-MAN5= aliases.5
-MAN8= sendmail.8
+MAN= mailq.1 newaliases.1 aliases.5 sendmail.8
BINMODE=4555
.if exists(${.OBJDIR}/../../lib/libsmutil)
diff --git a/usr.sbin/setextattr/Makefile b/usr.sbin/setextattr/Makefile
index babb397a5ef7..3cb842682135 100644
--- a/usr.sbin/setextattr/Makefile
+++ b/usr.sbin/setextattr/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG= setextattr
+MAN= setextattr.8
LDADD= ${LIBUTIL}
CFLAGS+= -Wall
diff --git a/usr.sbin/setkey/Makefile b/usr.sbin/setkey/Makefile
index b8a270c5dd01..1c5538ba2cb8 100644
--- a/usr.sbin/setkey/Makefile
+++ b/usr.sbin/setkey/Makefile
@@ -56,6 +56,7 @@ DPADD+= ${LIBIPSEC}
LDADD+= -lipsec
CLEANFILES+= scriptdump y.tab.h
+MAN= setkey.8
LOCALPREFIX= /usr/local
scriptdump: scriptdump.pl
diff --git a/usr.sbin/sgsc/Makefile b/usr.sbin/sgsc/Makefile
index 99cdda104450..5f14a66b9bba 100644
--- a/usr.sbin/sgsc/Makefile
+++ b/usr.sbin/sgsc/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
PROG= sgsc
-MAN1= ${PROG}.1
.include <bsd.prog.mk>
diff --git a/usr.sbin/sicontrol/Makefile b/usr.sbin/sicontrol/Makefile
index 5c4c2ce7e9c7..2a8b785dd02c 100644
--- a/usr.sbin/sicontrol/Makefile
+++ b/usr.sbin/sicontrol/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= sicontrol
+MAN= sicontrol.8
CFLAGS+= -I${.CURDIR}/../../sys -Wall
.include <bsd.prog.mk>
diff --git a/usr.sbin/sliplogin/Makefile b/usr.sbin/sliplogin/Makefile
index a8e4973947de..3136dbb3f19b 100644
--- a/usr.sbin/sliplogin/Makefile
+++ b/usr.sbin/sliplogin/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= sliplogin
+MAN= sliplogin.8
BINGRP= network
BINMODE=4550
INSTALLFLAGS=-fschg
diff --git a/usr.sbin/slstat/Makefile b/usr.sbin/slstat/Makefile
index 38ad93d66c88..ff0b9cacc504 100644
--- a/usr.sbin/slstat/Makefile
+++ b/usr.sbin/slstat/Makefile
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= slstat
+MAN= slstat.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/spkrtest/Makefile b/usr.sbin/spkrtest/Makefile
index 93baab8b4d7f..97a22682928c 100644
--- a/usr.sbin/spkrtest/Makefile
+++ b/usr.sbin/spkrtest/Makefile
@@ -2,7 +2,7 @@
MAINTAINER= wosch
-MAN8= spkrtest.8
+MAN= spkrtest.8
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.sbin/spray/Makefile b/usr.sbin/spray/Makefile
index 65448b7177b9..103a0354c7f3 100644
--- a/usr.sbin/spray/Makefile
+++ b/usr.sbin/spray/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= spray
+MAN= spray.8
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
diff --git a/usr.sbin/stallion/bootcode/Makefile b/usr.sbin/stallion/bootcode/Makefile
index 96ecf75cde81..759962a33088 100644
--- a/usr.sbin/stallion/bootcode/Makefile
+++ b/usr.sbin/stallion/bootcode/Makefile
@@ -8,7 +8,7 @@
FILES= 2681.sys cdk.sys
CLEANFILES= ${FILES}
-MAN4= stl.4
+MAN= stl.4
MLINKS= stl.4 stli.4
MANSUBDIR=/i386
diff --git a/usr.sbin/stallion/stlload/Makefile b/usr.sbin/stallion/stlload/Makefile
index 328bb74b07b0..7302b0f2f439 100644
--- a/usr.sbin/stallion/stlload/Makefile
+++ b/usr.sbin/stallion/stlload/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= stlload
+MAN= stlload.8
MANSUBDIR=/i386
CFLAGS+=-DBOOTDIR=\"${BOOTDIR}\"
diff --git a/usr.sbin/stallion/stlstats/Makefile b/usr.sbin/stallion/stlstats/Makefile
index c708b04f7339..1902900e17b5 100644
--- a/usr.sbin/stallion/stlstats/Makefile
+++ b/usr.sbin/stallion/stlstats/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= stlstats
+MAN= stlstats.8
MANSUBDIR=/i386
DPADD= ${LIBNCURSES}
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index 7149dd4079a6..36ce9772142e 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= sysinstall
+MAN= sysinstall.8
CLEANFILES+= makedevs.c rtermcap rtermcap.tmp dumpnlist
CLEANFILES+= keymap.tmp keymap.h
diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile
index b137d46d65dc..65b0565a425f 100644
--- a/usr.sbin/syslogd/Makefile
+++ b/usr.sbin/syslogd/Makefile
@@ -4,8 +4,7 @@
PROG= syslogd
SRCS= syslogd.c ttymsg.c
.PATH: ${.CURDIR}/../../usr.bin/wall
-MAN5= syslog.conf.5
-MAN8= syslogd.8
+MAN= syslog.conf.5 syslogd.8
COPTS+= -Wall -DINET6
.include <bsd.prog.mk>
diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile
index 759b0317b359..9f9b715b9fcd 100644
--- a/usr.sbin/tcpdchk/Makefile
+++ b/usr.sbin/tcpdchk/Makefile
@@ -5,6 +5,7 @@
MAINTAINER=markm@FreeBSD.org
PROG= tcpdchk
+MAN= tcpdchk.8
SRCS= tcpdchk.c fakelog.c inetcf.c scaffold.c
CFLAGS= -DREAL_DAEMON_DIR=\"/usr/libexec\" \
diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile
index 3426dc941733..cc497d3a303f 100644
--- a/usr.sbin/tcpdmatch/Makefile
+++ b/usr.sbin/tcpdmatch/Makefile
@@ -5,6 +5,7 @@
MAINTAINER=markm@FreeBSD.org
PROG= tcpdmatch
+MAN= tcpdmatch.8
SRCS= tcpdmatch.c fakelog.c inetcf.c scaffold.c
CFLAGS= -DREAL_DAEMON_DIR=\"/usr/libexec\" \
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile
index 8b9423e6c7b8..a7d77c1d5b00 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/tcpdump/Makefile
@@ -2,7 +2,6 @@
PROG= tcpdump
CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}
-MAN1= tcpdump.1
SRCS = version.c tcpdump.c \
addrtoname.c bpf_dump.c gmt2local.c machdep.c parsenfsfh.c \
print-ah.c print-arp.c print-ascii.c print-atalk.c print-atm.c \
diff --git a/usr.sbin/tcpdump/tcpslice/Makefile b/usr.sbin/tcpdump/tcpslice/Makefile
index 2d0f33d83bb2..3bb2950f69bf 100644
--- a/usr.sbin/tcpdump/tcpslice/Makefile
+++ b/usr.sbin/tcpdump/tcpslice/Makefile
@@ -1,8 +1,8 @@
# @(#)Makefile 0.1 (RWGrimes) 3/24/93
+# $FreeBSD$
PROG= tcpslice
CFLAGS+=-Wall -I.
-MAN1= tcpslice.1
SRCS= gwtm2secs.c search.c tcpslice.c util.c version.c version.h
CLEANFILES+= version.c version.h
DPADD+= ${LIBPCAP}
diff --git a/usr.sbin/timed/timed/Makefile b/usr.sbin/timed/timed/Makefile
index a0002b554106..92206f84f34a 100644
--- a/usr.sbin/timed/timed/Makefile
+++ b/usr.sbin/timed/timed/Makefile
@@ -8,6 +8,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
+MAN= timed.8
.include "../../Makefile.inc"
.include <bsd.prog.mk>
diff --git a/usr.sbin/timed/timedc/Makefile b/usr.sbin/timed/timedc/Makefile
index a18eb0629d99..0adc501d8ea5 100644
--- a/usr.sbin/timed/timedc/Makefile
+++ b/usr.sbin/timed/timedc/Makefile
@@ -3,6 +3,7 @@
PROG= timedc
SRCS= cmds.c cmdtab.c timedc.c byteorder.c measure.c cksum.c
+MAN= timedc.8
BINMODE=4555
.PATH: ${.CURDIR}/../timed
diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile
index ea047301ee78..6dd8a3052052 100644
--- a/usr.sbin/traceroute/Makefile
+++ b/usr.sbin/traceroute/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= traceroute
+MAN= traceroute.8
BINMODE=4555
CFLAGS+=-DHAVE_SYS_SELECT_H=1 -DHAVE_SETLINEBUF=1 -DHAVE_RAW_OPTIONS=1 \
-DSTDC_HEADERS=1
diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile
index 01f2d1180e1a..ab485742662d 100644
--- a/usr.sbin/traceroute6/Makefile
+++ b/usr.sbin/traceroute6/Makefile
@@ -23,4 +23,6 @@ CFLAGS+=-DINET6 -DIPSEC -DHAVE_POLL
DPADD= ${LIBIPSEC}
LDADD= -lipsec
+MAN= traceroute6.8
+
.include <bsd.prog.mk>
diff --git a/usr.sbin/trpt/Makefile b/usr.sbin/trpt/Makefile
index f3304a22dca9..1f18d38d3c28 100644
--- a/usr.sbin/trpt/Makefile
+++ b/usr.sbin/trpt/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= trpt
+MAN= trpt.8
BINGRP= kmem
BINMODE=2555
CFLAGS+=-DINET6
diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile
index 4687a8727083..7be361c73a53 100644
--- a/usr.sbin/tzsetup/Makefile
+++ b/usr.sbin/tzsetup/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= tzsetup
+MAN= tzsetup.8
CFLAGS+= -I${.CURDIR}
LDADD+= -ldialog -lncurses
DPADD+= ${LIBDIALOG} ${LIBNCURSES}
diff --git a/usr.sbin/usbd/Makefile b/usr.sbin/usbd/Makefile
index e71bcd393114..716456d8348d 100644
--- a/usr.sbin/usbd/Makefile
+++ b/usr.sbin/usbd/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PROG= usbd
-MAN8= usbd.8
-MAN5= usbd.conf.5
+MAN= usbd.conf.5 usbd.8
CFLAGS+=-I${.CURDIR}/../../sys
.include <bsd.prog.mk>
diff --git a/usr.sbin/usbdevs/Makefile b/usr.sbin/usbdevs/Makefile
index 070b97957925..a735c08c9229 100644
--- a/usr.sbin/usbdevs/Makefile
+++ b/usr.sbin/usbdevs/Makefile
@@ -2,6 +2,7 @@
# FreeBSD $FreeBSD$
PROG= usbdevs
+MAN= usbdevs.8
CFLAGS+=-I${.CURDIR}/../../sys
.include <bsd.prog.mk>
diff --git a/usr.sbin/vidcontrol/Makefile b/usr.sbin/vidcontrol/Makefile
index 6f27868e6e34..a4019bca1611 100644
--- a/usr.sbin/vidcontrol/Makefile
+++ b/usr.sbin/vidcontrol/Makefile
@@ -2,7 +2,6 @@
PROG= vidcontrol
SRCS= vidcontrol.c decode.c
-MAN1= ${PROG}.1
CFLAGS += -Wall
diff --git a/usr.sbin/vipw/Makefile b/usr.sbin/vipw/Makefile
index ca42db45afac..0efd0fdbf7af 100644
--- a/usr.sbin/vipw/Makefile
+++ b/usr.sbin/vipw/Makefile
@@ -3,5 +3,6 @@
PROG= vipw
SRCS= pw_util.c vipw.c
+MAN= vipw.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/watch/Makefile b/usr.sbin/watch/Makefile
index 70ee3522f87c..66f9e04d195f 100644
--- a/usr.sbin/watch/Makefile
+++ b/usr.sbin/watch/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= watch
+MAN= watch.8
LDADD+= -ltermcap
DPADD+= ${LIBTERMCAP}
diff --git a/usr.sbin/wicontrol/Makefile b/usr.sbin/wicontrol/Makefile
index ed9f06ce7f19..fcf703b2ea0e 100644
--- a/usr.sbin/wicontrol/Makefile
+++ b/usr.sbin/wicontrol/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG= wicontrol
+MAN= wicontrol.8
CFLAGS+= -Wall -DWICACHE
diff --git a/usr.sbin/wlconfig/Makefile b/usr.sbin/wlconfig/Makefile
index d45b284ea1e1..1803227ba81f 100644
--- a/usr.sbin/wlconfig/Makefile
+++ b/usr.sbin/wlconfig/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
PROG= wlconfig
+MAN= wlconfig.8
CFLAGS+= -Wall
.include <bsd.prog.mk>
diff --git a/usr.sbin/xten/Makefile b/usr.sbin/xten/Makefile
index 23879aeec137..a86f58632a12 100644
--- a/usr.sbin/xten/Makefile
+++ b/usr.sbin/xten/Makefile
@@ -2,7 +2,6 @@
# $FreeBSD$
PROG= xten
-MAN1= ${PROG}.1
CFLAGS+= -I${.CURDIR}/../../libexec/xtend
.include <bsd.prog.mk>
diff --git a/usr.sbin/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile
index 42c291cecff5..a3bb567ebcf8 100644
--- a/usr.sbin/yp_mkdb/Makefile
+++ b/usr.sbin/yp_mkdb/Makefile
@@ -3,6 +3,8 @@
PROG= yp_mkdb
SRCS= yp_mkdb.c yp_dblookup.c yp_dbwrite.c
+MAN= yp_mkdb.8
+
.PATH: ${.CURDIR}/../../libexec/ypxfr ${.CURDIR}/../ypserv
CFLAGS+= -Dyp_error=warnx -I${.CURDIR}/../../libexec/ypxfr
diff --git a/usr.sbin/ypbind/Makefile b/usr.sbin/ypbind/Makefile
index fa7ced859e3d..45fb7891b7bc 100644
--- a/usr.sbin/ypbind/Makefile
+++ b/usr.sbin/ypbind/Makefile
@@ -3,6 +3,7 @@
SRCS= ypbind.c yp_ping.c
PROG= ypbind
+MAN= ypbind.8
CFLAGS+=-DDAEMON
.include <bsd.prog.mk>
diff --git a/usr.sbin/yppoll/Makefile b/usr.sbin/yppoll/Makefile
index 47451af9ae7a..63763316ef8c 100644
--- a/usr.sbin/yppoll/Makefile
+++ b/usr.sbin/yppoll/Makefile
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= yppoll
+MAN= yppoll.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile
index bea2c6fb201f..5c82935844e9 100644
--- a/usr.sbin/yppush/Makefile
+++ b/usr.sbin/yppush/Makefile
@@ -5,6 +5,8 @@ SRCS= ypxfr_getmap.c yp_dblookup.c yp_error.c ypxfr_misc.c yppush_main.c \
${GENSRCS}
GENSRCS=yp.h yp_clnt.c yppush_svc.c
+MAN= yppush.8
+
CFLAGS+=-I. -I${.CURDIR}/../../libexec/ypxfr
RPCDIR= ${.CURDIR}/../../include/rpcsvc
diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile
index 851cc228ada3..9de9bdcc1cde 100644
--- a/usr.sbin/ypserv/Makefile
+++ b/usr.sbin/ypserv/Makefile
@@ -4,7 +4,7 @@ PROG= ypserv
SRCS= yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \
ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c
-MAN8= ypserv.8 ypinit.8
+MAN= ypserv.8 ypinit.8
CFLAGS+= -I. -DDB_CACHE
diff --git a/usr.sbin/ypset/Makefile b/usr.sbin/ypset/Makefile
index 69dd650aee4d..10ed5f88fd78 100644
--- a/usr.sbin/ypset/Makefile
+++ b/usr.sbin/ypset/Makefile
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= ypset
+MAN= ypset.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/zic/zdump/Makefile b/usr.sbin/zic/zdump/Makefile
index 3ee3ce6bf873..2088d1871f18 100644
--- a/usr.sbin/zic/zdump/Makefile
+++ b/usr.sbin/zic/zdump/Makefile
@@ -5,6 +5,7 @@
PROG= zdump
SRCS= zdump.c ialloc.c scheck.c
+MAN= ${.CURDIR}/../zdump.8
CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../lib/libc/stdtime
CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS
CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"/usr/share/zoneinfo\" -Demkdir=mkdir
diff --git a/usr.sbin/zic/zic/Makefile b/usr.sbin/zic/zic/Makefile
index c7eae2d2eaac..5980252b3a6d 100644
--- a/usr.sbin/zic/zic/Makefile
+++ b/usr.sbin/zic/zic/Makefile
@@ -5,6 +5,7 @@
PROG= zic
SRCS= zic.c ialloc.c scheck.c
+MAN= ${.CURDIR}/../zic.8
CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../lib/libc/stdtime
CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS
CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"/usr/share/zoneinfo\" -Demkdir=mkdir