MAN[1-9] -> MAN.

55 files changed, 80 insertions, 82 deletions

diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index 74aac0d..13ec155 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 LIB=    dialog
-MAN3=	dialog.3
+MAN=	dialog.3
 
 SHLIB_MAJOR= 4
 SHLIB_MINOR= 0
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index 76307aa..af3a252 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -3,7 +3,7 @@
 SUBDIR= doc
 
 LIB=    readline
-MAN3=   readline.3
+MAN=	readline.3
 
 TILDESRC= tilde.c
 SRCS=     readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
diff --git a/gnu/libexec/uucp/uuchk/Makefile b/gnu/libexec/uucp/uuchk/Makefile
index 8af9626..4f5b3ce 100644
--- a/gnu/libexec/uucp/uuchk/Makefile
+++ b/gnu/libexec/uucp/uuchk/Makefile
@@ -4,8 +4,7 @@
 BINDIR=		$(sbindir)
 
 PROG=		uuchk
-MAN8=		uuchk.8
-SRCS=		uuchk.c
+MAN=		uuchk.8
 LDADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
 DPADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
 CFLAGS+=	-I$(.CURDIR)/../common_sources\
diff --git a/gnu/libexec/uucp/uucico/Makefile b/gnu/libexec/uucp/uucico/Makefile
index 1aa147a..1f91c87 100644
--- a/gnu/libexec/uucp/uucico/Makefile
+++ b/gnu/libexec/uucp/uucico/Makefile
@@ -15,7 +15,7 @@ DPADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
 CFLAGS+=	-I$(.CURDIR)/../common_sources\
 		-DVERSION=\"$(VERSION)\" -DOWNER=\"$(owner)\"
 
-MAN8=		uucico.8
+MAN=		uucico.8
 
 .include <bsd.prog.mk>
 .PATH: $(.CURDIR)/../common_sources
diff --git a/gnu/libexec/uucp/uusched/Makefile b/gnu/libexec/uucp/uusched/Makefile
index 0a203a8..5139027 100644
--- a/gnu/libexec/uucp/uusched/Makefile
+++ b/gnu/libexec/uucp/uusched/Makefile
@@ -4,7 +4,7 @@
 BINDIR=		$(bindir)
 CLEANFILES+=	$(ONESHPROG)
 ONESHPROG=	uusched
-MAN8=		uusched.8
+MAN=		uusched.8
 
 all: $(ONESHPROG)
 
diff --git a/gnu/libexec/uucp/uuto/Makefile b/gnu/libexec/uucp/uuto/Makefile
index da379ee..47a72dd 100644
--- a/gnu/libexec/uucp/uuto/Makefile
+++ b/gnu/libexec/uucp/uuto/Makefile
@@ -4,7 +4,7 @@
 BINDIR=		$(bindir)
 CLEANFILES+=	$(ONESHPROG)
 ONESHPROG=	uuto
-MAN1=		uuto.1
+MAN=		uuto.1
 
 all: $(ONESHPROG)
 
diff --git a/gnu/libexec/uucp/uuxqt/Makefile b/gnu/libexec/uucp/uuxqt/Makefile
index 8c6dffa..d1dafe7 100644
--- a/gnu/libexec/uucp/uuxqt/Makefile
+++ b/gnu/libexec/uucp/uuxqt/Makefile
@@ -13,7 +13,7 @@ DPADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
 CFLAGS+=	-I$(.CURDIR)/../common_sources\
 		-DVERSION=\"$(VERSION)\" -DOWNER=\"$(owner)\"
 
-MAN8=		uuxqt.8
+MAN=		uuxqt.8
 
 .include <bsd.prog.mk>
 .PATH: $(.CURDIR)/../common_sources
diff --git a/gnu/usr.bin/as/Makefile b/gnu/usr.bin/as/Makefile
index 30df831..a678242 100644
--- a/gnu/usr.bin/as/Makefile
+++ b/gnu/usr.bin/as/Makefile
@@ -17,7 +17,7 @@ ADDINCLUDE=-I${.OBJDIR}
 
 PROG=		as
 BINDIR= /usr/libexec/aout
-MAN1aout=as.1aout
+MAN=		as.1aout
 SRCS+=		app.c as.c atof-generic.c bignum-copy.c \
 		cond.c expr.c flo-const.c flo-copy.c flonum-mult.c \
 		frags.c hash.c hex-value.c input-file.c input-scrub.c \
diff --git a/gnu/usr.bin/awk/Makefile b/gnu/usr.bin/awk/Makefile
index c05310d..1ba744a 100644
--- a/gnu/usr.bin/awk/Makefile
+++ b/gnu/usr.bin/awk/Makefile
@@ -9,7 +9,7 @@
 PROG=	awk
 SRCS=	array.c awktab.y builtin.c eval.c field.c gawkmisc.c io.c main.c \
 	msg.c node.c re.c version.c dfa.c getopt.c getopt1.c
-MAN1=	doc/gawk.1
+MAN=	doc/gawk.1
 
 MLINKS=	gawk.1 awk.1
 
diff --git a/gnu/usr.bin/binutils/as/Makefile.inc0 b/gnu/usr.bin/binutils/as/Makefile.inc0
index cab64be..0920fb1 100644
--- a/gnu/usr.bin/binutils/as/Makefile.inc0
+++ b/gnu/usr.bin/binutils/as/Makefile.inc0
@@ -6,7 +6,7 @@ RELTOP:=	../${RELTOP}
 
 .PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config
 
-MAN1=		doc/as.1
+MAN=		doc/as.1
 SRCS+=		app.c as.c atof-generic.c atof-ieee.c bignum-copy.c \
 		cond.c ecoff.c expr.c flonum-copy.c flonum-konst.c \
 		flonum-mult.c frags.c hash.c input-file.c \
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index 1b3a340..ff9f2a8 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -5,7 +5,7 @@
 .PATH: ${GCCDIR}
 
 PROG=	cc
-MAN1=	gcc.1
+MAN=	gcc.1
 SRCS=	gcc.c gccspec.c
 NOSHARED?=yes
 
diff --git a/gnu/usr.bin/cc/cccp/Makefile b/gnu/usr.bin/cc/cccp/Makefile
index 400bf70..be87179 100644
--- a/gnu/usr.bin/cc/cccp/Makefile
+++ b/gnu/usr.bin/cc/cccp/Makefile
@@ -9,7 +9,7 @@ SRCS=	cccp.c cexp.y obstack.c prefix.c version.c
 YFLAGS=
 BINDIR=	/usr/libexec
 NOSHARED?=yes
-MAN1=	cccp.1
+MAN=	cccp.1
 MLINKS=	cccp.1 cpp.1
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cpio/Makefile b/gnu/usr.bin/cpio/Makefile
index 64d5c5e..279b60e 100644
--- a/gnu/usr.bin/cpio/Makefile
+++ b/gnu/usr.bin/cpio/Makefile
@@ -8,7 +8,6 @@
 SUBDIR=	doc
 
 PROG=	cpio
-MAN1=	cpio.1
 
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../../contrib/cpio 
 CFLAGS+= -DRETSIGTYPE=void -DHAVE_SYS_MTIO_H=1 -DSTDC_HEADERS=1 \
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index c56827a..4d2dac0 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -9,8 +9,7 @@ MAINTAINER=	peter@FreeBSD.org
 .PATH:	${CVSDIR}/man
 
 PROG=	cvs
-MAN1=	cvs.1
-MAN5=	cvs.5
+MAN=	cvs.1 cvs.5
 
 SRCS=	add.c admin.c buffer.c checkin.c checkout.c classify.c client.c \
 	commit.c create_adm.c cvsrc.c diff.c edit.c entries.c error.c \
diff --git a/gnu/usr.bin/cvs/cvsbug/Makefile b/gnu/usr.bin/cvs/cvsbug/Makefile
index af0bb57..7cb64d8 100644
--- a/gnu/usr.bin/cvs/cvsbug/Makefile
+++ b/gnu/usr.bin/cvs/cvsbug/Makefile
@@ -7,7 +7,7 @@ MAINTAINER=	peter@FreeBSD.org
 .PATH:	${CVSDIR}/src
 .PATH:	${CVSDIR}/man
 
-MAN8=	cvsbug.8
+MAN=	cvsbug.8
 
 CLEANFILES+= cvsbug ver
 
diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile
index 2b5aee5..b5dfeb3 100644
--- a/gnu/usr.bin/dialog/Makefile
+++ b/gnu/usr.bin/dialog/Makefile
@@ -4,7 +4,6 @@
 SUBDIR=	TESTS
 
 PROG=   dialog
-MAN1=   dialog.1
 
 CFLAGS+= -Wall -Wstrict-prototypes
 
diff --git a/gnu/usr.bin/groff/addftinfo/Makefile b/gnu/usr.bin/groff/addftinfo/Makefile
index b510b11..a3a8662 100644
--- a/gnu/usr.bin/groff/addftinfo/Makefile
+++ b/gnu/usr.bin/groff/addftinfo/Makefile
@@ -5,7 +5,7 @@ SRCS=		addftinfo.cc guess.cc
 LDADD+=		${LIBGROFF}
 DPADD+=		${LIBGROFF}
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	addftinfo.1
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/afmtodit/Makefile b/gnu/usr.bin/groff/afmtodit/Makefile
index ac347b3..aeb414a 100644
--- a/gnu/usr.bin/groff/afmtodit/Makefile
+++ b/gnu/usr.bin/groff/afmtodit/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-MAN1=		afmtodit.1
+MAN=		afmtodit.1
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	${MAN}
 
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile
index d031a26..28efb09 100644
--- a/gnu/usr.bin/groff/eqn/Makefile
+++ b/gnu/usr.bin/groff/eqn/Makefile
@@ -6,8 +6,8 @@ SRCS=		eqn.cc eqn_tab.h main.cc lex.cc \
 		script.cc mark.cc other.cc delim.cc sqrt.cc pile.cc special.cc
 DPADD=		${LIBGROFF}
 LDADD=		${LIBGROFF}
-MAN1=		eqn.1 neqn.1
-CLEANFILES=	eqn.cc eqn_tab.h ${MAN1} neqn y.tab.c y.tab.h
+MAN=		eqn.1 neqn.1
+CLEANFILES=	eqn.cc eqn_tab.h ${MAN} neqn y.tab.c y.tab.h
 
 all: neqn
 
diff --git a/gnu/usr.bin/groff/grn/Makefile b/gnu/usr.bin/groff/grn/Makefile
index ee63e49..d8cdd73 100644
--- a/gnu/usr.bin/groff/grn/Makefile
+++ b/gnu/usr.bin/groff/grn/Makefile
@@ -6,7 +6,7 @@ CFLAGS+=	-I${.CURDIR}/../include
 LDADD+= 	${LIBGROFF} -lm
 DPADD+= 	${LIBGROFF} ${LIBM}
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	grn.1
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grodvi/Makefile b/gnu/usr.bin/groff/grodvi/Makefile
index 5c15975..bdbad24 100644
--- a/gnu/usr.bin/groff/grodvi/Makefile
+++ b/gnu/usr.bin/groff/grodvi/Makefile
@@ -5,7 +5,7 @@ SRCS=		dvi.cc
 LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
 DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	grodvi.1
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/groff/Makefile b/gnu/usr.bin/groff/groff/Makefile
index d909179..05ffd14 100644
--- a/gnu/usr.bin/groff/groff/Makefile
+++ b/gnu/usr.bin/groff/groff/Makefile
@@ -6,7 +6,7 @@ CFLAGS+=	-I${.CURDIR}/../include
 LDADD+=		${LIBGROFF} -lm
 DPADD+=		${LIBGROFF} ${LIBM}
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	groff.1
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grog/Makefile b/gnu/usr.bin/groff/grog/Makefile
index 0ae3a5e..eb28285 100644
--- a/gnu/usr.bin/groff/grog/Makefile
+++ b/gnu/usr.bin/groff/grog/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-MAN1=	grog.1
-CLEANFILES= grog ${MAN1}
+MAN=	grog.1
+CLEANFILES= grog ${MAN}
 
 all: grog
 
diff --git a/gnu/usr.bin/groff/grohtml/Makefile b/gnu/usr.bin/groff/grohtml/Makefile
index c75f93a..3010146 100644
--- a/gnu/usr.bin/groff/grohtml/Makefile
+++ b/gnu/usr.bin/groff/grohtml/Makefile
@@ -6,7 +6,7 @@ SRCS=		html.cc output.cc
 LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
 DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	grohtml.1
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grolbp/Makefile b/gnu/usr.bin/groff/grolbp/Makefile
index e71fd34..43c7791 100644
--- a/gnu/usr.bin/groff/grolbp/Makefile
+++ b/gnu/usr.bin/groff/grolbp/Makefile
@@ -5,7 +5,7 @@ SRCS=		lbp.cc
 LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
 DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	grolbp.1
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grolj4/Makefile b/gnu/usr.bin/groff/grolj4/Makefile
index a803ab9..1ff29aa 100644
--- a/gnu/usr.bin/groff/grolj4/Makefile
+++ b/gnu/usr.bin/groff/grolj4/Makefile
@@ -5,7 +5,7 @@ SRCS=		lj4.cc
 LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
 DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	grolj4.1
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grops/Makefile b/gnu/usr.bin/groff/grops/Makefile
index 5ce668d..7c7c3bb 100644
--- a/gnu/usr.bin/groff/grops/Makefile
+++ b/gnu/usr.bin/groff/grops/Makefile
@@ -5,7 +5,7 @@ SRCS=		ps.cc psrm.cc
 LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
 DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	grops.1
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grotty/Makefile b/gnu/usr.bin/groff/grotty/Makefile
index 9da934f..d8c5fda 100644
--- a/gnu/usr.bin/groff/grotty/Makefile
+++ b/gnu/usr.bin/groff/grotty/Makefile
@@ -5,7 +5,7 @@ SRCS=		tty.cc
 LDADD+=		${LIBDRIVER} ${LIBGROFF} -lm
 DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	grotty.1
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/hpftodit/Makefile b/gnu/usr.bin/groff/hpftodit/Makefile
index c1a0945..5fd7c52 100644
--- a/gnu/usr.bin/groff/hpftodit/Makefile
+++ b/gnu/usr.bin/groff/hpftodit/Makefile
@@ -5,7 +5,7 @@ SRCS=		hpftodit.cc
 LDADD+=		${LIBGROFF} -lm
 DPADD+=		${LIBGROFF} ${LIBM}
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	hpftodit.1
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/indxbib/Makefile b/gnu/usr.bin/groff/indxbib/Makefile
index d0a070d..b9df1e5 100644
--- a/gnu/usr.bin/groff/indxbib/Makefile
+++ b/gnu/usr.bin/groff/indxbib/Makefile
@@ -6,7 +6,7 @@ CFLAGS+=	-I${.CURDIR}/../include
 LDADD+= 	${LIBBIB} ${LIBGROFF} -lm
 DPADD+= 	${LIBBIB} ${LIBGROFF} ${LIBM}
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	indxbib.1
 
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
diff --git a/gnu/usr.bin/groff/lkbib/Makefile b/gnu/usr.bin/groff/lkbib/Makefile
index b341761..c0a3bb4 100644
--- a/gnu/usr.bin/groff/lkbib/Makefile
+++ b/gnu/usr.bin/groff/lkbib/Makefile
@@ -6,7 +6,7 @@ CFLAGS+=	-I${.CURDIR}/../include
 LDADD+=		${LIBBIB} ${LIBGROFF} -lm
 DPADD+=		${LIBBIB} ${LIBGROFF} ${LIBM}
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	lkbib.1
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/lookbib/Makefile b/gnu/usr.bin/groff/lookbib/Makefile
index 6ca3e7c..573421f 100644
--- a/gnu/usr.bin/groff/lookbib/Makefile
+++ b/gnu/usr.bin/groff/lookbib/Makefile
@@ -5,7 +5,7 @@ SRCS=		lookbib.cc
 LDADD+=		$(LIBBIB) $(LIBGROFF) -lm
 DPADD+=		$(LIBBIB) $(LIBGROFF) $(LIBM)
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	lookbib.1
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/man/Makefile b/gnu/usr.bin/groff/man/Makefile
index dd7e9c5..f79a098 100644
--- a/gnu/usr.bin/groff/man/Makefile
+++ b/gnu/usr.bin/groff/man/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-MAN5=	groff_font.5 groff_out.5
-MAN7=	groff.7 groff_char.7 roff.7
+MAN=	groff_font.5 groff_out.5
+MAN+=	groff.7 groff_char.7 roff.7
 
-CLEANFILES+=	${MAN5} ${MAN7}
+CLEANFILES+=	${MAN}
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/mm/Makefile b/gnu/usr.bin/groff/mm/Makefile
index c98db04..092994b 100644
--- a/gnu/usr.bin/groff/mm/Makefile
+++ b/gnu/usr.bin/groff/mm/Makefile
@@ -8,10 +8,10 @@ TMACDIR?=	${SHAREDIR}/tmac
 FILES=		0.MT 5.MT 4.MT ms.cov se_ms.cov
 LOCALE=		locale se_locale
 
-MAN7=		groff_mm.7 groff_mmse.7 mmroff.7
+MAN=		groff_mm.7 groff_mmse.7 mmroff.7
 MLINKS=		groff_mm.7 mm.7 groff_mmse.7 mmse.7
 
-CLEANFILES+=	${MAN7}
+CLEANFILES+=	${MAN}
 
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/gnu/usr.bin/groff/nroff/Makefile b/gnu/usr.bin/groff/nroff/Makefile
index bbcf990..9fe5f95 100644
--- a/gnu/usr.bin/groff/nroff/Makefile
+++ b/gnu/usr.bin/groff/nroff/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-MAN1=		nroff.1 psroff.1
+MAN=		nroff.1 psroff.1
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	${MAN}
 
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/gnu/usr.bin/groff/pfbtops/Makefile b/gnu/usr.bin/groff/pfbtops/Makefile
index 32503a5..28eac95 100644
--- a/gnu/usr.bin/groff/pfbtops/Makefile
+++ b/gnu/usr.bin/groff/pfbtops/Makefile
@@ -4,7 +4,7 @@ PROG=		pfbtops
 LDADD+=		${LIBGROFF}
 DPADD+=		${LIBGROFF}
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	pfbtops.1
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/pic/Makefile b/gnu/usr.bin/groff/pic/Makefile
index df2ca67..91de6f62 100644
--- a/gnu/usr.bin/groff/pic/Makefile
+++ b/gnu/usr.bin/groff/pic/Makefile
@@ -5,7 +5,7 @@ SRCS=		lex.cc main.cc object.cc pic.cc pic_tab.h \
 		common.cc troff.cc tex.cc
 DPADD=		${LIBGROFF} ${LIBM}
 LDADD=		${LIBGROFF} -lm
-CLEANFILES=	${MAN1} pic.cc pic_tab.h y.tab.c y.tab.h
+CLEANFILES=	pic.1 pic.cc pic_tab.h y.tab.c y.tab.h
 
 pic_tab.h: pic.cc
 
diff --git a/gnu/usr.bin/groff/refer/Makefile b/gnu/usr.bin/groff/refer/Makefile
index 7660718..91c27b3 100644
--- a/gnu/usr.bin/groff/refer/Makefile
+++ b/gnu/usr.bin/groff/refer/Makefile
@@ -4,7 +4,7 @@ PROG=		refer
 SRCS=		command.cc label.cc ref.cc refer.cc token.cc
 DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBBIB} ${LIBGROFF} -lm
-CLEANFILES=	label.cc label_tab.h ${MAN1} y.tab.c y.tab.h
+CLEANFILES=	label.cc label_tab.h refer.1 y.tab.c y.tab.h
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tbl/Makefile b/gnu/usr.bin/groff/tbl/Makefile
index cbc44a0..45c41a5 100644
--- a/gnu/usr.bin/groff/tbl/Makefile
+++ b/gnu/usr.bin/groff/tbl/Makefile
@@ -5,7 +5,7 @@ SRCS=		main.cc table.cc
 LDADD+=		${LIBGROFF} -lm
 DPADD+=		${LIBGROFF} ${LIBM}
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	tbl.1
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tfmtodit/Makefile b/gnu/usr.bin/groff/tfmtodit/Makefile
index 72bf531..a0c17dd 100644
--- a/gnu/usr.bin/groff/tfmtodit/Makefile
+++ b/gnu/usr.bin/groff/tfmtodit/Makefile
@@ -5,7 +5,7 @@ SRCS=		tfmtodit.cc
 LDADD+=		${LIBGROFF} -lm
 DPADD+=		${LIBGROFF} ${LIBM}
 
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	tfmtodit.1
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index 121b077..ed11344 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -9,16 +9,16 @@ TMACDIR?=	${SHAREDIR}/tmac
 MDOCDIR?=	${TMACDIR}/mdoc
 LOCALEDIR?=     ${MDOCDIR}/locale
 
-MAN5=		groff_tmac.5
+MAN=		groff_tmac.5
 MLINKS+=	groff_tmac.5 tmac.5
-MAN7=		groff_ms.7 groff_man.7 groff_me.7 groff_msafer.7 groff_markup.7
+MAN+=		groff_ms.7 groff_man.7 groff_me.7 groff_msafer.7 groff_markup.7
 MLINKS+=	groff_ms.7 ms.7
 MLINKS+=	groff_me.7 me.7
 MLINKS+=	groff_msafer.7 msafer.7
 MLINKS+=	groff_markup.7 markup.7
 LINKS=          ${TMACDIR}/tmac.andoc ${TMACDIR}/tmac.an
 
-CLEANFILES=	${MAN5} ${MAN7} ${MDOCFILES} ${STRIPFILES} ${SPECIALFILES}
+CLEANFILES=	${MAN} ${MDOCFILES} ${STRIPFILES} ${SPECIALFILES}
 CLEANFILES+=	tmac.an-old
 
 FILES=          tmac.mandoc tmac.andoc tmac.pic tmac.ps tmac.psnew tmac.psold \
diff --git a/gnu/usr.bin/groff/troff/Makefile b/gnu/usr.bin/groff/troff/Makefile
index 1af9d90..c2752cb 100644
--- a/gnu/usr.bin/groff/troff/Makefile
+++ b/gnu/usr.bin/groff/troff/Makefile
@@ -7,7 +7,7 @@ CFLAGS+=	-I${.CURDIR}/../include
 LDADD+=		${LIBGROFF} -lm
 DPADD+=		${LIBGROFF} ${LIBM}
 
-CLEANFILES+=	majorminor.cc ${MAN1}
+CLEANFILES+=	majorminor.cc troff.1
 
 afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${DIST_DIR}/hyphen.us \
diff --git a/gnu/usr.bin/gzip/Makefile b/gnu/usr.bin/gzip/Makefile
index 4019dab..fc52f56 100644
--- a/gnu/usr.bin/gzip/Makefile
+++ b/gnu/usr.bin/gzip/Makefile
@@ -4,7 +4,7 @@
 PROG=	gzip
 SRCS=	gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \
 	crypt.c lzw.c unlzw.c unlzh.c unpack.c getopt.c
-MAN1=	gzexe.1 gzip.1 zdiff.1 zforce.1 zmore.1 znew.1
+MAN=	gzexe.1 gzip.1 zdiff.1 zforce.1 zmore.1 znew.1
 CFLAGS+=-DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DDIRENT=1
 GREP_LIBZ?=	YES
 
@@ -24,7 +24,7 @@ LINKS+= ${BINDIR}/zdiff ${BINDIR}/zcmp
 LINKS+= ${BINDIR}/zgrep ${BINDIR}/zegrep
 LINKS+= ${BINDIR}/zgrep ${BINDIR}/zfgrep
 MLINKS+= zgrep.1 zfgrep.1 zgrep.1 zegrep.1
-MAN1+=	zgrep.1
+MAN+=	zgrep.1
 .endif
 
 NOSHARED?=yes
diff --git a/gnu/usr.bin/ld/Makefile b/gnu/usr.bin/ld/Makefile
index ae0ff94..a52f510 100644
--- a/gnu/usr.bin/ld/Makefile
+++ b/gnu/usr.bin/ld/Makefile
@@ -5,7 +5,7 @@ RTLD=	${.CURDIR}/../../../libexec/rtld-aout
 
 PROG=	ld
 BINDIR= /usr/libexec/aout
-MAN1aout=ld.1aout
+MAN=	ld.1aout
 SRCS=	ld.c symbol.c lib.c shlib.c warnings.c support.c rrs.c xbits.c md.c \
 	cplus-dem.c
 CFLAGS+= -I${.CURDIR} -I${RTLD} -I${RTLD}/${MACHINE_ARCH} \
diff --git a/gnu/usr.bin/man/Makefile.shprog b/gnu/usr.bin/man/Makefile.shprog
index 819ed33..07fb1ed 100644
--- a/gnu/usr.bin/man/Makefile.shprog
+++ b/gnu/usr.bin/man/Makefile.shprog
@@ -5,9 +5,9 @@
 # - programs without man pages.
 # - programs with man pages in sections other than section 1.
 
-MAN1=	${SHPROG:S/$/.1/g}
+MAN=	${SHPROG:S/$/.1/g}
 
-CLEANFILES+=	${SHPROG} ${MAN1}
+CLEANFILES+=	${SHPROG} ${MAN}
 
 all:	${SHPROG}
 
diff --git a/gnu/usr.bin/man/catman/Makefile b/gnu/usr.bin/man/catman/Makefile
index 075bfdf..bd5ce9e 100644
--- a/gnu/usr.bin/man/catman/Makefile
+++ b/gnu/usr.bin/man/catman/Makefile
@@ -3,7 +3,7 @@
 MAINTAINER= wosch
 
 
-MAN1=	catman.1
+MAN=	catman.1
 
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/gnu/usr.bin/man/makewhatis/Makefile b/gnu/usr.bin/man/makewhatis/Makefile
index 1de2f08..d196003 100644
--- a/gnu/usr.bin/man/makewhatis/Makefile
+++ b/gnu/usr.bin/man/makewhatis/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 MAINTAINER= wosch
 
-MAN1=	makewhatis.1
-MAN8=	makewhatis.local.8
+MAN=	makewhatis.1 makewhatis.local.8
 MLINKS=	makewhatis.local.8 catman.local.8
 
 libexecdir=/usr/libexec
diff --git a/gnu/usr.bin/man/man/Makefile b/gnu/usr.bin/man/man/Makefile
index 41d620b..852e43b 100644
--- a/gnu/usr.bin/man/man/Makefile
+++ b/gnu/usr.bin/man/man/Makefile
@@ -21,16 +21,16 @@ CFLAGS+=-DHAVE_LIBZ=1
 
 CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF
 CFLAGS+= -DDO_COMPRESS -DALT_SYSTEMS -DSETREUID -DCATMODE=0644
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	man.1
 
 .PATH:	${.CURDIR}/../manpath
 
-.include <bsd.prog.mk>
-
-${MAN1}: ${.CURDIR}/man.man
+man.1: ${.CURDIR}/man.man
 	@${ECHO} echo Making ${.TARGET:T} from ${.ALLSRC:T}; \
 	sed -e 's,%libdir%,${libdir},' -e 's,%bindir%,${bindir},' \
 	    -e 's,%pager%,${pager},' -e 's,%troff%,${troff},' \
 	    -e 's,%manpath_config_file%,${manpath_config_file},' \
 	    -e 's,%compress%,${compress},' \
-	${.CURDIR}/man.man > ${MAN1}
+	${.ALLSRC} > ${.TARGET}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/man/manpath/Makefile b/gnu/usr.bin/man/manpath/Makefile
index 72f4d80..2c57188 100644
--- a/gnu/usr.bin/man/manpath/Makefile
+++ b/gnu/usr.bin/man/manpath/Makefile
@@ -7,11 +7,11 @@ LDADD=	${LIBMAN}
 
 CFLAGS+= -DMAIN -DSTDC_HEADERS -DPOSIX -DHAS_TROFF -DDO_UNCOMPRESS
 CFLAGS+= -DALT_SYSTEMS -I${.CURDIR}/../lib -I${.OBJDIR}/../lib
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	manpath.1
 
-.include <bsd.prog.mk>
-
-${MAN1}: ${.CURDIR}/manpath.man
+manpath.1: ${.CURDIR}/manpath.man
 	@${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \
 	sed -e 's,%manpath_config_file%,/etc/manpath.config,' \
 	${.ALLSRC} > ${.TARGET}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/patch/Makefile b/gnu/usr.bin/patch/Makefile
index 4d5fad2..10eeab4 100644
--- a/gnu/usr.bin/patch/Makefile
+++ b/gnu/usr.bin/patch/Makefile
@@ -1,6 +1,8 @@
+# $FreeBSD$
+
 PROG= 	patch
-SRCS = backupfile.c getopt.c getopt1.c inp.c patch.c pch.c util.c \
+SRCS=	backupfile.c getopt.c getopt1.c inp.c patch.c pch.c util.c \
 	version.c
-CFLAGS += -DHAVE_CONFIG_H
-MAN=	patch.1
+CFLAGS+=-DHAVE_CONFIG_H
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/pod/pod/Makefile b/gnu/usr.bin/perl/pod/pod/Makefile
index eca0a43..72a07dd 100644
--- a/gnu/usr.bin/perl/pod/pod/Makefile
+++ b/gnu/usr.bin/perl/pod/pod/Makefile
@@ -77,7 +77,7 @@ ${I}.1: ${I}.pod
 	${MINIPERL} ${MINIPERLOPT} ${.OBJDIR}/../pod2man/pod2man ${.OODATE} \
 		> ${.TARGET}
 
-MAN1+=	${I}.1
+MAN+=	${I}.1
 
 CLEANFILES+= ${.OBJDIR}/${I}.pod ${I}.1
 .endfor
diff --git a/gnu/usr.bin/rcs/rcs/Makefile b/gnu/usr.bin/rcs/rcs/Makefile
index 344ab6e..aa7cc5f 100644
--- a/gnu/usr.bin/rcs/rcs/Makefile
+++ b/gnu/usr.bin/rcs/rcs/Makefile
@@ -1,11 +1,10 @@
+# $FreeBSD$
+
 PROG=	rcs
-SRCS=	rcs.c
+MAN=	rcs.1 rcsintro.1 rcsfile.5
 CFLAGS+= -I${.CURDIR}/../lib
 LDADD=  ${LIBRCS}
 DPADD=  ${LIBRCS}
 
-MAN1=	rcs.1 rcsintro.1
-MAN5=   rcsfile.5
-
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/rcsfreeze/Makefile b/gnu/usr.bin/rcs/rcsfreeze/Makefile
index a71f9d7..c52f93e 100644
--- a/gnu/usr.bin/rcs/rcsfreeze/Makefile
+++ b/gnu/usr.bin/rcs/rcsfreeze/Makefile
@@ -1,4 +1,6 @@
-MAN1=	rcsfreeze.1
+# $FreeBSD$
+
+MAN=	rcsfreeze.1
 
 afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/gnu/usr.bin/send-pr/Makefile b/gnu/usr.bin/send-pr/Makefile
index 842d65c..95dc518 100644
--- a/gnu/usr.bin/send-pr/Makefile
+++ b/gnu/usr.bin/send-pr/Makefile
@@ -1,8 +1,9 @@
+# $FreeBSD$
 #
 # Makefile for building a standalone send-pr.
 #
 
-MAN1=		send-pr.1
+MAN=		send-pr.1
 SUBMITTERS=	current-users
 RELEASE=	`uname -rsm`
 RELEASE_EV!=	uname -rsm
diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile
index d97f040..c371e30 100644
--- a/gnu/usr.bin/texinfo/info/Makefile
+++ b/gnu/usr.bin/texinfo/info/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PROG=	info
-MAN1=	info.1
-MAN5=	info.5 texinfo.5
+MAN=	info.1 info.5 texinfo.5
 
 SRCS=	dir.c display.c doc.c dribble.c echo-area.c filesys.c \
 	footnotes.c gc.c indices.c info-utils.c info.c infodoc.c \