Sync up with the current state of things--mi and mac68k.

2 files changed, 108 insertions, 37 deletions

diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index f3a21033e1b..aee98534637 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -3,7 +3,9 @@
 ./usr/include/m68k
 ./usr/include/m68k/ansi.h
 ./usr/include/m68k/asm.h
+./usr/include/m68k/asm_single.h
 ./usr/include/m68k/cdefs.h
+./usr/include/m68k/cpu.h
 ./usr/include/m68k/db_machdep.h
 ./usr/include/m68k/endian.h
 ./usr/include/m68k/float.h
@@ -18,6 +20,7 @@
 ./usr/include/m68k/setjmp.h
 ./usr/include/m68k/signal.h
 ./usr/include/m68k/stdarg.h
+./usr/include/m68k/sysctl.h
 ./usr/include/m68k/trap.h
 ./usr/include/m68k/types.h
 ./usr/include/m68k/varargs.h
@@ -25,6 +28,7 @@
 ./usr/include/machine/ansi.h
 ./usr/include/machine/asm.h
 ./usr/include/machine/autoconf.h
+./usr/include/machine/bus.h
 ./usr/include/machine/cdefs.h
 ./usr/include/machine/cpu.h
 ./usr/include/machine/db_machdep.h
@@ -38,6 +42,7 @@
 ./usr/include/machine/iteioctl.h
 ./usr/include/machine/keyboard.h
 ./usr/include/machine/limits.h
+./usr/include/machine/macinfo.h
 ./usr/include/machine/param.h
 ./usr/include/machine/pcb.h
 ./usr/include/machine/pio.h
@@ -59,39 +64,38 @@
 ./usr/include/machine/viareg.h
 ./usr/include/machine/vmparam.h
 ./usr/include/machine/z8530var.h
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/cc1
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/cc1obj
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/cc1plus
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/cpp
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/f771
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include/README
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include/f2c.h
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include/float.h
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include/limits.h
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include/objc
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include/objc/NXConstStr.h
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include/objc/Object.h
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include/objc/Protocol.h
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include/objc/encoding.h
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include/objc/hash.h
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include/objc/list.h
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include/objc/objc-api.h
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include/objc/objc.h
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include/objc/sarray.h
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include/objc/typedstream.h
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/include/syslimits.h
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/libf2c.a
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/libgcc.a
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/libobjc.a
-./usr/lib/gcc-lib/m68k-apple-openbsd2.0/2.7.2.1/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/cpp
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/f2c.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/NXConstStr.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/Object.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/Protocol.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/encoding.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/hash.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/list.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/objc-api.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/objc.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/sarray.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/typedstream.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/libf2c.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/libobjc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
-./usr/lib/libcrypt_pic.a
 ./usr/lib/libcurses_pic.a
 ./usr/lib/libdes_pic.a
 ./usr/lib/libedit_pic.a
@@ -116,6 +120,7 @@
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
 ./usr/lib/libutil_pic.a
+./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
 ./usr/lib/scrt0.o
 ./usr/share/man/cat1/gdb.0
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index a964d743373..c4b479116ad 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -31,7 +31,9 @@
 ./usr/include/arpa/tftp.h
 ./usr/include/assert.h
 ./usr/include/bitstring.h
+./usr/include/blf.h
 ./usr/include/bm.h
+./usr/include/com_err.h
 ./usr/include/cpio.h
 ./usr/include/ctype.h
 ./usr/include/curses.h
@@ -70,10 +72,13 @@
 ./usr/include/dev/ic/am7990reg.h
 ./usr/include/dev/ic/am7990var.h
 ./usr/include/dev/ic/cd1400reg.h
+./usr/include/dev/ic/comreg.h
+./usr/include/dev/ic/comvar.h
 ./usr/include/dev/ic/cs4231reg.h
 ./usr/include/dev/ic/cyreg.h
 ./usr/include/dev/ic/dc21040reg.h
 ./usr/include/dev/ic/dp8390reg.h
+./usr/include/dev/ic/dp857xreg.h
 ./usr/include/dev/ic/elink3reg.h
 ./usr/include/dev/ic/elink3var.h
 ./usr/include/dev/ic/espreg.h
@@ -84,6 +89,8 @@
 ./usr/include/dev/ic/i82586reg.h
 ./usr/include/dev/ic/i82595reg.h
 ./usr/include/dev/ic/ics2101reg.h
+./usr/include/dev/ic/lptreg.h
+./usr/include/dev/ic/lptvar.h
 ./usr/include/dev/ic/mb86960reg.h
 ./usr/include/dev/ic/mc146818reg.h
 ./usr/include/dev/ic/mc6845.h
@@ -91,6 +98,8 @@
 ./usr/include/dev/ic/midwayvar.h
 ./usr/include/dev/ic/ncr5380reg.h
 ./usr/include/dev/ic/ncr5380var.h
+./usr/include/dev/ic/ncr53c9xreg.h
+./usr/include/dev/ic/ncr53c9xvar.h
 ./usr/include/dev/ic/nec765reg.h
 ./usr/include/dev/ic/ns16450reg.h
 ./usr/include/dev/ic/ns16550reg.h
@@ -98,6 +107,8 @@
 ./usr/include/dev/ic/pdqvar.h
 ./usr/include/dev/ic/smc90cx6reg.h
 ./usr/include/dev/ic/smc93cx6var.h
+./usr/include/dev/ic/uhareg.h
+./usr/include/dev/ic/uhavar.h
 ./usr/include/dev/ic/z8530reg.h
 ./usr/include/dev/ic/z8530sc.h
 ./usr/include/dev/isa
@@ -105,10 +116,10 @@
 ./usr/include/dev/isa/ahareg.h
 ./usr/include/dev/isa/ariareg.h
 ./usr/include/dev/isa/btreg.h
-./usr/include/dev/isa/comreg.h
-./usr/include/dev/isa/comvar.h
 ./usr/include/dev/isa/cs4231var.h
 ./usr/include/dev/isa/elink.h
+./usr/include/dev/isa/fdlink.h
+./usr/include/dev/isa/fdreg.h
 ./usr/include/dev/isa/gusreg.h
 ./usr/include/dev/isa/ics2101var.h
 ./usr/include/dev/isa/if_edreg.h
@@ -125,7 +136,6 @@
 ./usr/include/dev/isa/isapnpvar.h
 ./usr/include/dev/isa/isareg.h
 ./usr/include/dev/isa/isavar.h
-./usr/include/dev/isa/lptreg.h
 ./usr/include/dev/isa/mcdreg.h
 ./usr/include/dev/isa/opti.h
 ./usr/include/dev/isa/pasreg.h
@@ -140,7 +150,10 @@
 ./usr/include/dev/microcode
 ./usr/include/dev/microcode/aic7xxx
 ./usr/include/dev/microcode/aic7xxx/aic7xxx_reg.h
+./usr/include/dev/microcode/aic7xxx/aic7xxx_seq.h
 ./usr/include/dev/mulaw.h
+./usr/include/dev/ofw
+./usr/include/dev/ofw/openfirm.h
 ./usr/include/dev/pci
 ./usr/include/dev/pci/if_levar.h
 ./usr/include/dev/pci/ncr_reg.h
@@ -166,6 +179,7 @@
 ./usr/include/dev/sun/kbd_tables.h
 ./usr/include/dev/sun/kbd_xlate.h
 ./usr/include/dev/tc
+./usr/include/dev/tc/ascvar.h
 ./usr/include/dev/tc/if_levar.h
 ./usr/include/dev/tc/ioasicvar.h
 ./usr/include/dev/tc/tcdevs.h
@@ -510,6 +524,13 @@
 ./usr/include/g++/vector
 ./usr/include/g++/vector.h
 ./usr/include/glob.h
+./usr/include/gnu
+./usr/include/gnu/ext2fs
+./usr/include/gnu/ext2fs/ext2_extern.h
+./usr/include/gnu/ext2fs/ext2_fs.h
+./usr/include/gnu/ext2fs/ext2_fs_i.h
+./usr/include/gnu/ext2fs/ext2_fs_sb.h
+./usr/include/gnu/ext2fs/fs.h
 ./usr/include/grp.h
 ./usr/include/histedit.h
 ./usr/include/ieeefp.h
@@ -540,6 +561,7 @@
 ./usr/include/ndbm.h
 ./usr/include/net/bpf.h
 ./usr/include/net/bpfdesc.h
+./usr/include/net/encap.h
 ./usr/include/net/if.h
 ./usr/include/net/if_arp.h
 ./usr/include/net/if_atm.h
@@ -584,14 +606,26 @@
 ./usr/include/netinet/in_systm.h
 ./usr/include/netinet/in_var.h
 ./usr/include/netinet/ip.h
+./usr/include/netinet/ip_ah.h
+./usr/include/netinet/ip_esp.h
 ./usr/include/netinet/ip_fil.h
 ./usr/include/netinet/ip_fil_compat.h
 ./usr/include/netinet/ip_frag.h
 ./usr/include/netinet/ip_icmp.h
+./usr/include/netinet/ip_ip4.h
+./usr/include/netinet/ip_ipsp.h
+./usr/include/netinet/ip_md5.h
 ./usr/include/netinet/ip_mroute.h
 ./usr/include/netinet/ip_nat.h
+./usr/include/netinet/ip_sha1.h
 ./usr/include/netinet/ip_state.h
 ./usr/include/netinet/ip_var.h
+./usr/include/netinet/libdeslite
+./usr/include/netinet/libdeslite/des.h
+./usr/include/netinet/libdeslite/des_locl.h
+./usr/include/netinet/libdeslite/podd.h
+./usr/include/netinet/libdeslite/sk.h
+./usr/include/netinet/libdeslite/spr.h
 ./usr/include/netinet/tcp.h
 ./usr/include/netinet/tcp_debug.h
 ./usr/include/netinet/tcp_fsm.h
@@ -664,13 +698,13 @@
 ./usr/include/nfs/nfsproto.h
 ./usr/include/nfs/nfsrtt.h
 ./usr/include/nfs/nfsrvcache.h
-./usr/include/nfs/nfsv2.h
 ./usr/include/nfs/nqnfs.h
 ./usr/include/nfs/rpcv2.h
 ./usr/include/nfs/xdr_subs.h
 ./usr/include/nl_types.h
 ./usr/include/nlist.h
 ./usr/include/ocurses.h
+./usr/include/olf_abi.h
 ./usr/include/panel.h
 ./usr/include/paths.h
 ./usr/include/pcap-namedb.h
@@ -786,6 +820,7 @@
 ./usr/include/sys/exec_aout.h
 ./usr/include/sys/exec_ecoff.h
 ./usr/include/sys/exec_elf.h
+./usr/include/sys/exec_olf.h
 ./usr/include/sys/exec_script.h
 ./usr/include/sys/extent.h
 ./usr/include/sys/fcntl.h
@@ -827,6 +862,7 @@
 ./usr/include/sys/select.h
 ./usr/include/sys/sem.h
 ./usr/include/sys/shm.h
+./usr/include/sys/siginfo.h
 ./usr/include/sys/signal.h
 ./usr/include/sys/signalvar.h
 ./usr/include/sys/socket.h
@@ -871,6 +907,7 @@
 ./usr/include/sysexits.h
 ./usr/include/syslog.h
 ./usr/include/tar.h
+./usr/include/tcpd.h
 ./usr/include/term.h
 ./usr/include/termios.h
 ./usr/include/time.h
@@ -927,8 +964,6 @@
 ./usr/lib/libcom_err_p.a
 ./usr/lib/libcompat.a
 ./usr/lib/libcompat_p.a
-./usr/lib/libcrypt.a
-./usr/lib/libcrypt_p.a
 ./usr/lib/libcurses.a
 ./usr/lib/libcurses_p.a
 ./usr/lib/libdes.a
@@ -984,6 +1019,8 @@
 ./usr/lib/libtermlib_p.a
 ./usr/lib/libutil.a
 ./usr/lib/libutil_p.a
+./usr/lib/libwrap.a
+./usr/lib/libwrap_p.a
 ./usr/lib/liby.a
 ./usr/lib/liby_p.a
 ./usr/lib/libz.a
@@ -1090,6 +1127,7 @@
 ./usr/share/man/cat2/ioctl.0
 ./usr/share/man/cat2/issetugid.0
 ./usr/share/man/cat2/kill.0
+./usr/share/man/cat2/lchown.0
 ./usr/share/man/cat2/link.0
 ./usr/share/man/cat2/listen.0
 ./usr/share/man/cat2/lseek.0
@@ -1234,6 +1272,10 @@
 ./usr/share/man/cat3/bcopy.0
 ./usr/share/man/cat3/bindresvport.0
 ./usr/share/man/cat3/bitstring.0
+./usr/share/man/cat3/blf_dec.0
+./usr/share/man/cat3/blf_enc.0
+./usr/share/man/cat3/blf_key.0
+./usr/share/man/cat3/blowfish.0
 ./usr/share/man/cat3/bm.0
 ./usr/share/man/cat3/bm_comp.0
 ./usr/share/man/cat3/bm_exec.0
@@ -1382,6 +1424,20 @@
 ./usr/share/man/cat3/dn_expand.0
 ./usr/share/man/cat3/drand48.0
 ./usr/share/man/cat3/edata.0
+./usr/share/man/cat3/editline.0
+./usr/share/man/cat3/el_deletestr.0
+./usr/share/man/cat3/el_end.0
+./usr/share/man/cat3/el_getc.0
+./usr/share/man/cat3/el_gets.0
+./usr/share/man/cat3/el_init.0
+./usr/share/man/cat3/el_insertstr.0
+./usr/share/man/cat3/el_line.0
+./usr/share/man/cat3/el_parse.0
+./usr/share/man/cat3/el_push.0
+./usr/share/man/cat3/el_reset.0
+./usr/share/man/cat3/el_resize.0
+./usr/share/man/cat3/el_set.0
+./usr/share/man/cat3/el_source.0
 ./usr/share/man/cat3/encrypt.0
 ./usr/share/man/cat3/end.0
 ./usr/share/man/cat3/endfsent.0
@@ -1546,6 +1602,11 @@
 ./usr/share/man/cat3/hash.0
 ./usr/share/man/cat3/heapsort.0
 ./usr/share/man/cat3/herror.0
+./usr/share/man/cat3/history.0
+./usr/share/man/cat3/history_end.0
+./usr/share/man/cat3/history_init.0
+./usr/share/man/cat3/hosts_access.0
+./usr/share/man/cat3/hosts_ctl.0
 ./usr/share/man/cat3/htonl.0
 ./usr/share/man/cat3/htons.0
 ./usr/share/man/cat3/hypot.0
@@ -1731,6 +1792,7 @@
 ./usr/share/man/cat3/pw_copy.0
 ./usr/share/man/cat3/pw_edit.0
 ./usr/share/man/cat3/pw_error.0
+./usr/share/man/cat3/pw_getconf.0
 ./usr/share/man/cat3/pw_init.0
 ./usr/share/man/cat3/pw_lock.0
 ./usr/share/man/cat3/pw_mkdb.0
@@ -1751,6 +1813,7 @@
 ./usr/share/man/cat3/re_comp.0
 ./usr/share/man/cat3/re_exec.0
 ./usr/share/man/cat3/readdir.0
+./usr/share/man/cat3/readlabelfs.0
 ./usr/share/man/cat3/realloc.0
 ./usr/share/man/cat3/realpath.0
 ./usr/share/man/cat3/recno.0
@@ -1764,6 +1827,8 @@
 ./usr/share/man/cat3/remainder.0
 ./usr/share/man/cat3/remove.0
 ./usr/share/man/cat3/remque.0
+./usr/share/man/cat3/request_init.0
+./usr/share/man/cat3/request_set.0
 ./usr/share/man/cat3/res_init.0
 ./usr/share/man/cat3/res_mkquery.0
 ./usr/share/man/cat3/res_query.0
@@ -2053,6 +2118,7 @@
 ./usr/share/man/cat3/ypclnt.0
 ./usr/share/man/cat3/yperr_string.0
 ./usr/share/man/cat3/ypprot_err.0
+./usr/share/man/cat3/zopen.0
 ./usr/share/man/cat7/operator.0
 ./usr/share/man/cat8/config.0
 ./usr/share/man/cat8/kgmon.0
@@ -2087,7 +2153,7 @@
 ./usr/share/man/cat9/md5.0
 ./usr/share/man/cat9/mono_time.0
 ./usr/share/man/cat9/resettodr.0
-./usr/share/man/cat9/rnd.0
+./usr/share/man/cat9/random.0
 ./usr/share/man/cat9/runtime.0
 ./usr/share/man/cat9/shutdownhook_disestablish.0
 ./usr/share/man/cat9/shutdownhook_establish.0