sync

16 files changed, 62 insertions, 6 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 80e829287ec..8982f3b090d 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1687,3 +1687,5 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/ssl/md4.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/ssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/ssl/symhacks.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/maestro_reg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/readline/history.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 3eff18c980a..b25a2d6551a 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -1766,3 +1766,5 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ssl/md4.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ssl/symhacks.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/maestro_reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/readline/history.ph
diff --git a/distrib/sets/lists/base/md.arc b/distrib/sets/lists/base/md.arc
index b30eb3c15a3..e33c39cdd90 100644
--- a/distrib/sets/lists/base/md.arc
+++ b/distrib/sets/lists/base/md.arc
@@ -498,3 +498,5 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/ssl/md4.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/ssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/ssl/symhacks.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/maestro_reg.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/readline/history.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index f3ed412eccb..845118c1fb7 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1762,3 +1762,5 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ssl/md4.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ssl/symhacks.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/maestro_reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/readline/history.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index a7a9659c095..f7664c99ff1 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1780,3 +1780,5 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/ssl/md4.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/ssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/ssl/symhacks.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/maestro_reg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/readline/history.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 8799c8cca6c..29734106082 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1746,3 +1746,5 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ssl/md4.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ssl/symhacks.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/maestro_reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/readline/history.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 7898861b329..ed320d9ad23 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1759,3 +1759,5 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ssl/md4.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ssl/symhacks.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/maestro_reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/readline/history.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 321f9aea98b..e11c206d85d 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -442,3 +442,5 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ssl/md4.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ssl/symhacks.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/maestro_reg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/readline/history.ph
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index bdfdbca9fc8..7b6ace8dbb7 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -1769,3 +1769,5 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/ssl/md4.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/ssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/ssl/symhacks.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/maestro_reg.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/readline/history.ph
diff --git a/distrib/sets/lists/base/md.powerpc b/distrib/sets/lists/base/md.powerpc
index b3f5a8d5353..a519c648fed 100644
--- a/distrib/sets/lists/base/md.powerpc
+++ b/distrib/sets/lists/base/md.powerpc
@@ -1747,3 +1747,5 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/ssl/md4.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/ssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/ssl/symhacks.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/maestro_reg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/readline/history.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 18da69673e7..6d113c6d7db 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1752,3 +1752,5 @@
 ./usr/sbin/eeprom
 ./usr/sbin/fdformat
 ./usr/sbin/screenblank
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/maestro_reg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/readline/history.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 1d3f1100234..97623bd53fa 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -1772,3 +1772,5 @@
 ./usr/mdec/ufsboot
 ./usr/sbin/eeprom
 ./usr/sbin/screenblank
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/maestro_reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/readline/history.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index bbd0b4b99d0..a2cfebe7ec6 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1670,3 +1670,5 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/ssl/md4.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/ssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/ssl/symhacks.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/maestro_reg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/readline/history.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index a7248d6160c..95d28829289 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -117,7 +117,6 @@
 ./sbin/mount_portal
 ./sbin/mount_procfs
 ./sbin/mount_tcfs
-./sbin/mount_ufs
 ./sbin/mount_umap
 ./sbin/mount_union
 ./sbin/mount_xfs
@@ -1153,7 +1152,6 @@
 ./usr/sbin/ext_srvtab
 ./usr/sbin/faithd
 ./usr/sbin/fs
-./usr/sbin/fsinfo
 ./usr/sbin/getencstat
 ./usr/sbin/group
 ./usr/sbin/groupadd
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index f32a4398c2a..bcc60980ddf 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1366,7 +1366,6 @@
 ./usr/include/xfs/xfs_vopdefs.h
 ./usr/include/zconf.h
 ./usr/include/zlib.h
-./usr/lib/apache/include/alloc.h
 ./usr/lib/apache/include/ap.h
 ./usr/lib/apache/include/ap_compat.h
 ./usr/lib/apache/include/ap_config.h
@@ -4043,3 +4042,6 @@
 ./usr/share/misc/gprof.flat
 ./usr/share/misc/operator
 ./var/db/libc.tags
+./usr/include/dev/pci/maestro_reg.h
+./usr/include/readline/history.h
+./usr/lib/apache/include/ap_alloc.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 6d18234eea6..92dff00ab11 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -27,6 +27,11 @@
 ./usr/share/doc/html/lynx_help/lynx-dev.html
 ./usr/share/doc/html/lynx_help/lynx_help_main.html
 ./usr/share/doc/html/lynx_help/lynx_url_support.html
+./usr/share/info/amdref.info
+./usr/share/info/amdref.info-1
+./usr/share/info/amdref.info-2
+./usr/share/info/amdref.info-3
+./usr/share/info/amdref.info-4
 ./usr/share/info/bfd.info
 ./usr/share/info/bfd.info-1
 ./usr/share/info/bfd.info-2
@@ -148,6 +153,15 @@
 ./usr/share/info/texinfo-7
 ./usr/share/info/texinfo-8
 ./usr/share/info/texinfo-9
+./usr/share/info/uucp.info
+./usr/share/info/uucp.info-1
+./usr/share/info/uucp.info-2
+./usr/share/info/uucp.info-3
+./usr/share/info/uucp.info-4
+./usr/share/info/uucp.info-5
+./usr/share/info/uucp.info-6
+./usr/share/info/uucp.info-7
+./usr/share/info/uucp.info-8
 ./usr/share/man/cat1/Mail.0
 ./usr/share/man/cat1/[.0
 ./usr/share/man/cat1/a2p.0
@@ -659,6 +673,10 @@
 ./usr/share/man/cat2/kevent.0
 ./usr/share/man/cat2/kqueue.0
 ./usr/share/man/cat3
+./usr/share/man/cat3/FD_CLR.0
+./usr/share/man/cat3/FD_ISSET.0
+./usr/share/man/cat3/FD_SET.0
+./usr/share/man/cat3/FD_ZERO.0
 ./usr/share/man/cat3/alpha
 ./usr/share/man/cat3/amiga
 ./usr/share/man/cat3/arc
@@ -673,6 +691,12 @@
 ./usr/share/man/cat3/powerpc
 ./usr/share/man/cat3/sparc
 ./usr/share/man/cat3/sun3
+./usr/share/man/cat3/svc_getreqset2.0
+./usr/share/man/cat3/timeradd.0
+./usr/share/man/cat3/timerclear.0
+./usr/share/man/cat3/timercmp.0
+./usr/share/man/cat3/timerisset.0
+./usr/share/man/cat3/timersub.0
 ./usr/share/man/cat3/vax
 ./usr/share/man/cat3/vw_scanw.0
 ./usr/share/man/cat3p
@@ -926,6 +950,7 @@
 ./usr/share/man/cat4/atapiscsi.0
 ./usr/share/man/cat4/audio.0
 ./usr/share/man/cat4/aue.0
+./usr/share/man/cat4/auich.0
 ./usr/share/man/cat4/auvia.0
 ./usr/share/man/cat4/awi.0
 ./usr/share/man/cat4/bpf.0
@@ -1029,7 +1054,6 @@
 ./usr/share/man/cat4/i386/wss.0
 ./usr/share/man/cat4/i386/wt.0
 ./usr/share/man/cat4/i386/xf86.0
-./usr/share/man/cat4/ich.0
 ./usr/share/man/cat4/icmp.0
 ./usr/share/man/cat4/icmp6.0
 ./usr/share/man/cat4/icsphy.0
@@ -1528,7 +1552,6 @@
 ./usr/share/man/cat8/fsck_ffs.0
 ./usr/share/man/cat8/fsck_msdos.0
 ./usr/share/man/cat8/fsdb.0
-./usr/share/man/cat8/fsinfo.0
 ./usr/share/man/cat8/fsirand.0
 ./usr/share/man/cat8/ftpd.0
 ./usr/share/man/cat8/getNAME.0
@@ -1638,7 +1661,6 @@
 ./usr/share/man/cat8/mount_portal.0
 ./usr/share/man/cat8/mount_procfs.0
 ./usr/share/man/cat8/mount_tcfs.0
-./usr/share/man/cat8/mount_ufs.0
 ./usr/share/man/cat8/mount_umap.0
 ./usr/share/man/cat8/mount_union.0
 ./usr/share/man/cat8/mount_xfs.0
@@ -2002,3 +2024,11 @@
 ./usr/share/man/ps9/sparc
 ./usr/share/man/ps9/sun3
 ./usr/share/man/ps9/vax
+./var/www/htdocs/manual/configuring.html
+./var/www/htdocs/manual/misc/tutorials.html
+./var/www/htdocs/manual/mod/index-bytype.html
+./var/www/htdocs/manual/mod/module-dict.html
+./var/www/htdocs/manual/mpeix.html
+./var/www/htdocs/manual/new_features_2_0.html
+./var/www/htdocs/manual/win_compiling.html
+./var/www/htdocs/manual/win_service.html