summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2001-03-27 10:52:19 +0000
committerru <ru@FreeBSD.org>2001-03-27 10:52:19 +0000
commit89596e453852464f330543234ea7d0894c5fc287 (patch)
tree2f3bf33fa937fe4dcbe5a97851f84bed559bbc7b
parent27b491435b5af71a9b47047589a2d7bb2e49affc (diff)
downloadFreeBSD-src-89596e453852464f330543234ea7d0894c5fc287.zip
FreeBSD-src-89596e453852464f330543234ea7d0894c5fc287.tar.gz
MAN[1-9] -> MAN.
-rw-r--r--usr.bin/ar/Makefile3
-rw-r--r--usr.bin/at/Makefile8
-rw-r--r--usr.bin/banner/Makefile3
-rw-r--r--usr.bin/c89/Makefile4
-rw-r--r--usr.bin/chat/Makefile3
-rw-r--r--usr.bin/compress/Makefile3
-rw-r--r--usr.bin/dnskeygen/Makefile2
-rw-r--r--usr.bin/enigma/Makefile3
-rw-r--r--usr.bin/file/Makefile3
-rw-r--r--usr.bin/file2c/Makefile1
-rw-r--r--usr.bin/finger/Makefile3
-rw-r--r--usr.bin/gensetdefs/Makefile2
-rw-r--r--usr.bin/getopt/Makefile1
-rw-r--r--usr.bin/hexdump/Makefile3
-rw-r--r--usr.bin/id/Makefile3
-rw-r--r--usr.bin/key/Makefile3
-rw-r--r--usr.bin/keyinit/Makefile4
-rw-r--r--usr.bin/less/Makefile2
-rw-r--r--usr.bin/lesskey/Makefile2
-rw-r--r--usr.bin/lex/Makefile1
-rw-r--r--usr.bin/locate/locate/Makefile3
-rw-r--r--usr.bin/login/Makefile3
-rw-r--r--usr.bin/lorder/Makefile3
-rw-r--r--usr.bin/mkdep/Makefile3
-rw-r--r--usr.bin/mklocale/Makefile1
-rw-r--r--usr.bin/ncplogin/Makefile2
-rw-r--r--usr.bin/newkey/Makefile3
-rw-r--r--usr.bin/nm/Makefile3
-rw-r--r--usr.bin/opieinfo/Makefile2
-rw-r--r--usr.bin/opiekey/Makefile2
-rw-r--r--usr.bin/opiepasswd/Makefile2
-rw-r--r--usr.bin/pagesize/Makefile3
-rw-r--r--usr.bin/passwd/Makefile1
-rw-r--r--usr.bin/ranlib/Makefile3
-rw-r--r--usr.bin/renice/Makefile3
-rw-r--r--usr.bin/rpcgen/Makefile6
-rw-r--r--usr.bin/rpcinfo/Makefile2
-rw-r--r--usr.bin/rup/Makefile1
-rw-r--r--usr.bin/rusers/Makefile1
-rw-r--r--usr.bin/rwall/Makefile1
-rw-r--r--usr.bin/shar/Makefile3
-rw-r--r--usr.bin/showmount/Makefile3
-rw-r--r--usr.bin/size/Makefile3
-rw-r--r--usr.bin/sockstat/Makefile2
-rw-r--r--usr.bin/strings/Makefile3
-rw-r--r--usr.bin/strip/Makefile3
-rw-r--r--usr.bin/tip/tip/Makefile4
-rw-r--r--usr.bin/uuencode/Makefile4
-rw-r--r--usr.bin/vgrind/Makefile4
-rw-r--r--usr.bin/vi/Makefile2
-rw-r--r--usr.bin/vmstat/Makefile4
-rw-r--r--usr.bin/w/Makefile2
-rw-r--r--usr.bin/whereis/Makefile4
-rw-r--r--usr.bin/window/Makefile1
-rw-r--r--usr.bin/xinstall/Makefile3
-rw-r--r--usr.bin/xlint/xlint/Makefile3
-rw-r--r--usr.bin/yacc/Makefile2
57 files changed, 74 insertions, 81 deletions
diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index af31612..d195769 100644
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -5,8 +5,7 @@ PROG= ar
CFLAGS+=-I${.CURDIR} -Wall
SRCS= append.c ar.c archive.c contents.c delete.c extract.c misc.c \
move.c print.c replace.c
-MAN1aout=ar.1aout
-MAN5= ar.5
+MAN= ar.1aout ar.5
BINDIR= /usr/libexec/aout
.include <bsd.prog.mk>
diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile
index b3bf218..0f31ee0 100644
--- a/usr.bin/at/Makefile
+++ b/usr.bin/at/Makefile
@@ -13,11 +13,9 @@ MLINKS= at.1 batch.1 \
at.1 atrm.1
BINMODE= 4555
-CLEANFILES += ${MAN1}
+CLEANFILES+= at.1
-.include <bsd.prog.mk>
-
-${MAN1}: at.man
+at.1: at.man
@${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \
sed -e \
"s@_ATSPOOL_DIR@$(ATSPOOL_DIR)@g; \
@@ -28,3 +26,5 @@ ${MAN1}: at.man
s@_PERM_PATH@$(PERM_PATH)@g; \
s@_LOCKFILE@$(LOCKFILE)@g" \
< ${.ALLSRC} > ${.TARGET}
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/banner/Makefile b/usr.bin/banner/Makefile
index c04e68ae6..21e4686 100644
--- a/usr.bin/banner/Makefile
+++ b/usr.bin/banner/Makefile
@@ -1,7 +1,8 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
PROG= banner
CFLAGS+=-Wall
-MAN6= banner.6
+MAN= banner.6
.include <bsd.prog.mk>
diff --git a/usr.bin/c89/Makefile b/usr.bin/c89/Makefile
index c6f909f..f2f9df0 100644
--- a/usr.bin/c89/Makefile
+++ b/usr.bin/c89/Makefile
@@ -1,4 +1,6 @@
-MAN1 = c89.1
+# $FreeBSD$
+
+MAN= c89.1
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.bin/chat/Makefile b/usr.bin/chat/Makefile
index 2d25d76..d104347 100644
--- a/usr.bin/chat/Makefile
+++ b/usr.bin/chat/Makefile
@@ -2,8 +2,7 @@
PROG= chat
CFLAGS+=-Wall
-SRCS= chat.c
-MAN8= chat.8
+MAN= chat.8
#as per policies section in handbook
MAINTAINER= peter@freebsd.org
diff --git a/usr.bin/compress/Makefile b/usr.bin/compress/Makefile
index 02f7fbb..77e01ba 100644
--- a/usr.bin/compress/Makefile
+++ b/usr.bin/compress/Makefile
@@ -1,4 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 4/17/94
+# $FreeBSD$
PROG= compress
CFLAGS+=-Wall
@@ -7,6 +8,6 @@ LINKS= ${BINDIR}/compress ${BINDIR}/uncompress
MLINKS= compress.1 uncompress.1
# XXX zopen is not part of libc
-# MAN3=zopen.3
+# MAN=zopen.3
.include <bsd.prog.mk>
diff --git a/usr.bin/dnskeygen/Makefile b/usr.bin/dnskeygen/Makefile
index 7273341..fce2a92 100644
--- a/usr.bin/dnskeygen/Makefile
+++ b/usr.bin/dnskeygen/Makefile
@@ -7,7 +7,5 @@ USE_LIBBIND= true
.PATH: ${BIND_DIR}/doc/man
PROG= dnskeygen
-SRCS= dnskeygen.c
-MAN1= dnskeygen.1
.include <bsd.prog.mk>
diff --git a/usr.bin/enigma/Makefile b/usr.bin/enigma/Makefile
index 6936b7e..74a1a69 100644
--- a/usr.bin/enigma/Makefile
+++ b/usr.bin/enigma/Makefile
@@ -1,6 +1,7 @@
+# $FreeBSD$
+
PROG= enigma
CFLAGS+=-Wall
-MAN1= enigma.1
LINKS= ${BINDIR}/enigma ${BINDIR}/crypt
MLINKS= enigma.1 crypt.1
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 9471b7f..e9c186a 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -38,8 +38,7 @@ SRCS= file.c apprentice.c fsmagic.c softmagic.c ascmagic.c \
compress.c is_tar.c readelf.c print.c
# compress.c is_tar.c readelf.c internat.c print.c
-MAN1= file.1
-MAN5= magic.5
+MAN= file.1 magic.5
CLEANFILES+= magic
diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile
index 79fdc92..e88a3bc 100644
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
PROG= file2c
-MAN1= file2c.1
.include <bsd.prog.mk>
diff --git a/usr.bin/finger/Makefile b/usr.bin/finger/Makefile
index 7562aa0..983392b 100644
--- a/usr.bin/finger/Makefile
+++ b/usr.bin/finger/Makefile
@@ -3,7 +3,6 @@
PROG= finger
SRCS= finger.c lprint.c net.c sprint.c util.c
-MAN1= finger.1
-MAN5= finger.conf.5
+MAN= finger.1 finger.conf.5
.include <bsd.prog.mk>
diff --git a/usr.bin/gensetdefs/Makefile b/usr.bin/gensetdefs/Makefile
index 8942873..35dab52 100644
--- a/usr.bin/gensetdefs/Makefile
+++ b/usr.bin/gensetdefs/Makefile
@@ -3,7 +3,7 @@
TARGET_ARCH?= ${MACHINE_ARCH}
PROG= gensetdefs
-MAN8= gensetdefs.8
+MAN= gensetdefs.8
CFLAGS+= -Darch_${TARGET_ARCH}
.include <bsd.prog.mk>
diff --git a/usr.bin/getopt/Makefile b/usr.bin/getopt/Makefile
index 5d01b3d..01dfa87 100644
--- a/usr.bin/getopt/Makefile
+++ b/usr.bin/getopt/Makefile
@@ -2,6 +2,5 @@
#
PROG = getopt
-MAN1 = getopt.1
.include <bsd.prog.mk>
diff --git a/usr.bin/hexdump/Makefile b/usr.bin/hexdump/Makefile
index 24ad198..4cd3cc5 100644
--- a/usr.bin/hexdump/Makefile
+++ b/usr.bin/hexdump/Makefile
@@ -1,8 +1,9 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
PROG= hexdump
SRCS= conv.c display.c hexdump.c hexsyntax.c odsyntax.c parse.c
-MAN1= hexdump.1 od.1
+MAN= hexdump.1 od.1
MLINKS= hexdump.1 hd.1
LINKS= ${BINDIR}/hexdump ${BINDIR}/od
LINKS+= ${BINDIR}/hexdump ${BINDIR}/hd
diff --git a/usr.bin/id/Makefile b/usr.bin/id/Makefile
index 5b90f29..104d75d 100644
--- a/usr.bin/id/Makefile
+++ b/usr.bin/id/Makefile
@@ -1,7 +1,8 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
PROG= id
-MAN1= id.1 groups.1 whoami.1
+MAN= id.1 groups.1 whoami.1
# XXX BROKEN: afterinstall:
afterinstall:
diff --git a/usr.bin/key/Makefile b/usr.bin/key/Makefile
index d6f3c3e..f680657 100644
--- a/usr.bin/key/Makefile
+++ b/usr.bin/key/Makefile
@@ -1,9 +1,8 @@
# @(#)Makefile 5.6 (Berkeley) 3/5/91
-#
+# $FreeBSD$
PROG= key
SRCS= skey.c
-MAN1= key.1
CFLAGS+= -D_SKEY_INTERNAL
diff --git a/usr.bin/keyinit/Makefile b/usr.bin/keyinit/Makefile
index 41de62d..4443e6b 100644
--- a/usr.bin/keyinit/Makefile
+++ b/usr.bin/keyinit/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 5.6 (Berkeley) 3/5/91
-#
+# $FreeBSD$
+
PROG= keyinit
-MAN1= keyinit.1
SRCS= skeyinit.c
CFLAGS+= -D_SKEY_INTERNAL
diff --git a/usr.bin/less/Makefile b/usr.bin/less/Makefile
index 4b3effd..5302aa1 100644
--- a/usr.bin/less/Makefile
+++ b/usr.bin/less/Makefile
@@ -9,7 +9,7 @@ DPADD= ${LIBTERMCAP}
LDADD= -ltermcap
LINKS= ${BINDIR}/less /usr/bin/more
MLINKS= less.1 more.1
-CLEANFILES= ${MAN1}
+CLEANFILES= less.1
.include "Makefile.common"
.include <bsd.prog.mk>
diff --git a/usr.bin/lesskey/Makefile b/usr.bin/lesskey/Makefile
index 5c80cc6..b10bf6d 100644
--- a/usr.bin/lesskey/Makefile
+++ b/usr.bin/lesskey/Makefile
@@ -2,7 +2,7 @@
PROG= lesskey
SRCS= lesskey.c version.c
-CLEANFILES= ${MAN1}
+CLEANFILES= lesskey.1
.include "${.CURDIR}/../less/Makefile.common"
.include <bsd.prog.mk>
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index f7604c2..88b44fa 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -18,7 +18,6 @@ SRCS= scan.c ccl.c dfa.c ecs.c gen.c main.c misc.c nfa.c parse.y \
skel.c sym.c tblcmp.c yylex.c
LFLAGS+= -is
CFLAGS+= -I. -I${.CURDIR}
-MAN1= lex.1
MLINKS+= lex.1 flex.1
MLINKS+= lex.1 flex++.1
MLINKS+= lex.1 lex++.1
diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile
index 064cf08..512c217 100644
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@@ -4,8 +4,7 @@
PROG= locate
SRCS= util.c locate.c
CFLAGS+= -I${.CURDIR} -DMMAP # -DDEBUG (print time) -O2 (10% faster)
-MAN1= locate.1
-MAN8= locate.updatedb.8
+MAN= locate.1 locate.updatedb.8
SCRIPTS= updatedb mklocatedb concatdb
MLINKS+= locate.updatedb.8 updatedb.8
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 2813ccb..a9a42bc 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -2,9 +2,8 @@
# $FreeBSD$
PROG= login
-MAN1= login.1
-MAN5= login.access.5
SRCS= login.c login_access.c login_fbtab.c
+MAN= login.1 login.access.5
CFLAGS+=-Wall -DLOGIN_ACCESS -DLOGALL
diff --git a/usr.bin/lorder/Makefile b/usr.bin/lorder/Makefile
index a1682d1..7741bcc 100644
--- a/usr.bin/lorder/Makefile
+++ b/usr.bin/lorder/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
-MAN1= lorder.1
+MAN= lorder.1
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.bin/mkdep/Makefile b/usr.bin/mkdep/Makefile
index a094bc5..c94d0c3 100644
--- a/usr.bin/mkdep/Makefile
+++ b/usr.bin/mkdep/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
-MAN1= mkdep.1
+MAN= mkdep.1
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile
index 248fd8e..777e045 100644
--- a/usr.bin/mklocale/Makefile
+++ b/usr.bin/mklocale/Makefile
@@ -4,6 +4,5 @@
PROG= mklocale
SRCS= yacc.y lex.l y.tab.h
CFLAGS+= -I. -I${.CURDIR}
-MAN1= mklocale.1
.include <bsd.prog.mk>
diff --git a/usr.bin/ncplogin/Makefile b/usr.bin/ncplogin/Makefile
index 8de346f..8795f29 100644
--- a/usr.bin/ncplogin/Makefile
+++ b/usr.bin/ncplogin/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= ncplogin
-MAN1= ncplogin.1 ncplogout.1
+MAN= ncplogin.1 ncplogout.1
LINKS= ${BINDIR}/ncplogin ${BINDIR}/ncplogout
diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile
index 75f369f..560c020 100644
--- a/usr.bin/newkey/Makefile
+++ b/usr.bin/newkey/Makefile
@@ -2,8 +2,7 @@
PROG= newkey
SRCS= newkey.c update.c generic.c
-
-MAN8= newkey.8
+MAN= newkey.8
# Later
#CFLAGS+= -DYP
diff --git a/usr.bin/nm/Makefile b/usr.bin/nm/Makefile
index 639b4d0..bc28a5a 100644
--- a/usr.bin/nm/Makefile
+++ b/usr.bin/nm/Makefile
@@ -1,7 +1,8 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
PROG= nm
BINDIR= /usr/libexec/aout
-MAN1aout=nm.1aout
+MAN= nm.1aout
.include <bsd.prog.mk>
diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile
index 7f7241d..dab590f 100644
--- a/usr.bin/opieinfo/Makefile
+++ b/usr.bin/opieinfo/Makefile
@@ -3,8 +3,6 @@
OPIE_DIST?= ${.CURDIR}/../../contrib/opie
PROG= opieinfo
-SRCS= opieinfo.c
-MAN1= opieinfo.1
CFLAGS+=-I${OPIE_DIST}
diff --git a/usr.bin/opiekey/Makefile b/usr.bin/opiekey/Makefile
index 3be38dc..116ca7e 100644
--- a/usr.bin/opiekey/Makefile
+++ b/usr.bin/opiekey/Makefile
@@ -3,8 +3,6 @@
OPIE_DIST?= ${.CURDIR}/../../contrib/opie
PROG= opiekey
-SRCS= opiekey.c
-MAN1= opiekey.1
CFLAGS+= -I${OPIE_DIST}
diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile
index 7fc70ff..c0bfca2 100644
--- a/usr.bin/opiepasswd/Makefile
+++ b/usr.bin/opiepasswd/Makefile
@@ -3,8 +3,6 @@
OPIE_DIST?= ${.CURDIR}/../../contrib/opie
PROG= opiepasswd
-SRCS= opiepasswd.c
-MAN1= opiepasswd.1
CFLAGS+=-I${OPIE_DIST}
diff --git a/usr.bin/pagesize/Makefile b/usr.bin/pagesize/Makefile
index c66eae7..aa202ee 100644
--- a/usr.bin/pagesize/Makefile
+++ b/usr.bin/pagesize/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 4/3/94
+# $FreeBSD$
-MAN1= pagesize.1
+MAN= pagesize.1
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 4042f09..65c5dcf 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -75,7 +75,6 @@ yppasswd_private_clnt.c: ${RPCSRC_PRIV}
${RPCGEN} -l -o ${.TARGET} ${RPCSRC_PRIV}
BINMODE=4555
-MAN1=passwd.1
LINKS=${BINDIR}/passwd ${BINDIR}/yppasswd
MLINKS=passwd.1 yppasswd.1
diff --git a/usr.bin/ranlib/Makefile b/usr.bin/ranlib/Makefile
index 8148e57..d923416 100644
--- a/usr.bin/ranlib/Makefile
+++ b/usr.bin/ranlib/Makefile
@@ -4,8 +4,7 @@
PROG= ranlib
SRCS= archive.c build.c misc.c ranlib.c touch.c
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../ar
-MAN1aout=ranlib.1aout
-MAN5= ranlib.5
+MAN= ranlib.1aout ranlib.5
BINDIR= /usr/libexec/aout
VPATH= ${.CURDIR}/../ar
diff --git a/usr.bin/renice/Makefile b/usr.bin/renice/Makefile
index 1042921..d547137 100644
--- a/usr.bin/renice/Makefile
+++ b/usr.bin/renice/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/9/93
+# $FreeBSD$
PROG= renice
-MAN8= renice.8
+MAN= renice.8
.include <bsd.prog.mk>
diff --git a/usr.bin/rpcgen/Makefile b/usr.bin/rpcgen/Makefile
index d0e4c14..67db97e 100644
--- a/usr.bin/rpcgen/Makefile
+++ b/usr.bin/rpcgen/Makefile
@@ -1,9 +1,9 @@
+# $FreeBSD$
+
+PROG= rpcgen
SRCS= rpc_main.c rpc_clntout.c rpc_cout.c rpc_hout.c rpc_parse.c \
rpc_sample.c rpc_scan.c rpc_svcout.c rpc_tblout.c rpc_util.c
-PROG= rpcgen
-MAN1= rpcgen.1
-
#
# This is a kludge to work around the fact that this program
# uses 'inline' as a variable name.
diff --git a/usr.bin/rpcinfo/Makefile b/usr.bin/rpcinfo/Makefile
index 6c75c8f..e7283a4 100644
--- a/usr.bin/rpcinfo/Makefile
+++ b/usr.bin/rpcinfo/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PROG= rpcinfo
-MAN8= rpcinfo.8
SRCS= rpcinfo.c rpc_generic.c
+MAN= rpcinfo.8
LIBCDIR= ${.CURDIR}/../../lib/libc
LIBCRPCDIR= ${LIBCDIR}/rpc
diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index 2e67e37..6d32977 100644
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
PROG= rup
-MAN1= rup.1
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile
index 6ec50ab..6cb39ac 100644
--- a/usr.bin/rusers/Makefile
+++ b/usr.bin/rusers/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
PROG = rusers
-MAN1 = rusers.1
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile
index 33a2dcc..f402c03 100644
--- a/usr.bin/rwall/Makefile
+++ b/usr.bin/rwall/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
PROG = rwall
-MAN1 = rwall.1
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
diff --git a/usr.bin/shar/Makefile b/usr.bin/shar/Makefile
index 6d06623..2532421 100644
--- a/usr.bin/shar/Makefile
+++ b/usr.bin/shar/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
-MAN1= shar.1
+MAN= shar.1
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.bin/showmount/Makefile b/usr.bin/showmount/Makefile
index 9bf4783..5919909 100644
--- a/usr.bin/showmount/Makefile
+++ b/usr.bin/showmount/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
PROG= showmount
-MAN8= showmount.8
+MAN= showmount.8
.include <bsd.prog.mk>
diff --git a/usr.bin/size/Makefile b/usr.bin/size/Makefile
index fabe3eb..55aefd9 100644
--- a/usr.bin/size/Makefile
+++ b/usr.bin/size/Makefile
@@ -1,7 +1,8 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
PROG= size
+MAN= size.1aout
BINDIR= /usr/libexec/aout
-MAN1aout=size.1aout
.include <bsd.prog.mk>
diff --git a/usr.bin/sockstat/Makefile b/usr.bin/sockstat/Makefile
index a72aadf..2537730 100644
--- a/usr.bin/sockstat/Makefile
+++ b/usr.bin/sockstat/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
MAINTAINER= des@freebsd.org
-MAN1= sockstat.1
+MAN= sockstat.1
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.bin/strings/Makefile b/usr.bin/strings/Makefile
index a3593c8..04b3f02 100644
--- a/usr.bin/strings/Makefile
+++ b/usr.bin/strings/Makefile
@@ -1,7 +1,8 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
PROG= strings
+MAN= strings.1aout
BINDIR= /usr/libexec/aout
-MAN1aout=strings.1aout
.include <bsd.prog.mk>
diff --git a/usr.bin/strip/Makefile b/usr.bin/strip/Makefile
index f5160e6..fe05a65 100644
--- a/usr.bin/strip/Makefile
+++ b/usr.bin/strip/Makefile
@@ -1,8 +1,9 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
PROG= strip
+MAN= strip.1aout
BINDIR= /usr/libexec/aout
-MAN1aout=strip.1aout
CLEANFILES += maybe_stripped
all: maybe_stripped
diff --git a/usr.bin/tip/tip/Makefile b/usr.bin/tip/tip/Makefile
index 79bac7a..fd208d7 100644
--- a/usr.bin/tip/tip/Makefile
+++ b/usr.bin/tip/tip/Makefile
@@ -1,4 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
#
# Files are:
# /etc/remote remote host description file
@@ -17,8 +18,7 @@ PROG= tip
DPADD= ${LIBACU} ${LIBUTIL}
LDADD= ${LIBACU} -lutil
LINKS= ${BINDIR}/tip
-MAN1= tip.1
-MAN5= modems.5
+MAN= tip.1 modems.5
SRCS= acu.c acutab.c cmds.c cmdtab.c cu.c hunt.c log.c partab.c \
remote.c tip.c tipout.c value.c vars.c
diff --git a/usr.bin/uuencode/Makefile b/usr.bin/uuencode/Makefile
index cf14277..dfd1d59 100644
--- a/usr.bin/uuencode/Makefile
+++ b/usr.bin/uuencode/Makefile
@@ -1,8 +1,8 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
PROG= uuencode
-MAN1= uuencode.1
-MAN5= uuencode.format.5
+MAN= uuencode.1 uuencode.format.5
MLINKS= uuencode.1 uudecode.1 \
uuencode.format.5 uuencode.5
diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile
index 5682b25..2294fd7 100644
--- a/usr.bin/vgrind/Makefile
+++ b/usr.bin/vgrind/Makefile
@@ -1,9 +1,9 @@
# @(#)Makefile 8.1 (Berkeley) 6/9/93
+# $FreeBSD$
PROG= vfontedpr
SRCS= regexp.c vfontedpr.c
-MAN1= vgrind.1
-MAN5= vgrindefs.5
+MAN= vgrind.1 vgrindefs.5
BINDIR= /usr/libexec
BIN2DIR=/usr/bin
EXTRA= vgrindefs.src.db
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index a064123..b68fa30 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -42,7 +42,7 @@ LINKS= ${BINDIR}/${VI} ${BINDIR}/${EX} ${BINDIR}/${VI} ${BINDIR}/${VIEW}
LINKS+= ${BINDIR}/${VI} ${BINDIR}/vi ${BINDIR}/${EX} ${BINDIR}/ex
LINKS+= ${BINDIR}/${VI} ${BINDIR}/view
-MAN1= ${SRCDIR}/docs/USD.doc/vi.man/vi.1
+MAN= ${SRCDIR}/docs/USD.doc/vi.man/vi.1
MLINKS+=vi.1 ex.1 vi.1 view.1
MLINKS+=vi.1 nex.1 vi.1 nview.1 vi.1 nvi.1
diff --git a/usr.bin/vmstat/Makefile b/usr.bin/vmstat/Makefile
index 38e45e7..d3bd40d 100644
--- a/usr.bin/vmstat/Makefile
+++ b/usr.bin/vmstat/Makefile
@@ -1,9 +1,9 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
PROG= vmstat
+MAN= vmstat.8
CFLAGS+=-I${.CURDIR}/../../sys
-SRCS= vmstat.c
-MAN8= vmstat.8
BINGRP= kmem
BINMODE=2555
DPADD= ${LIBKVM} ${LIBDEVSTAT}
diff --git a/usr.bin/w/Makefile b/usr.bin/w/Makefile
index 1f0af4e..7de8f19 100644
--- a/usr.bin/w/Makefile
+++ b/usr.bin/w/Makefile
@@ -3,7 +3,7 @@
PROG= w
SRCS= fmt.c pr_time.c proc_compare.c w.c
-MAN1= w.1 uptime.1
+MAN= w.1 uptime.1
DPADD= ${LIBKVM}
LDADD= -lkvm
#BINGRP= kmem
diff --git a/usr.bin/whereis/Makefile b/usr.bin/whereis/Makefile
index b4a4df1..0a87b6d 100644
--- a/usr.bin/whereis/Makefile
+++ b/usr.bin/whereis/Makefile
@@ -1,4 +1,6 @@
-MAN1= whereis.1
+# $FreeBSD$
+
+MAN= whereis.1
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.bin/window/Makefile b/usr.bin/window/Makefile
index 3d2616a..b69d98d 100644
--- a/usr.bin/window/Makefile
+++ b/usr.bin/window/Makefile
@@ -15,7 +15,6 @@ SRCS= char.c cmd.c cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \
wwredrawwin.c wwrint.c wwscroll.c wwsize.c wwspawn.c wwsuspend.c \
wwterminfo.c wwtty.c wwunframe.c wwupdate.c wwwrite.c xx.c xxflush.c \
compress.c
-MAN= window.1
CFLAGS+= -I.
diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index f41f80e..50fafa8 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PROG= xinstall
-SRCS= xinstall.c
-MAN1= install.1
+MAN= install.1
install: maninstall
${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/usr.bin/xlint/xlint/Makefile b/usr.bin/xlint/xlint/Makefile
index 35fea3f..f2a1cfa 100644
--- a/usr.bin/xlint/xlint/Makefile
+++ b/usr.bin/xlint/xlint/Makefile
@@ -1,10 +1,11 @@
# $NetBSD: Makefile,v 1.2 1995/07/03 21:25:14 cgd Exp $
+# $FreeBSD$
.PATH: ${.CURDIR}/../lint1
PROG= xlint
SRCS= xlint.c mem.c
-MAN1= lint.1
+MAN= lint.1
CFLAGS+=-I${.CURDIR}/../lint1
diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile
index 3a871d9..55efd98 100644
--- a/usr.bin/yacc/Makefile
+++ b/usr.bin/yacc/Makefile
@@ -4,7 +4,7 @@
PROG= yacc
SRCS= closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \
skeleton.c symtab.c verbose.c warshall.c
-MAN1= yacc.1 yyfix.1
+MAN= yacc.1 yyfix.1
LINKS+= ${BINDIR}/yacc ${BINDIR}/byacc
MLINKS+=yacc.1 byacc.1
OpenPOWER on IntegriCloud