aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/Makefile.inc2
-rw-r--r--games/adventure/Makefile1
-rw-r--r--games/arithmetic/Makefile1
-rw-r--r--games/atc/Makefile1
-rw-r--r--games/backgammon/backgammon/Makefile1
-rw-r--r--games/battlestar/Makefile1
-rw-r--r--games/bcd/Makefile1
-rw-r--r--games/bs/Makefile1
-rw-r--r--games/caesar/Makefile1
-rw-r--r--games/canfield/canfield/Makefile1
-rw-r--r--games/cribbage/Makefile1
-rw-r--r--games/dm/Makefile4
-rw-r--r--games/factor/Makefile1
-rw-r--r--games/fish/Makefile1
-rw-r--r--games/fortune/fortune/Makefile1
-rw-r--r--games/fortune/strfile/Makefile2
-rw-r--r--games/grdc/Makefile1
-rw-r--r--games/hack/Makefile1
-rw-r--r--games/hangman/Makefile1
-rw-r--r--games/larn/Makefile1
-rw-r--r--games/mille/Makefile1
-rw-r--r--games/morse/Makefile1
-rw-r--r--games/number/Makefile1
-rw-r--r--games/phantasia/Makefile1
-rw-r--r--games/piano/Makefile1
-rw-r--r--games/pig/Makefile1
-rw-r--r--games/pom/Makefile1
-rw-r--r--games/quiz/Makefile1
-rw-r--r--games/rain/Makefile1
-rw-r--r--games/random/Makefile1
-rw-r--r--games/robots/Makefile1
-rw-r--r--games/rogue/Makefile1
-rw-r--r--games/sail/Makefile1
-rw-r--r--games/snake/snake/Makefile1
-rw-r--r--games/trek/Makefile1
-rw-r--r--games/wargames/Makefile2
-rw-r--r--games/worm/Makefile1
-rw-r--r--games/worms/Makefile1
-rw-r--r--games/wump/Makefile1
-rw-r--r--libexec/Makefile.inc1
-rw-r--r--libexec/atrun/Makefile9
-rw-r--r--libexec/bootpd/Makefile3
-rw-r--r--libexec/bootpd/tools/Makefile.inc1
-rw-r--r--libexec/bootpd/tools/bootpef/Makefile1
-rw-r--r--libexec/bootpd/tools/bootptest/Makefile1
-rw-r--r--libexec/comsat/Makefile1
-rw-r--r--libexec/fingerd/Makefile1
-rw-r--r--libexec/ftpd/Makefile1
-rw-r--r--libexec/getNAME/Makefile1
-rw-r--r--libexec/getty/Makefile3
-rw-r--r--libexec/mail.local/Makefile1
-rw-r--r--libexec/makekey/Makefile1
-rw-r--r--libexec/mknetid/Makefile2
-rw-r--r--libexec/named-xfer/Makefile2
-rw-r--r--libexec/pppoed/Makefile1
-rw-r--r--libexec/rbootd/Makefile1
-rw-r--r--libexec/revnetgroup/Makefile2
-rw-r--r--libexec/rexecd/Makefile1
-rw-r--r--libexec/rlogind/Makefile1
-rw-r--r--libexec/rpc.rquotad/Makefile1
-rw-r--r--libexec/rpc.rstatd/Makefile1
-rw-r--r--libexec/rpc.rusersd/Makefile1
-rw-r--r--libexec/rpc.rwalld/Makefile1
-rw-r--r--libexec/rpc.sprayd/Makefile1
-rw-r--r--libexec/rshd/Makefile1
-rw-r--r--libexec/rtld-aout/Makefile2
-rw-r--r--libexec/rtld-elf/Makefile2
-rw-r--r--libexec/smrsh/Makefile1
-rw-r--r--libexec/talkd/Makefile2
-rw-r--r--libexec/telnetd/Makefile1
-rw-r--r--libexec/tftpd/Makefile1
-rw-r--r--libexec/uucpd/Makefile1
-rw-r--r--libexec/xtend/Makefile2
-rw-r--r--libexec/ypxfr/Makefile2
74 files changed, 81 insertions, 19 deletions
diff --git a/games/Makefile.inc b/games/Makefile.inc
index fce64134be9c..bd1156f988e1 100644
--- a/games/Makefile.inc
+++ b/games/Makefile.inc
@@ -9,5 +9,3 @@ GBINDIR:= ${BINDIR}
BINDIR:= ${BINDIR}/hide
BINMODE= 550
.endif
-
-MANSECT?= 6
diff --git a/games/adventure/Makefile b/games/adventure/Makefile
index 91404f0a9de4..f1a912addb65 100644
--- a/games/adventure/Makefile
+++ b/games/adventure/Makefile
@@ -3,6 +3,7 @@
PROG= adventure
SRCS= main.c init.c done.c save.c subr.c vocab.c wizard.c io.c data.c crc.c
+MAN= adventure.6
CFLAGS+=-traditional-cpp
HIDEGAME=hidegame
CLEANFILES=data.c setup setup.o
diff --git a/games/arithmetic/Makefile b/games/arithmetic/Makefile
index a459cfbbe6f4..f02d43dcb345 100644
--- a/games/arithmetic/Makefile
+++ b/games/arithmetic/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= arithmetic
+MAN= arithmetic.6
HIDEGAME=hidegame
.include <bsd.prog.mk>
diff --git a/games/atc/Makefile b/games/atc/Makefile
index 251f16de29a8..5f9e7feb5ddb 100644
--- a/games/atc/Makefile
+++ b/games/atc/Makefile
@@ -5,6 +5,7 @@ PROG= atc
CFLAGS+=-DBSD -I${.CURDIR} -I.
SRCS= extern.c grammar.y graphics.c input.c lex.l list.c log.c \
main.c tunable.c update.c y.tab.h
+MAN= atc.6
DPADD= ${LIBL} ${LIBM} ${LIBCURSES}
LDADD= -ll -lm -lcurses
GAMES= Game_List Killer crossover default easy game_2
diff --git a/games/backgammon/backgammon/Makefile b/games/backgammon/backgammon/Makefile
index 9c7c93f3cfcc..8277c0939f32 100644
--- a/games/backgammon/backgammon/Makefile
+++ b/games/backgammon/backgammon/Makefile
@@ -5,6 +5,7 @@ PROG= backgammon
CFLAGS+=-DV7 -I${.CURDIR}/../common_source
SRCS= allow.c board.c check.c extra.c fancy.c init.c main.c move.c \
odds.c one.c save.c subs.c table.c text.c version.c
+MAN= backgammon.6
DPADD= ${LIBTERMCAP} ${LIBCOMPAT}
LDADD= -ltermcap -lcompat
.PATH: ${.CURDIR}/../common_source
diff --git a/games/battlestar/Makefile b/games/battlestar/Makefile
index 7e1c65a3d491..a6be83c3c073 100644
--- a/games/battlestar/Makefile
+++ b/games/battlestar/Makefile
@@ -5,6 +5,7 @@ PROG= battlestar
SRCS= battlestar.c com1.c com2.c com3.c com4.c com5.c com6.c com7.c \
init.c cypher.c getcom.c parse.c room.c save.c fly.c misc.c \
globals.c dayfile.c nightfile.c dayobjs.c nightobjs.c words.c
+MAN= battlestar.6
DPADD= ${LIBCURSES} ${LIBCOMPAT}
LDADD= -lcurses -lcompat
HIDEGAME=hidegame
diff --git a/games/bcd/Makefile b/games/bcd/Makefile
index 487b35696a11..1e0bbfc60cea 100644
--- a/games/bcd/Makefile
+++ b/games/bcd/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= bcd
+MAN= bcd.6
MLINKS= bcd.6 ppt.6
.include <bsd.prog.mk>
diff --git a/games/bs/Makefile b/games/bs/Makefile
index 701651057900..5a6ca34bfe53 100644
--- a/games/bs/Makefile
+++ b/games/bs/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= bs
+MAN= bs.6
DPADD= ${LIBNCURSES}
LDADD= -lncurses
HIDEGAME=hidegame
diff --git a/games/caesar/Makefile b/games/caesar/Makefile
index 4c930d606d49..48a843005d2e 100644
--- a/games/caesar/Makefile
+++ b/games/caesar/Makefile
@@ -4,6 +4,7 @@
PROG= caesar
DPADD= ${LIBM}
LDADD= -lm
+MAN= caesar.6
MLINKS= caesar.6 rot13.6
CFLAGS+= -Wall
diff --git a/games/canfield/canfield/Makefile b/games/canfield/canfield/Makefile
index 8e2a834bca02..650e784eefb5 100644
--- a/games/canfield/canfield/Makefile
+++ b/games/canfield/canfield/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= canfield
+MAN= canfield.6
DPADD= ${LIBCURSES} ${LIBCOMPAT}
LDADD= -lcurses -lcompat
HIDEGAME=hidegame
diff --git a/games/cribbage/Makefile b/games/cribbage/Makefile
index 86964d7b08b0..23458f70cfc7 100644
--- a/games/cribbage/Makefile
+++ b/games/cribbage/Makefile
@@ -5,6 +5,7 @@ PROG= cribbage
DPADD= ${LIBCURSES} ${LIBCOMPAT}
LDADD= -lcurses -lcompat
SRCS= extern.c crib.c cards.c instr.c io.c score.c support.c
+MAN= cribbage.6
HIDEGAME=hidegame
beforeinstall:
diff --git a/games/dm/Makefile b/games/dm/Makefile
index 199a07e49de8..827352b5203a 100644
--- a/games/dm/Makefile
+++ b/games/dm/Makefile
@@ -1,9 +1,9 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
+# $FreeBSD$
# -DLOG log games
PROG= dm
-MAN8= dm.8
-MAN5= dm.conf.5
+MAN= dm.8 dm.conf.5
BINGRP= games
BINMODE=2555
diff --git a/games/factor/Makefile b/games/factor/Makefile
index f6f9984e8346..16896f041106 100644
--- a/games/factor/Makefile
+++ b/games/factor/Makefile
@@ -4,6 +4,7 @@
PROG= factor
SRCS= factor.c pr_tbl.c
CFLAGS+=-I${.CURDIR}/../primes
+MAN= factor.6
MLINKS+=factor.6 primes.6
.PATH: ${.CURDIR}/../primes
diff --git a/games/fish/Makefile b/games/fish/Makefile
index eacb61435b2c..be24203d8d47 100644
--- a/games/fish/Makefile
+++ b/games/fish/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= fish
+MAN= fish.6
HIDEGAME=hidegame
beforeinstall:
diff --git a/games/fortune/fortune/Makefile b/games/fortune/fortune/Makefile
index 14f134c05e4e..9ac600456987 100644
--- a/games/fortune/fortune/Makefile
+++ b/games/fortune/fortune/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= fortune
+MAN= fortune.6
CFLAGS+=-DDEBUG -Wall -I${.CURDIR}/../strfile
DPADD= ${LIBCOMPAT}
LDADD= -lcompat
diff --git a/games/fortune/strfile/Makefile b/games/fortune/strfile/Makefile
index 5a0cee3e7a7a..e8d3fac6a4b2 100644
--- a/games/fortune/strfile/Makefile
+++ b/games/fortune/strfile/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PROG= strfile
-MAN8= strfile.8
+MAN= strfile.8
MLINKS= strfile.8 unstr.8
CFLAGS+= -Wall
diff --git a/games/grdc/Makefile b/games/grdc/Makefile
index 762c8a47a747..a0d362e30b78 100644
--- a/games/grdc/Makefile
+++ b/games/grdc/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= grdc
+MAN= grdc.6
DPADD= ${LIBNCURSES}
LDADD= -lncurses
diff --git a/games/hack/Makefile b/games/hack/Makefile
index 7b5be2bf3146..47ad3bfd0ac0 100644
--- a/games/hack/Makefile
+++ b/games/hack/Makefile
@@ -14,6 +14,7 @@ SRCS= alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \
hack.u_init.c hack.unix.c hack.vault.c hack.version.c hack.wield.c \
hack.wizard.c hack.worm.c hack.worn.c hack.zap.c rnd.c \
hack.onames.h
+MAN= hack.6
DPADD= ${LIBTERMCAP} ${LIBCOMPAT}
LDADD= -ltermcap -lcompat
CFLAGS+= -fwritable-strings -I${.CURDIR} -I.
diff --git a/games/hangman/Makefile b/games/hangman/Makefile
index 1a6a19f2e9bf..acabd3d381fa 100644
--- a/games/hangman/Makefile
+++ b/games/hangman/Makefile
@@ -4,6 +4,7 @@
PROG= hangman
SRCS= endgame.c extern.c getguess.c getword.c main.c playgame.c \
prdata.c prman.c prword.c setup.c
+MAN= hangman.6
DPADD= ${LIBCURSES} ${LIBCOMPAT}
LDADD= -lcurses -lcompat
HIDEGAME=hidegame
diff --git a/games/larn/Makefile b/games/larn/Makefile
index 24529bd58c71..c67d3a616d53 100644
--- a/games/larn/Makefile
+++ b/games/larn/Makefile
@@ -53,6 +53,7 @@
# Turn off logging.
PROG= larn
+MAN= larn.6
CFLAGS+=-DBSD -DVER=12 -DSUBVER=0 -DNONAP -DUIDSCORE -fwritable-strings
SRCS= main.c object.c create.c tok.c display.c global.c data.c io.c \
monster.c store.c diag.c help.c config.c nap.c bill.c scores.c \
diff --git a/games/mille/Makefile b/games/mille/Makefile
index f6d3e8080215..eed146579685 100644
--- a/games/mille/Makefile
+++ b/games/mille/Makefile
@@ -6,6 +6,7 @@ SRCS= comp.c end.c extern.c init.c mille.c misc.c move.c print.c \
roll.c save.c types.c varpush.c
DPADD= ${LIBCURSES} ${LIBCOMPAT}
LDADD= -lcurses -lcompat
+MAN= mille.6
HIDEGAME=hidegame
.include <bsd.prog.mk>
diff --git a/games/morse/Makefile b/games/morse/Makefile
index f0fedeb1739c..44b20bab668b 100644
--- a/games/morse/Makefile
+++ b/games/morse/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= morse
+MAN= morse.6
.if ${MACHINE_ARCH} == "i386"
CFLAGS += -DSPEAKER=\"/dev/speaker\"
diff --git a/games/number/Makefile b/games/number/Makefile
index dfc9dc9ca8ac..8e75f71a7858 100644
--- a/games/number/Makefile
+++ b/games/number/Makefile
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= number
+MAN= number.6
.include <bsd.prog.mk>
diff --git a/games/phantasia/Makefile b/games/phantasia/Makefile
index 9814962cf635..4d1b9924e926 100644
--- a/games/phantasia/Makefile
+++ b/games/phantasia/Makefile
@@ -7,6 +7,7 @@ DPADD= ${LIBM} ${LIBCURSES} ${LIBCOMPAT}
LDADD= -lm -lcurses -lcompat
DATAFILES=characs gold lastdead mess monsters motd scoreboard void
HIDEGAME=hidegame
+MAN= phantasia.6
CLEANFILES=${DATAFILES} cross-phantglobs.o map setup setup.o stamp.setuprun
all: stamp.setuprun
diff --git a/games/piano/Makefile b/games/piano/Makefile
index 825bb2f0b9d5..c9a93923e73e 100644
--- a/games/piano/Makefile
+++ b/games/piano/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= piano
+MAN= piano.6
DPADD= ${LIBCURSES}
LDADD= -lcurses
diff --git a/games/pig/Makefile b/games/pig/Makefile
index 4cc741919b82..9cde1e428533 100644
--- a/games/pig/Makefile
+++ b/games/pig/Makefile
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= pig
+MAN= pig.6
.include <bsd.prog.mk>
diff --git a/games/pom/Makefile b/games/pom/Makefile
index 52e06ab7498c..afde919cf8b1 100644
--- a/games/pom/Makefile
+++ b/games/pom/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= pom
+MAN= pom.6
DPADD= ${LIBM}
LDADD= -lm
CFLAGS+=-Wall
diff --git a/games/quiz/Makefile b/games/quiz/Makefile
index 08d2254851f6..45c69b258566 100644
--- a/games/quiz/Makefile
+++ b/games/quiz/Makefile
@@ -3,6 +3,7 @@
PROG= quiz
SRCS= quiz.c rxp.c
+MAN= quiz.6
CATS= africa america areas arith asia babies bard chinese collectives \
ed elements europe flowers greek inca index latin locomotive \
midearth morse murders poetry posneg pres province seq-easy seq-hard \
diff --git a/games/rain/Makefile b/games/rain/Makefile
index 5f13c9ae3274..6f2097fea735 100644
--- a/games/rain/Makefile
+++ b/games/rain/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= rain
+MAN= rain.6
DPADD= ${LIBCURSES}
LDADD= -lcurses
diff --git a/games/random/Makefile b/games/random/Makefile
index 8b8909cd983b..666023c873c4 100644
--- a/games/random/Makefile
+++ b/games/random/Makefile
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= random
+MAN= random.6
.include <bsd.prog.mk>
diff --git a/games/robots/Makefile b/games/robots/Makefile
index a1520bb63160..1c2ef0d329fc 100644
--- a/games/robots/Makefile
+++ b/games/robots/Makefile
@@ -5,6 +5,7 @@ PROG= robots
CFLAGS+=-DMAX_PER_UID=5
SRCS= extern.c init_field.c main.c make_level.c move.c move_robs.c \
play_level.c query.c rnd_pos.c score.c flush_in.c
+MAN= robots.6
DPADD= ${LIBCURSES} ${LIBCOMPAT}
LDADD= -lcurses -lcompat
HIDEGAME=hidegame
diff --git a/games/rogue/Makefile b/games/rogue/Makefile
index b206a17c9d84..95734e9f33f5 100644
--- a/games/rogue/Makefile
+++ b/games/rogue/Makefile
@@ -9,6 +9,7 @@ SRCS= hit.c init.c inventory.c level.c machdep.c main.c \
DPADD= ${LIBCURSES}
LDADD= -lcurses
HIDEGAME=hidegame
+MAN= rogue.6
beforeinstall:
.if !exists(${DESTDIR}/var/games/rogue.scores)
diff --git a/games/sail/Makefile b/games/sail/Makefile
index e42406b0ef8b..c921c83dd01d 100644
--- a/games/sail/Makefile
+++ b/games/sail/Makefile
@@ -5,6 +5,7 @@ PROG= sail
SRCS= main.c pl_main.c pl_1.c pl_2.c pl_3.c pl_4.c pl_5.c pl_6.c pl_7.c \
dr_main.c dr_1.c dr_2.c dr_3.c dr_4.c dr_5.c lo_main.c \
assorted.c game.c globals.c misc.c parties.c sync.c version.c
+MAN= sail.6
DPADD= ${LIBCURSES} ${LIBCOMPAT}
LDADD= -lcurses -lcompat
HIDEGAME=hidegame
diff --git a/games/snake/snake/Makefile b/games/snake/snake/Makefile
index 475539df7d97..597044d7237a 100644
--- a/games/snake/snake/Makefile
+++ b/games/snake/snake/Makefile
@@ -3,6 +3,7 @@
PROG= snake
SRCS= snake.c move.c
+MAN= snake.6
DPADD= ${LIBM} ${LIBTERMCAP} ${LIBCOMPAT}
LDADD= -lm -ltermcap -lcompat
HIDEGAME=hidegame
diff --git a/games/trek/Makefile b/games/trek/Makefile
index c3a0a139d488..daaa3c61b46d 100644
--- a/games/trek/Makefile
+++ b/games/trek/Makefile
@@ -10,6 +10,7 @@ SRCS= abandon.c attack.c autover.c capture.c check_out.c checkcond.c \
ranf.c rest.c schedule.c score.c setup.c setwarp.c \
shield.c snova.c srscan.c systemname.c torped.c utility.c \
visual.c warp.c win.c cgetc.c
+MAN= trek.6
DPADD= ${LIBM} ${LIBCOMPAT}
LDADD= -lm -lcompat
HIDEGAME=hidegame
diff --git a/games/wargames/Makefile b/games/wargames/Makefile
index 59d4734a4596..841f9d265f04 100644
--- a/games/wargames/Makefile
+++ b/games/wargames/Makefile
@@ -1,6 +1,8 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
+MAN= wargames.6
+
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/wargames.sh ${DESTDIR}${BINDIR}/wargames
diff --git a/games/worm/Makefile b/games/worm/Makefile
index fa870c87b41e..531aa8d945aa 100644
--- a/games/worm/Makefile
+++ b/games/worm/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= worm
+MAN= worm.6
DPADD= ${LIBCURSES} ${LIBCOMPAT}
LDADD= -lcurses -lcompat
HIDEGAME=hidegame
diff --git a/games/worms/Makefile b/games/worms/Makefile
index 56bb685c4cfe..a9d48b5e3e9b 100644
--- a/games/worms/Makefile
+++ b/games/worms/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= worms
+MAN= worms.6
DPADD= ${LIBCURSES}
LDADD= -lcurses
diff --git a/games/wump/Makefile b/games/wump/Makefile
index e471b70f5f94..8cede50c7928 100644
--- a/games/wump/Makefile
+++ b/games/wump/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= wump
+MAN= wump.6
HIDEGAME=hidegame
beforeinstall:
diff --git a/libexec/Makefile.inc b/libexec/Makefile.inc
index 1e6f06c715e9..185ccf3e88d6 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 3ae4d8154227..22bae455814f 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 f428be888778..830577a57def 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 993014725b0e..4d7876162d28 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 860509cb1d88..9436561d4a66 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 e82fcb207da0..fae5127eebb3 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 0547d04125af..c501cccb8551 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 62d32c6fef5a..7f1dae3fe4a7 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 f2626727f5ac..a1c25472bc7c 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 4e02d71d1583..a88492c48eb9 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 595ae44a0d5e..f86d1d3ce61b 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 a1d5fc0826de..ac04ca3af97a 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 417d6e809977..b2be2e166915 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 dfdea29ce8a3..cf351c27b679 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 b58d38d961f5..d37482e3685d 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 7e12057a2182..bbae4c0c9f9c 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 c187af816023..c083e57c13cc 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 a82901fdd5fd..708837141347 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 626a99b331e5..59d026027fe1 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 74ab8d1ab4db..8320152d5f2e 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 13304eda6aad..331f6ab6e2b6 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 8af426f7092b..f0e4649a3752 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 8d783ed598c1..af43bd3e7cf3 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 20a9a23a0511..e64ff3e1a4b2 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 e4944d9cd95c..1dd582de0082 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 24dd7e3f853a..54e254b9460b 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 c4a588df768e..b9647d62cb6a 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 00fcdcd228eb..0e8050997b5f 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 505fde26be27..f34a4cf75806 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 100e867ba5be..e0e946d6aed0 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 64c6bcc7fb68..20acad94933a 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 d7456d1513c7..75b16ae7f76e 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 fa5ee36f96b2..ff0809c39dda 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 9f5b7f111439..477629dcc44c 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 3d7af161e66a..999ae892f9f4 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