54 files changed, 92 insertions, 105 deletions

diff --git a/lib/libalias/Makefile b/lib/libalias/Makefile
index c5bd11dec9e4..a6f577d11261 100644
--- a/lib/libalias/Makefile
+++ b/lib/libalias/Makefile
@@ -8,6 +8,6 @@ SRCS=		alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \
 		alias_nbt.c alias_pptp.c alias_proxy.c alias_smedia.c \
 		alias_util.c
 INCS=		alias.h
-MAN3=		libalias.3
+MAN=		libalias.3
 
 .include <bsd.lib.mk>
diff --git a/lib/libc/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc
index e90188244d1f..f9954f3529d5 100644
--- a/lib/libc/compat-43/Makefile.inc
+++ b/lib/libc/compat-43/Makefile.inc
@@ -8,8 +8,8 @@ SRCS+=	creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \
 	setrgid.c setruid.c sigcompat.c
 
 .if ${LIB} == "c"
-MAN2+=	creat.2 killpg.2 sigblock.2 sigpause.2 sigsetmask.2 sigvec.2
-MAN3+=	gethostid.3 setruid.3
+MAN+=	creat.2 killpg.2 sigblock.2 sigpause.2 sigsetmask.2 sigvec.2
+MAN+=	gethostid.3 setruid.3
 
 MLINKS+=gethostid.3 sethostid.3
 MLINKS+=setruid.3 setrgid.3
diff --git a/lib/libc/db/man/Makefile.inc b/lib/libc/db/man/Makefile.inc
index 8ccef0a5af03..216b75610b91 100644
--- a/lib/libc/db/man/Makefile.inc
+++ b/lib/libc/db/man/Makefile.inc
@@ -4,7 +4,7 @@
 .PATH: ${.CURDIR}/../libc/db/man
 
 .if ${LIB} == "c"
-MAN3+=	btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3
+MAN+=	btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3
 
 MLINKS+= dbm.3 dbm_clearerr.3
 MLINKS+= dbm.3 dbm_close.3
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 6a7406a35938..e4bcff29ab10 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -34,7 +34,7 @@ SRCS+=  _rand48.c _spinlock_stub.c alarm.c arc4random.c assert.c \
 .include "${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc"
 
 .if ${LIB} == "c"
-MAN3+=  alarm.3 arc4random.3 clock.3 \
+MAN+=	alarm.3 arc4random.3 clock.3 \
 	basename.3 \
 	confstr.3 ctermid.3 daemon.3 \
 	devname.3 directory.3 dirname.3 dladdr.3 dllockinit.3 dlopen.3 \
diff --git a/lib/libc/gmon/Makefile.inc b/lib/libc/gmon/Makefile.inc
index 1b8a90629204..ca13d5edbd0a 100644
--- a/lib/libc/gmon/Makefile.inc
+++ b/lib/libc/gmon/Makefile.inc
@@ -7,7 +7,7 @@
 SRCS+=	gmon.c mcount.c
 
 .if ${LIB} == "c"
-MAN3+=	moncontrol.3
+MAN+=	moncontrol.3
 
 MLINKS+=moncontrol.3 monstartup.3
 .endif
diff --git a/lib/libc/i386/sys/Makefile.inc b/lib/libc/i386/sys/Makefile.inc
index f6707050a6d6..a2fd7e9fa5a7 100644
--- a/lib/libc/i386/sys/Makefile.inc
+++ b/lib/libc/i386/sys/Makefile.inc
@@ -21,8 +21,8 @@ PSEUDO=	_getlogin.o
 PSEUDOR=	_exit.o
 
 .if ${LIB} == "c"
-MAN2+=	i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2
-MAN3+=	i386_set_watch.3
+MAN+=	i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2
+MAN+=	i386_set_watch.3
 
 MLINKS+=i386_get_ioperm.2 i386_set_ioperm.2
 MLINKS+=i386_get_ldt.2 i386_set_ldt.2
diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc
index fb3cb3928a6a..630370025651 100644
--- a/lib/libc/locale/Makefile.inc
+++ b/lib/libc/locale/Makefile.inc
@@ -10,11 +10,11 @@ SRCS+=	ansi.c big5.c collate.c collcmp.c euc.c frune.c isctype.c \
 	tolower.c toupper.c utf2.c
 
 .if ${LIB} == "c"
-MAN3+=	ctype.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \
+MAN+=	ctype.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \
 	isdigit.3 isgraph.3 islower.3 isprint.3 ispunct.3 isspace.3 \
 	isupper.3 isxdigit.3 mbrune.3 multibyte.3 rune.3 setlocale.3 \
 	toascii.3 tolower.3 toupper.3
-MAN4+=	euc.4 utf2.4
+MAN+=	euc.4 utf2.4
 
 MLINKS+=mbrune.3 mbmb.3 mbrune.3 mbrrune.3
 MLINKS+=multibyte.3 mblen.3 multibyte.3 mbstowcs.3 multibyte.3 mbtowc.3 \
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index 1d3ab660da73..c859070d3ea2 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -27,7 +27,7 @@ CFLAGS+=-DINET6
 .include "${.CURDIR}/../libc/${MACHINE_ARCH}/net/Makefile.inc"
 
 .if ${LIB} == "c"
-MAN3+=	addr2ascii.3 byteorder.3 ethers.3 getaddrinfo.3 gethostbyname.3 \
+MAN+=	addr2ascii.3 byteorder.3 ethers.3 getaddrinfo.3 gethostbyname.3 \
 	getifaddrs.3 getipnodebyname.3 \
 	getnameinfo.3 getnetent.3 getprotoent.3 getservent.3 if_indextoname.3 \
 	inet.3 inet6_option_space.3 inet6_rthdr_space.3 linkaddr.3 \
diff --git a/lib/libc/nls/Makefile.inc b/lib/libc/nls/Makefile.inc
index 06e7de7727f5..c124d67cf4c7 100644
--- a/lib/libc/nls/Makefile.inc
+++ b/lib/libc/nls/Makefile.inc
@@ -6,5 +6,5 @@
 SRCS+=	msgcat.c
 
 .if ${LIB} == "c"
-MAN3+=  catclose.3 catgets.3 catopen.3
+MAN+=	catclose.3 catgets.3 catopen.3
 .endif
diff --git a/lib/libc/regex/Makefile.inc b/lib/libc/regex/Makefile.inc
index 107de2e9c4ef..53468016c03d 100644
--- a/lib/libc/regex/Makefile.inc
+++ b/lib/libc/regex/Makefile.inc
@@ -9,8 +9,8 @@ CFLAGS+=-DPOSIX_MISTAKE
 SRCS+=	regcomp.c regerror.c regexec.c regfree.c
 
 .if ${LIB} == "c"
-MAN3+=	regex.3
-MAN7+=	re_format.7
+MAN+=	regex.3
+MAN+=	re_format.7
 
 MLINKS+=regex.3 regcomp.3 regex.3 regexec.3 regex.3 regerror.3
 MLINKS+=regexec.3 regfree.3
diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc
index f9471598931e..c8371cb38d23 100644
--- a/lib/libc/rpc/Makefile.inc
+++ b/lib/libc/rpc/Makefile.inc
@@ -37,9 +37,9 @@ crypt.h: ${RPCDIR}/crypt.x
 
 .if ${LIB} == "c"
 
-MAN3+=	bindresvport.3 des_crypt.3 getrpcent.3 getrpcport.3 publickey.3 rpc.3 \
+MAN+=	bindresvport.3 des_crypt.3 getrpcent.3 getrpcport.3 publickey.3 rpc.3 \
 	rpc_secure.3 rtime.3
-MAN5+=	publickey.5 rpc.5
+MAN+=	publickey.5 rpc.5
 
 MLINKS+=	bindresvport.3 bindresvport_sa.3 \
 		getrpcent.3 endrpcent.3 \
diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc
index 514ab31c15bc..f4a9f329cb9e 100644
--- a/lib/libc/stdio/Makefile.inc
+++ b/lib/libc/stdio/Makefile.inc
@@ -17,7 +17,7 @@ SRCS+=	_flock_stub.c \
 	vsscanf.c wbuf.c wsetup.c
 
 .if ${LIB} == "c"
-MAN3+=	fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fopen.3 fputs.3 \
+MAN+=	fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fopen.3 fputs.3 \
 	fread.3 fseek.3 funopen.3 getc.3 mktemp.3 printf.3 putc.3 remove.3 \
 	scanf.3 setbuf.3 stdio.3 tmpnam.3 ungetc.3
 
diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc
index bd82afe96e47..3f70d591de37 100644
--- a/lib/libc/stdlib/Makefile.inc
+++ b/lib/libc/stdlib/Makefile.inc
@@ -24,7 +24,7 @@ SRCS+=	strtod.c
 .include "${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib/Makefile.inc"
 
 .if ${LIB} == "c"
-MAN3+=	abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \
+MAN+=	abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \
 	div.3 exit.3 getenv.3 getopt.3 getsubopt.3 labs.3 \
 	ldiv.3 malloc.3 memory.3 qsort.3 radixsort.3 rand.3 random.3 \
 	realpath.3 strtod.3 strtol.3 strtoul.3 system.3 tsearch.3
diff --git a/lib/libc/stdtime/Makefile.inc b/lib/libc/stdtime/Makefile.inc
index 39daaa661ed8..8869af0619d8 100644
--- a/lib/libc/stdtime/Makefile.inc
+++ b/lib/libc/stdtime/Makefile.inc
@@ -6,8 +6,8 @@
 SRCS+=	asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c
 
 .if ${LIB} == "c"
-MAN3+=	ctime.3 strftime.3 strptime.3 time2posix.3
-MAN5+=	tzfile.5
+MAN+=	ctime.3 strftime.3 strptime.3 time2posix.3
+MAN+=	tzfile.5
 
 MLINKS+=ctime.3 asctime.3 ctime.3 difftime.3 ctime.3 gmtime.3 \
 	ctime.3 localtime.3 ctime.3 mktime.3 ctime.3 timegm.3
diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
index 6e0569175bc4..026be17282b7 100644
--- a/lib/libc/string/Makefile.inc
+++ b/lib/libc/string/Makefile.inc
@@ -17,7 +17,7 @@ MISRCS+=bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \
 .include "${.CURDIR}/../libc/${MACHINE_ARCH}/string/Makefile.inc"
 
 .if ${LIB} == "c"
-MAN3+=	bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \
+MAN+=	bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \
 	memcmp.3 memcpy.3 memmove.3 memset.3 rindex.3 strcasecmp.3 strcat.3 \
 	strchr.3 strcmp.3 strcoll.3 strcpy.3 strcspn.3 strdup.3 strerror.3 \
 	string.3 strlcpy.3 strlen.3 strmode.3 strpbrk.3 strrchr.3 strsep.3 \
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index b6629ecb8e7f..9e529f03b9ea 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -73,7 +73,7 @@ ${SPSEUDOR}:
 	    > ${.TARGET}
 
 .if ${LIB} == "c"
-MAN2+=	_exit.2 accept.2 access.2 acct.2 adjtime.2 \
+MAN+=	_exit.2 accept.2 access.2 acct.2 adjtime.2 \
 	aio_cancel.2 aio_error.2 aio_read.2 aio_return.2 \
 	aio_suspend.2 aio_waitcomplete.2 aio_write.2 \
 	bind.2 brk.2 chdir.2 chflags.2 \
@@ -102,7 +102,7 @@ MAN2+=	_exit.2 accept.2 access.2 acct.2 adjtime.2 \
 	truncate.2 umask.2 undelete.2 \
 	unlink.2 utimes.2 vfork.2 wait.2 write.2
 .if !defined(NO_P1003_1B)
-MAN2+=	sched_get_priority_max.2 sched_setparam.2 \
+MAN+=	sched_get_priority_max.2 sched_setparam.2 \
 	sched_setscheduler.2 sched_yield.2
 .endif
 
diff --git a/lib/libc/xdr/Makefile.inc b/lib/libc/xdr/Makefile.inc
index 1837ef889a38..0d50d7820c89 100644
--- a/lib/libc/xdr/Makefile.inc
+++ b/lib/libc/xdr/Makefile.inc
@@ -6,7 +6,7 @@ SRCS+=	xdr.c xdr_array.c xdr_float.c xdr_mem.c \
 	xdr_rec.c xdr_reference.c xdr_stdio.c xdr_sizeof.c
 
 .if ${LIB} == "c"
-MAN3+=	xdr.3
+MAN+=	xdr.3
 
 MLINKS+=	xdr.3 xdr_array.3 \
 		xdr.3 xdr_bool.3 \
diff --git a/lib/libc_r/man/Makefile.inc b/lib/libc_r/man/Makefile.inc
index 9cc74d750d2a..da127e51a17e 100644
--- a/lib/libc_r/man/Makefile.inc
+++ b/lib/libc_r/man/Makefile.inc
@@ -4,7 +4,7 @@
 
 .PATH: ${.CURDIR}/man
 
-MAN3+=	pthread_attr.3 \
+MAN+=	pthread_attr.3 \
 	pthread_cancel.3 \
 	pthread_cleanup_pop.3 \
 	pthread_cleanup_push.3 \
diff --git a/lib/libcalendar/Makefile b/lib/libcalendar/Makefile
index 9674405d2025..601b77cbe5ca 100644
--- a/lib/libcalendar/Makefile
+++ b/lib/libcalendar/Makefile
@@ -5,7 +5,7 @@ LIB=	calendar
 SRCS=	calendar.c easter.c
 INCS=	calendar.h
 
-MAN3=   calendar.3
+MAN=	calendar.3
 
 MLINKS=	calendar.3 easterg.3 calendar.3 easterog.3 calendar.3 easteroj.3 \
 	calendar.3 gdate.3 calendar.3 jdate.3 \
diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
index a66251092481..bd2d868203a6 100644
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
@@ -6,7 +6,7 @@ LIB=	cam
 SRCS=	camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c
 INCS=	camlib.h
 
-MAN3=	cam.3 cam_cdbparse.3
+MAN=	cam.3 cam_cdbparse.3
 
 
 MLINKS+=cam.3 cam_open_device.3 \
diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile
index 081a0b7d229c..65a3ffd212ad 100644
--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@@ -3,7 +3,7 @@
 LIB=	com_err
 SRCS=	com_err.c error.c
 INCS=	${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h
-MAN3=	com_err.3
+MAN=	com_err.3
 COM_ERRDIR=	${.CURDIR}/../../contrib/com_err
 CFLAGS+=	-I${COM_ERRDIR}
 
diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile
index b07c67e19051..668f7b674ce5 100644
--- a/lib/libcompat/Makefile
+++ b/lib/libcompat/Makefile
@@ -15,8 +15,8 @@ NOPIC=
 # XXX MISSING:	tell.c
 SRCS+=	ascftime.c cftime.c ftime.c getpw.c gtty.c stty.c
 
-MAN3+=	4.1/ftime.3 4.1/getpw.3 4.1/stty.3
-MAN3+=	4.1/cftime.3
+MAN+=	4.1/ftime.3 4.1/getpw.3 4.1/stty.3
+MAN+=	4.1/cftime.3
 
 MLINKS+=stty.3 gtty.3
 MLINKS+=cftime.3 ascftime.3
@@ -27,7 +27,7 @@ SRCS+=	cfree.c lsearch.c regex.c rexec.c
 SRCS+=	insque.c remque.c
 
 # XXX MISSING:	ecvt.0
-MAN3+=  4.3/cfree.3 4.3/insque.3 4.3/lsearch.3 4.3/re_comp.3 4.3/rexec.3
+MAN+=	4.3/cfree.3 4.3/insque.3 4.3/lsearch.3 4.3/re_comp.3 4.3/rexec.3
 
 # XXX MISSING:	ecvt.3, so can't MLINK
 #MLINKS+=ecvt.3 fcvt.3 ecvt.3 gcvt.3
@@ -37,12 +37,12 @@ MLINKS+=lsearch.3 lfind.3
 
 # compat 4.4 sources
 SRCS+=	cuserid.c
-MAN3+=	4.4/cuserid.3
+MAN+=	4.4/cuserid.3
 
 # regexp sources
 SRCS+=	regerror.c regexp.c regsub.c
 
-MAN3+=	regexp/regexp.3
+MAN+=	regexp/regexp.3
 
 # XXX name clash with libc
 # MLINKS+=regexp.3 regcomp.3 regexp.3 regexec.3 regexp.3 regerror.3
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index dc6311e1696c..dc373993ade9 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -19,7 +19,7 @@ SONAME=		${LCRYPTSO}
 SRCS=		crypt.c crypt-md5.c misc.c
 STATICSRCS=	md5c.c
 STATICOBJS=	${STATICSRCS:S/.c/.o/g}
-MAN3=		crypt.3
+MAN=		crypt.3
 MLINKS=		crypt.3 crypt_get_format.3 crypt.3 crypt_set_format.3
 CFLAGS+=	-I${.CURDIR}/../libmd
 CFLAGS+=	-DLIBC_SCCS -Wall
diff --git a/lib/libdevstat/Makefile b/lib/libdevstat/Makefile
index 73e51c9f62a7..07e580ef1b90 100644
--- a/lib/libdevstat/Makefile
+++ b/lib/libdevstat/Makefile
@@ -6,7 +6,7 @@ LIB=	devstat
 SRCS=	devstat.c
 INCS=	devstat.h
 
-MAN3=	devstat.3
+MAN=	devstat.3
 
 MLINKS+=devstat.3 getnumdevs.3 
 MLINKS+=devstat.3 getgeneration.3 
diff --git a/lib/libdisk/Makefile b/lib/libdisk/Makefile
index 0c153706826e..afe06ab1e037 100644
--- a/lib/libdisk/Makefile
+++ b/lib/libdisk/Makefile
@@ -15,7 +15,7 @@ NOPROFILE=	yes
 NOSHARED=	yes
 NOPIC=		yes
 
-MAN3=		libdisk.3
+MAN=		libdisk.3
 MLINKS+=	libdisk.3 Open_Disk.3 \
 		libdisk.3 Clone_Disk.3 \
 		libdisk.3 Free_Disk.3 \
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index af1bb953d0ce..331263c9780d 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -11,8 +11,7 @@ OSRCS=	chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \
 DPADD=	${LIBTERMCAP}
 LDADD=	-ltermcap
 
-MAN3=   editline.3
-MAN5=   editrc.5
+MAN=	editline.3 editrc.5
 
 MLINKS=	editline.3 el_init.3 editline.3 el_end.3 editline.3 el_reset.3 \
 	editline.3 el_gets.3 editline.3 el_getc.3 editline.3 el_push.3 \
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index 90a2b2a0b67f..14b03316ce7d 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -10,7 +10,7 @@ CFLAGS+=	-DNDEBUG
 SRCS=		fetch.c common.c ftp.c http.c file.c \
 		ftperr.h httperr.h
 INCS=		fetch.h
-MAN3=		fetch.3
+MAN=		fetch.3
 CLEANFILES=	ftperr.h httperr.h
 
 SHLIB_MAJOR=    2
diff --git a/lib/libform/Makefile b/lib/libform/Makefile
index e274b5bb4e2d..308e97be16c9 100644
--- a/lib/libform/Makefile
+++ b/lib/libform/Makefile
@@ -28,7 +28,7 @@ ncurses_def.h:	MKncurses_def.sh ncurses_defs
 	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
 	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
 
-MAN3x=	form.3x form_cursor.3x form_data.3x form_driver.3x \
+MANx=	form.3x form_cursor.3x form_data.3x form_driver.3x \
 	form_field.3x form_field_attributes.3x form_field_buffer.3x \
 	form_field_info.3x form_field_just.3x form_field_new.3x \
 	form_field_opts.3x form_field_userptr.3x \
@@ -36,12 +36,11 @@ MAN3x=	form.3x form_cursor.3x form_data.3x form_driver.3x \
 	form_new.3x form_new_page.3x form_opts.3x form_page.3x \
 	form_post.3x form_requestname.3x form_userptr.3x form_win.3x
 
-# Generate the MAN3 list from MAN3x
-.for page in ${MAN3x}
-CLEANFILES+=${page:T:S/3x$/3/g}
-MAN3+=${page:T:S/3x$/3/g}
-all-man: ${page:T:S/3x$/3/g}
-${page:T:S/3x$/3/g}: ${page}
+# Generate the MAN list from MANx
+.for page in ${MANx}
+CLEANFILES+=${page:T:S/x$//g}
+MAN+=${page:T:S/x$//g}
+${page:T:S/x$//g}: ${page}
 	ln -s ${.ALLSRC} ${.TARGET}
 .endfor
 
@@ -92,5 +91,3 @@ MLINKS+=form_win.3 form_sub.3 form_win.3 scale_form.3 \
 	form_win.3 set_form_sub.3 form_win.3 set_form_win.3
 
 .include <bsd.lib.mk>
-
-.SUFFIXES: .3x .3
diff --git a/lib/libftpio/Makefile b/lib/libftpio/Makefile
index 8652bc7ce539..a06a75e9f060 100644
--- a/lib/libftpio/Makefile
+++ b/lib/libftpio/Makefile
@@ -8,7 +8,7 @@ SRCS=		ftpio.c ftperr.c
 INCS=		ftpio.h
 CFLAGS+=	-I${.CURDIR} -Wall
 CFLAGS+=	-DINET6
-MAN3=		ftpio.3
+MAN=		ftpio.3
 CLEANFILES=	ftperr.c
 
 ftperr.c:	ftp.errors
diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile
index c06752a4c54c..0f191a4ad984 100644
--- a/lib/libipsec/Makefile
+++ b/lib/libipsec/Makefile
@@ -44,7 +44,7 @@ CLEANFILES+=	y.tab.c y.tab.h
 YFLAGS+=-d -p __libipsecyy
 LFLAGS+=-P__libipsecyy
 
-MAN3=	ipsec_set_policy.3 ipsec_strerror.3
+MAN=	ipsec_set_policy.3 ipsec_strerror.3
 MLINKS+=ipsec_set_policy.3 ipsec_get_policylen.3 \
 	ipsec_set_policy.3 ipsec_dump_policy.3
 
diff --git a/lib/libipx/Makefile b/lib/libipx/Makefile
index 04665babbc88..b468f606143e 100644
--- a/lib/libipx/Makefile
+++ b/lib/libipx/Makefile
@@ -1,8 +1,10 @@
+# $FreeBSD$
+
 LIB=	ipx
 #CFLAGS+=-DLIBC_SCCS -I${.CURDIR}/../../sys
 SRCS=	ipx_addr.c ipx_ntoa.c
 
-MAN3=	ipx.3
+MAN=	ipx.3
 
 MLINKS+=ipx.3 ipx_addr.3 ipx.3 ipx_ntoa.3
 
diff --git a/lib/libisc/Makefile b/lib/libisc/Makefile
index f0bd477785f4..a368f3c0d7db 100644
--- a/lib/libisc/Makefile
+++ b/lib/libisc/Makefile
@@ -29,9 +29,9 @@ INCS=		${BIND_DIR}/include/isc/assertions.h \
 		${BIND_DIR}/include/isc/tree.h
 INCDIR=		/usr/include/isc
 
-MAN3=		assertions.3 bitncmp.3 eventlib.3 heap.3 \
+MAN=		assertions.3 bitncmp.3 eventlib.3 heap.3 \
 		logging.3 memcluster.3 tree.3
-CLEANFILES+=	${MAN3}
+CLEANFILES+=	${MAN}
 
 MLINKS+=	assertions.3 ENSURE.3 \
 		assertions.3 ENSURE_ERR.3 \
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
index 325524fcc01d..da645f7db0fc 100644
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
@@ -7,7 +7,7 @@ SRCS=	kvm.c kvm_${MACHINE_ARCH}.c kvm_file.c kvm_getloadavg.c \
 	kvm_getswapinfo.c kvm_proc.c
 INCS=	kvm.h
 
-MAN3=	kvm.3 kvm_geterr.3 kvm_getfiles.3 kvm_getloadavg.3 kvm_getprocs.3 \
+MAN=	kvm.3 kvm_geterr.3 kvm_getfiles.3 kvm_getloadavg.3 kvm_getprocs.3 \
 	kvm_getswapinfo.3 kvm_nlist.3 kvm_open.3 kvm_read.3
 
 MLINKS+=kvm_getprocs.3 kvm_getargv.3 kvm_getprocs.3 kvm_getenvv.3
diff --git a/lib/libm/Makefile b/lib/libm/Makefile
index 0752465ad194..b5495d7b38c0 100644
--- a/lib/libm/Makefile
+++ b/lib/libm/Makefile
@@ -128,7 +128,7 @@ SRCS+=	atan2.s cabs.s cbrt.s sqrt.s sincos.s tan.s argred.s support.s \
 
 .endif
 
-MAN3+=	common_source/acos.3 common_source/acosh.3 common_source/asin.3 \
+MAN+=	common_source/acos.3 common_source/acosh.3 common_source/asin.3 \
 	common_source/asinh.3 common_source/atan.3 common_source/atan2.3 \
 	common_source/atanh.3 common_source/ceil.3 common_source/cos.3 \
 	common_source/cosh.3 common_source/erf.3 common_source/exp.3 \
diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile
index 5762808f1f0e..81073b3de402 100644
--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@@ -6,7 +6,7 @@ SRCS=	md2c.c md4c.c md5c.c md2hl.c md4hl.c md5hl.c \
 	sha0c.c sha0hl.c sha1c.c sha1hl.c
 INCS=	md2.h md4.h md5.h ripemd.h sha.h
 
-MAN3+=  md2.3 md4.3 md5.3 ripemd.3 sha.3
+MAN+=	md2.3 md4.3 md5.3 ripemd.3 sha.3
 MLINKS+=md2.3 MD2Init.3 md2.3 MD2Update.3 md2.3 MD2Final.3
 MLINKS+=md2.3 MD2End.3  md2.3 MD2File.3   md2.3 MD2Data.3
 MLINKS+=md4.3 MD4Init.3 md4.3 MD4Update.3 md4.3 MD4Final.3
diff --git a/lib/libmenu/Makefile b/lib/libmenu/Makefile
index eb8b5197330b..df7ce042713d 100644
--- a/lib/libmenu/Makefile
+++ b/lib/libmenu/Makefile
@@ -25,7 +25,7 @@ ncurses_def.h:	MKncurses_def.sh ncurses_defs
 	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
 	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
 
-MAN3x=	menu.3x menu_attribs.3x menu_attributes.3x menu_cursor.3x \
+MANx=	menu.3x menu_attribs.3x menu_attributes.3x menu_cursor.3x \
 	menu_driver.3x menu_format.3x menu_hook.3x menu_items.3x \
 	menu_mark.3x menu_new.3x menu_opts.3x menu_pattern.3x \
 	menu_post.3x menu_requestname.3x menu_spacing.3x \
@@ -33,12 +33,11 @@ MAN3x=	menu.3x menu_attribs.3x menu_attributes.3x menu_cursor.3x \
 	mitem_new.3x mitem_opts.3x mitem_userptr.3x mitem_value.3x \
 	mitem_visible.3x
 
-# Generate the MAN3 list from MAN3x
-.for page in ${MAN3x}
-CLEANFILES+=${page:T:S/3x$/3/g}
-MAN3+=${page:T:S/3x$/3/g}
-all-man: ${page:T:S/3x$/3/g}
-${page:T:S/3x$/3/g}: ${page}
+# Generate the MAN list from MANx
+.for page in ${MANx}
+CLEANFILES+=${page:T:S/x$//g}
+MAN+=${page:T:S/x$//g}
+${page:T:S/x$//g}: ${page}
 	ln -s ${.ALLSRC} ${.TARGET}
 .endfor
 
@@ -77,5 +76,3 @@ MLINKS+=mitem_value.3 item_value.3 mitem_value.3 set_item_value.3
 MLINKS+=mitem_visible.3 item_visible.3
 
 .include <bsd.lib.mk>
-
-.SUFFIXES: .3x .3
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index c39dd77b11a0..fc14e0b58fea 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -376,7 +376,7 @@ terminfo.5:	MKterminfo.sh terminfo.head Caps
 CLEANFILES+=	terminfo.5
 MANFILTER=	sed -e 's\#@DATADIR@\#${TERMINFODIR}/terminfo\#g'
 
-MAN3x=	curs_addch.3x curs_addchstr.3x curs_addstr.3x curs_attr.3x \
+MANx=	curs_addch.3x curs_addchstr.3x curs_addstr.3x curs_attr.3x \
 	curs_beep.3x curs_bkgd.3x curs_border.3x curs_clear.3x curs_color.3x \
 	curs_delch.3x curs_deleteln.3x curs_extend.3x curs_getch.3x \
 	curs_getstr.3x \
@@ -389,15 +389,14 @@ MAN3x=	curs_addch.3x curs_addchstr.3x curs_addstr.3x curs_attr.3x \
 	curs_touch.3x curs_trace.3x curs_util.3x curs_window.3x \
 	default_colors.3x define_key.3x \
 	dft_fgbg.3x keybound.3x keyok.3x ncurses.3x resizeterm.3x wresize.3x
-MAN5=	term.5 terminfo.5
-MAN7=	term.7
-
-# Generate the MAN3 list from MAN3x
-.for page in ${MAN3x}
-CLEANFILES+=${page:T:S/3x$/3/g}
-MAN3+=${page:T:S/3x$/3/g}
-all-man: ${page:T:S/3x$/3/g}
-${page:T:S/3x$/3/g}: ${page}
+MAN=	term.5 terminfo.5
+MAN+=	term.7
+
+# Generate the MAN list from MANx
+.for page in ${MANx}
+CLEANFILES+=${page:T:S/x$//g}
+MAN+=${page:T:S/x$//g}
+${page:T:S/x$//g}: ${page}
 	ln -s ${.ALLSRC} ${.TARGET}
 .endfor
 
@@ -545,5 +544,3 @@ MLINKS+=default_colors.3 assume_default_colors.3 \
 	default_colors.3 use_default_colors.3
 
 .include <bsd.lib.mk>
-
-.SUFFIXES: .3x .3
diff --git a/lib/libnetgraph/Makefile b/lib/libnetgraph/Makefile
index 04a917dc5e79..43417769125c 100644
--- a/lib/libnetgraph/Makefile
+++ b/lib/libnetgraph/Makefile
@@ -2,7 +2,7 @@
 # $Whistle: Makefile,v 1.4 1999/01/17 03:41:02 julian Exp $
 
 LIB=		netgraph
-MAN3=		netgraph.3
+MAN=		netgraph.3
 
 SHLIB_MAJOR=	1
 #SHLIB_MINOR=	1
diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile
index c79415aa115f..15d31852d07d 100644
--- a/lib/libopie/Makefile
+++ b/lib/libopie/Makefile
@@ -27,7 +27,6 @@ CFLAGS+=-I${.CURDIR} -I${OPIE_DIST} -I${DIST_DIR} \
 LDADD+=	-lmd
 DPADD+=	${LIBMD}
 
-MAN4=	${OPIE_DIST}/opie.4
-MAN5=	${OPIE_DIST}/opiekeys.5 ${OPIE_DIST}/opieaccess.5
+MAN=	${OPIE_DIST}/opie.4 ${OPIE_DIST}/opiekeys.5 ${OPIE_DIST}/opieaccess.5
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index a85836c5ac06..344be7f465fd 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -43,12 +43,12 @@ SRCS=		pam_account.c pam_auth.c pam_data.c pam_delay.c \
 		pam_strerror.c
 HDRS1=		_pam_compat.h _pam_macros.h _pam_types.h \
 		pam_appl.h pam_malloc.h pam_modules.h
-MAN3+=		pam_authenticate.3 pam_chauthtok.3 pam_fail_delay.3 \
+MAN+=		pam_authenticate.3 pam_chauthtok.3 pam_fail_delay.3 \
 		pam_open_session.3 pam_setcred.3 pam_start.3 \
 		pam_strerror.3
 MLINKS+=	pam_open_session.3 pam_close_session.3 \
 		pam_start.3 pam_end.3
-MAN8+=		pam.8
+MAN+=		pam.8
 MLINKS+=	pam.8 pam.conf.5 pam.8 pam.d.5
 
 # Files from ${PAMDIR}/libpam_misc:
diff --git a/lib/libpam/modules/pam_radius/Makefile b/lib/libpam/modules/pam_radius/Makefile
index 25cb8600d96b..ea5cb9cdfde3 100644
--- a/lib/libpam/modules/pam_radius/Makefile
+++ b/lib/libpam/modules/pam_radius/Makefile
@@ -37,6 +37,6 @@ LDADD+=		-lradius
 INTERNALLIB=    yes
 INTERNALSTATICLIB=yes
 
-MAN8=		pam_radius.8
+MAN=		pam_radius.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpanel/Makefile b/lib/libpanel/Makefile
index c6c99f10a115..423b73dbc88c 100644
--- a/lib/libpanel/Makefile
+++ b/lib/libpanel/Makefile
@@ -23,9 +23,9 @@ ncurses_def.h:	MKncurses_def.sh ncurses_defs
 	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
 	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
 
-# generate MAN3
+# generate MAN
 CLEANFILES+=	panel.3
-MAN3=		panel.3
+MAN=		panel.3
 all-man: panel.3
 panel.3: panel.3x
 	ln -s ${.ALLSRC} ${.TARGET}
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index ab0eeac171d3..d4af1ac82986 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -6,7 +6,7 @@ SRCS=	grammar.y tokdefs.h pcap-bpf.c \
         pcap.c inet.c gencode.c optimize.c nametoaddr.c \
 	etherent.c savefile.c bpf_filter.c bpf_image.c \
         scanner.l version.c
-MAN3=	pcap.3
+MAN=	pcap.3
 CLEANFILES=tokdefs.h version.c
 
 DEFS=	-DHAVE_SYS_IOCCOM_H=1 -DHAVE_SYS_SOCKIO_H=1 \
diff --git a/lib/libposix1e/Makefile b/lib/libposix1e/Makefile
index 43a8a35b503f..dd73c0c7aa4b 100644
--- a/lib/libposix1e/Makefile
+++ b/lib/libposix1e/Makefile
@@ -11,7 +11,7 @@ SRCS+=	acl_delete.c			\
 	acl_to_text.c			\
 	acl_valid.c
 
-MAN3=	acl.3				\
+MAN=	acl.3				\
 	acl_delete.3			\
 	acl_dup.3			\
 	acl_free.3			\
diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile
index f4807938bf00..ccb66599d704 100644
--- a/lib/libradius/Makefile
+++ b/lib/libradius/Makefile
@@ -32,7 +32,6 @@ DPADD+=		${LIBMD}
 LDADD+=		-lmd
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0
-MAN3+=		libradius.3
-MAN5+=		radius.conf.5
+MAN=		libradius.3 radius.conf.5
 
 .include <bsd.lib.mk>
diff --git a/lib/libskey/Makefile b/lib/libskey/Makefile
index 42216d88838a..1a799fd985d9 100644
--- a/lib/libskey/Makefile
+++ b/lib/libskey/Makefile
@@ -4,12 +4,12 @@
 LIB=	skey
 SRCS=	skeyaccess.c put.c skey_crypt.c skey_getpass.c skeylogin.c skeysubr.c
 INCS=	skey.h
-MAN1=	skey.1
-MAN3=	skey.3
+MAN=	skey.1
+MAN+=	skey.3
 MLINKS=	skey.3 skeylookup.3 skey.3 skeyverify.3 skey.3 skeychallenge.3 \
 	skey.3 skeyinfo.3 skey.3 skeyaccess.3 skey.3 skey_getpass.3 \
 	skey.3 skey_crypt.3
-MAN5=	skey.access.5
+MAN+=	skey.access.5
 
 CFLAGS+=-DPERMIT_CONSOLE -D_SKEY_INTERNAL -I${.CURDIR}
 CFLAGS+=-W -Wall
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index b9a5ddfafcb5..ff809f395210 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -10,7 +10,7 @@
 LIB=		stand
 NOPROFILE=	YES
 NOPIC=		YES
-MAN3=		libstand.3
+MAN=		libstand.3
 
 # Mostly OK, some of the libc imports are a bit noisy
 CFLAGS+=	-Wall
diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile
index 1da667223b1c..2d6c376c6768 100644
--- a/lib/libtacplus/Makefile
+++ b/lib/libtacplus/Makefile
@@ -32,7 +32,6 @@ DPADD+=		${LIBMD}
 LDADD+=		-lmd
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0
-MAN3+=		libtacplus.3
-MAN5+=		tacplus.conf.5
+MAN=		libtacplus.3 tacplus.conf.5
 
 .include <bsd.lib.mk>
diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
index fddc4aad1d3b..73f129e912e4 100644
--- a/lib/libusb/Makefile
+++ b/lib/libusb/Makefile
@@ -4,7 +4,7 @@
 MAINTAINER=	n_hibma@FreeBSD.ORG
 
 LIB=	usb
-MAN3=	usb.3
+MAN=	usb.3
 
 SHLIB_MAJOR= 0
 SHLIB_MINOR= 0
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 97a3e596d59e..85707d590fd4 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -12,11 +12,11 @@ SRCS=	login.c login_tty.c logout.c logwtmp.c pty.c \
 	realhostname.c fparseln.c stub.c
 INCS=	libutil.h login_cap.h
 
-MAN3+=	login.3 login_auth.3 login_tty.3 logout.3 logwtmp.3 pty.3 \
+MAN+=	login.3 login_auth.3 login_tty.3 logout.3 logwtmp.3 pty.3 \
 	login_cap.3 login_class.3 login_times.3 login_ok.3 \
 	_secure_path.3 uucplock.3 property.3 auth.3 realhostname.3 \
 	realhostname_sa.3 trimdomain.3 fparseln.3
-MAN5+=	login.conf.5 auth.conf.5
+MAN+=	login.conf.5 auth.conf.5
 MLINKS+= property.3 properties_read.3  property.3 properties_free.3
 MLINKS+= property.3 property_find.3
 MLINKS+= auth.3 auth_getval.3
diff --git a/lib/libvgl/Makefile b/lib/libvgl/Makefile
index 1a06c7a9c6ad..36dcd61444ca 100644
--- a/lib/libvgl/Makefile
+++ b/lib/libvgl/Makefile
@@ -5,7 +5,7 @@ SHLIB_MINOR= 0
 CFLAGS+=-Wall -I${.CURDIR}
 SRCS=	main.c simple.c bitmap.c text.c mouse.c keyboard.c
 INCS=	vgl.h
-MAN3=	vgl.3
+MAN=	vgl.3
 MLINKS+=	vgl.3 VGLBitmapCopy.3 \
 		vgl.3 VGLBitmapPutChar.3 \
 		vgl.3 VGLBitmapString.3 \
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 022da441d670..99293314c1aa 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -7,8 +7,8 @@ MAINTAINER=markm@FreeBSD.org
 LIB=	wrap
 SHLIB_MAJOR= 3
 SHLIB_MINOR= 0
-MAN3=   hosts_access.3
-MAN5=	hosts_access.5 hosts_options.5
+MAN=	hosts_access.3
+MAN+=	hosts_access.5 hosts_options.5
 
 .PATH:	${.CURDIR}/../../contrib/tcp_wrappers
 
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index fa5d9c25e2cb..c467e8b7ef7e 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -5,7 +5,7 @@
 MAINTAINER=peter@FreeBSD.org
 
 LIB=		z
-MAN3=           zlib.3
+MAN=		zlib.3
 
 #CFLAGS+=	-DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
 #CFLAGS+=	-g -DDEBUG
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index 4281b142a957..afe54cf02324 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -121,9 +121,7 @@ ${ARCH_PREFIX}${i}: ${.CURDIR}/${ARCH}/${i}
 	cp ${.ALLSRC} ${.TARGET}
 .endfor
 
-MANSRC= ${.CURDIR}/man
-
-MAN3+=	acos.3 acosh.3 asin.3 asinh.3 atan.3 atan2.3 atanh.3 ceil.3 \
+MAN=	acos.3 acosh.3 asin.3 asinh.3 atan.3 atan2.3 atanh.3 ceil.3 \
 	cos.3 cosh.3 erf.3 exp.3 fabs.3 floor.3 fmod.3 hypot.3 ieee.3 \
 	ieee_test.3 j0.3 lgamma.3 math.3 rint.3 sin.3 sinh.3 sqrt.3 \
 	tan.3 tanh.3