sync pass 1

6 files changed, 35 insertions, 35 deletions

diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 50f6615ca19..21122ebb6fd 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -14,7 +14,7 @@
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
-./usr/lib/libc.so.16.6
+./usr/lib/libc.so.17.0
 ./usr/lib/libcurses.so.3.1
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
@@ -34,7 +34,7 @@
 ./usr/lib/libpanel.so.0.0
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
-./usr/lib/libskey.so.0.4
+./usr/lib/libskey.so.1.0
 ./usr/lib/libss.so.4.0
 ./usr/lib/libstdc++.so.27.1
 ./usr/lib/libtelnet.so.1.0
@@ -430,7 +430,6 @@
 ./usr/lib/perl5/i386-openbsd/5.003/scsi.ph
 ./usr/lib/perl5/i386-openbsd/5.003/search.ph
 ./usr/lib/perl5/i386-openbsd/5.003/setjmp.ph
-./usr/lib/perl5/i386-openbsd/5.003/rmd160.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sgtty.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sha1.ph
 ./usr/lib/perl5/i386-openbsd/5.003/signal.ph
@@ -572,6 +571,7 @@
 ./usr/lib/perl5/i386-openbsd/5.003/vis.ph
 ./usr/lib/perl5/i386-openbsd/5.003/zconf.ph
 ./usr/lib/perl5/i386-openbsd/5.003/zlib.ph
+./usr/lib/perl5/i386-openbsd/5.003/machine/biosvar.ph
 ./usr/lib/perl5/site_perl/i386-openbsd
 ./usr/libexec/ld.so
 ./usr/lkm/ap.o
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 4498bd1e804..dc84da02a40 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -267,12 +267,10 @@
 ./usr/bin/netstat
 ./usr/bin/newaliases
 ./usr/bin/newsyslog
-./usr/bin/nex
 ./usr/bin/nfsstat
 ./usr/bin/nice
 ./usr/bin/nm
 ./usr/bin/nohup
-./usr/bin/nvi
 ./usr/bin/od
 ./usr/bin/oldrdist
 ./usr/bin/olf2elf
@@ -380,7 +378,6 @@
 ./usr/bin/vacation
 ./usr/bin/vi
 ./usr/bin/view
-./usr/bin/vim
 ./usr/bin/vis
 ./usr/bin/vmstat
 ./usr/bin/w
@@ -1139,28 +1136,13 @@
 ./usr/share/tmac/mm
 ./usr/share/vi
 ./usr/share/vi/catalog
-./usr/share/vim
-./usr/share/vim/vim_40.txt
-./usr/share/vim/vim_ami.txt
-./usr/share/vim/vim_arch.txt
-./usr/share/vim/vim_diff.txt
-./usr/share/vim/vim_digr.txt
-./usr/share/vim/vim_dos.txt
-./usr/share/vim/vim_gui.txt
-./usr/share/vim/vim_help.txt
-./usr/share/vim/vim_idx.txt
-./usr/share/vim/vim_kcc.txt
-./usr/share/vim/vim_mac.txt
-./usr/share/vim/vim_menu.txt
-./usr/share/vim/vim_mint.txt
-./usr/share/vim/vim_os2.txt
-./usr/share/vim/vim_ref.txt
-./usr/share/vim/vim_rlh.txt
-./usr/share/vim/vim_tags
-./usr/share/vim/vim_tips.txt
-./usr/share/vim/vim_unix.txt
-./usr/share/vim/vim_w32.txt
-./usr/share/vim/vim_win.txt
+./usr/share/vi/catalog/dutch
+./usr/share/vi/catalog/english
+./usr/share/vi/catalog/french
+./usr/share/vi/catalog/german
+./usr/share/vi/catalog/ru_SU.KOI8-R
+./usr/share/vi/catalog/spanish
+./usr/share/vi/catalog/swedish
 ./usr/share/zoneinfo
 ./usr/share/zoneinfo/Africa
 ./usr/share/zoneinfo/Africa/Abidjan
@@ -1732,7 +1714,6 @@
 ./var/spool/uucp
 ./var/spool/uucppublic
 ./var/tmp
-./var/tmp/vi.recover
 ./var/yp
 ./var/yp/Makefile.main
 ./var/yp/Makefile.main.dist
@@ -1742,3 +1723,8 @@
 ./bin/rmd160
 ./bin/sha1
 ./usr/bin/otp-rmd160
+./sbin/photurisd
+./sbin/startkey
+./usr/sbin/mkalias
+./usr/libexec/vi.recover
+./var/tmp/vi.recover
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index f2c3dabd51e..60df35bb025 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -2,6 +2,7 @@
 ./usr/include/dlfcn.h
 ./usr/include/link.h
 ./usr/include/machine/ansi.h
+./usr/include/machine/biosvar.h
 ./usr/include/machine/apmvar.h
 ./usr/include/machine/asm.h
 ./usr/include/machine/bus.h
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 14e156ef5c5..57097c07338 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -580,6 +580,15 @@
 ./usr/include/net/slcompress.h
 ./usr/include/net/slip.h
 ./usr/include/net/zlib.h
+./usr/include/netatalk
+./usr/include/netatalk/aarp.h
+./usr/include/netatalk/at.h
+./usr/include/netatalk/at_extern.h
+./usr/include/netatalk/at_var.h
+./usr/include/netatalk/ddp.h
+./usr/include/netatalk/ddp_var.h
+./usr/include/netatalk/endian.h
+./usr/include/netatalk/phase2.h
 ./usr/include/netccitt/dll.h
 ./usr/include/netccitt/hd_var.h
 ./usr/include/netccitt/hdlc.h
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index 3c100c4582e..6d1719203d2 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -86,7 +86,7 @@
 ./etc/uucp/passwd
 ./etc/uucp/port
 ./etc/uucp/sys
-./etc/virc
+./etc/photuris
 ./etc/weekly
 ./root/.cshrc
 ./root/.klogin
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 346c8e49fb0..6865a2eb97d 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -167,7 +167,6 @@
 ./usr/share/man/cat1/encrypt.0
 ./usr/share/man/cat1/env.0
 ./usr/share/man/cat1/error.0
-./usr/share/man/cat1/ex.0
 ./usr/share/man/cat1/expand.0
 ./usr/share/man/cat1/expr.0
 ./usr/share/man/cat1/false.0
@@ -272,12 +271,10 @@
 ./usr/share/man/cat1/nc.0
 ./usr/share/man/cat1/netstat.0
 ./usr/share/man/cat1/newaliases.0
-./usr/share/man/cat1/nex.0
 ./usr/share/man/cat1/nfsstat.0
 ./usr/share/man/cat1/nice.0
 ./usr/share/man/cat1/nm.0
 ./usr/share/man/cat1/nohup.0
-./usr/share/man/cat1/nvi.0
 ./usr/share/man/cat1/od.0
 ./usr/share/man/cat1/oldrdist.0
 ./usr/share/man/cat1/olf2elf.0
@@ -420,8 +417,6 @@
 ./usr/share/man/cat1/uux.0
 ./usr/share/man/cat1/vacation.0
 ./usr/share/man/cat1/vi.0
-./usr/share/man/cat1/view.0
-./usr/share/man/cat1/vim.0
 ./usr/share/man/cat1/vis.0
 ./usr/share/man/cat1/w.0
 ./usr/share/man/cat1/wait.0
@@ -866,3 +861,12 @@
 ./usr/share/man/cat3/SHA1Update.0
 ./usr/share/man/cat3/sha1.0
 ./usr/share/man/cat3/rmd160.0
+./usr/share/man/cat3/localeconv.0
+./usr/share/man/cat3/setlocale.0
+./usr/share/man/cat8/mkalias.0
+./usr/share/man/cat1/photurisd.0
+./usr/share/man/cat1/startkey.0
+./usr/share/man/cat3/inet_ntop.0
+./usr/share/man/cat3/inet_pton.0
+./usr/share/man/cat8/fsck_ext2fs.0
+./usr/share/man/cat8/e2fsck.0