sync

3 files changed, 36 insertions, 37 deletions

diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index 69ae51af6aa..c348b0e83fc 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -1477,6 +1477,24 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/ftw.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++/FlexLexer.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward/algo.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward/algobase.ph
@@ -1567,24 +1585,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++/bits/type_traits.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++/bits/valarray_array.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++/bits/valarray_meta.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.6/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++/cursesapp.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++/cursesf.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++/cursesm.ph
diff --git a/distrib/sets/lists/comp/md.cats b/distrib/sets/lists/comp/md.cats
index 9f026d69561..4ae1485ebbf 100644
--- a/distrib/sets/lists/comp/md.cats
+++ b/distrib/sets/lists/comp/md.cats
@@ -103,6 +103,24 @@
 ./usr/include/cats/types.h
 ./usr/include/cats/vmparam.h
 ./usr/include/dis-asm.h
+./usr/include/g++/arm-unknown-openbsd3.6
+./usr/include/g++/arm-unknown-openbsd3.6/bits
+./usr/include/g++/arm-unknown-openbsd3.6/bits/atomicity.h
+./usr/include/g++/arm-unknown-openbsd3.6/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd3.6/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd3.6/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd3.6/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd3.6/bits/codecvt_specializations.h
+./usr/include/g++/arm-unknown-openbsd3.6/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd3.6/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd3.6/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd3.6/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd3.6/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd3.6/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd3.6/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd3.6/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd3.6/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd3.6/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -207,24 +225,6 @@
 ./usr/include/g++/bits/valarray_array.tcc
 ./usr/include/g++/bits/valarray_meta.h
 ./usr/include/g++/bits/vector.tcc
-./usr/include/g++/arm-unknown-openbsd3.6
-./usr/include/g++/arm-unknown-openbsd3.6/bits
-./usr/include/g++/arm-unknown-openbsd3.6/bits/atomicity.h
-./usr/include/g++/arm-unknown-openbsd3.6/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd3.6/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd3.6/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd3.6/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd3.6/bits/codecvt_specializations.h
-./usr/include/g++/arm-unknown-openbsd3.6/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd3.6/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd3.6/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd3.6/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd3.6/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd3.6/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd3.6/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd3.6/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd3.6/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd3.6/bits/time_members.h
 ./usr/include/g++/cxxabi.h
 ./usr/include/g++/exception_defines.h
 ./usr/include/g++/ext
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 80b84f4a3f9..e26cda759fc 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1173,7 +1173,6 @@
 ./usr/share/man/cat4/hp300
 ./usr/share/man/cat4/hp300/apci.0
 ./usr/share/man/cat4/hp300/autoconf.0
-./usr/share/man/cat4/hp300/cons.0
 ./usr/share/man/cat4/hp300/ct.0
 ./usr/share/man/cat4/hp300/dca.0
 ./usr/share/man/cat4/hp300/dcm.0