16 files changed, 23 insertions, 23 deletions

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 \