sync

3 files changed, 21 insertions, 72 deletions

diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index a7d802302da..59e00b74a50 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1,4 +1,3 @@
-./sbin/iopctl
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.2
@@ -726,9 +725,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/i82365_pcivar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_bgereg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_devar.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_em.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_em_hw.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_em_osdep.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_gxreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_gxvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_levar.ph
@@ -1861,7 +1857,5 @@
 ./usr/mdec/boot
 ./usr/mdec/bootxx
 ./usr/mdec/installboot
-./usr/mdec/netboot
-./usr/mdec/setnetbootinfo
 ./usr/sbin/wsconscfg
 ./usr/sbin/wsfontload
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index 4f52fd362da..97cf4f825ac 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -9,119 +9,76 @@
 ./usr/include/dlfcn.h
 ./usr/include/hppa
 ./usr/include/hppa/ansi.h
-./usr/include/hppa/aout_machdep.h
 ./usr/include/hppa/asm.h
-./usr/include/hppa/atomic.h
 ./usr/include/hppa/autoconf.h
 ./usr/include/hppa/bus.h
-./usr/include/hppa/bwx.h
 ./usr/include/hppa/cdefs.h
-./usr/include/hppa/cfbreg.h
 ./usr/include/hppa/conf.h
 ./usr/include/hppa/cpu.h
-./usr/include/hppa/cpuconf.h
+./usr/include/hppa/cpufunc.h
 ./usr/include/hppa/db_machdep.h
 ./usr/include/hppa/disklabel.h
-./usr/include/hppa/ecoff_machdep.h
-./usr/include/hppa/elf_machdep.h
 ./usr/include/hppa/endian.h
 ./usr/include/hppa/exec.h
-./usr/include/hppa/fbio.h
 ./usr/include/hppa/float.h
 ./usr/include/hppa/frame.h
-./usr/include/hppa/hppa_cpu.h
 ./usr/include/hppa/ieee.h
 ./usr/include/hppa/ieeefp.h
 ./usr/include/hppa/internal_types.h
 ./usr/include/hppa/intr.h
-./usr/include/hppa/intrcnt.h
-./usr/include/hppa/ioctl_fd.h
-./usr/include/hppa/kbio.h
+./usr/include/hppa/iomod.h
 ./usr/include/hppa/kcore.h
 ./usr/include/hppa/limits.h
-./usr/include/hppa/netbsd_machdep.h
-./usr/include/hppa/pal.h
+./usr/include/hppa/nvm.h
 ./usr/include/hppa/param.h
 ./usr/include/hppa/pcb.h
+./usr/include/hppa/pdc.h
 ./usr/include/hppa/pmap.h
 ./usr/include/hppa/proc.h
 ./usr/include/hppa/profile.h
-./usr/include/hppa/prom.h
+./usr/include/hppa/psl.h
 ./usr/include/hppa/pte.h
 ./usr/include/hppa/ptrace.h
 ./usr/include/hppa/reg.h
 ./usr/include/hppa/reloc.h
-./usr/include/hppa/rpb.h
 ./usr/include/hppa/setjmp.h
-./usr/include/hppa/sfbreg.h
 ./usr/include/hppa/signal.h
+./usr/include/hppa/som.h
 ./usr/include/hppa/spinlock.h
 ./usr/include/hppa/stdarg.h
+./usr/include/hppa/trap.h
 ./usr/include/hppa/types.h
 ./usr/include/hppa/varargs.h
 ./usr/include/hppa/vmparam.h
-./usr/include/hppa/vuid_event.h
-./usr/include/hppa/wsconsio.h
-./usr/include/ieeefp.h
-./usr/include/link.h
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
+./usr/lib/crt0.o
+./usr/lib/scrt0.o
+./usr/lib/gcrt0.o
+./usr/lib/libbfd.a
+./usr/lib/libmmalloc.a
+./usr/lib/libopcodes.a
+./usr/lib/libreadline.a
+./usr/lib/mcrt0.o
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/SYSCALLS.c.X
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/cc1
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/cc1obj
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/cc1plus
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/f771
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/ieee
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/ieee/libgcc.a
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/README
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/exception
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/fixed
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/float.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/iso646.h
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/limits.h
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/new
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/new.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/proto.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/stdarg.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/stdbool.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/stddef.h
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/syslimits.h
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-arc.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-c4x.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-clipper.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-h8300.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-hppa.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-i860.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-i960.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-m32r.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-m88k.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-mips.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-mn10200.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-mn10300.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-pa.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-ppc.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-pyr.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-sh.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-sparc.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-spur.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/va-v850.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/include/varargs.h
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.2/2.95.3/libgcc.a
 ./usr/libdata/ldscripts
-./usr/libdata/ldscripts/elf64hppa.x
-./usr/libdata/ldscripts/elf64hppa.xbn
-./usr/libdata/ldscripts/elf64hppa.xn
-./usr/libdata/ldscripts/elf64hppa.xr
-./usr/libdata/ldscripts/elf64hppa.xs
-./usr/libdata/ldscripts/elf64hppa.xu
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/umct.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/umidi_quirks.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/umidireg.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/umidivar.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/sys/hash.ph
+./usr/libdata/ldscripts/hppaobsd.x
+./usr/libdata/ldscripts/hppaobsd.xbn
+./usr/libdata/ldscripts/hppaobsd.xn
+./usr/libdata/ldscripts/hppaobsd.xr
+./usr/libdata/ldscripts/hppaobsd.xs
+./usr/libdata/ldscripts/hppaobsd.xu
 ./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objcopy.0
 ./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/man/md.hppa b/distrib/sets/lists/man/md.hppa
index 0f33e483172..f61cdaa85da 100644
--- a/distrib/sets/lists/man/md.hppa
+++ b/distrib/sets/lists/man/md.hppa
@@ -20,5 +20,3 @@
 ./usr/share/info/ld.info-4
 ./usr/share/info/ld.info-5
 ./usr/share/info/ld.info-6
-./usr/share/man/cat1/ldd.0
-./usr/share/man/cat8/ldconfig.0