sync

12 files changed, 50 insertions, 45 deletions

diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index e01498899b9..c91972d2c7b 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -11,10 +11,10 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.2/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.17.4
-./usr/lib/libcurses.so.3.1
+./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
-./usr/lib/libform.so.0.0
+./usr/lib/libform.so.1.0
 ./usr/lib/libg++.so.27.1
 ./usr/lib/libiberty.so.0.0
 ./usr/lib/libkadm.so.4.0
@@ -23,9 +23,9 @@
 ./usr/lib/libkrb.so.4.1
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
-./usr/lib/libmenu.so.0.0
+./usr/lib/libmenu.so.1.0
 ./usr/lib/libocurses.so.2.1
-./usr/lib/libpanel.so.0.0
+./usr/lib/libpanel.so.1.0
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/libskey.so.1.0
diff --git a/distrib/sets/lists/base/md.arc b/distrib/sets/lists/base/md.arc
index df0a654eea3..ca2a4fd2818 100644
--- a/distrib/sets/lists/base/md.arc
+++ b/distrib/sets/lists/base/md.arc
@@ -12,19 +12,19 @@
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.2/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.17.4
-./usr/lib/libcurses.so.3.1
+./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
-./usr/lib/libform.so.0.0
+./usr/lib/libform.so.1.0
 ./usr/lib/libkadm.so.4.0
 ./usr/lib/libkafs.so.4.0
 ./usr/lib/libkdb.so.4.1
 ./usr/lib/libkrb.so.4.1
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
-./usr/lib/libmenu.so.0.0
+./usr/lib/libmenu.so.1.0
 ./usr/lib/libocurses.so.2.1
-./usr/lib/libpanel.so.0.0
+./usr/lib/libpanel.so.1.0
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/libskey.so.1.0
diff --git a/distrib/sets/lists/base/md.atari b/distrib/sets/lists/base/md.atari
index 88e01fd0e2f..fc6db0acfa7 100644
--- a/distrib/sets/lists/base/md.atari
+++ b/distrib/sets/lists/base/md.atari
@@ -5,10 +5,10 @@
 ./usr/include/m68k
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.17.4
-./usr/lib/libcurses.so.3.1
+./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
-./usr/lib/libform.so.0.0
+./usr/lib/libform.so.1.0
 ./usr/lib/libg++.so.27.1
 ./usr/lib/libiberty.so.0.0
 ./usr/lib/libkadm.so.4.0
@@ -17,9 +17,9 @@
 ./usr/lib/libkrb.so.4.1
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
-./usr/lib/libmenu.so.0.0
+./usr/lib/libmenu.so.1.0
 ./usr/lib/libocurses.so.2.1
-./usr/lib/libpanel.so.0.0
+./usr/lib/libpanel.so.1.0
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/libskey.so.0.4
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 52712ef1d2f..933032fd412 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -8,10 +8,10 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.2/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.17.4
-./usr/lib/libcurses.so.3.1
+./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
-./usr/lib/libform.so.0.0
+./usr/lib/libform.so.1.0
 ./usr/lib/libg++.so.27.1
 ./usr/lib/libiberty.so.0.0
 ./usr/lib/libkadm.so.4.0
@@ -20,9 +20,9 @@
 ./usr/lib/libkrb.so.4.1
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
-./usr/lib/libmenu.so.0.0
+./usr/lib/libmenu.so.1.0
 ./usr/lib/libocurses.so.2.1
-./usr/lib/libpanel.so.0.0
+./usr/lib/libpanel.so.1.0
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/libskey.so.1.0
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index cc647dcc317..b69df8d604a 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -15,10 +15,10 @@
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.2/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.17.4
-./usr/lib/libcurses.so.3.1
+./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
-./usr/lib/libform.so.0.0
+./usr/lib/libform.so.1.0
 ./usr/lib/libg++.so.27.1
 ./usr/lib/libi386.so.0.2
 ./usr/lib/libiberty.so.0.0
@@ -29,9 +29,9 @@
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libm_i387.so.0.1
-./usr/lib/libmenu.so.0.0
+./usr/lib/libmenu.so.1.0
 ./usr/lib/libocurses.so.2.1
-./usr/lib/libpanel.so.0.0
+./usr/lib/libpanel.so.1.0
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/libskey.so.1.0
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 905e1d07324..012c9406e9c 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -9,10 +9,10 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.2/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.17.4
-./usr/lib/libcurses.so.3.1
+./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
-./usr/lib/libform.so.0.0
+./usr/lib/libform.so.1.0
 ./usr/lib/libg++.so.27.1
 ./usr/lib/libiberty.so.0.0
 ./usr/lib/libkadm.so.4.0
@@ -21,9 +21,9 @@
 ./usr/lib/libkrb.so.4.1
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
-./usr/lib/libmenu.so.0.0
+./usr/lib/libmenu.so.1.0
 ./usr/lib/libocurses.so.2.1
-./usr/lib/libpanel.so.0.0
+./usr/lib/libpanel.so.1.0
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/libskey.so.1.0
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index d48d9c5e711..cf6b564400c 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -8,10 +8,10 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.2/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.17.4
-./usr/lib/libcurses.so.3.1
+./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
-./usr/lib/libform.so.0.0
+./usr/lib/libform.so.1.0
 ./usr/lib/libg++.so.27.1
 ./usr/lib/libiberty.so.0.0
 ./usr/lib/libkadm.so.4.0
@@ -20,9 +20,9 @@
 ./usr/lib/libkrb.so.4.1
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
-./usr/lib/libmenu.so.0.0
+./usr/lib/libmenu.so.1.0
 ./usr/lib/libocurses.so.2.1
-./usr/lib/libpanel.so.0.0
+./usr/lib/libpanel.so.1.0
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/libskey.so.1.0
diff --git a/distrib/sets/lists/base/md.pc532 b/distrib/sets/lists/base/md.pc532
index 3e6d47a1ec7..086c009343e 100644
--- a/distrib/sets/lists/base/md.pc532
+++ b/distrib/sets/lists/base/md.pc532
@@ -5,10 +5,10 @@
 ./usr/include/ns32k
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.17.4
-./usr/lib/libcurses.so.3.1
+./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
-./usr/lib/libform.so.0.0
+./usr/lib/libform.so.1.0
 ./usr/lib/libg++.so.27.1
 ./usr/lib/libiberty.so.0.0
 ./usr/lib/libkadm.so.4.0
@@ -17,9 +17,9 @@
 ./usr/lib/libkrb.so.4.1
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
-./usr/lib/libmenu.so.0.0
+./usr/lib/libmenu.so.1.0
 ./usr/lib/libocurses.so.2.1
-./usr/lib/libpanel.so.0.0
+./usr/lib/libpanel.so.1.0
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/libskey.so.0.4
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index 2afd90c0d00..c6ac53b3b82 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -9,19 +9,19 @@
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.2/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.17.4
-./usr/lib/libcurses.so.3.1
+./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
-./usr/lib/libform.so.0.0
+./usr/lib/libform.so.1.0
 ./usr/lib/libkadm.so.4.0
 ./usr/lib/libkafs.so.4.0
 ./usr/lib/libkdb.so.4.1
 ./usr/lib/libkrb.so.4.1
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
-./usr/lib/libmenu.so.0.0
+./usr/lib/libmenu.so.1.0
 ./usr/lib/libocurses.so.2.1
-./usr/lib/libpanel.so.0.0
+./usr/lib/libpanel.so.1.0
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/libskey.so.1.0
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 85a1da5fb48..d4f1de369c2 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -9,10 +9,10 @@
 ./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.17.4
-./usr/lib/libcurses.so.3.1
+./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
-./usr/lib/libform.so.0.0
+./usr/lib/libform.so.1.0
 ./usr/lib/libg++.so.27.1
 ./usr/lib/libiberty.so.0.0
 ./usr/lib/libkadm.so.4.0
@@ -21,9 +21,9 @@
 ./usr/lib/libkrb.so.4.1
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
-./usr/lib/libmenu.so.0.0
+./usr/lib/libmenu.so.1.0
 ./usr/lib/libocurses.so.2.1
-./usr/lib/libpanel.so.0.0
+./usr/lib/libpanel.so.1.0
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/libskey.so.1.0
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 75d250066ff..d0891c93aad 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -5,10 +5,10 @@
 ./usr/include/m68k
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.17.4
-./usr/lib/libcurses.so.3.1
+./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
-./usr/lib/libform.so.0.0
+./usr/lib/libform.so.1.0
 ./usr/lib/libg++.so.27.1
 ./usr/lib/libiberty.so.0.0
 ./usr/lib/libkadm.so.4.0
@@ -17,9 +17,9 @@
 ./usr/lib/libkrb.so.4.1
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
-./usr/lib/libmenu.so.0.0
+./usr/lib/libmenu.so.1.0
 ./usr/lib/libocurses.so.2.1
-./usr/lib/libpanel.so.0.0
+./usr/lib/libpanel.so.1.0
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/libskey.so.0.4
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 2de156a087f..e3f85ba3260 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -612,6 +612,7 @@
 ./usr/include/netdb.h
 ./usr/include/netgroup.h
 ./usr/include/netinet/icmp_var.h
+./usr/include/netinet/ip_rmd160.h
 ./usr/include/netinet/if_arc.h
 ./usr/include/netinet/if_atm.h
 ./usr/include/netinet/if_ether.h
@@ -1419,7 +1420,11 @@
 ./usr/share/man/cat3/curs_pad.0
 ./usr/share/man/cat3/curs_printw.0
 ./usr/share/man/cat3/curs_refresh.0
-./usr/share/man/cat3/curs_resize.0
+./usr/share/man/cat3/curs_print.0
+./usr/share/man/cat3/form_requestname.0
+./usr/share/man/cat3/menu_requestname.0
+./usr/share/man/cat3/menu_spacing.0
+./usr/share/man/cat3/wresize.0
 ./usr/share/man/cat3/curs_scanw.0
 ./usr/share/man/cat3/curs_scr_dmp.0
 ./usr/share/man/cat3/curs_scroll.0