35 files changed, 41 insertions, 14 deletions

diff --git a/libexec/Makefile.inc b/libexec/Makefile.inc
index 1e6f06c715e90..185ccf3e88d66 100644
--- a/libexec/Makefile.inc
+++ b/libexec/Makefile.inc
@@ -2,4 +2,3 @@
 # $FreeBSD$
 
 BINDIR?=	/usr/libexec
-MANSECT?=	8
diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile
index 3ae4d8154227e..22bae455814f5 100644
--- a/libexec/atrun/Makefile
+++ b/libexec/atrun/Makefile
@@ -6,15 +6,14 @@ MAINSRC=${.CURDIR}/../../usr.bin/at
 
 PROG=	atrun
 SRCS=	atrun.c gloadavg.c
+MAN=	atrun.8
 
 BINDIR=	${ATLIB_DIR}
-CLEANFILES= ${MAN8}
+CLEANFILES= ${MAN}
 
 CFLAGS+=-I${MAINSRC} -I${.CURDIR}
 
-.include <bsd.prog.mk>
-
-${MAN8}: atrun.man
+atrun.8: atrun.man
 	@${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \
 	sed -e \
 		"s@_ATSPOOL_DIR@$(ATSPOOL_DIR)@g; \
@@ -22,3 +21,5 @@ ${MAN8}: atrun.man
 		s@_ATLIB_DIR@$(ATLIB_DIR)@g; \
 		s@_LOADAVG_MX@$(LOADAVG_MX)@g;" \
 		< ${.ALLSRC} > ${.TARGET}
+
+.include <bsd.prog.mk>
diff --git a/libexec/bootpd/Makefile b/libexec/bootpd/Makefile
index f428be8887780..830577a57def6 100644
--- a/libexec/bootpd/Makefile
+++ b/libexec/bootpd/Makefile
@@ -10,8 +10,7 @@ SUBDIR= bootpgw tools
 SRCS=	bootpd.c dovend.c readfile.c hash.c dumptab.c \
 	 lookup.c getif.c hwaddr.c report.c tzone.c rtmsg.c
 
-MAN5=	bootptab.5
-MAN8=	bootpd.8
+MAN=	bootptab.5 bootpd.8
 MLINKS=	bootpd.8 bootpgw.8
 
 .include <bsd.prog.mk>
diff --git a/libexec/bootpd/tools/Makefile.inc b/libexec/bootpd/tools/Makefile.inc
index 993014725b0ef..4d7876162d287 100644
--- a/libexec/bootpd/tools/Makefile.inc
+++ b/libexec/bootpd/tools/Makefile.inc
@@ -2,4 +2,3 @@
 # $FreeBSD$
 
 BINDIR=		/usr/sbin
-MANSECT?=	8
diff --git a/libexec/bootpd/tools/bootpef/Makefile b/libexec/bootpd/tools/bootpef/Makefile
index 860509cb1d885..9436561d4a662 100644
--- a/libexec/bootpd/tools/bootpef/Makefile
+++ b/libexec/bootpd/tools/bootpef/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	bootpef
+MAN=	bootpef.8
 SRCS=	bootpef.c dovend.c readfile.c hash.c dumptab.c lookup.c \
 	hwaddr.c report.c tzone.c rtmsg.c
 
diff --git a/libexec/bootpd/tools/bootptest/Makefile b/libexec/bootpd/tools/bootptest/Makefile
index e82fcb207da08..fae5127eebb3b 100644
--- a/libexec/bootpd/tools/bootptest/Makefile
+++ b/libexec/bootpd/tools/bootptest/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	bootptest
+MAN=	bootptest.8
 SRCS=	bootptest.c getether.c getif.c print-bootp.c report.c
 
 SRCDIR=	${.CURDIR}/../..
diff --git a/libexec/comsat/Makefile b/libexec/comsat/Makefile
index 0547d04125afa..c501cccb8551f 100644
--- a/libexec/comsat/Makefile
+++ b/libexec/comsat/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	comsat
+MAN=	comsat.8
 
 .include <bsd.prog.mk>
diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile
index 62d32c6fef5a8..7f1dae3fe4a78 100644
--- a/libexec/fingerd/Makefile
+++ b/libexec/fingerd/Makefile
@@ -4,5 +4,6 @@
 PROG=	fingerd
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
+MAN=	fingerd.8
 
 .include <bsd.prog.mk>
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index f2626727f5ac1..a1c25472bc7c0 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	ftpd
+MAN=	ftpd.8
 SRCS=	ftpd.c ftpcmd.y logwtmp.c popen.c skey-stuff.c
 
 CFLAGS+=-DSETPROCTITLE -DSKEY -DLOGIN_CAP -DVIRTUAL_HOSTING -Wall
diff --git a/libexec/getNAME/Makefile b/libexec/getNAME/Makefile
index 4e02d71d15836..a88492c48eb95 100644
--- a/libexec/getNAME/Makefile
+++ b/libexec/getNAME/Makefile
@@ -2,6 +2,5 @@
 # $FreeBSD$
 
 PROG=	getNAME
-MAN1=	${PROG}.1
 
 .include <bsd.prog.mk>
diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile
index 595ae44a0d5e7..f86d1d3ce61b8 100644
--- a/libexec/getty/Makefile
+++ b/libexec/getty/Makefile
@@ -5,8 +5,7 @@ PROG=	getty
 SRCS=	main.c init.c subr.c chat.c
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
-MAN5=	gettytab.5 ttys.5
-MAN8=	getty.8
+MAN=	gettytab.5 ttys.5 getty.8
 # for the paranoid:
 #CFLAGS+= -Wall -Wstrict-prototypes -Wno-unused -Wwrite-strings
 
diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile
index a1d5fc0826dea..ac04ca3af97a8 100644
--- a/libexec/mail.local/Makefile
+++ b/libexec/mail.local/Makefile
@@ -8,6 +8,7 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 
 PROG=	mail.local
 SRCS=	mail.local.c
+MAN=	mail.local.8
 CFLAGS+=-I${SENDMAIL_DIR}/include
 
 .if exists(${.OBJDIR}/../../lib/libsmutil)
diff --git a/libexec/makekey/Makefile b/libexec/makekey/Makefile
index 417d6e8099771..b2be2e166915c 100644
--- a/libexec/makekey/Makefile
+++ b/libexec/makekey/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	makekey
+MAN=	makekey.8
 
 DPADD+= ${LIBCRYPT}
 LDADD+= -lcrypt
diff --git a/libexec/mknetid/Makefile b/libexec/mknetid/Makefile
index dfdea29ce8a33..cf351c27b6795 100644
--- a/libexec/mknetid/Makefile
+++ b/libexec/mknetid/Makefile
@@ -3,4 +3,6 @@
 PROG=	mknetid
 SRCS=	mknetid.c hash.c parse_group.c
 
+MAN=	mknetid.8
+
 .include <bsd.prog.mk>
diff --git a/libexec/named-xfer/Makefile b/libexec/named-xfer/Makefile
index b58d38d961f5b..d37482e3685db 100644
--- a/libexec/named-xfer/Makefile
+++ b/libexec/named-xfer/Makefile
@@ -21,4 +21,6 @@ LIBISC:=	${LIBISCDIR}/libisc.a
 DPADD+=		${LIBISC}
 LDADD+=		${LIBISC}
 
+MAN=	named-xfer.8
+
 .include <bsd.prog.mk>
diff --git a/libexec/pppoed/Makefile b/libexec/pppoed/Makefile
index 7e12057a2182d..bbae4c0c9f9c3 100644
--- a/libexec/pppoed/Makefile
+++ b/libexec/pppoed/Makefile
@@ -4,5 +4,6 @@ PROG=	pppoed
 SRCS=	pppoed.c
 DPADD=	${LIBNETGRAPH}
 LDADD=	-lnetgraph
+MAN=	pppoed.8
 
 .include <bsd.prog.mk>
diff --git a/libexec/rbootd/Makefile b/libexec/rbootd/Makefile
index c187af816023d..c083e57c13cca 100644
--- a/libexec/rbootd/Makefile
+++ b/libexec/rbootd/Makefile
@@ -3,5 +3,6 @@
 
 PROG=	rbootd
 SRCS=	bpf.c conf.c parseconf.c rbootd.c rmpproto.c utils.c
+MAN=	rbootd.8
 
 .include <bsd.prog.mk>
diff --git a/libexec/revnetgroup/Makefile b/libexec/revnetgroup/Makefile
index a82901fdd5fdd..708837141347f 100644
--- a/libexec/revnetgroup/Makefile
+++ b/libexec/revnetgroup/Makefile
@@ -3,4 +3,6 @@
 PROG=	revnetgroup
 SRCS=	revnetgroup.c hash.c parse_netgroup.c
 
+MAN= revnetgroup.8
+
 .include <bsd.prog.mk>
diff --git a/libexec/rexecd/Makefile b/libexec/rexecd/Makefile
index 626a99b331e59..59d026027fe12 100644
--- a/libexec/rexecd/Makefile
+++ b/libexec/rexecd/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	rexecd
+MAN=	rexecd.8
 CFLAGS+= -DSKEY
 
 DPADD=  ${LIBSKEY} ${LIBMD} ${LIBCRYPT} ${LIBUTIL}
diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile
index 74ab8d1ab4db4..8320152d5f2e4 100644
--- a/libexec/rlogind/Makefile
+++ b/libexec/rlogind/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	rlogind
 SRCS=	rlogind.c
+MAN=	rlogind.8
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 CFLAGS+= -Wall -DINET6
diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile
index 13304eda6aad1..331f6ab6e2b62 100644
--- a/libexec/rpc.rquotad/Makefile
+++ b/libexec/rpc.rquotad/Makefile
@@ -2,6 +2,7 @@
 
 PROG =	rpc.rquotad
 SRCS =	rquotad.c
+MAN  =	rpc.rquotad.8
 
 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc
diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile
index 8af426f7092bc..f0e4649a3752f 100644
--- a/libexec/rpc.rstatd/Makefile
+++ b/libexec/rpc.rstatd/Makefile
@@ -2,6 +2,7 @@
 
 PROG =	rpc.rstatd
 SRCS =	rstatd.c rstat_proc.c
+MAN =	rpc.rstatd.8
 
 DPADD=	${LIBRPCSVC} ${LIBUTIL} ${LIBKVM} ${LIBDEVSTAT}
 LDADD=	-lrpcsvc -lutil -lkvm -ldevstat
diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile
index 8d783ed598c14..af43bd3e7cf3e 100644
--- a/libexec/rpc.rusersd/Makefile
+++ b/libexec/rpc.rusersd/Makefile
@@ -2,6 +2,7 @@
 
 PROG =	rpc.rusersd
 SRCS =	rusersd.c rusers_proc.c
+MAN =	rpc.rusersd.8
 
 DPADD=	${LIBRPCSVC} ${LIBUTIL}
 LDADD=	-lrpcsvc -lutil
diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile
index 20a9a23a05115..e64ff3e1a4b2a 100644
--- a/libexec/rpc.rwalld/Makefile
+++ b/libexec/rpc.rwalld/Makefile
@@ -2,6 +2,7 @@
 
 PROG =	rpc.rwalld
 SRCS =	rwalld.c
+MAN =	rpc.rwalld.8
 
 DPADD=	${LIBRPCSVC} ${LIBUTIL}
 LDADD=	-lrpcsvc -lutil
diff --git a/libexec/rpc.sprayd/Makefile b/libexec/rpc.sprayd/Makefile
index e4944d9cd95ce..1dd582de0082c 100644
--- a/libexec/rpc.sprayd/Makefile
+++ b/libexec/rpc.sprayd/Makefile
@@ -2,6 +2,7 @@
 
 PROG =	rpc.sprayd
 SRCS =	sprayd.c
+MAN =	rpc.sprayd.8
 
 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc
diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile
index 24dd7e3f853aa..54e254b9460b5 100644
--- a/libexec/rshd/Makefile
+++ b/libexec/rshd/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	rshd
 SRCS=	rshd.c
+MAN=	rshd.8
 
 #CFLAGS+= -DCRYPT
 
diff --git a/libexec/rtld-aout/Makefile b/libexec/rtld-aout/Makefile
index c4a588df768e3..b9647d62cb6a4 100644
--- a/libexec/rtld-aout/Makefile
+++ b/libexec/rtld-aout/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 PROG=	ld.so
 SRCS=	mdprologue.S rtld.c shlib.c md.c support.c
-MAN1aout=	rtld.1aout
+MAN=	rtld.1aout
 # As there is relocation going on behind GCC's back, don't cache function addresses.
 PICFLAG=-fpic -fno-function-cse
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/${MACHINE_ARCH} ${PICFLAG} -DRTLD -Wall
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 00fcdcd228eba..0e8050997b5f0 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -4,7 +4,7 @@ MAINTAINER=	jdp
 PROG=		ld-elf.so.1
 SRCS=		rtld_start.S rtld.c lockdflt.c map_object.c malloc.c \
 		xmalloc.c debug.c reloc.c
-MAN1=		rtld.1
+MAN=		rtld.1
 CFLAGS+=	-Wall -DFREEBSD_ELF -I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR}
 LDFLAGS+=	-nostdlib -e .rtld_start
 INSTALLFLAGS+=	-fschg -C
diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile
index 505fde26be276..f34a4cf758068 100644
--- a/libexec/smrsh/Makefile
+++ b/libexec/smrsh/Makefile
@@ -8,6 +8,7 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 
 PROG=	smrsh
 SRCS=	smrsh.c
+MAN=	smrsh.8
 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include
 
 .if exists(${.OBJDIR}/../../lib/libsmutil)
diff --git a/libexec/talkd/Makefile b/libexec/talkd/Makefile
index 100e867ba5be2..e0e946d6aed07 100644
--- a/libexec/talkd/Makefile
+++ b/libexec/talkd/Makefile
@@ -4,6 +4,6 @@
 PROG=	ntalkd
 SRCS=	talkd.c announce.c process.c table.c print.c ttymsg.c
 .PATH:  ${.CURDIR}/../../usr.bin/wall
-MAN8=	talkd.8
+MAN=	talkd.8
 
 .include <bsd.prog.mk>
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index 64c6bcc7fb689..20acad94933a4 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -11,5 +11,6 @@ SRCS=	global.c slc.c state.c sys_term.c telnetd.c \
 	termstat.c utility.c
 DPADD=	${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
 LDADD=	-lutil -ltermcap -ltelnet
+MAN=	telnetd.8
 
 .include <bsd.prog.mk>
diff --git a/libexec/tftpd/Makefile b/libexec/tftpd/Makefile
index d7456d1513c7e..75b16ae7f76e9 100644
--- a/libexec/tftpd/Makefile
+++ b/libexec/tftpd/Makefile
@@ -5,6 +5,7 @@ PROG=	tftpd
 SRCS=	tftpd.c tftpsubs.c
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
+MAN=	tftpd.8
 CFLAGS+=-I${.CURDIR}/../../usr.bin/tftp
 .PATH:	${.CURDIR}/../../usr.bin/tftp
 
diff --git a/libexec/uucpd/Makefile b/libexec/uucpd/Makefile
index fa5ee36f96b2e..ff0809c39dda4 100644
--- a/libexec/uucpd/Makefile
+++ b/libexec/uucpd/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	uucpd
+MAN=	uucpd.8
 LDADD=  -lcrypt -lutil
 DPADD=  ${LIBCRYPT} ${LIBUTIL}
 .include <bsd.prog.mk>
diff --git a/libexec/xtend/Makefile b/libexec/xtend/Makefile
index 9f5b7f1114397..477629dcc44cf 100644
--- a/libexec/xtend/Makefile
+++ b/libexec/xtend/Makefile
@@ -9,4 +9,6 @@ CFLAGS+= -DXTENUNAME=\"xten\" -DXTENGNAME=\"xten\"
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
+MAN=	xtend.8
+
 .include <bsd.prog.mk>
diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile
index 3d7af161e66a3..999ae892f9f41 100644
--- a/libexec/ypxfr/Makefile
+++ b/libexec/ypxfr/Makefile
@@ -9,6 +9,8 @@ GENSRCS=yp.h yp_clnt.c ypxfr_clnt.c
 
 .PATH: ${.CURDIR}/../../usr.sbin/ypserv
 
+MAN=	ypxfr.8
+
 CFLAGS+= -I.
 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc