various MLINK fixes from Alan R. S. Bueno;

5 files changed, 18 insertions, 15 deletions

diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index 7599f02832a..244c266536a 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.44 2007/06/05 18:04:46 henning Exp $
+#	$OpenBSD: Makefile.inc,v 1.45 2009/08/13 19:54:58 jmc Exp $
 
 # net sources
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/net ${LIBCSRCDIR}/net
@@ -60,8 +60,8 @@ MLINKS+=getprotoent.3 endprotoent.3 getprotoent.3 getprotobyname.3 \
 MLINKS+=getservent.3 endservent.3 getservent.3 getservbyname.3 \
 	getservent.3 getservbyport.3 getservent.3 setservent.3 \
 	getservent.3 getservent_r.3 getservent.3 getservbyname_r.3 \
-	getservent.3 getservbyport_r.3 setservent.3 setservent_r.3 \
-	setservent.3 endservent_r.3
+	getservent.3 getservbyport_r.3 getservent.3 setservent_r.3 \
+	getservent.3 endservent_r.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 \
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 595d601ec82..d4767916585 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.86 2009/06/03 14:45:47 jj Exp $
+#	$OpenBSD: Makefile.inc,v 1.87 2009/08/13 19:54:58 jmc Exp $
 #	$NetBSD: Makefile.inc,v 1.35 1995/10/16 23:49:07 jtc Exp $
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/17/93
 
@@ -260,7 +260,7 @@ MLINKS+=getrlimit.2 setrlimit.2
 MLINKS+=getsockopt.2 setsockopt.2
 MLINKS+=gettimeofday.2 settimeofday.2
 MLINKS+=getuid.2 geteuid.2
-MLINKS+=kqueue.2 kevent.2
+MLINKS+=kqueue.2 kevent.2 kqueue.2 EV_SET.2
 MLINKS+=intro.2 errno.2
 MLINKS+=mlock.2 munlock.2
 MLINKS+=mlockall.2 munlockall.2
diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index bad3782baa2..cf63dceaaac 100644
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.57 2007/11/24 15:43:08 espie Exp $
+#	$OpenBSD: Makefile,v 1.58 2009/08/13 19:54:58 jmc Exp $
 
 # Uncomment this to enable tracing in libcurses
 #CURSESTRACE=-DTRACE
@@ -174,11 +174,11 @@ MLINKS+=curs_addch.3 addch.3 curs_addch.3 waddch.3 curs_addch.3 mvaddch.3 \
 	flushinp.3 curs_window.3 newwin.3 curs_window.3 delwin.3 curs_window.3 \
 	mvwin.3 curs_window.3 subwin.3 curs_window.3 derwin.3 curs_window.3 \
 	mvderwin.3 curs_window.3 dupwin.3 curs_window.3 wsyncup.3 \
-	curs_window.3 syncok.3 curs_window.3 wcursyncup.3 curs_window.3 \
-	wsyncdown.3 default_colors.3 use_default_colors.3
+	curs_window.3 syncok.3 curs_window.3 wcursyncup.3 \
+	curs_window.3 wsyncdown.3
 MLINKS+=curs_extend.3 curses_version.3 curs_extend.3 use_extended_names.3 \
-	default_colors.3 assume_default_colors.3 default_colors.3 \
-	use_default_colors.3
+	default_colors.3 assume_default_colors.3 \
+	default_colors.3 use_default_colors.3
 MLINKS+= terminfo.3 setupterm.3 terminfo.3 setterm.3 terminfo.3 set_curterm.3 \
 	terminfo.3 del_curterm.3 terminfo.3 restartterm.3 terminfo.3 tparm.3 \
 	terminfo.3 tparam.3 terminfo.3 tputs.3 terminfo.3 putp.3 \
diff --git a/lib/libkrb5/Makefile.krb5.inc b/lib/libkrb5/Makefile.krb5.inc
index 430291f60be..4fdc1c99bb4 100644
--- a/lib/libkrb5/Makefile.krb5.inc
+++ b/lib/libkrb5/Makefile.krb5.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.krb5.inc,v 1.15 2006/04/29 12:35:56 biorn Exp $
+# $OpenBSD: Makefile.krb5.inc,v 1.16 2009/08/13 19:54:58 jmc Exp $
 
 DIR_KRB5INC=	${.CURDIR}/../../kerberosV/include
 DIR_KRB5LIB=	${KRB5SRC}/lib/krb5
@@ -94,7 +94,7 @@ MLINKS+=krb5_config.3 krb5_config_vget_list.3
 MLINKS+=krb5_config.3 krb5_config_vget_next.3
 MLINKS+=krb5_config.3 krb5_config_vget_string.3
 MLINKS+=krb5_config.3 krb5_config_vget_string_default.3
-MLINKS+=krb5_config.3 krb5_config_vget_stringsq.3
+MLINKS+=krb5_config.3 krb5_config_vget_strings.3
 MLINKS+=krb5_config.3 krb5_config_vget_time.3
 MLINKS+=krb5_config.3 krb5_config_vget_time_default.3
 
@@ -151,6 +151,8 @@ MLINKS+=krb5_create_checksum.3 krb5_checksum_disable.3
 MLINKS+=krb5_create_checksum.3 krb5_checksum_is_collision_proof.3
 MLINKS+=krb5_create_checksum.3 krb5_checksum_is_keyed.3
 MLINKS+=krb5_create_checksum.3 krb5_checksumsize.3
+MLINKS+=krb5_create_checksum.3 krb5_cksumtype_valid.3
+MLINKS+=krb5_create_checksum.3 krb5_copy_checksum.3
 MLINKS+=krb5_create_checksum.3 krb5_crypto_get_checksum_type.3
 MLINKS+=krb5_create_checksum.3 krb5_free_checksum.3
 MLINKS+=krb5_create_checksum.3 krb5_free_checksum_contents.3
@@ -329,7 +331,7 @@ MLINKS+=krb5_get_init_creds.3 krb5_get_init_creds_opt_set_pa_password.3
 MLINKS+=krb5_get_init_creds.3 krb5_get_init_creds_opt_set_paq_request.3
 MLINKS+=krb5_get_init_creds.3 krb5_get_init_creds_opt_set_preauth_list.3
 MLINKS+=krb5_get_init_creds.3 krb5_get_init_creds_opt_set_proxiable.3
-MLINKS+=krb5_get_init_creds.3 krb5_get_init_creds_opt_set_rewew_life.3
+MLINKS+=krb5_get_init_creds.3 krb5_get_init_creds_opt_set_renew_life.3
 MLINKS+=krb5_get_init_creds.3 krb5_get_init_creds_opt_set_salt.3
 MLINKS+=krb5_get_init_creds.3 krb5_get_init_creds_opt_set_tkt_life.3
 MLINKS+=krb5_get_init_creds.3 krb5_get_init_creds_password.3
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 92440b63a3b..3519f88efa5 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.19 2006/09/18 18:18:17 jmc Exp $
+#	$OpenBSD: Makefile,v 1.20 2009/08/13 19:54:58 jmc Exp $
 #	$NetBSD: Makefile,v 1.3 1996/05/10 21:54:24 cgd Exp $
 
 LIB=	pcap
@@ -24,7 +24,8 @@ MLINKS=	pcap.3 pcap_open_live.3 pcap.3 pcap_open_offline.3 \
 	pcap.3 pcap_datalink_name_to_val.3 pcap.3 pcap_dump_fopen.3 \
 	pcap.3 pcap_sendpacket.3 pcap.3 pcap_next_ex.3 \
 	pcap.3 pcap_setdirection.3 pcap.3 pcap_dump_file.3 \
-	pcap.3 pcap_dump_ftell.3 pcap.3 pcap_fopen_offline.3
+	pcap.3 pcap_dump_ftell.3 pcap.3 pcap_fopen_offline.3 \
+	pcap.3 pcap_dump_flush.3
 
 DEFS=	-DHAVE_SYS_IOCCOM_H -DHAVE_SYS_SOCKIO_H -DHAVE_ETHER_HOSTTON \
 	-DHAVE_STRERROR -DHAVE_SOCKADDR_SA_LEN -DLBL_ALIGN -DHAVE_IFADDRS_H \