Beagle has been replaced by armv7.

5 files changed, 96 insertions, 98 deletions

diff --git a/distrib/sets/lists/base/md.beagle b/distrib/sets/lists/base/md.armv7
index e723bae412a..6b700bfc557 100644
--- a/distrib/sets/lists/base/md.beagle
+++ b/distrib/sets/lists/base/md.armv7
@@ -603,55 +603,54 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/arpa/telnet.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arpa/tftp.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/assert.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/_float.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/_types.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/apmvar.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/asm.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/atomic.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/beagle_intr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/bootconfig.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/bus.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/cdefs.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/conf.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/cpu.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/db_machdep.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/disklabel.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/elf_abi.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/endian.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/exec.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/fenv.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/fp.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/frame.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/ieee.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/ieeefp.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/intr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/irqhandler.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/isa_machdep.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/limits.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/loadfile_machdep.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/lock.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/machine_reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/math.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/mutex.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/param.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/pcb.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/pio.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/pmap.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/proc.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/profile.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/ptrace.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/reloc.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/rtc.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/setjmp.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/signal.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/spinlock.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/stdarg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/sysarch.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/tcb.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/trap.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/vmparam.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/_float.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/_types.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/apmvar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/asm.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/atomic.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/bootconfig.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/bus.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/cdefs.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/conf.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/cpu.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/db_machdep.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/disklabel.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/elf_abi.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/endian.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/exec.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/fenv.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/fp.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/frame.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/ieee.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/ieeefp.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/intr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/irqhandler.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/isa_machdep.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/limits.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/loadfile_machdep.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/lock.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/machine_reg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/math.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/mutex.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/param.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/pcb.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/pio.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/pmap.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/proc.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/profile.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/ptrace.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/reg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/reloc.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/rtc.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/setjmp.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/signal.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/spinlock.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/stdarg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/sysarch.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/tcb.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/trap.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/armv7/vmparam.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/bitstring.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/blf.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/bm.ph
diff --git a/distrib/sets/lists/comp/md.beagle b/distrib/sets/lists/comp/md.armv7
index b6e09acf829..5e4879a29c4 100644
--- a/distrib/sets/lists/comp/md.beagle
+++ b/distrib/sets/lists/comp/md.armv7
@@ -52,55 +52,54 @@
 ./usr/include/arm/trap.h
 ./usr/include/arm/undefined.h
 ./usr/include/arm/vmparam.h
-./usr/include/beagle
-./usr/include/beagle/_float.h
-./usr/include/beagle/_types.h
-./usr/include/beagle/apmvar.h
-./usr/include/beagle/asm.h
-./usr/include/beagle/atomic.h
-./usr/include/beagle/beagle_intr.h
-./usr/include/beagle/bootconfig.h
-./usr/include/beagle/bus.h
-./usr/include/beagle/cdefs.h
-./usr/include/beagle/conf.h
-./usr/include/beagle/cpu.h
-./usr/include/beagle/db_machdep.h
-./usr/include/beagle/disklabel.h
-./usr/include/beagle/elf_abi.h
-./usr/include/beagle/endian.h
-./usr/include/beagle/exec.h
-./usr/include/beagle/fenv.h
-./usr/include/beagle/fp.h
-./usr/include/beagle/frame.h
-./usr/include/beagle/ieee.h
-./usr/include/beagle/ieeefp.h
-./usr/include/beagle/intr.h
-./usr/include/beagle/irqhandler.h
-./usr/include/beagle/isa_machdep.h
-./usr/include/beagle/limits.h
-./usr/include/beagle/loadfile_machdep.h
-./usr/include/beagle/lock.h
-./usr/include/beagle/machine_reg.h
-./usr/include/beagle/math.h
-./usr/include/beagle/mutex.h
-./usr/include/beagle/param.h
-./usr/include/beagle/pcb.h
-./usr/include/beagle/pio.h
-./usr/include/beagle/pmap.h
-./usr/include/beagle/proc.h
-./usr/include/beagle/profile.h
-./usr/include/beagle/ptrace.h
-./usr/include/beagle/reg.h
-./usr/include/beagle/reloc.h
-./usr/include/beagle/rtc.h
-./usr/include/beagle/setjmp.h
-./usr/include/beagle/signal.h
-./usr/include/beagle/spinlock.h
-./usr/include/beagle/stdarg.h
-./usr/include/beagle/sysarch.h
-./usr/include/beagle/tcb.h
-./usr/include/beagle/trap.h
-./usr/include/beagle/vmparam.h
+./usr/include/armv7
+./usr/include/armv7/_float.h
+./usr/include/armv7/_types.h
+./usr/include/armv7/apmvar.h
+./usr/include/armv7/asm.h
+./usr/include/armv7/atomic.h
+./usr/include/armv7/bootconfig.h
+./usr/include/armv7/bus.h
+./usr/include/armv7/cdefs.h
+./usr/include/armv7/conf.h
+./usr/include/armv7/cpu.h
+./usr/include/armv7/db_machdep.h
+./usr/include/armv7/disklabel.h
+./usr/include/armv7/elf_abi.h
+./usr/include/armv7/endian.h
+./usr/include/armv7/exec.h
+./usr/include/armv7/fenv.h
+./usr/include/armv7/fp.h
+./usr/include/armv7/frame.h
+./usr/include/armv7/ieee.h
+./usr/include/armv7/ieeefp.h
+./usr/include/armv7/intr.h
+./usr/include/armv7/irqhandler.h
+./usr/include/armv7/isa_machdep.h
+./usr/include/armv7/limits.h
+./usr/include/armv7/loadfile_machdep.h
+./usr/include/armv7/lock.h
+./usr/include/armv7/machine_reg.h
+./usr/include/armv7/math.h
+./usr/include/armv7/mutex.h
+./usr/include/armv7/param.h
+./usr/include/armv7/pcb.h
+./usr/include/armv7/pio.h
+./usr/include/armv7/pmap.h
+./usr/include/armv7/proc.h
+./usr/include/armv7/profile.h
+./usr/include/armv7/ptrace.h
+./usr/include/armv7/reg.h
+./usr/include/armv7/reloc.h
+./usr/include/armv7/rtc.h
+./usr/include/armv7/setjmp.h
+./usr/include/armv7/signal.h
+./usr/include/armv7/spinlock.h
+./usr/include/armv7/stdarg.h
+./usr/include/armv7/sysarch.h
+./usr/include/armv7/tcb.h
+./usr/include/armv7/trap.h
+./usr/include/armv7/vmparam.h
 ./usr/include/g++/arm-unknown-openbsd5.4
 ./usr/include/g++/arm-unknown-openbsd5.4/bits
 ./usr/include/g++/arm-unknown-openbsd5.4/bits/atomic_word.h
diff --git a/distrib/sets/lists/etc/md.beagle b/distrib/sets/lists/etc/md.armv7
index 772a5110aeb..772a5110aeb 100644
--- a/distrib/sets/lists/etc/md.beagle
+++ b/distrib/sets/lists/etc/md.armv7
diff --git a/distrib/sets/lists/game/md.beagle b/distrib/sets/lists/game/md.armv7
index e69de29bb2d..e69de29bb2d 100644
--- a/distrib/sets/lists/game/md.beagle
+++ b/distrib/sets/lists/game/md.armv7
diff --git a/distrib/sets/lists/man/md.beagle b/distrib/sets/lists/man/md.armv7
index e69de29bb2d..e69de29bb2d 100644
--- a/distrib/sets/lists/man/md.beagle
+++ b/distrib/sets/lists/man/md.armv7