git: dc41de36abc0 - main - libc: Fix missing or misspelled MLINKS.

From: Dag-Erling Smørgrav <des_at_FreeBSD.org>
Date: Wed, 18 Oct 2023 14:08:47 UTC
The branch main has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=dc41de36abc01cd19d43347e14f077b26d183665

commit dc41de36abc01cd19d43347e14f077b26d183665
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2023-10-18 14:05:44 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2023-10-18 14:07:46 +0000

    libc: Fix missing or misspelled MLINKS.
    
    Differential Revision:  https://reviews.freebsd.org/D42192
---
 ObsoleteFiles.inc                   |   3 +
 lib/libc/db/man/Makefile.inc        |   2 +-
 lib/libc/net/Makefile.inc           | 123 +++++++++++++++++++++++++-----------
 lib/libc/posix1e/Makefile.inc       |  12 ++--
 lib/libc/rpc/Makefile.inc           |   2 +
 lib/libc/stdio/Makefile.inc         | 118 ++++++++++++++++++++++++----------
 lib/libc/stdlib/Makefile.inc        |  50 +++++++++++----
 lib/libc/sys/Makefile.inc           |   1 +
 lib/libc/sys/sctp_generic_sendmsg.2 |   2 +-
 lib/libc/uuid/uuid.3                |  10 ++-
 lib/libc/xdr/Makefile.inc           |  17 +++--
 11 files changed, 243 insertions(+), 97 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 9e4be6b69312..f54e13ea3d2d 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20231018: Remove misspelled man page link
+OLD_FILES+=usr/share/man/man3/dbm_dirnfo.3.gz
+
 # 20231006: rename tcp6_v4unmapped_bind_test
 OLD_FILES+=usr/tests/sys/netinet/tcp6_v4unmapped_bind_test
 
diff --git a/lib/libc/db/man/Makefile.inc b/lib/libc/db/man/Makefile.inc
index 15021f0ca900..bbe89473e66d 100644
--- a/lib/libc/db/man/Makefile.inc
+++ b/lib/libc/db/man/Makefile.inc
@@ -7,7 +7,7 @@ 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
 MLINKS+= dbm.3 dbm_delete.3
-MLINKS+= dbm.3 dbm_dirnfo.3
+MLINKS+= dbm.3 dbm_dirfno.3
 MLINKS+= dbm.3 dbm_error.3
 MLINKS+= dbm.3 dbm_fetch.3
 MLINKS+= dbm.3 dbm_firstkey.3
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index ea5ddf875151..ef4898dbcbe7 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -50,41 +50,73 @@ MAN+=	byteorder.3 ethers.3 eui64.3 \
         sctp_getaddrlen.3 sctp_getassocid.3 sctp_getpaddrs.3 \
         sctp_opt_info.3 sctp_recvmsg.3 sctp_send.3 sctp_sendmsg.3 \
 
-MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \
+MLINKS+=byteorder.3 htonl.3 \
+	byteorder.3 htons.3 \
+	byteorder.3 ntohl.3 \
 	byteorder.3 ntohs.3
-MLINKS+=ethers.3 ether_aton.3 ethers.3 ether_hostton.3 ethers.3 ether_line.3 \
-	ethers.3 ether_ntoa.3 ethers.3 ether_ntohost.3
-MLINKS+=eui64.3 eui64_aton.3 eui64.3 eui64_hostton.3 \
-	eui64.3 eui64_ntoa.3 eui64.3 eui64_ntohost.3
-MLINKS+=getaddrinfo.3 freeaddrinfo.3 
-MLINKS+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \
-	gethostbyname.3 gethostbyaddr_r.3 gethostbyname.3 gethostbyname2.3 \
-	gethostbyname.3 gethostbyname2_r.3 gethostbyname.3 gethostbyname_r.3 \
-	gethostbyname.3 gethostent.3 gethostbyname.3 herror.3 \
-	gethostbyname.3 hstrerror.3 gethostbyname.3 sethostent.3
+MLINKS+=ethers.3 ether_aton.3 \
+	ethers.3 ether_aton_r.3 \
+	ethers.3 ether_hostton.3 \
+	ethers.3 ether_line.3 \
+	ethers.3 ether_ntoa.3 \
+	ethers.3 ether_ntoa_r.3 \
+	ethers.3 ether_ntohost.3
+MLINKS+=eui64.3 eui64_aton.3 \
+	eui64.3 eui64_hostton.3 \
+	eui64.3 eui64_ntoa.3 \
+	eui64.3 eui64_ntohost.3
+MLINKS+=getaddrinfo.3 freeaddrinfo.3
+MLINKS+=gethostbyname.3 endhostent.3 \
+	gethostbyname.3 gethostbyaddr.3 \
+	gethostbyname.3 gethostbyaddr_r.3 \
+	gethostbyname.3 gethostbyname2.3 \
+	gethostbyname.3 gethostbyname2_r.3 \
+	gethostbyname.3 gethostbyname_r.3 \
+	gethostbyname.3 gethostent.3 \
+	gethostbyname.3 herror.3 \
+	gethostbyname.3 hstrerror.3 \
+	gethostbyname.3 sethostent.3
 MLINKS+=getifaddrs.3 freeifaddrs.3
 MLINKS+=getifmaddrs.3 freeifmaddrs.3
-MLINKS+=getipnodebyname.3 getipnodebyaddr.3 getipnodebyname.3 freehostent.3
-MLINKS+=getnetent.3 endnetent.3 getnetent.3 getnetbyaddr.3 \
-	getnetent.3 getnetbyaddr_r.3 getnetent.3 getnetbyname.3 \
-	getnetent.3 getnetbyname_r.3 getnetent.3 setnetent.3 \
+MLINKS+=getipnodebyname.3 getipnodebyaddr.3 \
+	getipnodebyname.3 freehostent.3
+MLINKS+=getnetent.3 endnetent.3 \
+	getnetent.3 getnetbyaddr.3 \
+	getnetent.3 getnetbyaddr_r.3 \
+	getnetent.3 getnetbyname.3 \
+	getnetent.3 getnetbyname_r.3 \
+	getnetent.3 setnetent.3 \
 	getnetent.3 getnetent_r.3
-MLINKS+=getprotoent.3 endprotoent.3 getprotoent.3 getprotobyname.3 \
-	getprotoent.3 getprotobynumber.3 getprotoent.3 setprotoent.3
-MLINKS+=getservent.3 endservent.3 getservent.3 getservbyname.3 \
-	getservent.3 getservbyport.3 getservent.3 setservent.3
-MLINKS+=if_indextoname.3 if_nametoindex.3 if_indextoname.3 if_nameindex.3 \
+MLINKS+=getprotoent.3 endprotoent.3 \
+	getprotoent.3 getprotobyname.3 \
+	getprotoent.3 getprotobynumber.3 \
+	getprotoent.3 setprotoent.3
+MLINKS+=getservent.3 endservent.3 \
+	getservent.3 getservbyname.3 \
+	getservent.3 getservbyport.3 \
+	getservent.3 setservent.3
+MLINKS+=if_indextoname.3 if_nametoindex.3 \
+	if_indextoname.3 if_nameindex.3 \
 	if_indextoname.3 if_freenameindex.3
-MLINKS+=inet.3 addr.3 inet.3 inet_addr.3 inet.3 inet_aton.3 \
-	inet.3 inet_lnaof.3 inet.3 inet_makeaddr.3 inet.3 inet_netof.3 \
-	inet.3 inet_network.3 inet.3 inet_ntoa.3 inet.3 inet_ntoa_r.3\
-	inet.3 inet_ntop.3 inet.3 inet_pton.3 \
-	inet.3 network.3 inet.3 ntoa.3 
+MLINKS+=inet.3 addr.3 \
+	inet.3 inet_addr.3 \
+	inet.3 inet_aton.3 \
+	inet.3 inet_lnaof.3 \
+	inet.3 inet_makeaddr.3 \
+	inet.3 inet_netof.3 \
+	inet.3 inet_network.3 \
+	inet.3 inet_ntoa.3 \
+	inet.3 inet_ntoa_r.3 \
+	inet.3 inet_ntop.3 \
+	inet.3 inet_pton.3 \
+	inet.3 network.3 \
+	inet.3 ntoa.3
 MLINKS+= sctp_send.3 sctp_sendx.3
 MLINKS+= sctp_sendmsg.3 sctp_sendmsgx.3
 MLINKS+= sctp_freepaddrs.3 sctp_freeladdrs.3
 MLINKS+= sctp_getpaddrs.3 sctp_getladdrs.3
-MLINKS+=inet_net.3 inet_net_ntop.3 inet_net.3 inet_net_pton.3
+MLINKS+=inet_net.3 inet_net_ntop.3 \
+	inet_net.3 inet_net_pton.3
 MLINKS+=inet6_opt_init.3 inet6_opt_append.3 \
 	inet6_opt_init.3 inet6_opt_find.3 \
 	inet6_opt_init.3 inet6_opt_finish.3 \
@@ -108,22 +140,39 @@ MLINKS+=inet6_opt_init.3 inet6_opt_append.3 \
 	inet6_rthdr_space.3 inet6_rthdr_lasthop.3 \
 	inet6_rthdr_space.3 inet6_rthdr_reverse.3 \
 	inet6_rthdr_space.3 inet6_rthdr_segments.3
-MLINKS+=linkaddr.3 link_addr.3 linkaddr.3 link_ntoa.3 
-MLINKS+=rcmd.3 iruserok.3 rcmd.3 iruserok_sa.3 \
+MLINKS+=linkaddr.3 link_addr.3 \
+	linkaddr.3 link_ntoa.3
+MLINKS+=rcmd.3 iruserok.3 \
+	rcmd.3 iruserok_sa.3 \
 	rcmd.3 rcmd_af.3 \
-	rcmd.3 rresvport.3 rcmd.3 rresvport_af.3 \
+	rcmd.3 rresvport.3 \
+	rcmd.3 rresvport_af.3 \
 	rcmd.3 ruserok.3
-MLINKS+=resolver.3 dn_comp.3 resolver.3 dn_expand.3 resolver.3 res_init.3 \
-	resolver.3 res_mkquery.3 resolver.3 res_query.3 \
-	resolver.3 res_search.3 resolver.3 res_send.3 resolver.3 dn_skipname.3 \
-	resolver.3 ns_get16.3 resolver.3 ns_get32.3 \
-	resolver.3 ns_put16.3 resolver.3 ns_put32.3
-MLINKS+=sourcefilter.3 setipv4sourcefilter.3 sourcefilter.3 getipv4sourcefilter.3 \
-	sourcefilter.3 setsourcefilter.3 sourcefilter.3 getsourcefilter.3
+MLINKS+=resolver.3 dn_comp.3 \
+	resolver.3 dn_expand.3 \
+	resolver.3 res_init.3 \
+	resolver.3 res_mkquery.3 \
+	resolver.3 res_query.3 \
+	resolver.3 res_search.3 \
+	resolver.3 res_send.3 \
+	resolver.3 dn_skipname.3 \
+	resolver.3 ns_get16.3 \
+	resolver.3 ns_get32.3 \
+	resolver.3 ns_put16.3 \
+	resolver.3 ns_put32.3
+MLINKS+=sourcefilter.3 setipv4sourcefilter.3 \
+	sourcefilter.3 getipv4sourcefilter.3 \
+	sourcefilter.3 setsourcefilter.3 \
+	sourcefilter.3 getsourcefilter.3
 
 .if ${MK_HESIOD} != "no"
-SRCS+=	hesiod.c 
+SRCS+=	hesiod.c
 MAN+=	hesiod.3
+MLINKS+=hesiod.3 hesiod_init.3 \
+	hesiod.3 hesiod_resolve.3 \
+	hesiod.3 hesiod_free_list.3 \
+	hesiod.3 hesiod_to_bind.3 \
+	hesiod.3 hesiod_end.3
 .endif
 
 afterinstallconfig: modify-nsswitch-conf
diff --git a/lib/libc/posix1e/Makefile.inc b/lib/libc/posix1e/Makefile.inc
index 5d3d30ed6dea..0b738ef7e239 100644
--- a/lib/libc/posix1e/Makefile.inc
+++ b/lib/libc/posix1e/Makefile.inc
@@ -95,23 +95,27 @@ MAN+=	acl.3				\
 	posix1e.3
 
 MLINKS+=acl_create_entry.3 acl_create_entry_np.3\
+	acl_cmp_np.3 acl_cmp.3			\
 	acl_delete.3 acl_delete_def_file.3	\
-	acl_delete.3 acl_delete_file_np.3	\
+	acl_delete.3 acl_delete_def_link_np.3	\
 	acl_delete.3 acl_delete_fd_np.3		\
+	acl_delete.3 acl_delete_file_np.3	\
+	acl_delete.3 acl_delete_link_np.3	\
 	acl_delete_entry.3 acl_delete_entry_np.3\
 	acl_extended_file_np.3 acl_extended_file_nofollow_np.3 \
 	acl_extended_file_np.3 acl_extended_link_np.3 \
-	acl_get.3 acl_get_file.3		\
 	acl_get.3 acl_get_fd.3			\
 	acl_get.3 acl_get_fd_np.3		\
+	acl_get.3 acl_get_file.3		\
 	acl_get.3 acl_get_link_np.3		\
-	acl_set.3 acl_set_file.3		\
 	acl_set.3 acl_set_fd.3			\
 	acl_set.3 acl_set_fd_np.3		\
+	acl_set.3 acl_set_file.3		\
 	acl_set.3 acl_set_link_np.3		\
 	acl_to_text.3 acl_to_text_np.3		\
-	acl_valid.3 acl_valid_file_np.3		\
 	acl_valid.3 acl_valid_fd_np.3		\
+	acl_valid.3 acl_valid_file_np.3		\
+	acl_valid.3 acl_valid_link_np.3		\
 	extattr.3 extattr_namespace_to_string.3	\
 	extattr.3 extattr_string_to_namespace.3 \
 	mac_get.3 mac_get_fd.3			\
diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc
index 969c775d156a..6ca307d44b74 100644
--- a/lib/libc/rpc/Makefile.inc
+++ b/lib/libc/rpc/Makefile.inc
@@ -167,6 +167,7 @@ MLINKS+=	bindresvport.3 bindresvport_sa.3 \
 		rpc_soc.3 svc_fds.3 \
 		rpc_soc.3 svc_fdset.3 \
 		rpc_soc.3 svc_getcaller.3 \
+		rpc_soc.3 svc_getreq.3 \
 		rpc_soc.3 svc_register.3 \
 		rpc_soc.3 svc_unregister.3 \
 		rpc_soc.3 svcfd_create.3 \
@@ -175,5 +176,6 @@ MLINKS+=	bindresvport.3 bindresvport_sa.3 \
 		rpc_soc.3 svctcp_create.3 \
 		rpc_soc.3 svcudp_bufcreate.3 \
 		rpc_soc.3 svcunix_create.3 \
+		rpc_soc.3 xdr_authunix_parms.3 \
 		rpc_soc.3 xdr_pmap.3 \
 		rpc_soc.3 xdr_pmaplist.3
diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc
index 0fc0a6bfd68c..f02ac627a3b6 100644
--- a/lib/libc/stdio/Makefile.inc
+++ b/lib/libc/stdio/Makefile.inc
@@ -42,50 +42,102 @@ MAN+=	fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \
 	stdio.3 tmpnam.3 \
 	ungetc.3 ungetwc.3 wprintf.3 wscanf.3
 
-MLINKS+=fclose.3 fcloseall.3 fclose.3 fdclose.3
+MLINKS+=fclose.3 fcloseall.3 \
+	fclose.3 fdclose.3
 MLINKS+=ferror.3 ferror_unlocked.3 \
-	ferror.3 clearerr.3 ferror.3 clearerr_unlocked.3 \
-	ferror.3 feof.3 ferror.3 feof_unlocked.3 \
-	ferror.3 fileno.3 ferror.3 fileno_unlocked.3
+	ferror.3 clearerr.3 \
+	ferror.3 clearerr_unlocked.3 \
+	ferror.3 feof.3 \
+	ferror.3 feof_unlocked.3 \
+	ferror.3 fileno.3 \
+	ferror.3 fileno_unlocked.3
 MLINKS+=fflush.3 fflush_unlocked.3 \
 	fflush.3 fpurge.3
 MLINKS+=fgets.3 gets.3
 MLINKS+=fgets.3 gets_s.3
-MLINKS+=flockfile.3 ftrylockfile.3 flockfile.3 funlockfile.3
-MLINKS+=fopen.3 fdopen.3 fopen.3 freopen.3 fopen.3 fmemopen.3
+MLINKS+=flockfile.3 ftrylockfile.3 \
+	flockfile.3 funlockfile.3
+MLINKS+=fopen.3 fdopen.3 \
+	fopen.3 freopen.3 \
+	fopen.3 fmemopen.3
 MLINKS+=fputs.3 fputs_unlocked.3 \
 	fputs.3 puts.3
 MLINKS+=fread.3 fread_unlocked.3 \
 	fread.3 fwrite.3 \
 	fread.3 fwrite_unlocked.3
-MLINKS+=fseek.3 fgetpos.3 fseek.3 fseeko.3 fseek.3 fsetpos.3 fseek.3 ftell.3 \
-	fseek.3 ftello.3 fseek.3 rewind.3
-MLINKS+=funopen.3 fropen.3 funopen.3 fwopen.3
-MLINKS+=getc.3 fgetc.3 getc.3 getc_unlocked.3 getc.3 getchar.3 \
-	getc.3 getchar_unlocked.3 getc.3 getw.3
+MLINKS+=fseek.3 fgetpos.3 \
+	fseek.3 fseeko.3 \
+	fseek.3 fsetpos.3 \
+	fseek.3 ftell.3 \
+	fseek.3 ftello.3 \
+	fseek.3 rewind.3
+MLINKS+=funopen.3 fropen.3 \
+	funopen.3 fwopen.3
+MLINKS+=getc.3 fgetc.3 \
+	getc.3 getc_unlocked.3 \
+	getc.3 getchar.3 \
+	getc.3 getchar_unlocked.3 \
+	getc.3 getw.3
 MLINKS+=getline.3 getdelim.3
-MLINKS+=getwc.3 fgetwc.3 getwc.3 getwchar.3
-MLINKS+=mktemp.3 mkdtemp.3 mktemp.3 mkstemp.3 mktemp.3 mkstemps.3 \
-	mktemp.3 mkostemp.3 mktemp.3 mkostemps.3 mktemp.3 mkostempsat.3
+MLINKS+=getwc.3 fgetwc.3 \
+	getwc.3 getwchar.3
+MLINKS+=mktemp.3 mkdtemp.3 \
+	mktemp.3 mkstemp.3 \
+	mktemp.3 mkstemps.3 \
+	mktemp.3 mkostemp.3 \
+	mktemp.3 mkostemps.3 \
+	mktemp.3 mkostempsat.3
 MLINKS+=open_memstream.3 open_wmemstream.3
-MLINKS+=printf.3 asprintf.3 printf.3 dprintf.3 printf.3 fprintf.3 \
-	printf.3 snprintf.3 printf.3 sprintf.3 \
-	printf.3 vasprintf.3 printf.3 vdprintf.3 \
-	printf.3 vfprintf.3 printf.3 vprintf.3 printf.3 vsnprintf.3 \
+MLINKS+=printf.3 asprintf.3 \
+	printf.3 dprintf.3 \
+	printf.3 fprintf.3 \
+	printf.3 snprintf.3 \
+	printf.3 sprintf.3 \
+	printf.3 vasprintf.3 \
+	printf.3 vdprintf.3 \
+	printf.3 vfprintf.3 \
+	printf.3 vprintf.3 \
+	printf.3 vsnprintf.3 \
 	printf.3 vsprintf.3
-MLINKS+=printf_l.3 asprintf_l.3 printf_l.3 fprintf_l.3 printf_l.3 snprintf_l.3 \
-	printf_l.3 sprintf_l.3 printf_l.3 vasprintf_l.3 printf_l.3 vfprintf_l.3 \
-	printf_l.3 vprintf_l.3 printf_l.3 vsnprintf_l.3 printf_l.3 vsprintf_l.3
-MLINKS+=putc.3 fputc.3 putc.3 putc_unlocked.3 putc.3 putchar.3 \
-	putc.3 putchar_unlocked.3 putc.3 putw.3
-MLINKS+=putwc.3 fputwc.3 putwc.3 putwchar.3
-MLINKS+=scanf.3 fscanf.3 scanf.3 sscanf.3 scanf.3 vfscanf.3 scanf.3 vscanf.3 \
+MLINKS+=printf_l.3 asprintf_l.3 \
+	printf_l.3 fprintf_l.3 \
+	printf_l.3 snprintf_l.3 \
+	printf_l.3 sprintf_l.3 \
+	printf_l.3 vasprintf_l.3 \
+	printf_l.3 vfprintf_l.3 \
+	printf_l.3 vprintf_l.3 \
+	printf_l.3 vsnprintf_l.3 \
+	printf_l.3 vsprintf_l.3
+MLINKS+=putc.3 fputc.3 \
+	putc.3 fputc_unlocked.3 \
+	putc.3 putc_unlocked.3 \
+	putc.3 putchar.3 \
+	putc.3 putchar_unlocked.3 \
+	putc.3 putw.3
+MLINKS+=putwc.3 fputwc.3 \
+	putwc.3 putwchar.3
+MLINKS+=scanf.3 fscanf.3 \
+	scanf.3 sscanf.3 \
+	scanf.3 vfscanf.3 \
+	scanf.3 vscanf.3 \
 	scanf.3 vsscanf.3
-MLINKS+=scanf_l.3 fscanf_l.3 scanf_l.3 sscanf_l.3 scanf_l.3 vfscanf_l.3 \
-	scanf_l.3 vscanf_l.3 scanf_l.3 vsscanf_l.3
-MLINKS+=setbuf.3 setbuffer.3 setbuf.3 setlinebuf.3 setbuf.3 setvbuf.3
-MLINKS+=tmpnam.3 tempnam.3 tmpnam.3 tmpfile.3
-MLINKS+=wprintf.3 fwprintf.3 wprintf.3 swprintf.3 \
-	wprintf.3 vwprintf.3 wprintf.3 vfwprintf.3 wprintf.3 vswprintf.3
-MLINKS+=wscanf.3 fwscanf.3 wscanf.3 swscanf.3 wscanf.3 vwscanf.3 \
-	wscanf.3 vswscanf.3 wscanf.3 vfwscanf.3
+MLINKS+=scanf_l.3 fscanf_l.3 \
+	scanf_l.3 sscanf_l.3 \
+	scanf_l.3 vfscanf_l.3 \
+	scanf_l.3 vscanf_l.3 \
+	scanf_l.3 vsscanf_l.3
+MLINKS+=setbuf.3 setbuffer.3 \
+	setbuf.3 setlinebuf.3 \
+	setbuf.3 setvbuf.3
+MLINKS+=tmpnam.3 tempnam.3 \
+	tmpnam.3 tmpfile.3
+MLINKS+=wprintf.3 fwprintf.3 \
+	wprintf.3 swprintf.3 \
+	wprintf.3 vwprintf.3 \
+	wprintf.3 vfwprintf.3 \
+	wprintf.3 vswprintf.3
+MLINKS+=wscanf.3 fwscanf.3 \
+	wscanf.3 swscanf.3 \
+	wscanf.3 vwscanf.3 \
+	wscanf.3 vswscanf.3 \
+	wscanf.3 vfwscanf.3
diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc
index 413c9421c0ee..227bc32b237d 100644
--- a/lib/libc/stdlib/Makefile.inc
+++ b/lib/libc/stdlib/Makefile.inc
@@ -44,27 +44,51 @@ MAN+=	a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 \
 	strfmon.3 strtod.3 strtol.3 strtonum.3 strtoul.3 system.3 \
 	tsearch.3
 
-MLINKS+=a64l.3 l64a.3 a64l.3 l64a_r.3
+MLINKS+=a64l.3 l64a.3 \
+	a64l.3 l64a_r.3
 MLINKS+=atol.3 atoll.3
 MLINKS+=exit.3 _Exit.3
-MLINKS+=getenv.3 clearenv.3 getenv.3 putenv.3 getenv.3 secure_getenv.3 \
-	getenv.3 setenv.3 getenv.3 unsetenv.3
+MLINKS+=getenv.3 clearenv.3 \
+	getenv.3 putenv.3 \
+	getenv.3 secure_getenv.3 \
+	getenv.3 setenv.3 \
+	getenv.3 unsetenv.3
 MLINKS+=getopt_long.3 getopt_long_only.3
-MLINKS+=hcreate.3 hdestroy.3 hcreate.3 hsearch.3
-MLINKS+=hcreate.3 hcreate_r.3 hcreate.3 hdestroy_r.3 hcreate.3 hsearch_r.3
+MLINKS+=hcreate.3 hdestroy.3 \
+	hcreate.3 hsearch.3
+MLINKS+=hcreate.3 hcreate_r.3 \
+	hcreate.3 hdestroy_r.3 \
+	hcreate.3 hsearch_r.3
 MLINKS+=insque.3 remque.3
 MLINKS+=lsearch.3 lfind.3
-MLINKS+=ptsname.3 grantpt.3 ptsname.3 ptsname_r.3 ptsname.3 unlockpt.3
-MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3 qsort.3 qsort_r.3 \
+MLINKS+=ptsname.3 grantpt.3 \
+	ptsname.3 ptsname_r.3 \
+	ptsname.3 unlockpt.3
+MLINKS+=qsort.3 heapsort.3 \
+	qsort.3 heapsort_b.3 \
+	qsort.3 mergesort.3 \
+	qsort.3 mergesort_b.3 \
+	qsort.3 qsort_b.3 \
+	qsort.3 qsort_r.3 \
 	qsort.3 qsort_s.3
-MLINKS+=rand.3 rand_r.3 rand.3 srand.3
-MLINKS+=random.3 initstate.3 random.3 setstate.3 random.3 srandom.3 \
+MLINKS+=rand.3 rand_r.3 \
+	rand.3 srand.3
+MLINKS+=random.3 initstate.3 \
+	random.3 setstate.3 \
+	random.3 srandom.3 \
 	random.3 srandomdev.3
 MLINKS+=radixsort.3 sradixsort.3
 MLINKS+=set_constraint_handler_s.3 abort_handler_s.3
 MLINKS+=set_constraint_handler_s.3 ignore_handler_s.3
 MLINKS+=strfmon.3 strfmon_l.3
-MLINKS+=strtod.3 strtof.3 strtod.3 strtold.3
-MLINKS+=strtol.3 strtoll.3 strtol.3 strtoq.3 strtol.3 strtoimax.3
-MLINKS+=strtoul.3 strtoull.3 strtoul.3 strtouq.3 strtoul.3 strtoumax.3
-MLINKS+=tsearch.3 tdelete.3 tsearch.3 tfind.3 tsearch.3 twalk.3
+MLINKS+=strtod.3 strtof.3 \
+	strtod.3 strtold.3
+MLINKS+=strtol.3 strtoll.3 \
+	strtol.3 strtoq.3 \
+	strtol.3 strtoimax.3
+MLINKS+=strtoul.3 strtoull.3 \
+	strtoul.3 strtouq.3 \
+	strtoul.3 strtoumax.3
+MLINKS+=tsearch.3 tdelete.3 \
+	tsearch.3 tfind.3 \
+	tsearch.3 twalk.3
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 480002f9875e..f52487a3fef2 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -469,6 +469,7 @@ MLINKS+=sched_get_priority_max.2 sched_get_priority_min.2 \
 	sched_get_priority_max.2 sched_rr_get_interval.2
 MLINKS+=sched_setparam.2 sched_getparam.2
 MLINKS+=sched_setscheduler.2 sched_getscheduler.2
+MLINKS+=sctp_generic_sendmsg.2 sctp_generic_sendmsg_iov.2
 MLINKS+=select.2 FD_CLR.3 \
 	select.2 FD_ISSET.3 \
 	select.2 FD_SET.3 \
diff --git a/lib/libc/sys/sctp_generic_sendmsg.2 b/lib/libc/sys/sctp_generic_sendmsg.2
index 5c62328aeace..66ce41ee2fcb 100644
--- a/lib/libc/sys/sctp_generic_sendmsg.2
+++ b/lib/libc/sys/sctp_generic_sendmsg.2
@@ -29,7 +29,7 @@
 .Dt SCTP_GENERIC_SENDMSG 2
 .Os
 .Sh NAME
-.Nm sctp_generic_sendmsg
+.Nm sctp_generic_sendmsg ,
 .Nm sctp_generic_sendmsg_iov
 .Nd send data to a peer
 .Sh LIBRARY
diff --git a/lib/libc/uuid/uuid.3 b/lib/libc/uuid/uuid.3
index 42f7a4b43ccd..1cfd3a86ad91 100644
--- a/lib/libc/uuid/uuid.3
+++ b/lib/libc/uuid/uuid.3
@@ -27,8 +27,14 @@
 .Dt UUID 3
 .Os
 .Sh NAME
-.Nm uuid_compare , uuid_create , uuid_create_nil , uuid_equal ,
-.Nm uuid_from_string , uuid_hash , uuid_is_nil , uuid_to_string
+.Nm uuid_compare ,
+.Nm uuid_create ,
+.Nm uuid_create_nil ,
+.Nm uuid_equal ,
+.Nm uuid_from_string ,
+.Nm uuid_hash ,
+.Nm uuid_is_nil ,
+.Nm uuid_to_string
 .Nd DCE 1.1 compliant UUID functions
 .Sh LIBRARY
 .Lb libc
diff --git a/lib/libc/xdr/Makefile.inc b/lib/libc/xdr/Makefile.inc
index 76997c1da218..b9d0b575d8dc 100644
--- a/lib/libc/xdr/Makefile.inc
+++ b/lib/libc/xdr/Makefile.inc
@@ -26,26 +26,31 @@ MLINKS+=	rpc_xdr.3 xdr_accepted_reply.3 \
 		xdr.3 xdr_float.3 \
 		xdr.3 xdr_free.3 \
 		xdr.3 xdr_getpos.3 \
+		xdr.3 xdr_hyper.3 \
 		xdr.3 xdr_inline.3 \
 		xdr.3 xdr_int.3 \
 		xdr.3 xdr_long.3 \
-		xdr.3 xdrmem_create.3 \
+		xdr.3 xdr_longlong_t.3 \
 		xdr.3 xdr_opaque.3 \
 		xdr.3 xdr_pointer.3 \
-		xdr.3 xdrrec_create.3 \
-		xdr.3 xdrrec_endofrecord.3 \
-		xdr.3 xdrrec_eof.3 \
-		xdr.3 xdrrec_skiprecord.3 \
 		xdr.3 xdr_reference.3 \
 		xdr.3 xdr_setpos.3 \
 		xdr.3 xdr_short.3 \
 		xdr.3 xdr_sizeof.3 \
-		xdr.3 xdrstdio_create.3 \
 		xdr.3 xdr_string.3 \
 		xdr.3 xdr_u_char.3 \
+		xdr.3 xdr_u_hyper.3 \
+		xdr.3 xdr_u_int.3 \
 		xdr.3 xdr_u_long.3 \
+		xdr.3 xdr_u_longlong_t.3 \
 		xdr.3 xdr_u_short.3 \
 		xdr.3 xdr_union.3 \
 		xdr.3 xdr_vector.3 \
 		xdr.3 xdr_void.3 \
+		xdr.3 xdrmem_create.3 \
+		xdr.3 xdrrec_create.3 \
+		xdr.3 xdrrec_endofrecord.3 \
+		xdr.3 xdrrec_eof.3 \
+		xdr.3 xdrrec_skiprecord.3 \
+		xdr.3 xdrstdio_create.3 \
                 xdr.3 xdr_wrapstring.3