sync

2 files changed, 96 insertions, 80 deletions

diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 638d82508fd..72f1dc061d9 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1190,6 +1190,57 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/locale.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/login_cap.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/machine
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/adbsys.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/ansi.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/asm.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/autoconf.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/bat.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/bus.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/cdefs.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/conf.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/cpu.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/db_machdep.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/disklabel.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/dlfcn.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/elf_abi.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/endian.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/exec.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/float.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/fpu.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/frame.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/ieee.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/ieeefp.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/intr.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/ipkdb.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/kbio.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/kcore.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/limits.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/link.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/loadfile_machdep.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/param.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/pcb.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/pio.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/pmap.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/powerpc.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/proc.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/profile.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/psl.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/pte.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/ptrace.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/reg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/reloc.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/setjmp.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/signal.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/spinlock.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/stdarg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/trap.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/types.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/va-ppc.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/varargs.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/vmparam.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/vuid_event.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/wsconsio.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/malloc.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/math.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/md4.ph
@@ -1428,57 +1479,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/pcap-namedb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/pcap.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/poll.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/adbsys.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/ansi.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/asm.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/autoconf.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/bat.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/bus.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/cdefs.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/conf.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/cpu.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/db_machdep.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/disklabel.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/dlfcn.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/elf_abi.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/endian.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/exec.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/float.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/fpu.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/frame.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/ieee.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/ieeefp.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/intr.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/ipkdb.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/kbio.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/kcore.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/limits.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/link.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/loadfile_machdep.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/param.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/pcb.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/pio.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/pmap.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/powerpc.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/proc.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/profile.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/psl.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/pte.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/ptrace.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/reloc.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/setjmp.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/signal.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/spinlock.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/stdarg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/trap.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/types.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/va-ppc.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/varargs.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/vmparam.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/vuid_event.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/wsconsio.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/ansi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/asm.ph
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 794bb05967c..12712630c49 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -367,6 +367,7 @@
 ./usr/share/man/cat1/m4.0
 ./usr/share/man/cat1/mac68k
 ./usr/share/man/cat1/machine.0
+./usr/share/man/cat1/macppc
 ./usr/share/man/cat1/mail.0
 ./usr/share/man/cat1/mailq.0
 ./usr/share/man/cat1/mailx.0
@@ -393,6 +394,7 @@
 ./usr/share/man/cat1/mv.0
 ./usr/share/man/cat1/mvme68k
 ./usr/share/man/cat1/mvme88k
+./usr/share/man/cat1/mvmeppc
 ./usr/share/man/cat1/nawk.0
 ./usr/share/man/cat1/nc.0
 ./usr/share/man/cat1/neqn.0
@@ -504,7 +506,6 @@
 ./usr/share/man/cat1/podchecker.0
 ./usr/share/man/cat1/podselect.0
 ./usr/share/man/cat1/popd.0
-./usr/share/man/cat1/powerpc
 ./usr/share/man/cat1/pr.0
 ./usr/share/man/cat1/praliases.0
 ./usr/share/man/cat1/printenv.0
@@ -675,9 +676,10 @@
 ./usr/share/man/cat3/hppa
 ./usr/share/man/cat3/i386
 ./usr/share/man/cat3/mac68k
+./usr/share/man/cat3/macppc
 ./usr/share/man/cat3/mvme68k
 ./usr/share/man/cat3/mvme88k
-./usr/share/man/cat3/powerpc
+./usr/share/man/cat3/mvmeppc
 ./usr/share/man/cat3/sparc
 ./usr/share/man/cat3/sun3
 ./usr/share/man/cat3/vax
@@ -955,6 +957,7 @@
 ./usr/share/man/cat4/cua.0
 ./usr/share/man/cat4/cue.0
 ./usr/share/man/cat4/cy.0
+./usr/share/man/cat4/cz.0
 ./usr/share/man/cat4/dc.0
 ./usr/share/man/cat4/ddb.0
 ./usr/share/man/cat4/de.0
@@ -1078,6 +1081,15 @@
 ./usr/share/man/cat4/mac68k/mem.0
 ./usr/share/man/cat4/mac68k/obio.0
 ./usr/share/man/cat4/mac68k/sn.0
+./usr/share/man/cat4/macppc
+./usr/share/man/cat4/macppc/abtn.0
+./usr/share/man/cat4/macppc/adb.0
+./usr/share/man/cat4/macppc/aed.0
+./usr/share/man/cat4/macppc/ams.0
+./usr/share/man/cat4/macppc/autoconf.0
+./usr/share/man/cat4/macppc/bm.0
+./usr/share/man/cat4/macppc/gm.0
+./usr/share/man/cat4/macppc/intro.0
 ./usr/share/man/cat4/maestro.0
 ./usr/share/man/cat4/midi.0
 ./usr/share/man/cat4/mii.0
@@ -1090,6 +1102,7 @@
 ./usr/share/man/cat4/mvme68k/le.0
 ./usr/share/man/cat4/mvme68k/mem.0
 ./usr/share/man/cat4/mvme88k
+./usr/share/man/cat4/mvmeppc
 ./usr/share/man/cat4/ncr.0
 ./usr/share/man/cat4/ne.0
 ./usr/share/man/cat4/neo.0
@@ -1118,15 +1131,6 @@
 ./usr/share/man/cat4/pms.0
 ./usr/share/man/cat4/pmsi.0
 ./usr/share/man/cat4/pnp.0
-./usr/share/man/cat4/powerpc
-./usr/share/man/cat4/powerpc/abtn.0
-./usr/share/man/cat4/powerpc/adb.0
-./usr/share/man/cat4/powerpc/aed.0
-./usr/share/man/cat4/powerpc/ams.0
-./usr/share/man/cat4/powerpc/autoconf.0
-./usr/share/man/cat4/powerpc/bm.0
-./usr/share/man/cat4/powerpc/gm.0
-./usr/share/man/cat4/powerpc/intro.0
 ./usr/share/man/cat4/prandom.0
 ./usr/share/man/cat4/pty.0
 ./usr/share/man/cat4/puc.0
@@ -1393,6 +1397,7 @@
 ./usr/share/man/cat5/link.0
 ./usr/share/man/cat5/login.conf.0
 ./usr/share/man/cat5/mac68k
+./usr/share/man/cat5/macppc
 ./usr/share/man/cat5/magic.0
 ./usr/share/man/cat5/mailer.conf.0
 ./usr/share/man/cat5/malloc.conf.0
@@ -1403,6 +1408,7 @@
 ./usr/share/man/cat5/motd.0
 ./usr/share/man/cat5/mvme68k
 ./usr/share/man/cat5/mvme88k
+./usr/share/man/cat5/mvmeppc
 ./usr/share/man/cat5/nat.conf.0
 ./usr/share/man/cat5/netgroup.0
 ./usr/share/man/cat5/netid.0
@@ -1413,7 +1419,6 @@
 ./usr/share/man/cat5/pf.conf.0
 ./usr/share/man/cat5/phones.0
 ./usr/share/man/cat5/portal.conf.0
-./usr/share/man/cat5/powerpc
 ./usr/share/man/cat5/printcap.0
 ./usr/share/man/cat5/protocols.0
 ./usr/share/man/cat5/rcsfile.0
@@ -1664,6 +1669,13 @@
 ./usr/share/man/cat8/mac68k/MAKEDEV.0
 ./usr/share/man/cat8/mac68k/boot_mac68k.0
 ./usr/share/man/cat8/mac68k/makedev.0
+./usr/share/man/cat8/macppc
+./usr/share/man/cat8/macppc/MAKEDEV.0
+./usr/share/man/cat8/macppc/fdisk.0
+./usr/share/man/cat8/macppc/makedev.0
+./usr/share/man/cat8/macppc/pdisk.0
+./usr/share/man/cat8/macppc/wsconscfg.0
+./usr/share/man/cat8/macppc/wsconsctl.0
 ./usr/share/man/cat8/mail.local.0
 ./usr/share/man/cat8/mailstats.0
 ./usr/share/man/cat8/mailwrapper.0
@@ -1704,6 +1716,7 @@
 ./usr/share/man/cat8/mvme68k
 ./usr/share/man/cat8/mvme68k/installboot.0
 ./usr/share/man/cat8/mvme88k
+./usr/share/man/cat8/mvmeppc
 ./usr/share/man/cat8/named-xfer.0
 ./usr/share/man/cat8/named.0
 ./usr/share/man/cat8/named.reload.0
@@ -1730,13 +1743,6 @@
 ./usr/share/man/cat8/ping.0
 ./usr/share/man/cat8/ping6.0
 ./usr/share/man/cat8/portmap.0
-./usr/share/man/cat8/powerpc
-./usr/share/man/cat8/powerpc/MAKEDEV.0
-./usr/share/man/cat8/powerpc/fdisk.0
-./usr/share/man/cat8/powerpc/makedev.0
-./usr/share/man/cat8/powerpc/pdisk.0
-./usr/share/man/cat8/powerpc/wsconscfg.0
-./usr/share/man/cat8/powerpc/wsconsctl.0
 ./usr/share/man/cat8/ppp.0
 ./usr/share/man/cat8/pppctl.0
 ./usr/share/man/cat8/pppd.0
@@ -1917,10 +1923,11 @@
 ./usr/share/man/cat9/hppa
 ./usr/share/man/cat9/i386
 ./usr/share/man/cat9/mac68k
+./usr/share/man/cat9/macppc
 ./usr/share/man/cat9/mbuf_tags.0
 ./usr/share/man/cat9/mvme68k
 ./usr/share/man/cat9/mvme88k
-./usr/share/man/cat9/powerpc
+./usr/share/man/cat9/mvmeppc
 ./usr/share/man/cat9/sparc
 ./usr/share/man/cat9/sun3
 ./usr/share/man/cat9/vax
@@ -1932,9 +1939,10 @@
 ./usr/share/man/man1/hppa
 ./usr/share/man/man1/i386
 ./usr/share/man/man1/mac68k
+./usr/share/man/man1/macppc
 ./usr/share/man/man1/mvme68k
 ./usr/share/man/man1/mvme88k
-./usr/share/man/man1/powerpc
+./usr/share/man/man1/mvmeppc
 ./usr/share/man/man1/sparc
 ./usr/share/man/man1/sun3
 ./usr/share/man/man1/vax
@@ -1949,9 +1957,10 @@
 ./usr/share/man/man4/hppa
 ./usr/share/man/man4/i386
 ./usr/share/man/man4/mac68k
+./usr/share/man/man4/macppc
 ./usr/share/man/man4/mvme68k
 ./usr/share/man/man4/mvme88k
-./usr/share/man/man4/powerpc
+./usr/share/man/man4/mvmeppc
 ./usr/share/man/man4/sparc
 ./usr/share/man/man4/sun3
 ./usr/share/man/man4/vax
@@ -1966,9 +1975,10 @@
 ./usr/share/man/man8/hppa
 ./usr/share/man/man8/i386
 ./usr/share/man/man8/mac68k
+./usr/share/man/man8/macppc
 ./usr/share/man/man8/mvme68k
 ./usr/share/man/man8/mvme88k
-./usr/share/man/man8/powerpc
+./usr/share/man/man8/mvmeppc
 ./usr/share/man/man8/sparc
 ./usr/share/man/man8/sun3
 ./usr/share/man/man8/vax
@@ -1981,9 +1991,10 @@
 ./usr/share/man/ps1/hppa
 ./usr/share/man/ps1/i386
 ./usr/share/man/ps1/mac68k
+./usr/share/man/ps1/macppc
 ./usr/share/man/ps1/mvme68k
 ./usr/share/man/ps1/mvme88k
-./usr/share/man/ps1/powerpc
+./usr/share/man/ps1/mvmeppc
 ./usr/share/man/ps1/sparc
 ./usr/share/man/ps1/sun3
 ./usr/share/man/ps1/vax
@@ -1997,9 +2008,10 @@
 ./usr/share/man/ps3/hppa
 ./usr/share/man/ps3/i386
 ./usr/share/man/ps3/mac68k
+./usr/share/man/ps3/macppc
 ./usr/share/man/ps3/mvme68k
 ./usr/share/man/ps3/mvme88k
-./usr/share/man/ps3/powerpc
+./usr/share/man/ps3/mvmeppc
 ./usr/share/man/ps3/sparc
 ./usr/share/man/ps3/sun3
 ./usr/share/man/ps3/vax
@@ -2012,9 +2024,10 @@
 ./usr/share/man/ps4/hppa
 ./usr/share/man/ps4/i386
 ./usr/share/man/ps4/mac68k
+./usr/share/man/ps4/macppc
 ./usr/share/man/ps4/mvme68k
 ./usr/share/man/ps4/mvme88k
-./usr/share/man/ps4/powerpc
+./usr/share/man/ps4/mvmeppc
 ./usr/share/man/ps4/sparc
 ./usr/share/man/ps4/sun3
 ./usr/share/man/ps4/vax
@@ -2026,9 +2039,10 @@
 ./usr/share/man/ps5/hppa
 ./usr/share/man/ps5/i386
 ./usr/share/man/ps5/mac68k
+./usr/share/man/ps5/macppc
 ./usr/share/man/ps5/mvme68k
 ./usr/share/man/ps5/mvme88k
-./usr/share/man/ps5/powerpc
+./usr/share/man/ps5/mvmeppc
 ./usr/share/man/ps5/sparc
 ./usr/share/man/ps5/sun3
 ./usr/share/man/ps5/vax
@@ -2042,9 +2056,10 @@
 ./usr/share/man/ps8/hppa
 ./usr/share/man/ps8/i386
 ./usr/share/man/ps8/mac68k
+./usr/share/man/ps8/macppc
 ./usr/share/man/ps8/mvme68k
 ./usr/share/man/ps8/mvme88k
-./usr/share/man/ps8/powerpc
+./usr/share/man/ps8/mvmeppc
 ./usr/share/man/ps8/sparc
 ./usr/share/man/ps8/sun3
 ./usr/share/man/ps8/vax
@@ -2056,9 +2071,10 @@
 ./usr/share/man/ps9/hppa
 ./usr/share/man/ps9/i386
 ./usr/share/man/ps9/mac68k
+./usr/share/man/ps9/macppc
 ./usr/share/man/ps9/mvme68k
 ./usr/share/man/ps9/mvme88k
-./usr/share/man/ps9/powerpc
+./usr/share/man/ps9/mvmeppc
 ./usr/share/man/ps9/sparc
 ./usr/share/man/ps9/sun3
 ./usr/share/man/ps9/vax