sync

3 files changed, 54 insertions, 41 deletions

diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 8625a7991ce..1d0cedd66d1 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -110,9 +110,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/pcap-namedb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/pcap.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/poll.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/pthread.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/pthread_np.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/pwd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ranlib.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/re_comp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/regex.ph
@@ -666,4 +663,21 @@
 ./usr/mdec/rboot
 ./usr/mdec/sboot
 ./usr/mdec/stboot
-
+./usr/lib/apache/modules/libproxy.so
+./usr/lib/apache/modules/mod_auth_anon.so
+./usr/lib/apache/modules/mod_auth_db.so
+./usr/lib/apache/modules/mod_auth_dbm.so
+./usr/lib/apache/modules/mod_auth_digest.so
+./usr/lib/apache/modules/mod_cern_meta.so
+./usr/lib/apache/modules/mod_define.so
+./usr/lib/apache/modules/mod_digest.so
+./usr/lib/apache/modules/mod_info.so
+./usr/lib/apache/modules/mod_log_agent.so
+./usr/lib/apache/modules/mod_log_referer.so
+./usr/lib/apache/modules/mod_mime_magic.so
+./usr/lib/apache/modules/mod_mmap_static.so
+./usr/lib/apache/modules/mod_rewrite.so
+./usr/lib/apache/modules/mod_speling.so
+./usr/lib/apache/modules/mod_unique_id.so
+./usr/lib/apache/modules/mod_usertrack.so
+./usr/lib/apache/modules/mod_vhost_alias.so
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index 3f4815535e0..f070da40c47 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -35,41 +35,41 @@
 ./usr/include/m68k/trap.h
 ./usr/include/m68k/types.h
 ./usr/include/m68k/varargs.h
-./usr/include/machine/ansi.h
-./usr/include/machine/asm.h
-./usr/include/machine/autoconf.h
-./usr/include/machine/cdefs.h
-./usr/include/machine/cpu.h
-./usr/include/machine/db_machdep.h
-./usr/include/machine/disklabel.h
-./usr/include/machine/endian.h
-./usr/include/machine/exec.h
-./usr/include/machine/float.h
-./usr/include/machine/frame.h
-./usr/include/machine/hpux_machdep.h
-./usr/include/machine/ieeefp.h
-./usr/include/machine/kcore.h
-./usr/include/machine/limits.h
-./usr/include/machine/mioctl.h
-./usr/include/machine/nvram.h
-./usr/include/machine/param.h
-./usr/include/machine/pcb.h
-./usr/include/machine/pmap.h
-./usr/include/machine/proc.h
-./usr/include/machine/profile.h
-./usr/include/machine/prom.h
-./usr/include/machine/psl.h
-./usr/include/machine/pte.h
-./usr/include/machine/ptrace.h
-./usr/include/machine/reg.h
-./usr/include/machine/setjmp.h
-./usr/include/machine/signal.h
-./usr/include/machine/spinlock.h
-./usr/include/machine/stdarg.h
-./usr/include/machine/trap.h
-./usr/include/machine/types.h
-./usr/include/machine/varargs.h
-./usr/include/machine/vmparam.h
+./usr/include/mvme68k/ansi.h
+./usr/include/mvme68k/asm.h
+./usr/include/mvme68k/autoconf.h
+./usr/include/mvme68k/cdefs.h
+./usr/include/mvme68k/cpu.h
+./usr/include/mvme68k/db_machdep.h
+./usr/include/mvme68k/disklabel.h
+./usr/include/mvme68k/endian.h
+./usr/include/mvme68k/exec.h
+./usr/include/mvme68k/float.h
+./usr/include/mvme68k/frame.h
+./usr/include/mvme68k/hpux_machdep.h
+./usr/include/mvme68k/ieeefp.h
+./usr/include/mvme68k/kcore.h
+./usr/include/mvme68k/limits.h
+./usr/include/mvme68k/mioctl.h
+./usr/include/mvme68k/nvram.h
+./usr/include/mvme68k/param.h
+./usr/include/mvme68k/pcb.h
+./usr/include/mvme68k/pmap.h
+./usr/include/mvme68k/proc.h
+./usr/include/mvme68k/profile.h
+./usr/include/mvme68k/prom.h
+./usr/include/mvme68k/psl.h
+./usr/include/mvme68k/pte.h
+./usr/include/mvme68k/ptrace.h
+./usr/include/mvme68k/reg.h
+./usr/include/mvme68k/setjmp.h
+./usr/include/mvme68k/signal.h
+./usr/include/mvme68k/spinlock.h
+./usr/include/mvme68k/stdarg.h
+./usr/include/mvme68k/trap.h
+./usr/include/mvme68k/types.h
+./usr/include/mvme68k/varargs.h
+./usr/include/mvme68k/vmparam.h
 ./usr/include/obstack.h
 ./usr/include/readline
 ./usr/include/readline/chardefs.h
@@ -108,7 +108,6 @@
 ./usr/lib/libkadm_pic.a
 ./usr/lib/libkafs_pic.a
 ./usr/lib/libkdb_pic.a
-./usr/lib/libkeynote_pic.a
 ./usr/lib/libkrb_pic.a
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
diff --git a/distrib/sets/lists/man/md.mvme68k b/distrib/sets/lists/man/md.mvme68k
index 4df87d6d3b8..974c60a42e8 100644
--- a/distrib/sets/lists/man/md.mvme68k
+++ b/distrib/sets/lists/man/md.mvme68k
@@ -3,5 +3,5 @@
 ./usr/share/man/cat1/rtld.0
 ./usr/share/man/cat5/ar.0
 ./usr/share/man/cat5/ranlib.0
-./usr/share/man/cat8/installboot.0
+./usr/share/man/cat8/mvme68k/installboot.0
 ./usr/share/man/cat8/ldconfig.0