Sorted lists.

11 files changed, 146 insertions, 144 deletions

diff --git a/lib/libc/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc
index ccbc0ab94ec6..798326282996 100644
--- a/lib/libc/compat-43/Makefile.inc
+++ b/lib/libc/compat-43/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/2/93
-#	$Id: Makefile.inc,v 1.5 1997/05/03 03:49:51 jb Exp $
+#	$Id: Makefile.inc,v 1.6 1997/10/15 16:15:20 bde Exp $
 
 # compat-43 sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/compat-43 ${.CURDIR}/../libc/compat-43
@@ -9,9 +9,8 @@ SRCS+=	creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \
 
 .if ${LIB} == "c"
 MAN2+=	creat.2 killpg.2 sigblock.2 sigpause.2 sigsetmask.2 sigvec.2
+MAN3+=	gethostid.3 setruid.3
 
-MAN3+=  gethostid.3 setruid.3
-
-MLINKS+=setruid.3 setrgid.3
 MLINKS+=gethostid.3 sethostid.3
+MLINKS+=setruid.3 setrgid.3
 .endif
diff --git a/lib/libc/db/man/Makefile.inc b/lib/libc/db/man/Makefile.inc
index 7981a2cc60f6..2c70dd0760c9 100644
--- a/lib/libc/db/man/Makefile.inc
+++ b/lib/libc/db/man/Makefile.inc
@@ -1,11 +1,10 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile.inc,v 1.5 1997/09/24 20:38:10 julian Exp $
+#	$Id: Makefile.inc,v 1.6 1997/10/16 14:26:09 bde Exp $
 
 .PATH: ${.CURDIR}/../libc/db/man
 
 .if ${LIB} == "c"
-# mpool.3
-MAN3+=	btree.3 dbopen.3 hash.3 recno.3
-MAN3+=	mpool.3
+MAN3+=	btree.3 dbopen.3 hash.3 mpool.3 recno.3
+
 MLINKS+= dbopen.3 db.3
 .endif
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index d94558f4d49a..e0b087f244ae 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -1,31 +1,32 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-#	$Id: Makefile.inc,v 1.39 1997/10/14 07:43:18 bde Exp $
+#	$Id: Makefile.inc,v 1.40 1997/10/15 16:15:24 bde Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/gen ${.CURDIR}/../libc/gen
 
-SRCS+=  alarm.c arc4random.c assert.c clock.c closedir.c config.c confstr.c \
-	crypt.c ctermid.c daemon.c devname.c disklabel.c err.c errlst.c \
+SRCS+=  _rand48.c alarm.c arc4random.c assert.c \
+	clock.c closedir.c config.c confstr.c \
+	crypt.c ctermid.c daemon.c devname.c disklabel.c \
+	drand48.c erand48.c err.c errlst.c \
 	exec.c fnmatch.c fstab.c fts.c getbootfile.c getbsize.c \
 	getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \
 	gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \
 	getosreldate.c getpagesize.c getpass.c getpwent.c getttyent.c \
 	getusershell.c getvfsbyname.c getvfsent.c glob.c \
-	initgroups.c isatty.c msgctl.c \
-	msgget.c msgrcv.c msgsnd.c nice.c nlist.c ntp_gettime.c opendir.c \
+	initgroups.c isatty.c jrand48.c lcong48.c \
+	lrand48.c mrand48.c msgctl.c \
+	msgget.c msgrcv.c msgsnd.c nice.c \
+	nlist.c nrand48.c ntp_gettime.c opendir.c \
 	pause.c popen.c psignal.c pwcache.c raise.c readdir.c rewinddir.c \
-	scandir.c seekdir.c semconfig.c semctl.c semget.c semop.c \
+	scandir.c seed48.c seekdir.c semconfig.c semctl.c semget.c semop.c \
 	setdomainname.c sethostname.c setjmperr.c setmode.c shmat.c \
 	shmctl.c shmdt.c shmget.c siginterrupt.c siglist.c signal.c \
-	sigsetops.c sleep.c stringlist.c sysconf.c sysctl.c sysctlbyname.c \
+	sigsetops.c sleep.c srand48.c stringlist.c \
+	sysconf.c sysctl.c sysctlbyname.c \
 	syslog.c telldir.c termios.c time.c times.c timezone.c ttyname.c \
 	ttyslot.c ualarm.c uname.c unvis.c usleep.c utime.c valloc.c vis.c \
 	wait.c wait3.c waitpid.c
 
-# *rand48 family, from 1.1.5
-SRCS+=	_rand48.c drand48.c erand48.c jrand48.c lcong48.c lrand48.c \
-	mrand48.c nrand48.c seed48.c srand48.c
-
 # machine-dependent gen sources
 .include "${.CURDIR}/../libc/${MACHINE}/gen/Makefile.inc"
 
@@ -42,16 +43,16 @@ errlst.o errlst.po:
 .endif
 
 .if ${LIB} == "c"
-MAN3+=  alarm.3 arc4random.3 clock.3 confstr.3 \
-	config_open.3 crypt.3 ctermid.3 daemon.3 \
+MAN3+=  alarm.3 arc4random.3 clock.3 config_open.3 \
+	confstr.3 crypt.3 ctermid.3 daemon.3 \
 	devname.3 directory.3 err.3 exec.3 fnmatch.3 frexp.3 fts.3 \
-	getbsize.3 getbootfile.3 getcap.3 getcwd.3 \
+	getbootfile.3 getbsize.3 getcap.3 getcwd.3 \
 	getdiskbyname.3 getdomainname.3 getfsent.3 \
 	getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \
 	getmntinfo.3 getnetgrent.3 getpagesize.3 getpass.3 getpwent.3 \
 	getttyent.3 getusershell.3 getvfsbyname.3 getvfsent.3 \
 	glob.3 initgroups.3 isinf.3 \
-	ldexp.3 msgctl.3 msgget.3 msgrcv.3 msgsnd.3 modf.3 \
+	ldexp.3 modf.3 msgctl.3 msgget.3 msgrcv.3 msgsnd.3 \
 	nice.3 nlist.3 pause.3 popen.3 psignal.3 pwcache.3 \
 	raise.3 rand48.3 scandir.3 setjmp.3 setmode.3 siginterrupt.3 \
 	signal.3 sigsetops.3 sleep.3 stringlist.3 \
@@ -60,46 +61,45 @@ MAN3+=  alarm.3 arc4random.3 clock.3 confstr.3 \
 	ttyname.3 tzset.3 ualarm.3 uname.3 unvis.3 usleep.3 utime.3 \
 	valloc.3 vis.3
 
-MLINKS+=arc4random.3 arc4random_stir.3 arc4random.3 arc4random_addrandom.3
-MLINKS+=config_open.3 config_next.3 config_open.3 config_close.3 \
+MLINKS+=arc4random.3 arc4random_addrandom.3 arc4random.3 arc4random_stir.3
+MLINKS+=config_open.3 config_close.3 config_open.3 config_next.3 \
 	config_open.3 config_skip.3
-MLINKS+=crypt.3 encrypt.3 crypt.3 setkey.3 crypt.3  des_setkey.3 \
-	crypt.3 des_cipher.3
+MLINKS+=crypt.3 des_cipher.3 crypt.3 des_setkey.3 crypt.3 encrypt.3 \
+	crypt.3 setkey.3
 MLINKS+=directory.3 closedir.3 directory.3 dirfd.3 directory.3 opendir.3 \
 	directory.3 readdir.3 directory.3 rewinddir.3 directory.3 seekdir.3 \
 	directory.3 telldir.3
-MLINKS+=exec.3 execl.3 exec.3 execle.3 exec.3 execlp.3 exec.3 execv.3 \
-	exec.3 execvp.3 exec.3 exect.3
-MLINKS+=err.3 verr.3 err.3 errx.3 err.3 verrx.3 err.3 warn.3 err.3 vwarn.3 \
-	err.3 warnx.3 err.3 vwarnx.3 err.3 err_set_file.3 \
-	err.3 err_set_exit.3
+MLINKS+=exec.3 execl.3 exec.3 execle.3 exec.3 execlp.3 exec.3 exect.3 \
+	exec.3 execv.3 exec.3 execvp.3
+MLINKS+=err.3 err_set_exit.3 err.3 err_set_file.3 err.3 errx.3 err.3 verr.3 \
+	err.3 verrx.3 err.3 vwarn.3 err.3 vwarnx.3 err.3 warn.3 err.3 warnx.3
 MLINKS+=isinf.3 isnan.3
 MLINKS+=getcap.3 cgetcap.3 getcap.3 cgetclose.3 getcap.3 cgetent.3 \
 	getcap.3 cgetfirst.3 getcap.3 cgetmatch.3 getcap.3 cgetnext.3 \
 	getcap.3 cgetnum.3 getcap.3 cgetset.3 getcap.3 cgetstr.3 \
 	getcap.3 cgetustr.3
 MLINKS+=getcwd.3 getwd.3
+MLINKS+=getdomainname.3 setdomainname.3
 MLINKS+=getfsent.3 endfsent.3 getfsent.3 getfsfile.3 getfsent.3 getfsspec.3 \
 	getfsent.3 getfstype.3 getfsent.3 setfsent.3
-MLINKS+=getgrent.3 endgrent.3 getgrent.3 setgroupent.3 getgrent.3 getgrgid.3 \
-	getgrent.3 getgrnam.3 getgrent.3 setgrent.3
+MLINKS+=getgrent.3 endgrent.3 getgrent.3 getgrgid.3 getgrent.3 getgrnam.3 \
+	getgrent.3 setgrent.3 getgrent.3 setgroupent.3
 MLINKS+=gethostname.3 sethostname.3
-MLINKS+=getdomainname.3 setdomainname.3
-MLINKS+=getnetgrent.3 endnetgrent.3 getnetgrent.3 setnetgrent.3 \
-	getnetgrent.3 innetgr.3
-MLINKS+=getpwent.3 endpwent.3 getpwent.3 setpassent.3 getpwent.3 getpwnam.3 \
-	getpwent.3 getpwuid.3 getpwent.3 setpwent.3 getpwent.3 setpwfile.3
+MLINKS+=getnetgrent.3 endnetgrent.3 getnetgrent.3 innetgr.3 \
+	getnetgrent.3 setnetgrent.3
+MLINKS+=getpwent.3 endpwent.3 getpwent.3 getpwnam.3 getpwent.3 getpwuid.3 \
+	getpwent.3 setpassent.3 getpwent.3 setpwent.3 getpwent.3 setpwfile.3
 MLINKS+=getttyent.3 endttyent.3 getttyent.3 getttynam.3 \
-	getttyent.3 setttyent.3 getttyent.3 isdialuptty.3 \
-	getttyent.3 isnetworktty.3
-MLINKS+=getvfsent.3 getvfsbytype.3 \
-	getvfsent.3 setvfsent.3 getvfsent.3 endvfsent.3 \
-	getvfsent.3 vfsisloadable.3 getvfsent.3 vfsload.3
+	getttyent.3 isdialuptty.3 getttyent.3 isnetworktty.3 \
+	getttyent.3 setttyent.3
+MLINKS+=getvfsent.3 endvfsent.3 getvfsent.3 getvfsbytype.3 \
+	getvfsent.3 setvfsent.3 getvfsent.3 vfsisloadable.3 \
+	getvfsent.3 vfsload.3
 MLINKS+=getusershell.3 endusershell.3 getusershell.3 setusershell.3
 MLINKS+=glob.3 globfree.3
 MLINKS+=popen.3 pclose.3
 MLINKS+=psignal.3 sys_siglist.3 psignal.3 sys_signame.3
-MLINKS+=pwcache.3 user_from_uid.3 pwcache.3 group_from_gid.3
+MLINKS+=pwcache.3 group_from_gid.3 pwcache.3 user_from_uid.3
 MLINKS+=rand48.3 _rand48.3 rand48.3 drand48.3 rand48.3 erand48.3 \
 	rand48.3 jrand48.3 rand48.3 lcong48.3 rand48.3 lrand48.3 \
 	rand48.3 mrand48.3 rand48.3 nrand48.3 rand48.3 seed48.3 \
@@ -109,21 +109,21 @@ MLINKS+=setjmp.3 _longjmp.3 setjmp.3 _setjmp.3 setjmp.3 longjmp.3 \
 	setjmp.3 longjmperr.3 setjmp.3 longjmperror.3 \
 	setjmp.3 sigsetjmp.3 setjmp.3 siglongjmp.3
 MLINKS+=setmode.3 getmode.3
-MLINKS+=sigsetops.3 sigemptyset.3 sigsetops.3 sigfillset.3 \
-	sigsetops.3 sigaddset.3 sigsetops.3 sigdelset.3 \
+MLINKS+=sigsetops.3 sigaddset.3 sigsetops.3 sigdelset.3 \
+	sigsetops.3 sigemptyset.3 sigsetops.3 sigfillset.3 \
 	sigsetops.3 sigismember.3
 MLINKS+=sysctl.3 sysctlbyname.3
 MLINKS+=syslog.3 closelog.3 syslog.3 openlog.3 syslog.3 setlogmask.3 \
 	syslog.3 vsyslog.3
 MLINKS+=tcsendbreak.3 tcdrain.3 tcsendbreak.3 tcflush.3 tcsendbreak.3 tcflow.3
-MLINKS+=tcsetattr.3 tcgetattr.3 tcsetattr.3 cfsetospeed.3 \
-	tcsetattr.3 cfgetospeed.3 tcsetattr.3 cfgetispeed.3 \
-	tcsetattr.3 cfsetispeed.3 tcsetattr.3 cfsetspeed.3 \
-	tcsetattr.3 cfmakeraw.3
+MLINKS+=tcsetattr.3 tcgetattr.3 tcsetattr.3 cfgetispeed.3 \
+	tcsetattr.3 cfgetospeed.3 tcsetattr.3 cfmakeraw.3 \
+	tcsetattr.3 cfsetispeed.3 tcsetattr.3 cfsetospeed.3 \
+	tcsetattr.3 cfsetspeed.3
 MLINKS+=ttyname.3 isatty.3 ttyname.3 ttyslot.3
 MLINKS+=tzset.3 tzsetwall.3
 MLINKS+=vis.3 strvis.3 vis.3 strvisx.3
 MLINKS+=unvis.3 strunvis.3 
-MLINKS+=fts.3 fts_open.3 fts.3 fts_read.3 fts.3 fts_children.3 \
-	fts.3 fts_close.3 fts.3 fts_set.3
+MLINKS+=fts.3 fts_children.3 fts.3 fts_close.3 fts.3 fts_open.3 \
+	fts.3 fts_read.3 fts.3 fts_set.3
 .endif
diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc
index 8833024f97b3..87a41f63074b 100644
--- a/lib/libc/locale/Makefile.inc
+++ b/lib/libc/locale/Makefile.inc
@@ -1,13 +1,13 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile.inc,v 1.9 1997/09/24 20:38:10 julian Exp $
+#	$Id: Makefile.inc,v 1.10 1997/10/15 16:15:34 bde Exp $
 
 # locale sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/locale ${.CURDIR}/../libc/locale
 
-SRCS+=	ansi.c ctype.c euc.c frune.c isctype.c lconv.c localeconv.c \
-	mbrune.c none.c rune.c setlocale.c table.c utf2.c setrunelocale.c \
-	runetype.c tolower.c toupper.c nomacros.c collate.c setinvalidrune.c \
-	collcmp.c mskanji.c
+SRCS+=	ansi.c collate.c collcmp.c ctype.c euc.c frune.c isctype.c lconv.c \
+	localeconv.c mbrune.c mskanji.c nomacros.c none.c rune.c runetype.c \
+	setinvalidrune.c setlocale.c setrunelocale.c table.c tolower.c \
+	toupper.c utf2.c
 
 .if ${LIB} == "c"
 MAN3+=	ctype.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \
@@ -15,9 +15,12 @@ MAN3+=	ctype.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \
 	isupper.3 isxdigit.3 mbrune.3 multibyte.3 rune.3 setlocale.3 \
 	toascii.3 tolower.3 toupper.3
 MAN4+=	euc.4 utf2.4
-MLINKS+= rune.3 setrunelocale.3 rune.3 setinvalidrune.3 rune.3 sgetrune.3 \
-	 rune.3 sputrune.3 rune.3 fgetrune.3 rune.3 fungetrune.3 \
-	 rune.3 fputrune.3 mbrune.3 mbrrune.3 mbrune.3 mbmb.3 \
-	 multibyte.3 mblen.3 multibyte.3 mbstowcs.3 multibyte.3 mbtowc.3 \
-	 multibyte.3 wcstombs.3 multibyte.3 wctomb.3 setlocale.3 localeconv.3
+
+MLINKS+=mbrune.3 mbmb.3 mbrune.3 mbrrune.3
+MLINKS+=multibyte.3 mblen.3 multibyte.3 mbstowcs.3 multibyte.3 mbtowc.3 \
+	multibyte.3 wcstombs.3 multibyte.3 wctomb.3
+MLINKS+=rune.3 fgetrune.3 rune.3 fputrune.3 rune.3 fungetrune.3 \
+	rune.3 setinvalidrune.3 rune.3 setrunelocale.3 rune.3 sgetrune.3 \
+	rune.3 sputrune.3
+MLINKS+=setlocale.3 localeconv.3
 .endif
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index d5c69e435155..c7381dba02ca 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -1,22 +1,21 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 9/5/93
-#	$Id: Makefile.inc,v 1.23 1997/05/03 03:50:01 jb Exp $
+#	$Id: Makefile.inc,v 1.24 1997/10/15 16:15:41 bde Exp $
 
 # machine-independent net sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/net ${.CURDIR}/../libc/net
 
-SRCS+=	addr2ascii.c ascii2addr.c base64.c \
+SRCS+=	addr2ascii.c ascii2addr.c base64.c ether_addr.c \
 	gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \
 	getnetbydns.c getnetbyht.c getnetbynis.c getnetnamadr.c \
 	getproto.c getprotoent.c getprotoname.c getservbyname.c \
 	getservbyport.c getservent.c herror.c inet_addr.c inet_lnaof.c \
-	inet_makeaddr.c inet_netof.c inet_network.c inet_ntoa.c inet_ntop.c \
-	inet_net_ntop.c inet_net_pton.c inet_neta.c \
-	inet_pton.c linkaddr.c map_v4v6.c nsap_addr.c \
+	inet_makeaddr.c inet_net_ntop.c inet_net_pton.c inet_neta.c \
+	inet_netof.c inet_network.c inet_ntoa.c inet_ntop.c \
+	inet_pton.c linkaddr.c map_v4v6.c ns_addr.c ns_ntoa.c nsap_addr.c \
 	rcmd.c recv.c res_comp.c res_data.c res_debug.c \
 	res_init.c res_mkquery.c res_query.c res_send.c res_stubs.c \
-	send.c ether_addr.c \
-	ns_addr.c ns_ntoa.c 
-# iso_addr.c 
+	send.c
+# not supported: iso_addr.c 
 
 # machine-dependent net sources
 .include "${.CURDIR}/../libc/${MACHINE}/net/Makefile.inc"
@@ -25,31 +24,31 @@ SRCS+=	addr2ascii.c ascii2addr.c base64.c \
 MAN3+=	addr2ascii.3 byteorder.3 ethers.3 gethostbyname.3 \
 	getnetent.3 getprotoent.3 getservent.3 \
 	inet.3 linkaddr.3 rcmd.3 resolver.3
-
-# not installed: ns.3 iso_addr.3
+# not installed: iso_addr.3 ns.3
 
 MLINKS+=addr2ascii.3 ascii2addr.3
 MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \
 	byteorder.3 ntohs.3
-MLINKS+=ethers.3 ether_line.3 ethers.3 ether_aton.3 ethers.3 ether_ntoa.3 \
-	ethers.3 ether_ntohost.3 ethers.3 ether_hostton.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+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \
-	gethostbyname.3 sethostent.3 gethostbyname.3 gethostent.3 \
+	gethostbyname.3 gethostbyname2.3 gethostbyname.3 gethostent.3 \
 	gethostbyname.3 herror.3 gethostbyname.3 hstrerror.3 \
-	gethostbyname.3 gethostbyname2.3 
+	gethostbyname.3 sethostent.3
 MLINKS+=getnetent.3 endnetent.3 getnetent.3 getnetbyaddr.3 \
 	getnetent.3 getnetbyname.3 getnetent.3 setnetent.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+=inet.3 addr.3 inet.3 inet_addr.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 network.3 inet.3 ntoa.3 inet.3 inet_aton.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 network.3 \
+	inet.3 ntoa.3
 MLINKS+=linkaddr.3 link_addr.3 linkaddr.3 link_ntoa.3 
 #MLINKS+=ns.3 ns_addr.3 ns.3 ns_ntoa.3
-MLINKS+=rcmd.3 rresvport.3 rcmd.3 iruserok.3 rcmd.3 ruserok.3
+MLINKS+=rcmd.3 iruserok.3 rcmd.3 rresvport.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_send.3 resolver.3 res_query.3 \
-	resolver.3 res_search.3
+	resolver.3 res_mkquery.3 resolver.3 res_query.3 \
+	resolver.3 res_search.3 resolver.3 res_send.3
 .endif
diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc
index a9b1b3e0ea28..7574e4d2b59e 100644
--- a/lib/libc/rpc/Makefile.inc
+++ b/lib/libc/rpc/Makefile.inc
@@ -1,20 +1,23 @@
 #	@(#)Makefile	5.11 (Berkeley) 9/6/90
+#	$Id$
 
 .PATH: ${.CURDIR}/../libc/rpc ${.CURDIR}/.
-SRCS+=	auth_none.c auth_unix.c  authunix_prot.c bindresvport.c \
+
+SRCS+=	auth_des.c auth_none.c auth_time.c auth_unix.c \
+	authdes_prot.c authunix_prot.c bindresvport.c \
 	clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c clnt_tcp.c \
-	clnt_udp.c rpc_dtablesize.c get_myaddress.c getrpcent.c getrpcport.c \
+	clnt_udp.c clnt_unix.c crypt_client.c des_crypt.c des_soft.c \
+	get_myaddress.c getpublickey.c getrpcent.c getrpcport.c \
+	key_call.c key_prot_xdr.c netname.c netnamer.c \
 	pmap_clnt.c pmap_getmaps.c pmap_getport.c pmap_prot.c \
-	pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c rpc_callmsg.c \
-	svc.c svc_auth.c svc_auth_unix.c svc_raw.c svc_run.c svc_simple.c \
-	svc_tcp.c svc_udp.c
-
-SRCS+=	clnt_unix.c svc_unix.c
+	pmap_prot2.c pmap_rmt.c rpc_callmsg.c rpc_commondata.c \
+	rpc_dtablesize.c rpc_prot.c rpcdname.c rtime.c \
+	svc.c svc_auth.c svc_auth_des.c svc_auth_unix.c \
+	svc_raw.c svc_run.c svc_simple.c \
+	svc_tcp.c svc_udp.c svc_unix.c
 
-SRCS+=	auth_des.c authdes_prot.c auth_time.c des_soft.c des_crypt.c \
-	key_call.c key_prot_xdr.c netname.c netnamer.c rpcdname.c rtime.c \
-	svc_auth_des.c crypt_clnt.c crypt_xdr.c crypt_client.c \
-	getpublickey.c
+# generated sources
+SRCS+=	crypt_clnt.c crypt_xdr.c
 
 CFLAGS+= -DBROKEN_DES
 
@@ -40,17 +43,15 @@ crypt.h: ${RPCDIR}/crypt.x
 # Paul.
 #
 
-# MAN1+= rstat.1
-MAN3+= bindresvport.3 getrpcent.3 getrpcport.3 rpc.3
-MAN5+= rpc.5
-MAN8+= rstat_svc.8
+# MAN1+=	rstat.1
+MAN3+=	bindresvport.3 des_crypt.3 getrpcent.3 getrpcport.3 publickey.3 rpc.3 \
+	rpc_secure.3 rtime.3
+MAN5+=	publickey.5 rpc.5
+MAN8+=	rstat_svc.8
 
-MAN3+= rpc_secure.3 publickey.3 rtime.3 des_crypt.3
-MAN5+= publickey.5
-
-MLINKS+=	getrpcent.3 getrpcbyname.3 \
+MLINKS+=	getrpcent.3 endrpcent.3 \
+		getrpcent.3 getrpcbyname.3 \
 		getrpcent.3 getrpcbynumber.3 \
-		getrpcent.3 endrpcent.3 \
 		getrpcent.3 setrpcent.3 \
 		rpc.3 auth_destroy.3 \
 		rpc.3 authnone_create.3 \
@@ -114,7 +115,5 @@ MLINKS+=	getrpcent.3 getrpcbyname.3 \
 		rpc.3 xdr_rejected_reply.3 \
 		rpc.3 xdr_replymsg.3 \
 		rpc.3 xprt_register.3 \
-		rpc.3 xprt_unregister.3 \
-
-MLINKS+=getrpcent.3 getrpcbyname.3 getrpcent.3 getrpcbynumber.3
+		rpc.3 xprt_unregister.3
 .endif
diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc
index b9664b46ee16..97b403a25071 100644
--- a/lib/libc/stdio/Makefile.inc
+++ b/lib/libc/stdio/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 4/17/94
-#	$Id: Makefile.inc,v 1.9 1997/05/03 03:50:03 jb Exp $
+#	$Id: Makefile.inc,v 1.10 1997/10/15 16:16:07 bde Exp $
 
 # stdio sources
 .PATH: ${.CURDIR}/../libc/stdio
@@ -30,9 +30,11 @@ MLINKS+=fseek.3 fgetpos.3 fseek.3 fsetpos.3 fseek.3 ftell.3 fseek.3 rewind.3
 MLINKS+=funopen.3 fropen.3 funopen.3 fwopen.3
 MLINKS+=getc.3 fgetc.3 getc.3 getchar.3 getc.3 getw.3
 MLINKS+=mktemp.3 mkstemp.3
-MLINKS+=printf.3 fprintf.3 printf.3 snprintf.3 printf.3 sprintf.3 \
+MLINKS+=printf.3 asprintf.3 printf.3 fprintf.3 \
+	printf.3 snprintf.3 printf.3 sprintf.3 \
+	printf.3 vasprintf.3 \
 	printf.3 vfprintf.3 printf.3 vprintf.3 printf.3 vsnprintf.3 \
-	printf.3 vsprintf.3 printf.3 asprintf.3 printf.3 vasprintf.3
+	printf.3 vsprintf.3
 MLINKS+=putc.3 fputc.3 putc.3 putchar.3 putc.3 putw.3
 MLINKS+=scanf.3 fscanf.3 scanf.3 sscanf.3 scanf.3 vfscanf.3 scanf.3 vscanf.3 \
 	scanf.3 vsscanf.3
diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc
index 23af25e3bb64..03d0060cd94a 100644
--- a/lib/libc/stdlib/Makefile.inc
+++ b/lib/libc/stdlib/Makefile.inc
@@ -1,13 +1,13 @@
 #	from @(#)Makefile.inc	8.3 (Berkeley) 2/4/95
-#	$Id: Makefile.inc,v 1.11 1997/10/15 16:16:13 bde Exp $
+#	$Id: Makefile.inc,v 1.12 1997/10/16 14:58:18 bde Exp $
 
 # machine-independent stdlib sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/stdlib ${.CURDIR}/../libc/stdlib
 
 MISRCS+=abort.c abs.c atexit.c atof.c atoi.c atol.c bsearch.c calloc.c div.c \
-	exit.c getenv.c getopt.c getsubopt.c strhash.c heapsort.c labs.c \
-	ldiv.c malloc.c merge.c putenv.c qsort.c radixsort.c rand.c random.c \
-	realpath.c setenv.c strtod.c strtol.c strtoq.c strtoul.c \
+	exit.c getenv.c getopt.c getsubopt.c heapsort.c labs.c ldiv.c \
+	malloc.c merge.c putenv.c qsort.c radixsort.c rand.c random.c \
+	realpath.c setenv.c strhash.c strtod.c strtol.c strtoq.c strtoul.c \
 	strtouq.c system.c
 
 # machine-dependent stdlib sources
@@ -19,12 +19,12 @@ MAN3+=	abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.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
 
-MLINKS+=getenv.3 setenv.3 getenv.3 unsetenv.3 getenv.3 putenv.3
+MLINKS+=getenv.3 putenv.3 getenv.3 setenv.3 getenv.3 unsetenv.3
 MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3
 MLINKS+=rand.3 srand.3
 MLINKS+=random.3 initstate.3 random.3 setstate.3 random.3 srandom.3 \
 	random.3 srandomdev.3
 MLINKS+=strtol.3 strtoq.3
 MLINKS+=strtoul.3 strtouq.3
-MLINKS+=malloc.3 free.3 malloc.3 realloc.3 malloc.3 calloc.3
+MLINKS+=malloc.3 calloc.3 malloc.3 free.3 malloc.3 realloc.3
 .endif
diff --git a/lib/libc/stdtime/Makefile.inc b/lib/libc/stdtime/Makefile.inc
index 3a876ed81e31..311b8353e4a5 100644
--- a/lib/libc/stdtime/Makefile.inc
+++ b/lib/libc/stdtime/Makefile.inc
@@ -1,14 +1,13 @@
 #	Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp
-#	$Id: Makefile.inc,v 1.5 1997/08/09 15:43:51 joerg Exp $
+#	$Id: Makefile.inc,v 1.6 1997/10/15 16:16:21 bde Exp $
 
 .PATH:	${.CURDIR}/../libc/stdtime
 
-SRCS+=	asctime.c localtime.c strftime.c difftime.c timelocal.c strptime.c
+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
-MAN3+=	ctime.3 strftime.3 time2posix.3
-MAN3+=	strptime.3
 
 MLINKS+=ctime.3 asctime.3 ctime.3 difftime.3 ctime.3 gmtime.3 \
 	ctime.3 localtime.3 ctime.3 mktime.3
diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
index 3e91041eed4c..5583ce362759 100644
--- a/lib/libc/string/Makefile.inc
+++ b/lib/libc/string/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile.inc,v 1.11 1997/10/15 16:16:26 bde Exp $
+#	$Id: Makefile.inc,v 1.12 1997/10/16 13:46:50 bde Exp $
 
 .PATH: ${.CURDIR}/../libc/${MACHINE}/string ${.CURDIR}/../libc/string
 
@@ -18,10 +18,10 @@ MISRCS+=bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \
 .if ${LIB} == "c"
 MAN3+=	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 string.3 strlen.3 \
-	strmode.3 strdup.3 strerror.3 strpbrk.3 strrchr.3 strsep.3 strspn.3 \
+	strchr.3 strcmp.3 strcoll.3 strcpy.3 strcspn.3 strdup.3 strerror.3 \
+	string.3 strlen.3 strmode.3 strpbrk.3 strrchr.3 strsep.3 strspn.3 \
 	strstr.3 strtok.3 strxfrm.3 swab.3
-#
+
 MLINKS+=strcasecmp.3 strncasecmp.3
 MLINKS+=strcat.3 strncat.3
 MLINKS+=strcmp.3 strncmp.3
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 389d3eadc8ef..f8e8d5ab6ae3 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
-#	$Id: Makefile.inc,v 1.42 1997/10/15 16:16:34 bde Exp $
+#	$Id: Makefile.inc,v 1.43 1997/10/15 16:29:14 bde Exp $
 
 # sys sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/sys ${.CURDIR}/../libc/sys
@@ -15,34 +15,35 @@ SRCS+=	Ovfork.S brk.S cerror.S exect.S fork.S pipe.S ptrace.S reboot.S \
 SRCS+=	ftruncate.c lseek.c mmap.c truncate.c
 
 # modules with default implementations on all architectures:
-ASM=	access.o acct.o adjtime.o chdir.o chflags.o chmod.o \
-	chown.o chroot.o \
+ASM=	__getcwd.o __syscall.o __sysctl.o \
+	access.o acct.o adjtime.o \
+	aio_cancel.o aio_error.o aio_read.o aio_return.o aio_suspend.o \
+	aio_write.o \
+	chdir.o chflags.o chmod.o chown.o chroot.o \
 	clock_getres.o clock_gettime.o clock_settime.o \
 	getdtablesize.o getegid.o \
 	geteuid.o getfh.o getfsstat.o getgid.o getgroups.o getitimer.o \
 	getpgrp.o getpgid.o getpid.o getppid.o getpriority.o \
 	getrlimit.o getrusage.o getsid.o gettimeofday.o \
-	getuid.o issetugid.o kill.o ktrace.o lchown.o \
+	getuid.o issetugid.o kill.o \
+	kldfind.o kldfirstmod.o kldload.o kldnext.o kldstat.o kldunload.o \
+	ktrace.o lchown.o \
 	lfs_bmapv.o lfs_markv.o \
-	lfs_segclean.o lfs_segwait.o link.o lstat.o \
-	madvise.o __getcwd.o mincore.o minherit.o mkdir.o mlock.o \
+	lfs_segclean.o lfs_segwait.o link.o lio_listio.o lstat.o \
+	madvise.o mincore.o minherit.o mkdir.o mlock.o \
+	modfind.o modfnext.o modnext.o modstat.o \
 	mount.o \
 	mprotect.o msgsys.o msync.o munlock.o munmap.o \
 	ntp_adjtime.o pathconf.o profil.o quotactl.o \
 	readlink.o rename.o revoke.o rmdir.o \
-	rtprio.o semsys.o setegid.o seteuid.o \
-	setgid.o \
+	rtprio.o semsys.o setegid.o seteuid.o setgid.o \
 	setgroups.o setitimer.o	setpgid.o setpriority.o	\
 	setregid.o setreuid.o setrlimit.o \
 	setsid.o settimeofday.o setuid.o shmsys.o \
 	stat.o statfs.o \
 	swapon.o symlink.o sync.o sysarch.o \
 	umask.o undelete.o unlink.o unmount.o utimes.o utrace.o \
-	vadvise.o __syscall.o __sysctl.o \
-	modnext.o modstat.o modfnext.o modfind.o \
-	kldload.o kldunload.o kldfind.o kldnext.o kldstat.o kldfirstmod.o \
-	aio_read.o aio_write.o aio_suspend.o aio_error.o aio_cancel.o \
-	aio_return.o lio_listio.o
+	vadvise.o
 
 # Syscalls renamed as _thread_sys_{syscall} when building libc_r.
 ASMR=	accept.o bind.o close.o connect.o dup.o dup2.o \
@@ -91,26 +92,27 @@ ${SPSEUDOR}:
 	    > ${.TARGET}
 
 .if ${LIB} == "c"
-MAN2+=	accept.2 access.2 acct.2 adjtime.2 bind.2 brk.2 chdir.2 chflags.2 \
+MAN2+=	_exit.2 accept.2 access.2 acct.2 adjtime.2 \
+	bind.2 brk.2 chdir.2 chflags.2 \
 	chmod.2 chown.2 chroot.2 clock_gettime.2 close.2 \
-	connect.2 dup.2 execve.2 _exit.2 \
+	connect.2 dup.2 execve.2 \
 	fcntl.2 flock.2 fork.2 fsync.2 getdirentries.2 getdtablesize.2 \
 	getfh.2 getfsstat.2 getgid.2 getgroups.2 getitimer.2 getlogin.2 \
 	getpeername.2 getpgrp.2 getpid.2 getpriority.2 getrlimit.2 \
 	getrusage.2 getsid.2 getsockname.2 \
 	getsockopt.2 gettimeofday.2 getuid.2 \
 	intro.2 ioctl.2 issetugid.2 kill.2 ktrace.2 link.2 listen.2 lseek.2 \
-	mkdir.2 mkfifo.2 mknod.2 madvise.2 mincore.2 minherit.2 mlock.2 mmap.2 \
+	madvise.2 mincore.2 minherit.2 mkdir.2 mkfifo.2 mknod.2 mlock.2 mmap.2 \
 	mount.2 mprotect.2 msync.2 munmap.2 nanosleep.2 \
-	ptrace.2 nfssvc.2 open.2 pathconf.2 pipe.2 poll.2 profil.2 quotactl.2 \
+	nfssvc.2 open.2 pathconf.2 pipe.2 poll.2 profil.2 ptrace.2 quotactl.2 \
 	read.2 readlink.2 reboot.2 recv.2 rename.2 revoke.2 rfork.2 rmdir.2 \
 	rtprio.2 select.2 semctl.2 semget.2 semop.2 send.2 \
 	setgroups.2 setpgid.2 setregid.2 setreuid.2 setsid.2 setuid.2 \
 	shmat.2 shmctl.2 shmget.2 shutdown.2 \
-	sigaction.2 sigpending.2 sigprocmask.2 sigreturn.2 sigaltstack.2 \
+	sigaction.2 sigaltstack.2 sigpending.2 sigprocmask.2 sigreturn.2 \
 	sigstack.2 sigsuspend.2 socket.2 socketpair.2 stat.2 statfs.2 \
-	swapon.2 symlink.2 sync.2 syscall.2 truncate.2 umask.2 unlink.2 \
-	undelete.2 utimes.2 vfork.2 wait.2 write.2
+	swapon.2 symlink.2 sync.2 syscall.2 truncate.2 umask.2 undelete.2 \
+	unlink.2 utimes.2 vfork.2 wait.2 write.2
 
 MLINKS+=brk.2 sbrk.2
 MLINKS+=dup.2 dup2.2
@@ -118,7 +120,7 @@ MLINKS+=chdir.2 fchdir.2
 MLINKS+=chflags.2 fchflags.2
 MLINKS+=chmod.2 fchmod.2
 MLINKS+=chown.2 fchown.2 chown.2 lchown.2
-MLINKS+=clock_gettime.2 clock_settime.2 clock_gettime.2 clock_getres.2
+MLINKS+=clock_gettime.2 clock_getres.2 clock_gettime.2 clock_settime.2
 MLINKS+=getgid.2 getegid.2
 MLINKS+=getitimer.2 setitimer.2
 MLINKS+=getlogin.2 setlogin.2