sync pmax -moj

2 files changed, 32 insertions, 26 deletions

diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index f9c7e3c7097..a192088db82 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -1,7 +1,5 @@
 ./usr/lib/libcrypto.so.1.0
 ./usr/lib/libssl.so.1.0
-./usr/lib/libcrypto_pic.a
-./usr/lib/libssl_pic.a
 ./sbin/ldconfig
 ./usr/bin/elf2aout
 ./usr/bin/ldd
@@ -89,6 +87,7 @@
 ./usr/lib/perl5/mips-openbsd/5.00404/pod/perldiag.pod
 ./usr/lib/perl5/site_perl/mips-openbsd
 ./usr/lib/perl5/site_perl/mips-openbsd/a.out.ph
+./usr/lib/perl5/site_perl/mips-openbsd/ansidecl.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/ar.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/arpa
 ./usr/lib/perl5/site_perl/mips-openbsd/arpa/ftp.ph
@@ -97,6 +96,8 @@
 ./usr/lib/perl5/site_perl/mips-openbsd/arpa/telnet.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/arpa/tftp.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/assert.ph
+./usr/lib/perl5/site_perl/mips-openbsd/bfd.ph
+./usr/lib/perl5/site_perl/mips-openbsd/bfdlink.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/bitstring.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/blf.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/bm.ph
@@ -135,57 +136,60 @@
 ./usr/lib/perl5/site_perl/mips-openbsd/locale.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/ansi.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/apmvar.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/aout_machdep.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/asm.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/biosvar.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/autoconf.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/bsd-aout.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/bus.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/cdefs.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/conf.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/cpu.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/cpufunc.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/cputypes.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/db_machdep.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/cpuregs.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/dc7085cons.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/disklabel.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/dlfcn.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/ecoff.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/ecoff_machdep.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/elf.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/elf_abi.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/elf_machdep.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/endian.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/exec.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/fbio.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/fbvar.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/float.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/frame.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/freebsd_machdep.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/gdt.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/ieeefp.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/intr.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/ioctl_fd.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/joystick.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/kdbparam.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/limits.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/linux_machdep.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/mouse.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/npx.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/link.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/locore.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/machAsmDefs.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/machConst.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/mips1_pte.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/mips3_pte.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/mips_opcode.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/mips_param.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/param.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/pcb.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/pccons.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/pctr.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/pcvt_ioctl.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/pio.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/pmap.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/pmioctl.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/proc.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/profile.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/psl.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/pte.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/ptrace.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/reg.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/segments.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/regdef.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/regnum.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/reloc.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/setjmp.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/signal.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/specialreg.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/spkr.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/stdarg.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/svr4_machdep.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/sysarch.ph
+./usr/lib/perl5/site_perl/mips-openbsd/machine/tc_machdep.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/trap.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/tss.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/types.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/varargs.ph
-./usr/lib/perl5/site_perl/mips-openbsd/machine/vm86.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/machine/vmparam.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/malloc.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/math.ph
@@ -227,6 +231,7 @@
 ./usr/lib/perl5/site_perl/mips-openbsd/netgroup.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/nl_types.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/nlist.ph
+./usr/lib/perl5/site_perl/mips-openbsd/obstack.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/ocurses.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/olf_abi.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/panel.ph
diff --git a/distrib/sets/lists/comp/md.pmax b/distrib/sets/lists/comp/md.pmax
index e1b52037148..694241cab20 100644
--- a/distrib/sets/lists/comp/md.pmax
+++ b/distrib/sets/lists/comp/md.pmax
@@ -14,6 +14,7 @@
 ./usr/include/machine/asm.h
 ./usr/include/machine/autoconf.h
 ./usr/include/machine/bsd-aout.h
+./usr/include/machine/bus.h
 ./usr/include/machine/cdefs.h
 ./usr/include/machine/conf.h
 ./usr/include/machine/cpu.h