sync

9 files changed, 3 insertions, 9 deletions

diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index ffabad477c6..d11c3687286 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1684,7 +1684,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/frame.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/hil_machdep.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/hp300spu.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/hpux_machdep.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/ieee.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/ieeefp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/internal_types.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index b8da256ad16..c8e6db62428 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1759,9 +1759,9 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/endian.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/exec.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/float.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/fpu.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/frame.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/hil_machdep.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/hpux_machdep.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/ieee.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/ieeefp.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/internal_types.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index b866ab7633c..3c18af0a10e 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -1761,7 +1761,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa64/float.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa64/frame.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa64/hil_machdep.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa64/hpux_machdep.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa64/ieee.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa64/ieeefp.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa64/internal_types.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 836b3c26447..a4fdb5984c6 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1800,7 +1800,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/exec.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/float.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/frame.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/hpux_machdep.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/ieee.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/ieeefp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/internal_types.ph
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index 20d58abd35d..6907bd1f8b9 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -126,7 +126,6 @@
 ./usr/include/hp300/frame.h
 ./usr/include/hp300/hil_machdep.h
 ./usr/include/hp300/hp300spu.h
-./usr/include/hp300/hpux_machdep.h
 ./usr/include/hp300/ieee.h
 ./usr/include/hp300/ieeefp.h
 ./usr/include/hp300/internal_types.h
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index 839f0c56343..2864710f77d 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -166,9 +166,9 @@
 ./usr/include/hppa/endian.h
 ./usr/include/hppa/exec.h
 ./usr/include/hppa/float.h
+./usr/include/hppa/fpu.h
 ./usr/include/hppa/frame.h
 ./usr/include/hppa/hil_machdep.h
-./usr/include/hppa/hpux_machdep.h
 ./usr/include/hppa/ieee.h
 ./usr/include/hppa/ieeefp.h
 ./usr/include/hppa/internal_types.h
diff --git a/distrib/sets/lists/comp/md.hppa64 b/distrib/sets/lists/comp/md.hppa64
index d7f069385dd..8714247b060 100644
--- a/distrib/sets/lists/comp/md.hppa64
+++ b/distrib/sets/lists/comp/md.hppa64
@@ -169,7 +169,6 @@
 ./usr/include/hppa64/float.h
 ./usr/include/hppa64/frame.h
 ./usr/include/hppa64/hil_machdep.h
-./usr/include/hppa64/hpux_machdep.h
 ./usr/include/hppa64/ieee.h
 ./usr/include/hppa64/ieeefp.h
 ./usr/include/hppa64/internal_types.h
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index fb43cc2e4e6..fcbdda81c88 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -163,7 +163,6 @@
 ./usr/include/mvme68k/exec.h
 ./usr/include/mvme68k/float.h
 ./usr/include/mvme68k/frame.h
-./usr/include/mvme68k/hpux_machdep.h
 ./usr/include/mvme68k/ieee.h
 ./usr/include/mvme68k/ieeefp.h
 ./usr/include/mvme68k/internal_types.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 673d3af3df8..44a712e2cdd 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1447,7 +1447,6 @@
 ./usr/share/man/cat4/acpimadt.0
 ./usr/share/man/cat4/acpiprt.0
 ./usr/share/man/cat4/acpipwrres.0
-./usr/share/man/cat4/itherm.0
 ./usr/share/man/cat4/acpithinkpad.0
 ./usr/share/man/cat4/acpitimer.0
 ./usr/share/man/cat4/acpitz.0
@@ -1784,6 +1783,7 @@
 ./usr/share/man/cat4/isapnp.0
 ./usr/share/man/cat4/isp.0
 ./usr/share/man/cat4/it.0
+./usr/share/man/cat4/itherm.0
 ./usr/share/man/cat4/iwi.0
 ./usr/share/man/cat4/iwn.0
 ./usr/share/man/cat4/ix.0