locales: Rename zh_han* to zh_Han* (capitalize)
[dragonfly.git] / Makefile_upgrade.inc
index 8b98323..076b572 100644 (file)
@@ -1,5 +1,6 @@
 # Append all obsolete files to this file
 # Avoid constructs like {foo,bar}.  It is parsed by /bin/sh
+# Formatted manual pages (i.e., cat[1-9]) need not be specified separately
 
 TO_REMOVE+=/usr/libexec/named-xfer
 TO_REMOVE+=/usr/bin/dnsquery
@@ -8,9 +9,7 @@ TO_REMOVE+=/usr/sbin/ndc
 TO_REMOVE+=/usr/bin/dnssec-makekeyset
 TO_REMOVE+=/usr/bin/dnssec-signkey
 TO_REMOVE+=/usr/share/man/man8/dnssec-makekeyset.8.gz
-TO_REMOVE+=/usr/share/man/cat8/dnssec-makekeyset.8.gz
 TO_REMOVE+=/usr/share/man/man8/dnssec-signkey.8.gz
-TO_REMOVE+=/usr/share/man/cat8/dnssec-signkey.8.gz
 TO_REMOVE+=/usr/lib/gcc2/crtbegin.o
 TO_REMOVE+=/usr/lib/gcc2/crtbeginS.o
 TO_REMOVE+=/usr/lib/gcc2/crtend.o
@@ -28,13 +27,9 @@ TO_REMOVE+=/usr/sbin/pccardc
 TO_REMOVE+=/usr/sbin/pccardd
 TO_REMOVE+=/usr/share/examples/etc/defaults/pccard.conf
 TO_REMOVE+=/usr/share/man/man5/pccard.conf.5.gz
-TO_REMOVE+=/usr/share/man/cat5/pccard.conf.5.gz
 TO_REMOVE+=/usr/share/man/man8/pccardc.8.gz
-TO_REMOVE+=/usr/share/man/cat8/pccardc.8.gz
 TO_REMOVE+=/usr/share/man/man8/pccardd.8.gz
-TO_REMOVE+=/usr/share/man/cat8/pccardd.8.gz
 TO_REMOVE+=/usr/share/man/man8/rc.pccard.8.gz
-TO_REMOVE+=/usr/share/man/cat8/rc.pccard.8.gz
 TO_REMOVE+=/etc/defaults/pccard
 TO_REMOVE+=/etc/rc.d/pccard
 TO_REMOVE+=/etc/defaults/pccard.conf
@@ -54,17 +49,11 @@ TO_REMOVE+=/usr/bin/nawk
 TO_REMOVE+=/usr/bin/ptx
 TO_REMOVE+=/usr/bin/send-pr
 TO_REMOVE+=/usr/share/man/man8/genassym.8.gz
-TO_REMOVE+=/usr/share/man/cat8/genassym.8.gz
 TO_REMOVE+=/usr/share/man/man8/gensetdefs.8.gz
-TO_REMOVE+=/usr/share/man/cat8/gensetdefs.8.gz
 TO_REMOVE+=/usr/share/man/man1/cccp.1.gz
 TO_REMOVE+=/usr/share/man/man1/gawk.1.gz
 TO_REMOVE+=/usr/share/man/man1/nawk.1.gz
 TO_REMOVE+=/usr/share/man/man1/send-pr.1.gz
-TO_REMOVE+=/usr/share/man/cat1/cccp.1.gz
-TO_REMOVE+=/usr/share/man/cat1/gawk.1.gz
-TO_REMOVE+=/usr/share/man/cat1/nawk.1.gz
-TO_REMOVE+=/usr/share/man/cat1/send-pr.1.gz
 TO_REMOVE+=/usr/libexec/cc1
 TO_REMOVE+=/usr/libexec/cc1obj
 TO_REMOVE+=/usr/libexec/cc1plus
@@ -100,9 +89,6 @@ TO_REMOVE+=/usr/bin/makewhatis
 TO_REMOVE+=/usr/sbin/prebind
 TO_REMOVE+=/modules/checkpt.ko
 TO_REMOVE+=/usr/share/man/man1aout
-TO_REMOVE+=/usr/share/man/cat1aout
-TO_REMOVE+=/usr/share/man/en.ISO8859-1/man1aout
-TO_REMOVE+=/usr/share/man/en.ISO8859-1/cat1aout
 TO_REMOVE+=/usr/libdata/perl
 TO_REMOVE+=/usr/bin/find2perl
 TO_REMOVE+=/usr/bin/perl5
@@ -123,142 +109,77 @@ TO_REMOVE+=/usr/bin/pl2pm
 TO_REMOVE+=/usr/bin/pod2html
 TO_REMOVE+=/usr/bin/pod2man
 TO_REMOVE+=/usr/bin/s2p
-TO_REMOVE+=/usr/share/man/cat1/a2p.1.gz
 TO_REMOVE+=/usr/share/man/man1/a2p.1.gz
-TO_REMOVE+=/usr/share/man/cat1/c2ph.1.gz
 TO_REMOVE+=/usr/share/man/man1/c2ph.1.gz
-TO_REMOVE+=/usr/share/man/cat1/h2ph.1.gz
 TO_REMOVE+=/usr/share/man/man1/h2ph.1.gz
-TO_REMOVE+=/usr/share/man/cat1/h2xs.1.gz
 TO_REMOVE+=/usr/share/man/man1/h2xs.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlbug.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlbug.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlcc.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlcc.1.gz
-TO_REMOVE+=/usr/share/man/cat1/pl2pm.1.gz
 TO_REMOVE+=/usr/share/man/man1/pl2pm.1.gz
-TO_REMOVE+=/usr/share/man/cat1/pod2html.1.gz
 TO_REMOVE+=/usr/share/man/man1/pod2html.1.gz
-TO_REMOVE+=/usr/share/man/cat1/pod2man.1.gz
 TO_REMOVE+=/usr/share/man/man1/pod2man.1.gz
-TO_REMOVE+=/usr/share/man/cat1/s2p.1.gz
 TO_REMOVE+=/usr/share/man/man1/s2p.1.gz
 TO_REMOVE+=/usr/lib/libperl.a
 TO_REMOVE+=/usr/lib/libperl.so
 TO_REMOVE+=/usr/lib/libperl.so.3
 TO_REMOVE+=/usr/lib/libperl_p.a
-TO_REMOVE+=/usr/share/man/cat1/perl5004delta.1.gz
 TO_REMOVE+=/usr/share/man/man1/perl5004delta.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlapio.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlapio.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlbook.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlbook.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlbot.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlbot.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlcall.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlcall.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perldata.1.gz
 TO_REMOVE+=/usr/share/man/man1/perldata.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perldebug.1.gz
 TO_REMOVE+=/usr/share/man/man1/perldebug.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perldelta.1.gz
 TO_REMOVE+=/usr/share/man/man1/perldelta.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perldiag.1.gz
 TO_REMOVE+=/usr/share/man/man1/perldiag.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perldoc.1.gz
 TO_REMOVE+=/usr/share/man/man1/perldoc.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perldsc.1.gz
 TO_REMOVE+=/usr/share/man/man1/perldsc.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlembed.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlembed.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlfaq.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlfaq.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlfaq1.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlfaq1.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlfaq2.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlfaq2.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlfaq3.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlfaq3.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlfaq4.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlfaq4.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlfaq5.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlfaq5.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlfaq6.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlfaq6.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlfaq7.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlfaq7.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlfaq8.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlfaq8.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlfaq9.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlfaq9.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlform.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlform.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlfunc.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlfunc.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlguts.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlguts.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlhist.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlhist.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlipc.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlipc.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perllocale.1.gz
 TO_REMOVE+=/usr/share/man/man1/perllocale.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perllol.1.gz
 TO_REMOVE+=/usr/share/man/man1/perllol.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlmod.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlmod.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlmodinstall.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlmodinstall.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlmodlib.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlmodlib.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlobj.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlobj.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlop.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlop.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlopentut.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlopentut.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlpod.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlpod.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlport.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlport.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlre.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlre.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlref.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlref.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlreftut.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlreftut.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlrun.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlrun.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlsec.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlsec.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlstyle.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlstyle.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlsub.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlsub.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlsyn.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlsyn.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlthrtut.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlthrtut.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perltie.1.gz
 TO_REMOVE+=/usr/share/man/man1/perltie.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perltoc.1.gz
 TO_REMOVE+=/usr/share/man/man1/perltoc.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perltoot.1.gz
 TO_REMOVE+=/usr/share/man/man1/perltoot.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perltrap.1.gz
 TO_REMOVE+=/usr/share/man/man1/perltrap.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlvar.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlvar.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlxs.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlxs.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perlxstut.1.gz
 TO_REMOVE+=/usr/share/man/man1/perlxstut.1.gz
 TO_REMOVE+=/usr/share/man/man7/style.perl.7.gz
-TO_REMOVE+=/usr/share/man/cat7/style.perl.7.gz
 TO_REMOVE+=/usr/share/perl
 TO_REMOVE+=/usr/share/examples/bc
 TO_REMOVE+=/usr/share/man/man1/perl.1.gz
-TO_REMOVE+=/usr/share/man/cat1/perl.1.gz
 TO_REMOVE+=/usr/include/gmp
 TO_REMOVE+=/usr/include/mp.h
 TO_REMOVE+=/usr/lib/libmp.a
@@ -272,13 +193,9 @@ TO_REMOVE+=/usr/lib/libgmp.so.3
 TO_REMOVE+=/usr/sbin/ntpdate
 TO_REMOVE+=/modules/if_wx.ko
 TO_REMOVE+=/usr/share/man/man4/wx.4.gz
-TO_REMOVE+=/usr/share/man/cat4/wx.4.gz
 TO_REMOVE+=/usr/share/man/man4/wst.4.gz
-TO_REMOVE+=/usr/share/man/cat4/wst.4.gz
 TO_REMOVE+=/usr/share/man/man4/euc.4.gz
 TO_REMOVE+=/usr/share/man/man4/utf2.4.gz
-TO_REMOVE+=/usr/share/man/cat4/euc.4.gz
-TO_REMOVE+=/usr/share/man/cat4/utf2.4.gz
 TO_REMOVE+=/usr/share/syscons/keymaps/jp.pc98.iso.kbd
 TO_REMOVE+=/usr/share/syscons/keymaps/jp.pc98.kbd
 TO_REMOVE+=/etc/rc.d/bootconf.sh
@@ -292,22 +209,16 @@ TO_REMOVE+=/modules/canbus.ko
 TO_REMOVE+=/usr/lib/libkeycap.a
 TO_REMOVE+=/usr/lib/libkeycap_p.a
 TO_REMOVE+=/usr/share/man/man4/pcvt.4.gz
-TO_REMOVE+=/usr/share/man/cat4/pcvt.4.gz
 TO_REMOVE+=/usr/share/man/man4/vt.4.gz
-TO_REMOVE+=/usr/share/man/cat4/vt.4.gz
 TO_REMOVE+=/usr/share/man/man5/keycap.5.gz
-TO_REMOVE+=/usr/share/man/cat5/keycap.5.gz
 TO_REMOVE+=/usr/share/man/man8/ispcvt.8.gz
-TO_REMOVE+=/usr/share/man/cat8/ispcvt.8.gz
 TO_REMOVE+=/usr/share/misc/keycap.pcvt
 TO_REMOVE+=/usr/share/misc/fonts
 TO_REMOVE+=/usr/share/misc/pcvtfonts
 TO_REMOVE+=/usr/share/pcvt
 TO_REMOVE+=/usr/share/man/man1/battd.1.gz
-TO_REMOVE+=/usr/share/man/cat1/battd.1.gz
 TO_REMOVE+=/usr/include/machine/bus_pc98.h
 TO_REMOVE+=/usr/share/man/man4/pcic.4.gz
-TO_REMOVE+=/usr/share/man/cat4/pcic.4.gz
 TO_REMOVE+=/usr/share/info/cpp2.info.gz
 TO_REMOVE+=/usr/share/info/gcc2.info.gz
 TO_REMOVE+=/usr/sbin/diskpart
@@ -329,17 +240,11 @@ TO_REMOVE+=/usr/bin/ntpq
 TO_REMOVE+=/usr/bin/perldoc
 TO_REMOVE+=/usr/bin/sendbug
 TO_REMOVE+=/usr/share/man/man1/gasp.1.gz
-TO_REMOVE+=/usr/share/man/cat1/gasp.1.gz
 TO_REMOVE+=/usr/share/man/man1/gperf.1.gz
-TO_REMOVE+=/usr/share/man/cat1/gperf.1.gz
 TO_REMOVE+=/usr/share/man/man1/minigzip.1.gz
-TO_REMOVE+=/usr/share/man/cat1/minigzip.1.gz
 TO_REMOVE+=/usr/share/man/man1/sendbug.1.gz
-TO_REMOVE+=/usr/share/man/cat1/sendbug.1.gz
 TO_REMOVE+=/usr/share/man/man9/suser_xxx.9.gz
-TO_REMOVE+=/usr/share/man/cat9/suser_xxx.9.gz
 TO_REMOVE+=/usr/share/man/man9/NDINIT.9.gz
-TO_REMOVE+=/usr/share/man/cat9/NDINIT.9.gz
 TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-supfile
 TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-stable-supfile
 TO_REMOVE+=/usr/share/nls/*/.cat
@@ -359,101 +264,53 @@ TO_REMOVE+=/usr/sbin/scon
 TO_REMOVE+=/usr/sbin/vt220keys
 TO_REMOVE+=/usr/sbin/vttest
 TO_REMOVE+=/usr/share/man/man1/cursor.1.gz
-TO_REMOVE+=/usr/share/man/cat1/cursor.1.gz
 TO_REMOVE+=/usr/share/man/man1/fontedit.1.gz
-TO_REMOVE+=/usr/share/man/cat1/fontedit.1.gz
 TO_REMOVE+=/usr/share/man/man1/kcon.1.gz
-TO_REMOVE+=/usr/share/man/cat1/kcon.1.gz
 TO_REMOVE+=/usr/share/man/man1/loadfont.1.gz
-TO_REMOVE+=/usr/share/man/cat1/loadfont.1.gz
 TO_REMOVE+=/usr/share/man/man1/mcon.1.gz
-TO_REMOVE+=/usr/share/man/cat1/mcon.1.gz
 TO_REMOVE+=/usr/share/man/man1/scon.1.gz
-TO_REMOVE+=/usr/share/man/cat1/scon.1.gz
 TO_REMOVE+=/usr/share/man/man1/vt220keys.1.gz
-TO_REMOVE+=/usr/share/man/cat1/vt220keys.1.gz
 TO_REMOVE+=/usr/share/man/man1/vttest.1.gz
-TO_REMOVE+=/usr/share/man/cat1/vttest.1.gz
 TO_REMOVE+=/usr/share/man/man3/keycap.3.gz
-TO_REMOVE+=/usr/share/man/cat3/keycap.3.gz
 TO_REMOVE+=/usr/share/man/man3/kgetent.3.gz
-TO_REMOVE+=/usr/share/man/cat3/kgetent.3.gz
 TO_REMOVE+=/usr/share/man/man3/kgetflag.3.gz
-TO_REMOVE+=/usr/share/man/cat3/kgetflag.3.gz
 TO_REMOVE+=/usr/share/man/man3/kgetnum.3.gz
-TO_REMOVE+=/usr/share/man/cat3/kgetnum.3.gz
 TO_REMOVE+=/usr/share/man/man3/kgetstr.3.gz
-TO_REMOVE+=/usr/share/man/cat3/kgetstr.3.gz
 TO_REMOVE+=/usr/share/man/man3/dft_fgbg.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dft_fgbg.3.gz
 TO_REMOVE+=/usr/share/man/man3/dllockinit.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dllockinit.3.gz
 TO_REMOVE+=/usr/share/man/man3/dynamic_fieldinfo.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dynamic_fieldinfo.3.gz
 TO_REMOVE+=/usr/share/man/man3/fgetrune.3.gz
-TO_REMOVE+=/usr/share/man/cat3/fgetrune.3.gz
 TO_REMOVE+=/usr/share/man/man3/fputrune.3.gz
-TO_REMOVE+=/usr/share/man/cat3/fputrune.3.gz
 TO_REMOVE+=/usr/share/man/man3/fungetrune.3.gz
-TO_REMOVE+=/usr/share/man/cat3/fungetrune.3.gz
 TO_REMOVE+=/usr/share/man/man3/mbmb.3.gz
-TO_REMOVE+=/usr/share/man/cat3/mbmb.3.gz
 TO_REMOVE+=/usr/share/man/man3/mbrrune.3.gz
-TO_REMOVE+=/usr/share/man/cat3/mbrrune.3.gz
 TO_REMOVE+=/usr/share/man/man3/mbrune.3.gz
-TO_REMOVE+=/usr/share/man/cat3/mbrune.3.gz
 TO_REMOVE+=/usr/share/man/man3/menu_attribs.3.gz
-TO_REMOVE+=/usr/share/man/cat3/menu_attribs.3.gz
 TO_REMOVE+=/usr/share/man/man3/rune.3.gz
-TO_REMOVE+=/usr/share/man/cat3/rune.3.gz
 TO_REMOVE+=/usr/share/man/man3/setinvalidrune.3.gz
-TO_REMOVE+=/usr/share/man/cat3/setinvalidrune.3.gz
 TO_REMOVE+=/usr/share/man/man3/setrunelocale.3.gz
-TO_REMOVE+=/usr/share/man/cat3/setrunelocale.3.gz
 TO_REMOVE+=/usr/share/man/man3/sgetrune.3.gz
-TO_REMOVE+=/usr/share/man/cat3/sgetrune.3.gz
 TO_REMOVE+=/usr/share/man/man3/sputrune.3.gz
-TO_REMOVE+=/usr/share/man/cat3/sputrune.3.gz
 TO_REMOVE+=/usr/share/man/man3/dbm_dirnfo.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dbm_dirnfo.3.gz
 TO_REMOVE+=/usr/share/man/man3/exp10.3.gz
-TO_REMOVE+=/usr/share/man/cat3/exp10.3.gz
 TO_REMOVE+=/usr/share/man/man3/exp10f.3.gz
-TO_REMOVE+=/usr/share/man/cat3/exp10f.3.gz
 TO_REMOVE+=/usr/share/man/man5/drivers.conf.5.gz
-TO_REMOVE+=/usr/share/man/cat5/drivers.conf.5.gz
 TO_REMOVE+=/usr/share/man/man5/ntp.conf.5.gz
-TO_REMOVE+=/usr/share/man/cat5/ntp.conf.5.gz
 TO_REMOVE+=/usr/share/man/man5/ntp.keys.5.gz
-TO_REMOVE+=/usr/share/man/cat5/ntp.keys.5.gz
 TO_REMOVE+=/usr/share/man/man8/ibcs2.8.gz
-TO_REMOVE+=/usr/share/man/cat8/ibcs2.8.gz
 TO_REMOVE+=/usr/share/man/man8/joy.8.gz
-TO_REMOVE+=/usr/share/man/cat8/joy.8.gz
 TO_REMOVE+=/usr/share/man/man8/linux.8.gz
-TO_REMOVE+=/usr/share/man/cat8/linux.8.gz
 TO_REMOVE+=/usr/share/man/man8/ntp-genkeys.8.gz
-TO_REMOVE+=/usr/share/man/cat8/ntp-genkeys.8.gz
 TO_REMOVE+=/usr/share/man/man8/ntpdate.8.gz
-TO_REMOVE+=/usr/share/man/cat8/ntpdate.8.gz
 TO_REMOVE+=/usr/share/man/man8/ntpdc.8.gz
-TO_REMOVE+=/usr/share/man/cat8/ntpdc.8.gz
 TO_REMOVE+=/usr/share/man/man8/ntpq.8.gz
-TO_REMOVE+=/usr/share/man/cat8/ntpq.8.gz
 TO_REMOVE+=/usr/share/man/man8/ntptime.8.gz
-TO_REMOVE+=/usr/share/man/cat8/ntptime.8.gz
 TO_REMOVE+=/usr/share/man/man8/ntptrace.8.gz
-TO_REMOVE+=/usr/share/man/cat8/ntptrace.8.gz
 TO_REMOVE+=/usr/share/man/man8/picobsd.8.gz
-TO_REMOVE+=/usr/share/man/cat8/picobsd.8.gz
 TO_REMOVE+=/usr/share/man/man8/svr4.8.gz
-TO_REMOVE+=/usr/share/man/cat8/svr4.8.gz
 TO_REMOVE+=/usr/share/man/man8/sysinstall.8.gz
-TO_REMOVE+=/usr/share/man/cat8/sysinstall.8.gz
 TO_REMOVE+=/usr/share/man/man8/cvsbug.8.gz
-TO_REMOVE+=/usr/share/man/cat8/cvsbug.8.gz
 TO_REMOVE+=/usr/share/man/man8/diskpart.8.gz
-TO_REMOVE+=/usr/share/man/cat8/diskpart.8.gz
 TO_REMOVE+=/usr/share/zoneinfo/Africa/Timbuktu
 TO_REMOVE+=/usr/share/zoneinfo/America/Argentina/ComodRivadavia
 TO_REMOVE+=/usr/share/zoneinfo/America/Indianapolis
@@ -472,71 +329,43 @@ TO_REMOVE+=/etc/rc.d/network3
 TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-dfports-supfile
 TO_REMOVE+=/etc/periodic/weekly/400.status-pkg
 TO_REMOVE+=/usr/share/man/man7/ports.7.gz
-TO_REMOVE+=/usr/share/man/cat7/ports.7.gz
 TO_REMOVE+=/usr/share/man/man9/SPLASSERT.9.gz
-TO_REMOVE+=/usr/share/man/cat9/SPLASSERT.9.gz
 TO_REMOVE+=/usr/share/man/man9/spl.9.gz
-TO_REMOVE+=/usr/share/man/cat9/spl.9.gz
 TO_REMOVE+=/usr/share/man/man9/spl0.9.gz
-TO_REMOVE+=/usr/share/man/cat9/spl0.9.gz
 TO_REMOVE+=/usr/share/man/man9/splbio.9.gz
-TO_REMOVE+=/usr/share/man/cat9/splbio.9.gz
 TO_REMOVE+=/usr/share/man/man9/splclock.9.gz
-TO_REMOVE+=/usr/share/man/cat9/splclock.9.gz
 TO_REMOVE+=/usr/share/man/man9/splhigh.9.gz
-TO_REMOVE+=/usr/share/man/cat9/splhigh.9.gz
 TO_REMOVE+=/usr/share/man/man9/splimp.9.gz
-TO_REMOVE+=/usr/share/man/cat9/splimp.9.gz
 TO_REMOVE+=/usr/share/man/man9/splnet.9.gz
-TO_REMOVE+=/usr/share/man/cat9/splnet.9.gz
 TO_REMOVE+=/usr/share/man/man9/splsoftclock.9.gz
-TO_REMOVE+=/usr/share/man/cat9/splsoftclock.9.gz
 TO_REMOVE+=/usr/share/man/man9/splsofttty.9.gz
-TO_REMOVE+=/usr/share/man/cat9/splsofttty.9.gz
-TO_REMOVE+=/usr/share/man/cat9/splstatclock.9.gz
 TO_REMOVE+=/usr/share/man/man9/splstatclock.9.gz
 TO_REMOVE+=/usr/share/man/man9/spltty.9.gz
-TO_REMOVE+=/usr/share/man/cat9/spltty.9.gz
 TO_REMOVE+=/usr/share/man/man9/splvm.9.gz
-TO_REMOVE+=/usr/share/man/cat9/splvm.9.gz
 TO_REMOVE+=/usr/share/man/man9/splx.9.gz
-TO_REMOVE+=/usr/share/man/cat9/splx.9.gz
 TO_REMOVE+=/modules/if_owi.ko
 TO_REMOVE+=/modules/umap.ko
 TO_REMOVE+=/sbin/mount_umap
 TO_REMOVE+=/usr/share/man/man8/mount_umap.8.gz
-TO_REMOVE+=/usr/share/man/cat8/mount_umap.8.gz
 TO_REMOVE+=/usr/share/man/man3/isinff.3.gz
-TO_REMOVE+=/usr/share/man/cat3/isinff.3.gz
 TO_REMOVE+=/usr/share/man/man3/isnanf.3.gz
-TO_REMOVE+=/usr/share/man/cat3/isnanf.3.gz
 TO_REMOVE+=/modules/ibcs2.ko
 TO_REMOVE+=/usr/share/examples/ibcs2
 TO_REMOVE+=/modules/streams.ko
 TO_REMOVE+=/usr/share/man/man4/i386/streams.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/streams.4.gz
 TO_REMOVE+=/modules/svr4.ko
 TO_REMOVE+=/usr/share/man/man4/i386/svr4.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/svr4.4.gz
 TO_REMOVE+=/usr/include/net/oldbridge
 TO_REMOVE+=/usr/include/net/bridge/bridge.h
 TO_REMOVE+=/usr/share/man/man4/oldbridge.4.gz
-TO_REMOVE+=/usr/share/man/cat4/oldbridge.4.gz
 TO_REMOVE+=/modules/bridge.ko
 TO_REMOVE+=/usr/share/man/man9/ieee80211_attach.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_attach.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_crypto_attach.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_crypto_attach.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_crypto_detach.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_crypto_detach.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_crypto_wep_crypt.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_crypto_wep_crypt.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_decap.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_decap.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_lookup_node.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_lookup_node.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_timeout_nodes.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_timeout_nodes.9.gz
 TO_REMOVE+=/usr/share/mk/bsd.dfport.mk
 TO_REMOVE+=/usr/share/mk/bsd.dfport.post.mk
 TO_REMOVE+=/usr/share/mk/bsd.dfport.pre.mk
@@ -544,228 +373,137 @@ TO_REMOVE+=/var/db/port.mkversion
 TO_REMOVE+=/usr/share/mk/bsd.kern.mk
 TO_REMOVE+=/modules/pcic.ko
 TO_REMOVE+=/usr/share/man/man4/worm.4.gz
-TO_REMOVE+=/usr/share/man/cat4/worm.4.gz
 TO_REMOVE+=/usr/include/sys/wormio.h
 TO_REMOVE+=/usr/share/doc/ncurses
 TO_REMOVE+=/usr/share/man/man8/brconfig.8.gz
-TO_REMOVE+=/usr/share/man/cat8/brconfig.8.gz
 TO_REMOVE+=/usr/sbin/brconfig
 TO_REMOVE+=/usr/share/mk/bsd.cpu.gcc2.mk
 TO_REMOVE+=/usr/share/mk/bsd.cpu.gcc3.mk
 TO_REMOVE+=/modules/coda.ko
 TO_REMOVE+=/usr/share/man/man3/archive_read_open_file.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_read_open_file.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_write_open_file.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_write_open_file.3.gz
 TO_REMOVE+=/usr/include/emmintrin.h
 TO_REMOVE+=/usr/include/pmmintrin.h
 TO_REMOVE+=/usr/include/mmintrin.h
 TO_REMOVE+=/usr/share/man/man9/reallocf.9.gz
-TO_REMOVE+=/usr/share/man/cat9/reallocf.9.gz
 TO_REMOVE+=/usr/share/man/man9/suser_proc.9.gz
-TO_REMOVE+=/usr/share/man/cat9/suser_proc.9.gz
 TO_REMOVE+=/usr/share/man/man3/NgSendMsgReply.3.gz
-TO_REMOVE+=/usr/share/man/cat3/NgSendMsgReply.3.gz
 TO_REMOVE+=/usr/share/man/man9/kobj_class_compile_static.9.gz
-TO_REMOVE+=/usr/share/man/cat9/kobj_class_compile_static.9.gz
 TO_REMOVE+=/usr/include/machine/resource.h
 TO_REMOVE+=/usr/libexec/lukemftpd
 TO_REMOVE+=/usr/share/man/man8/lukemftpd.8.gz
-TO_REMOVE+=/usr/share/man/cat8/lukemftpd.8.gz
 TO_REMOVE+=/usr/share/man/man5/ftpd.conf.5.gz
-TO_REMOVE+=/usr/share/man/cat5/ftpd.conf.5.gz
 TO_REMOVE+=/usr/share/man/man5/ftpusers.5.gz
-TO_REMOVE+=/usr/share/man/cat5/ftpusers.5.gz
 TO_REMOVE+=/usr/include/machine/dvcfg.h
 TO_REMOVE+=/usr/share/man/man8/boot_i386.8.gz
-TO_REMOVE+=/usr/share/man/cat8/boot_i386.8.gz
 TO_REMOVE+=/usr/share/man/man9/malloc.9.gz
-TO_REMOVE+=/usr/share/man/cat9/malloc.9.gz
 TO_REMOVE+=/usr/share/man/man9/free.9.gz
-TO_REMOVE+=/usr/share/man/cat9/free.9.gz
 TO_REMOVE+=/usr/share/man/man9/realloc.9.gz
-TO_REMOVE+=/usr/share/man/cat9/realloc.9.gz
 TO_REMOVE+=/usr/share/man/man2/sys_get_tls_area.2.gz
-TO_REMOVE+=/usr/share/man/cat2/sys_get_tls_area.2.gz
 TO_REMOVE+=/usr/share/man/man2/sys_set_tls_area.2.gz
-TO_REMOVE+=/usr/share/man/cat2/sys_set_tls_area.2.gz
 TO_REMOVE+=/modules/snd.ko
 TO_REMOVE+=/modules/snd_pcm.ko
 TO_REMOVE+=/usr/share/man/man4/snd.4.gz
-TO_REMOVE+=/usr/share/man/cat4/snd.4.gz
 TO_REMOVE+=/usr/share/man/man9/CTR0.9.gz
-TO_REMOVE+=/usr/share/man/cat9/CTR0.9.gz
 TO_REMOVE+=/usr/share/man/man9/CTR1.9.gz
-TO_REMOVE+=/usr/share/man/cat9/CTR1.9.gz
 TO_REMOVE+=/usr/share/man/man9/CTR2.9.gz
-TO_REMOVE+=/usr/share/man/cat9/CTR2.9.gz
 TO_REMOVE+=/usr/share/man/man9/CTR3.9.gz
-TO_REMOVE+=/usr/share/man/cat9/CTR3.9.gz
 TO_REMOVE+=/usr/share/man/man9/CTR4.9.gz
-TO_REMOVE+=/usr/share/man/cat9/CTR4.9.gz
 TO_REMOVE+=/usr/share/man/man9/CTR5.9.gz
-TO_REMOVE+=/usr/share/man/cat9/CTR5.9.gz
 TO_REMOVE+=/usr/share/man/man9/CTR6.9.gz
-TO_REMOVE+=/usr/share/man/cat9/CTR6.9.gz
 TO_REMOVE+=/usr/share/man/man9/asleep.9.gz
-TO_REMOVE+=/usr/share/man/cat9/asleep.9.gz
 TO_REMOVE+=/usr/share/man/man9/await.9.gz
-TO_REMOVE+=/usr/share/man/cat9/await.9.gz
 TO_REMOVE+=/usr/include/machine/physio_proc.h
 TO_REMOVE+=/usr/include/c++/4.0
 TO_REMOVE+=/usr/lib/gcc40
 TO_REMOVE+=/usr/libexec/gcc40
 TO_REMOVE+=/usr/libdata/gcc40
 TO_REMOVE+=/usr/share/man/man1/cpp40.1.gz
-TO_REMOVE+=/usr/share/man/cat1/cpp40.1.gz
 TO_REMOVE+=/usr/share/man/man1/g++40.1.gz
-TO_REMOVE+=/usr/share/man/cat1/g++40.1.gz
 TO_REMOVE+=/usr/share/man/man1/gcc40.1.gz
-TO_REMOVE+=/usr/share/man/cat1/gcc40.1.gz
 TO_REMOVE+=/usr/share/man/man1/gcov40.1.gz
-TO_REMOVE+=/usr/share/man/cat1/gcov40.1.gz
 TO_REMOVE+=/usr/share/mk/bsd.cpu.gcc40.mk
 TO_REMOVE+=/usr/bin/gtar
 TO_REMOVE+=/usr/share/man/man9/fuswintr.9.gz
-TO_REMOVE+=/usr/share/man/cat9/fuswintr.9.gz
 TO_REMOVE+=/usr/share/man/man9/suswintr.9.gz
-TO_REMOVE+=/usr/share/man/cat9/suswintr.9.gz
 TO_REMOVE+=/usr/share/man/man9/MULTI_DRIVER_MODULE.9.gz
-TO_REMOVE+=/usr/share/man/cat9/MULTI_DRIVER_MODULE.9.gz
 TO_REMOVE+=/usr/share/man/man4/kame.4.gz
-TO_REMOVE+=/usr/share/man/cat4/kame.4.gz
 TO_REMOVE+=/usr/share/man/man3/archive_read_set_bytes_per_block.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_read_set_bytes_per_block.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_write_prepare.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_write_prepare.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_write_set_callbacks.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_write_set_callbacks.3.gz
 TO_REMOVE+=/usr/share/examples/cvsup/OpenDarwin-supfile
 TO_REMOVE+=/usr/share/man/man9/bus_generic_map_intr.9.gz
-TO_REMOVE+=/usr/share/man/cat9/bus_generic_map_intr.9.gz
 TO_REMOVE+=/usr/share/man/man9/VOP_BWRITE.9.gz
-TO_REMOVE+=/usr/share/man/cat9/VOP_BWRITE.9.gz
 TO_REMOVE+=/usr/include/net/hostcache.h
 TO_REMOVE+=/usr/include/netinet/in_hostcache.h
 TO_REMOVE+=/usr/include/libdisk.h
 TO_REMOVE+=/usr/lib/libdisk.a
 TO_REMOVE+=/usr/share/man/man3/libdisk.3.gz
-TO_REMOVE+=/usr/share/man/cat3/libdisk.3.gz
 TO_REMOVE+=/usr/share/man/man3/Open_Disk.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Open_Disk.3.gz
 TO_REMOVE+=/usr/share/man/man3/Clone_Disk.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Clone_Disk.3.gz
 TO_REMOVE+=/usr/share/man/man3/Free_Disk.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Free_Disk.3.gz
 TO_REMOVE+=/usr/share/man/man3/Debug_Disk.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Debug_Disk.3.gz
 TO_REMOVE+=/usr/share/man/man3/Set_Bios_Geom.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Set_Bios_Geom.3.gz
 TO_REMOVE+=/usr/share/man/man3/Delete_Chunk.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Delete_Chunk.3.gz
 TO_REMOVE+=/usr/share/man/man3/Collapse_Disk.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Collapse_Disk.3.gz
 TO_REMOVE+=/usr/share/man/man3/Collapse_Chunk.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Collapse_Chunk.3.gz
 TO_REMOVE+=/usr/share/man/man3/Create_Chunk.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Create_Chunk.3.gz
-TO_REMOVE+=/usr/share/man/cat3/All_FreeBSD.3.gz
 TO_REMOVE+=/usr/share/man/man3/All_FreeBSD.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CheckRules.3.gz
 TO_REMOVE+=/usr/share/man/man3/CheckRules.3.gz
 TO_REMOVE+=/usr/share/man/man3/Disk_Names.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Disk_Names.3.gz
 TO_REMOVE+=/usr/share/man/man3/Set_Boot_Mgr.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Set_Boot_Mgr.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Set_Boot_Blocks.3.gz
 TO_REMOVE+=/usr/share/man/man3/Set_Boot_Blocks.3.gz
 TO_REMOVE+=/usr/share/man/man3/Write_Disk.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Write_Disk.3.gz
 TO_REMOVE+=/usr/share/man/man3/Cyl_Aligned.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Cyl_Aligned.3.gz
 TO_REMOVE+=/usr/share/man/man3/Next_Cyl_Aligned.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Next_Cyl_Aligned.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Prev_Cyl_Aligned.3.gz
 TO_REMOVE+=/usr/share/man/man3/Prev_Cyl_Aligned.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Track_Aligned.3.gz
 TO_REMOVE+=/usr/share/man/man3/Track_Aligned.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Next_Track_Aligned.3.gz
 TO_REMOVE+=/usr/share/man/man3/Next_Track_Aligned.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Prev_Track_Aligned.3.gz
 TO_REMOVE+=/usr/share/man/man3/Prev_Track_Aligned.3.gz
-TO_REMOVE+=/usr/share/man/cat3/Create_Chunk_DWIM.3.gz
 TO_REMOVE+=/usr/share/man/man3/Create_Chunk_DWIM.3.gz
 TO_REMOVE+=/usr/share/man/man3/MakeDev.3.gz
-TO_REMOVE+=/usr/share/man/cat3/MakeDev.3.gz
 TO_REMOVE+=/usr/share/man/man3/MakeDevDisk.3.gz
-TO_REMOVE+=/usr/share/man/cat3/MakeDevDisk.3.gz
-TO_REMOVE+=/usr/share/man/cat3/ShowChunkFlags.3.gz
 TO_REMOVE+=/usr/share/man/man3/ShowChunkFlags.3.gz
 TO_REMOVE+=/usr/share/man/man3/ChunkCanBeRoot.3.gz
-TO_REMOVE+=/usr/share/man/cat3/ChunkCanBeRoot.3.gz
 TO_REMOVE+=/usr/share/man/man3/slice_type_name.3.gz
-TO_REMOVE+=/usr/share/man/cat3/slice_type_name.3.gz
 TO_REMOVE+=/usr/share/man/man4/i386/mcd.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/mcd.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/scd.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/scd.4.gz
 TO_REMOVE+=/etc/rc.d/archdep
 TO_REMOVE+=/usr/share/man/man4/sata.4.gz
-TO_REMOVE+=/usr/share/man/cat4/sata.4.gz
-TO_REMOVE+=/usr/share/man/cat9/cpu_switch.9.gz
 TO_REMOVE+=/usr/share/man/man9/cpu_switch.9.gz
-TO_REMOVE+=/usr/share/man/cat9/mi_switch.9.gz
 TO_REMOVE+=/usr/share/man/man9/mi_switch.9.gz
 TO_REMOVE+=/usr/libexec/getNAME
 TO_REMOVE+=/usr/share/man/man1/getNAME.1.gz
-TO_REMOVE+=/usr/share/man/cat1/getNAME.1.gz
 TO_REMOVE+=/modules/daemon_saver.ko
 TO_REMOVE+=/usr/include/net/if_arc.h
 TO_REMOVE+=/usr/include/net/iso88025.h
 TO_REMOVE+=/usr/include/netinet/if_fddi.h
-TO_REMOVE+=/usr/share/man/cat4/cm.4.gz
 TO_REMOVE+=/usr/share/man/man4/cm.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/oltr.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/oltr.4.gz
-TO_REMOVE+=/usr/share/man/cat4/fea.4.gz
 TO_REMOVE+=/usr/share/man/man4/fea.4.gz
-TO_REMOVE+=/usr/share/man/cat4/fpa.4.gz
 TO_REMOVE+=/usr/share/man/man4/fpa.4.gz
-TO_REMOVE+=/usr/share/man/cat4/fla.4.gz
 TO_REMOVE+=/usr/share/man/man4/fla.4.gz
 TO_REMOVE+=/usr/share/man/man4/nv.4.gz
-TO_REMOVE+=/usr/share/man/cat4/nv.4.gz
 TO_REMOVE+=/modules/if_nv.ko
 TO_REMOVE+=/usr/share/man/mann
-TO_REMOVE+=/usr/share/man/catn
 TO_REMOVE+=/usr/share/man/ja/mann
 TO_REMOVE+=/usr/share/man/ja/catn
-TO_REMOVE+=/usr/share/man/en.ISO8859-1/catn
 TO_REMOVE+=/usr/share/man/man9/psignal.9.gz
-TO_REMOVE+=/usr/share/man/cat9/psignal.9.gz
 TO_REMOVE+=/usr/share/openssl/man/man7/Modes_of_DES.7.gz
-TO_REMOVE+=/usr/share/openssl/man/cat7/Modes_of_DES.7.gz
 TO_REMOVE+=/usr/include/bus/usb/usbdevs.h
 TO_REMOVE+=/usr/include/bus/usb/usbdevs_data.h
 TO_REMOVE+=/usr/share/man/man9/callout_handle_init.9.gz
-TO_REMOVE+=/usr/share/man/cat9/callout_handle_init.9.gz
 TO_REMOVE+=/usr/include/net/intrq.h
 TO_REMOVE+=/usr/share/games/fortune/freebsd-tips
 TO_REMOVE+=/usr/share/games/fortune/freebsd-tips.dat
 TO_REMOVE+=/usr/share/man/man8/rc.atm.8.gz
-TO_REMOVE+=/usr/share/man/cat8/rc.atm.8.gz
 TO_REMOVE+=/usr/share/man/man8/rc.early.8.gz
-TO_REMOVE+=/usr/share/man/cat8/rc.early.8.gz
 TO_REMOVE+=/usr/share/man/man8/rc.network.8.gz
-TO_REMOVE+=/usr/share/man/cat8/rc.network.8.gz
 TO_REMOVE+=/usr/share/man/man8/rc.serial.8.gz
-TO_REMOVE+=/usr/share/man/cat8/rc.serial.8.gz
 TO_REMOVE+=/usr/share/man/man8/i386/rc.i386.8.gz
-TO_REMOVE+=/usr/share/man/cat8/i386/rc.i386.8.gz
 TO_REMOVE+=/usr/include/sys/xrpuio.h
 TO_REMOVE+=/etc/rc.d/kldxref
 TO_REMOVE+=/usr/share/man/man1/gtar.1.gz
-TO_REMOVE+=/usr/share/man/cat1/gtar.1.gz
 TO_REMOVE+=/etc/mtree/BSD.x11.dist
 TO_REMOVE+=/etc/mtree/BSD.x11-4.dist
 TO_REMOVE+=/usr/share/doc/handbook
@@ -774,30 +512,21 @@ TO_REMOVE+=/usr/share/examples/FreeBSD_version
 TO_REMOVE+=/usr/share/examples/worm
 TO_REMOVE+=/usr/share/examples/tcsh/csh-mode.el
 TO_REMOVE+=/usr/share/man/man5/pbm.5.gz
-TO_REMOVE+=/usr/share/man/cat5/pbm.5.gz
 TO_REMOVE+=/usr/sbin/wicontrol
 TO_REMOVE+=/usr/share/man/man8/wicontrol.8.gz
-TO_REMOVE+=/usr/share/man/cat8/wicontrol.8.gz
 TO_REMOVE+=/usr/sbin/ntpd
 TO_REMOVE+=/usr/share/man/man8/ntpd.8.gz
-TO_REMOVE+=/usr/share/man/cat8/ntpd.8.gz
 TO_REMOVE+=/usr/share/man/man5/ntpd.conf.5.gz
-TO_REMOVE+=/usr/share/man/cat5/ntpd.conf.5.gz
 TO_REMOVE+=/usr/share/examples/etc/ntpd.conf
-TO_REMOVE+=/usr/share/man/cat8/raycontrol.8.gz
 TO_REMOVE+=/usr/share/man/man8/raycontrol.8.gz
 TO_REMOVE+=/usr/sbin/raycontrol
 TO_REMOVE+=/modules/if_ray.ko
-TO_REMOVE+=/usr/share/man/cat4/i386/ray.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/ray.4.gz
-TO_REMOVE+=/usr/share/man/cat4/awi.4.gz
 TO_REMOVE+=/usr/share/man/man4/awi.4.gz
 TO_REMOVE+=/modules/if_gx.ko
-TO_REMOVE+=/usr/share/man/cat4/gx.4.gz
 TO_REMOVE+=/usr/share/man/man4/gx.4.gz
 TO_REMOVE+=/usr/sbin/acxcontrol
 TO_REMOVE+=/usr/share/man/man8/acxcontrol.8.gz
-TO_REMOVE+=/usr/share/man/cat8/acxcontrol.8.gz
 TO_REMOVE+=/usr/sbin/btpin
 TO_REMOVE+=/usr/sbin/rfcomm_sppd
 TO_REMOVE+=/usr/sbin/sdpquery
@@ -813,21 +542,16 @@ TO_REMOVE+=/usr/share/examples/cvsup/refuse
 TO_REMOVE+=/usr/share/examples/cvsup/refuse.README
 TO_REMOVE+=/modules/umsm.ko
 TO_REMOVE+=/usr/share/man/man4/umsm.4.gz
-TO_REMOVE+=/usr/share/man/cat4/umsm.4.gz
 TO_REMOVE+=/usr/share/groff_font/devlj4/Makefile
 TO_REMOVE+=/usr/share/groff_font/devlj4/special.map
 TO_REMOVE+=/usr/share/groff_font/devlj4/text.map
 TO_REMOVE+=/modules/if_ipw.ko
-TO_REMOVE+=/usr/share/man/cat4/ipw.4.gz
 TO_REMOVE+=/usr/share/man/man4/ipw.4.gz
 TO_REMOVE+=/usr/sbin/ipwcontrol
-TO_REMOVE+=/usr/share/man/cat8/ipwcontrol.8.gz
 TO_REMOVE+=/usr/share/man/man8/ipwcontrol.8.gz
 TO_REMOVE+=/usr/share/zoneinfo/Asia/Calcutta
 TO_REMOVE+=/usr/share/zoneinfo/Asia/Saigon
-TO_REMOVE+=/usr/share/man/cat9/mono_time.9.gz
 TO_REMOVE+=/usr/share/man/man9/mono_time.9.gz
-TO_REMOVE+=/usr/share/man/cat9/runtime.9.gz
 TO_REMOVE+=/usr/share/man/man9/runtime.9.gz
 TO_REMOVE+=/usr/share/i18n/csmapper/CP/CP932EXT%UCS.mps
 TO_REMOVE+=/usr/share/i18n/csmapper/CP/UCS%CP932EXT.mps
@@ -843,31 +567,18 @@ TO_REMOVE+=/usr/share/i18n/esdb/MISC/Big5.esdb
 TO_REMOVE+=/usr/share/i18n/esdb/MISC/GB18030.esdb
 TO_REMOVE+=/usr/share/i18n/esdb/MISC/KOI8-R.esdb
 TO_REMOVE+=/usr/share/i18n/esdb/MISC/KOI8-U.esdb
-TO_REMOVE+=/usr/share/man/cat3/_rand48.3.gz
 TO_REMOVE+=/usr/share/man/man3/_rand48.3.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_alloc_node.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_alloc_node.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_dup_bss.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_dup_bss.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_free_allnodes.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_free_allnodes.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_node_attach.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_node_attach.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_node_detach.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_node_detach.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_node_lateattach.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_node_lateattach.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_wep_crypt.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_wep_crypt.9.gz
-TO_REMOVE+=/usr/share/man/cat3/el_data_get.3.gz
 TO_REMOVE+=/usr/share/man/man3/el_data_get.3.gz
-TO_REMOVE+=/usr/share/man/cat3/el_data_set.3.gz
 TO_REMOVE+=/usr/share/man/man3/el_data_set.3.gz
-TO_REMOVE+=/usr/share/man/cat3/pam_fail_delay.3.gz
 TO_REMOVE+=/usr/share/man/man3/pam_fail_delay.3.gz
-TO_REMOVE+=/usr/share/man/cat5/pam.d.5.gz
 TO_REMOVE+=/usr/share/man/man5/pam.d.5.gz
-TO_REMOVE+=/usr/share/man/cat8/pam.8.gz
 TO_REMOVE+=/usr/share/man/man8/pam.8.gz
 TO_REMOVE+=/usr/bin/f77
 TO_REMOVE+=/usr/bin/g77
@@ -883,9 +594,7 @@ TO_REMOVE+=/usr/lib/gcc34/libg2c.so.3
 TO_REMOVE+=/usr/lib/gcc34/profile/libfrtbegin.a
 TO_REMOVE+=/usr/lib/gcc34/profile/libg2c.a
 TO_REMOVE+=/usr/share/info/g77.info.gz
-TO_REMOVE+=/usr/share/man/cat1/f77.1.gz
 TO_REMOVE+=/usr/share/man/man1/f77.1.gz
-TO_REMOVE+=/usr/share/man/cat1/g77.1.gz
 TO_REMOVE+=/usr/share/man/man1/g77.1.gz
 TO_REMOVE+=/usr/share/info/dc.info.gz
 TO_REMOVE+=/usr/share/info/gmp.info.gz
@@ -913,9 +622,7 @@ TO_REMOVE+=/usr/lib/profile/libreadline.a
 TO_REMOVE+=/usr/share/info/history.info.gz
 TO_REMOVE+=/usr/share/info/readline.info.gz
 TO_REMOVE+=/usr/share/info/rluserman.info.gz
-TO_REMOVE+=/usr/share/man/cat3/readline.3.gz
 TO_REMOVE+=/usr/share/man/man3/readline.3.gz
-TO_REMOVE+=/usr/share/man/cat5/types.5.gz
 TO_REMOVE+=/usr/share/man/man5/types.5.gz
 TO_REMOVE+=/usr/include/commands.h
 TO_REMOVE+=/usr/include/confed.h
@@ -924,7 +631,6 @@ TO_REMOVE+=/usr/include/functions.h
 TO_REMOVE+=/usr/include/package.h
 TO_REMOVE+=/usr/include/sysids.h
 TO_REMOVE+=/usr/include/uiutil.h
-TO_REMOVE+=/usr/share/man/cat4/i386/acpi_toshiba.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/acpi_toshiba.4.gz
 TO_REMOVE+=/etc/rc.d/dhcpd
 TO_REMOVE+=/etc/rc.d/dhcrelay
@@ -936,23 +642,14 @@ TO_REMOVE+=/usr/lib/profile/libomapi.a
 TO_REMOVE+=/usr/sbin/dhcpd
 TO_REMOVE+=/usr/sbin/dhcrelay
 TO_REMOVE+=/usr/sbin/omshell
-TO_REMOVE+=/usr/share/man/cat1/omshell.1.gz
 TO_REMOVE+=/usr/share/man/man1/omshell.1.gz
-TO_REMOVE+=/usr/share/man/cat3/dhcpctl.3.gz
 TO_REMOVE+=/usr/share/man/man3/dhcpctl.3.gz
-TO_REMOVE+=/usr/share/man/cat3/omapi.3.gz
 TO_REMOVE+=/usr/share/man/man3/omapi.3.gz
-TO_REMOVE+=/usr/share/man/cat5/dhcp-eval.5.gz
 TO_REMOVE+=/usr/share/man/man5/dhcp-eval.5.gz
-TO_REMOVE+=/usr/share/man/cat5/dhcp-options.5.gz
 TO_REMOVE+=/usr/share/man/man5/dhcp-options.5.gz
-TO_REMOVE+=/usr/share/man/cat5/dhcpd.conf.5.gz
 TO_REMOVE+=/usr/share/man/man5/dhcpd.conf.5.gz
-TO_REMOVE+=/usr/share/man/cat5/dhcpd.leases.5.gz
 TO_REMOVE+=/usr/share/man/man5/dhcpd.leases.5.gz
-TO_REMOVE+=/usr/share/man/cat8/dhcpd.8.gz
 TO_REMOVE+=/usr/share/man/man8/dhcpd.8.gz
-TO_REMOVE+=/usr/share/man/cat8/dhcrelay.8.gz
 TO_REMOVE+=/usr/share/man/man8/dhcrelay.8.gz
 TO_REMOVE+=/usr/include/machine/pci_cfgreg.h
 TO_REMOVE+=/usr/include/libusbhid.h
@@ -970,104 +667,62 @@ TO_REMOVE+=/etc/rc.d/nfslocking
 TO_REMOVE+=/usr/sbin/pmap_dump
 TO_REMOVE+=/usr/sbin/pmap_set
 TO_REMOVE+=/usr/sbin/portmap
-TO_REMOVE+=/usr/share/man/cat8/portmap.8.gz
 TO_REMOVE+=/usr/share/man/man8/portmap.8.gz
 TO_REMOVE+=/usr/share/examples/etc/host.conf
-TO_REMOVE+=/usr/share/man/cat3/regsterrpc.3.gz
 TO_REMOVE+=/usr/share/man/man3/regsterrpc.3.gz
-TO_REMOVE+=/usr/share/man/cat3/svc_getregset.3.gz
 TO_REMOVE+=/usr/share/man/man3/svc_getregset.3.gz
-TO_REMOVE+=/usr/share/man/cat9/KTR_LOG_PTR.9.gz
 TO_REMOVE+=/usr/share/man/man9/KTR_LOG_PTR.9.gz
 TO_REMOVE+=/usr/libexec/rexecd
 TO_REMOVE+=/usr/share/man/man8/rexecd.8.gz
-TO_REMOVE+=/usr/share/man/cat8/rexecd.8.gz
 TO_REMOVE+=/usr/bin/key
 TO_REMOVE+=/usr/share/man/man1/key.1.gz
-TO_REMOVE+=/usr/share/man/cat1/key.1.gz
 TO_REMOVE+=/usr/bin/keyinfo
 TO_REMOVE+=/usr/share/man/man1/keyinfo.1.gz
-TO_REMOVE+=/usr/share/man/cat1/keyinfo.1.gz
 TO_REMOVE+=/usr/bin/keyinit
 TO_REMOVE+=/usr/share/man/man1/keyinit.1.gz
-TO_REMOVE+=/usr/share/man/cat1/keyinit.1.gz
 TO_REMOVE+=/usr/lib/libskey.a
 TO_REMOVE+=/usr/lib/profile/libskey.a
 TO_REMOVE+=/usr/include/skey.h
 TO_REMOVE+=/usr/share/examples/etc/skey.access
 TO_REMOVE+=/usr/share/man/man1/skey.1.gz
-TO_REMOVE+=/usr/share/man/cat1/skey.1.gz
 TO_REMOVE+=/usr/share/man/man3/skey.3.gz
-TO_REMOVE+=/usr/share/man/cat3/skey.3.gz
 TO_REMOVE+=/usr/share/man/man3/skeylookup.3.gz
-TO_REMOVE+=/usr/share/man/cat3/skeylookup.3.gz
 TO_REMOVE+=/usr/share/man/man3/skeyverify.3.gz
-TO_REMOVE+=/usr/share/man/cat3/skeyverify.3.gz
 TO_REMOVE+=/usr/share/man/man3/skeychallenge.3.gz
-TO_REMOVE+=/usr/share/man/cat3/skeychallenge.3.gz
 TO_REMOVE+=/usr/share/man/man3/skeyinfo.3.gz
-TO_REMOVE+=/usr/share/man/cat3/skeyinfo.3.gz
 TO_REMOVE+=/usr/share/man/man3/skeyaccess.3.gz
-TO_REMOVE+=/usr/share/man/cat3/skeyaccess.3.gz
 TO_REMOVE+=/usr/share/man/man3/skey_getpass.3.gz
-TO_REMOVE+=/usr/share/man/cat3/skey_getpass.3.gz
 TO_REMOVE+=/usr/share/man/man3/skey_crypt.3.gz
-TO_REMOVE+=/usr/share/man/cat3/skey_crypt.3.gz
 TO_REMOVE+=/usr/share/man/man5/skey.access.5.gz
-TO_REMOVE+=/usr/share/man/cat5/skey.access.5.gz
 TO_REMOVE+=/etc/pam.d/xserver
 TO_REMOVE+=/usr/include/machine/cronyx.h
 TO_REMOVE+=/usr/share/man/man4/i386/cx.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/cx.4.gz
 TO_REMOVE+=/usr/share/zoneinfo/Asia/Katmandu
 TO_REMOVE+=/usr/share/man/man3/__svc_getcallercreds.3.gz
-TO_REMOVE+=/usr/share/man/cat3/__svc_getcallercreds.3.gz
 TO_REMOVE+=/usr/share/vi/perl
 TO_REMOVE+=/usr/share/vi/tcl
 TO_REMOVE+=/usr/sbin/iwicontrol
 TO_REMOVE+=/usr/share/man/man8/iwicontrol.8.gz
-TO_REMOVE+=/usr/share/man/cat8/iwicontrol.8.gz
 TO_REMOVE+=/usr/share/man/man9/objcache_reclaim_list.9.gz
-TO_REMOVE+=/usr/share/man/cat9/objcache_reclaim_list.9.gz
-TO_REMOVE+=/usr/share/man/cat3/timezone.3.gz
 TO_REMOVE+=/usr/share/man/man3/timezone.3.gz
-TO_REMOVE+=/usr/share/man/cat3/addr2ascii.3.gz
 TO_REMOVE+=/usr/share/man/man3/addr2ascii.3.gz
-TO_REMOVE+=/usr/share/man/cat3/ascii2addr.3.gz
 TO_REMOVE+=/usr/share/man/man3/ascii2addr.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_EMPTY.3.gz
 TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_EMPTY.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_ENTRY.3.gz
 TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_ENTRY.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_FIRST.3.gz
 TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_FIRST.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_FOREACH.3.gz
 TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_FOREACH.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_FOREACH_REVERSE.3.gz
 TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_FOREACH_REVERSE.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_HEAD.3.gz
 TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_HEAD.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_HEAD_INITIALIZER.3.gz
 TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_HEAD_INITIALIZER.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_INIT.3.gz
 TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_INIT.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_INSERT_AFTER.3.gz
 TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_INSERT_AFTER.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_INSERT_BEFORE.3.gz
 TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_INSERT_BEFORE.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_INSERT_HEAD.3.gz
 TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_INSERT_HEAD.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_INSERT_TAIL.3.gz
 TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_INSERT_TAIL.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_LAST.3.gz
 TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_LAST.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_NEXT.3.gz
 TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_NEXT.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_PREV.3.gz
 TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_PREV.3.gz
-TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_REMOVE.3.gz
 TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_REMOVE.3.gz
-TO_REMOVE+=/usr/share/man/cat3/fts_getstream.3.gz
 TO_REMOVE+=/usr/share/man/man3/fts_getstream.3.gz
 TO_REMOVE+=/usr/lib/gcc34/gcrt1.o
 TO_REMOVE+=/usr/lib/gcc34/crt1.o
@@ -1080,27 +735,19 @@ TO_REMOVE+=/usr/lib/gcc41/crtn.o
 TO_REMOVE+=/etc/rc.d/atm2.sh
 TO_REMOVE+=/etc/rc.d/atm3.sh
 TO_REMOVE+=/etc/rc.d/rcconf.sh
-TO_REMOVE+=/usr/share/man/cat9/namei.9.gz
 TO_REMOVE+=/usr/share/man/man9/namei.9.gz
-TO_REMOVE+=/usr/share/man/cat5/host.conf.5.gz
 TO_REMOVE+=/usr/share/man/man5/host.conf.5.gz
 TO_REMOVE+=/usr/share/misc/magic.mime
 TO_REMOVE+=/usr/share/misc/magic.mime.mgc
 TO_REMOVE+=/usr/bin/gcpio
-TO_REMOVE+=/usr/share/man/cat1/gcpio.1.gz
 TO_REMOVE+=/usr/share/man/man1/gcpio.1.gz
 TO_REMOVE+=/usr/share/info/cpio.info.gz
 TO_REMOVE+=/usr/sbin/tcpslice
-TO_REMOVE+=/usr/share/man/cat1/tcpslice.1.gz
 TO_REMOVE+=/usr/share/man/man1/tcpslice.1.gz
-TO_REMOVE+=/usr/share/man/cat9/suser.9.gz
 TO_REMOVE+=/usr/share/man/man9/suser.9.gz
-TO_REMOVE+=/usr/share/man/cat9/suser_cred.9.gz
 TO_REMOVE+=/usr/share/man/man9/suser_cred.9.gz
 TO_REMOVE+=/usr/share/examples/etc/devices.conf
-TO_REMOVE+=/usr/share/man/cat5/devices.conf.5.gz
 TO_REMOVE+=/usr/share/man/man5/devices.conf.5.gz
-TO_REMOVE+=/usr/share/man/cat8/i386/MAKEDEV.8.gz
 TO_REMOVE+=/usr/share/man/man8/i386/MAKEDEV.8.gz
 TO_REMOVE+=/usr/sbin/devfsctl
 TO_REMOVE+=/usr/include/c++/3.4
@@ -1111,31 +758,19 @@ TO_REMOVE+=/usr/share/info/cpp.info.gz
 TO_REMOVE+=/usr/share/info/cppinternals.info.gz
 TO_REMOVE+=/usr/share/info/gcc.info.gz
 TO_REMOVE+=/usr/share/info/gccint.info.gz
-TO_REMOVE+=/usr/share/man/cat1/gcc34.1.gz
 TO_REMOVE+=/usr/share/man/man1/gcc34.1.gz
 TO_REMOVE+=/usr/share/mk/bsd.cpu.gcc34.mk
 TO_REMOVE+=/etc/rc.d/kerberos
-TO_REMOVE+=/usr/share/man/cat9/compile_dev_ops.9.gz
 TO_REMOVE+=/usr/share/man/man9/compile_dev_ops.9.gz
-TO_REMOVE+=/usr/share/man/cat9/destroy_all_devs.9.gz
 TO_REMOVE+=/usr/share/man/man9/destroy_all_devs.9.gz
-TO_REMOVE+=/usr/share/man/cat9/dev_ops.9.gz
 TO_REMOVE+=/usr/share/man/man9/dev_ops.9.gz
-TO_REMOVE+=/usr/share/man/cat9/dev_ops_add.9.gz
 TO_REMOVE+=/usr/share/man/man9/dev_ops_add.9.gz
-TO_REMOVE+=/usr/share/man/cat9/dev_ops_add_override.9.gz
 TO_REMOVE+=/usr/share/man/man9/dev_ops_add_override.9.gz
-TO_REMOVE+=/usr/share/man/cat9/dev_ops_release.9.gz
 TO_REMOVE+=/usr/share/man/man9/dev_ops_release.9.gz
-TO_REMOVE+=/usr/share/man/cat9/dev_ops_remove.9.gz
 TO_REMOVE+=/usr/share/man/man9/dev_ops_remove.9.gz
-TO_REMOVE+=/usr/share/man/cat9/dev_ops_scan.9.gz
 TO_REMOVE+=/usr/share/man/man9/dev_ops_scan.9.gz
-TO_REMOVE+=/usr/share/man/cat9/get_dev.9.gz
 TO_REMOVE+=/usr/share/man/man9/get_dev.9.gz
-TO_REMOVE+=/usr/share/man/cat9/make_adhoc_dev.9.gz
 TO_REMOVE+=/usr/share/man/man9/make_adhoc_dev.9.gz
-TO_REMOVE+=/usr/share/man/cat9/make_sub_dev.9.gz
 TO_REMOVE+=/usr/share/man/man9/make_sub_dev.9.gz
 TO_REMOVE+=/usr/libdata/msdosfs
 TO_REMOVE+=/usr/lib/libc_r.so
@@ -1148,23 +783,16 @@ TO_REMOVE+=/usr/lib/profile/libc_r.a
 TO_REMOVE+=/usr/lib/libthread_xu.a
 TO_REMOVE+=/usr/lib/libthread_xu_p.a
 TO_REMOVE+=/usr/lib/profile/libthread_xu.a
-TO_REMOVE+=/usr/share/man/cat8/nsupdate.8.gz
 TO_REMOVE+=/usr/share/man/man8/nsupdate.8.gz
-TO_REMOVE+=/usr/share/man/cat9/msleep.9.gz
 TO_REMOVE+=/usr/share/man/man9/msleep.9.gz
-TO_REMOVE+=/usr/share/man/cat9/serialize_sleep.9.gz
 TO_REMOVE+=/usr/share/man/man9/serialize_sleep.9.gz
-TO_REMOVE+=/usr/share/man/cat9/count_udev.9.gz
 TO_REMOVE+=/usr/share/man/man9/count_udev.9.gz
-TO_REMOVE+=/usr/share/man/cat9/rman_await_resource.9.gz
 TO_REMOVE+=/usr/share/man/man9/rman_await_resource.9.gz
-TO_REMOVE+=/usr/share/man/cat4/ttcp.4.gz
 TO_REMOVE+=/usr/share/man/man4/ttcp.4.gz
 TO_REMOVE+=/usr/share/games/fortune/fortunes2
 TO_REMOVE+=/usr/share/games/fortune/fortunes2-o
 TO_REMOVE+=/usr/share/games/fortune/fortunes2-o.dat
 TO_REMOVE+=/usr/share/games/fortune/fortunes2.dat
-TO_REMOVE+=/usr/share/man/cat8/tmpfs.8.gz
 TO_REMOVE+=/usr/share/man/man8/tmpfs.8.gz
 TO_REMOVE+=/usr/include/sys/msfbuf.h
 TO_REMOVE+=/boot/kernel/wlan_ratectl_amrr.ko
@@ -1173,102 +801,55 @@ TO_REMOVE+=/boot/kernel/wlan_ratectl_sample.ko
 TO_REMOVE+=/usr/include/dev/netif/wi/spectrum24t_cf.h
 TO_REMOVE+=/usr/include/netproto/802_11/if_wavelan_ieee.h
 TO_REMOVE+=/usr/include/ktrfmt.tab.h
-TO_REMOVE+=/usr/share/man/cat4/wlan_ratectl.4.gz
 TO_REMOVE+=/usr/share/man/man4/wlan_ratectl.4.gz
-TO_REMOVE+=/usr/share/man/cat4/wlan_ratectl_amrr.4.gz
 TO_REMOVE+=/usr/share/man/man4/wlan_ratectl_amrr.4.gz
-TO_REMOVE+=/usr/share/man/cat4/wlan_ratectl_onoe.4.gz
 TO_REMOVE+=/usr/share/man/man4/wlan_ratectl_onoe.4.gz
-TO_REMOVE+=/usr/share/man/cat4/wlan_ratectl_sample.4.gz
 TO_REMOVE+=/usr/share/man/man4/wlan_ratectl_sample.4.gz
 TO_REMOVE+=/usr/include/kadm5
 TO_REMOVE+=/usr/include/sys/fbsd_firmware.h
 TO_REMOVE+=/boot/kernel/fbsd_firmware.ko
-TO_REMOVE+=/usr/share/man/cat9/firmware_image_load.9.gz
 TO_REMOVE+=/usr/share/man/man9/firmware_image_load.9.gz
-TO_REMOVE+=/usr/share/man/cat9/firmware_image_unload.9.gz
 TO_REMOVE+=/usr/share/man/man9/firmware_image_unload.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_cfgget.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_cfgget.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_cfgset.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_cfgset.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_ioctl.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_ioctl.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_add_rates.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_add_rates.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_add_ssid.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_add_ssid.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_add_xrates.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_add_xrates.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_begin_scan.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_begin_scan.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_chan2ieee.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_chan2ieee.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_chan2mode.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_chan2mode.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_create_ibss.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_create_ibss.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_dump_pkt.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_dump_pkt.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_encap.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_encap.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_end_scan.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_end_scan.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_find_node.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_find_node.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_find_txnode.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_find_txnode.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_fix_rate.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_fix_rate.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_ieee2mhz.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_ieee2mhz.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_media2rate.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_media2rate.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_media_change.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_media_change.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_media_init.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_media_init.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_media_status.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_media_status.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_mhz2ieee.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_mhz2ieee.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_next_scan.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_next_scan.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_print_essid.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_print_essid.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_proto_attach.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_proto_attach.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_proto_detach.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_proto_detach.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_rate2media.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_rate2media.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_recv_mgmt.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_recv_mgmt.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_send_mgmt.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_send_mgmt.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_setmode.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_setmode.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_watchdog.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_watchdog.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_amrr.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_amrr.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_amrr_choose.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_amrr_choose.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_amrr_cleanup.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_amrr_cleanup.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_amrr_init.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_amrr_init.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_amrr_node_init.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_amrr_node_init.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_amrr_setinterval.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_amrr_setinterval.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_amrr_tx_complete.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_amrr_tx_complete.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_amrr_tx_update.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_amrr_tx_update.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_cancel_scan_any.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_cancel_scan_any.9.gz
-TO_REMOVE+=/usr/share/man/cat9/ieee80211_wait_for_parent.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_wait_for_parent.9.gz
 TO_REMOVE+=/usr/bin/dig
 TO_REMOVE+=/usr/bin/dnssec-keygen
@@ -1306,36 +887,17 @@ TO_REMOVE+=/usr/share/man/man8/named.reload.8.gz
 TO_REMOVE+=/usr/share/man/man8/named.restart.8.gz
 TO_REMOVE+=/usr/share/man/man8/rndc-confgen.8.gz
 TO_REMOVE+=/usr/share/man/man8/rndc.8.gz
-TO_REMOVE+=/usr/share/man/cat1/dig.1.gz
-TO_REMOVE+=/usr/share/man/cat1/host.1.gz
-TO_REMOVE+=/usr/share/man/cat1/nslookup.1.gz
-TO_REMOVE+=/usr/share/man/cat1/nsupdate.1.gz
-TO_REMOVE+=/usr/share/man/cat5/named.conf.5.gz
-TO_REMOVE+=/usr/share/man/cat8/dnssec-keygen.8.gz
-TO_REMOVE+=/usr/share/man/cat8/dnssec-signzone.8.gz
-TO_REMOVE+=/usr/share/man/cat8/named-checkconf.8.gz
-TO_REMOVE+=/usr/share/man/cat8/named-checkzone.8.gz
-TO_REMOVE+=/usr/share/man/cat8/named.8.gz
-TO_REMOVE+=/usr/share/man/cat8/named.reload.8.gz
-TO_REMOVE+=/usr/share/man/cat8/named.restart.8.gz
-TO_REMOVE+=/usr/share/man/cat8/rndc-confgen.8.gz
-TO_REMOVE+=/usr/share/man/cat8/rndc.8.gz
-TO_REMOVE+=/usr/share/man/cat3/prop_dictionary_mutable.3.gz
 TO_REMOVE+=/usr/share/man/man3/prop_dictionary_mutable.3.gz
 TO_REMOVE+=/usr/bin/ionice
-TO_REMOVE+=/usr/share/man/cat9/lwkt_gettokref.9.gz
 TO_REMOVE+=/usr/share/man/man9/lwkt_gettokref.9.gz
-TO_REMOVE+=/usr/share/man/cat9/lwkt_trytokref.9.gz
 TO_REMOVE+=/usr/share/man/man9/lwkt_trytokref.9.gz
 TO_REMOVE+=/usr/sbin/udevd
 TO_REMOVE+=/usr/share/zoneinfo/Pacific/Ponape
 TO_REMOVE+=/usr/share/zoneinfo/Pacific/Truk
 TO_REMOVE+=/usr/sbin/dschedctl
-TO_REMOVE+=/usr/share/man/cat8/dschedctl.8.gz
 TO_REMOVE+=/usr/share/man/man8/dschedctl.8.gz
 TO_REMOVE+=/usr/include/sys/selinfo.h
 TO_REMOVE+=/usr/libexec/ftp-proxy
-TO_REMOVE+=/usr/share/man/cat9/devfs_clone_bitmap_rst.9.gz
 TO_REMOVE+=/usr/share/man/man9/devfs_clone_bitmap_rst.9.gz
 TO_REMOVE+=/usr/lib/libevent.a
 TO_REMOVE+=/usr/lib/profile/libevent.a
@@ -1406,85 +968,11 @@ TO_REMOVE+=/usr/share/man/man3/evdns_search_clear.3.gz
 TO_REMOVE+=/usr/share/man/man3/evdns_search_add.3.gz
 TO_REMOVE+=/usr/share/man/man3/evdns_search_ndots_set.3.gz
 TO_REMOVE+=/usr/share/man/man3/evdns_set_log_fn.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evdns.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_init.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_dispatch.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_loop.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_loopexit.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_set.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_base_dispatch.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_base_free.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_base_loop.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_base_loopexit.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_base_set.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_add.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_del.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_once.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_pending.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_initialized.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_priority_init.3.gz
-TO_REMOVE+=/usr/share/man/cat3/event_priority_set.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evtimer_set.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evtimer_add.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evtimer_del.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evtimer_pending.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evtimer_initialized.3.gz
-TO_REMOVE+=/usr/share/man/cat3/signal_set.3.gz
-TO_REMOVE+=/usr/share/man/cat3/signal_add.3.gz
-TO_REMOVE+=/usr/share/man/cat3/signal_del.3.gz
-TO_REMOVE+=/usr/share/man/cat3/signal_pending.3.gz
-TO_REMOVE+=/usr/share/man/cat3/signal_initialized.3.gz
-TO_REMOVE+=/usr/share/man/cat3/bufferevent_new.3.gz
-TO_REMOVE+=/usr/share/man/cat3/bufferevent_free.3.gz
-TO_REMOVE+=/usr/share/man/cat3/bufferevent_write.3.gz
-TO_REMOVE+=/usr/share/man/cat3/bufferevent_write_buffer.3.gz
-TO_REMOVE+=/usr/share/man/cat3/bufferevent_read.3.gz
-TO_REMOVE+=/usr/share/man/cat3/bufferevent_enable.3.gz
-TO_REMOVE+=/usr/share/man/cat3/bufferevent_disable.3.gz
-TO_REMOVE+=/usr/share/man/cat3/bufferevent_settimeout.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evbuffer_new.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evbuffer_free.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evbuffer_add.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evbuffer_add_buffer.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evbuffer_add_printf.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evbuffer_add_vprintf.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evbuffer_drain.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evbuffer_write.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evbuffer_read.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evbuffer_find.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evbuffer_readline.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evdns_init.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evdns_shutdown.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evdns_err_to_string.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evdns_nameserver_add.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evdns_count_nameservers.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evdns_clear_nameservers_and_suspend.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evdns_resume.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evdns_nameserver_ip_add.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evdns_resolve_ipv4.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evdns_resolve_reverse.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evdns_resolv_conf_parse.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evdns_search_clear.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evdns_search_add.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evdns_search_ndots_set.3.gz
-TO_REMOVE+=/usr/share/man/cat3/evdns_set_log_fn.3.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/alpm.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/alpm.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/amdpm.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/amdpm.4.gz
 TO_REMOVE+=/usr/include/machine/iic.h
 TO_REMOVE+=/usr/include/machine/smb.h
 TO_REMOVE+=/usr/include/machine/mouse.h
-TO_REMOVE+=/usr/share/man/cat9/spin_lock_rd.9.gz
-TO_REMOVE+=/usr/share/man/cat9/spin_lock_rd_quick.9.gz
-TO_REMOVE+=/usr/share/man/cat9/spin_lock_wr.9.gz
-TO_REMOVE+=/usr/share/man/cat9/spin_lock_wr_quick.9.gz
-TO_REMOVE+=/usr/share/man/cat9/spin_trylock_wr.9.gz
-TO_REMOVE+=/usr/share/man/cat9/spin_unlock_rd.9.gz
-TO_REMOVE+=/usr/share/man/cat9/spin_unlock_rd_quick.9.gz
-TO_REMOVE+=/usr/share/man/cat9/spin_unlock_wr.9.gz
-TO_REMOVE+=/usr/share/man/cat9/spin_unlock_wr_quick.9.gz
 TO_REMOVE+=/usr/share/man/man9/spin_lock_rd.9.gz
 TO_REMOVE+=/usr/share/man/man9/spin_lock_rd_quick.9.gz
 TO_REMOVE+=/usr/share/man/man9/spin_lock_wr.9.gz
@@ -1494,11 +982,8 @@ TO_REMOVE+=/usr/share/man/man9/spin_unlock_rd.9.gz
 TO_REMOVE+=/usr/share/man/man9/spin_unlock_rd_quick.9.gz
 TO_REMOVE+=/usr/share/man/man9/spin_unlock_wr.9.gz
 TO_REMOVE+=/usr/share/man/man9/spin_unlock_wr_quick.9.gz
-TO_REMOVE+=/usr/share/man/cat8/loader.4th.8.gz
 TO_REMOVE+=/usr/share/man/man8/loader.4th.8.gz
 TO_REMOVE+=/usr/share/examples/bootforth
-TO_REMOVE+=/usr/share/man/cat9/mtx_notowner.9.gz
-TO_REMOVE+=/usr/share/man/cat9/mtx_owner.9.gz
 TO_REMOVE+=/usr/share/man/man9/mtx_notowner.9.gz
 TO_REMOVE+=/usr/share/man/man9/mtx_owner.9.gz
 TO_REMOVE+=/usr/include/openssl/fips_err.h
@@ -1507,7 +992,6 @@ TO_REMOVE+=/usr/include/openssl/pq_compat.h
 TO_REMOVE+=/usr/include/openssl/rc5.h
 TO_REMOVE+=/usr/include/openssl/store.h
 TO_REMOVE+=/usr/include/openssl/tmdiff.h
-TO_REMOVE+=/usr/share/openssl/man/cat3/CRYPTO_set_id_callback.3.gz
 TO_REMOVE+=/usr/share/openssl/man/man3/CRYPTO_set_id_callback.3.gz
 TO_REMOVE+=/boot/beastie.4th
 TO_REMOVE+=/boot/frames.4th
@@ -1518,35 +1002,24 @@ TO_REMOVE+=/usr/share/zoneinfo/Factory
 TO_REMOVE+=/usr/freebsd_pkg
 TO_REMOVE+=/boot/kernel/hotplug.ko
 TO_REMOVE+=/usr/include/sys/hotplug.h
-TO_REMOVE+=/usr/share/man/cat4/hotplug.4.gz
 TO_REMOVE+=/usr/share/man/man4/hotplug.4.gz
 TO_REMOVE+=/usr/include/sys/dm.h
-TO_REMOVE+=/usr/share/man/cat4/ahb.4.gz
 TO_REMOVE+=/usr/share/man/man4/ahb.4.gz
 TO_REMOVE+=/boot/kernel/ahc_eisa.ko
 TO_REMOVE+=/boot/kernel/ahc_isa.ko
 TO_REMOVE+=/usr/include/netproto/ns
 TO_REMOVE+=/usr/include/netns
 TO_REMOVE+=/usr/include/sys/ref.h
-TO_REMOVE+=/usr/share/man/cat9/kref.9.gz
 TO_REMOVE+=/usr/share/man/man9/kref.9.gz
-TO_REMOVE+=/usr/share/man/cat9/kref_dec.9.gz
 TO_REMOVE+=/usr/share/man/man9/kref_dec.9.gz
-TO_REMOVE+=/usr/share/man/cat9/kref_inc.9.gz
 TO_REMOVE+=/usr/share/man/man9/kref_inc.9.gz
-TO_REMOVE+=/usr/share/man/cat9/kref_init.9.gz
 TO_REMOVE+=/usr/share/man/man9/kref_init.9.gz
 TO_REMOVE+=/usr/include/dev/video/meteor/meteor_reg.h
-TO_REMOVE+=/usr/share/man/cat4/i386/meteor.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/meteor.4.gz
-TO_REMOVE+=/usr/share/man/cat3/SLIST_REMOVE_NEXT.3.gz
 TO_REMOVE+=/usr/share/man/man3/SLIST_REMOVE_NEXT.3.gz
-TO_REMOVE+=/usr/share/man/cat3/STAILQ_REMOVE_NEXT.3.gz
 TO_REMOVE+=/usr/share/man/man3/STAILQ_REMOVE_NEXT.3.gz
 TO_REMOVE+=/usr/bin/gasp
-TO_REMOVE+=/usr/share/man/cat9/memoryallocators.9.gz
 TO_REMOVE+=/usr/share/man/man9/memoryallocators.9.gz
-TO_REMOVE+=/usr/share/man/cat4/rc.4.gz
 TO_REMOVE+=/usr/share/man/man4/rc.4.gz
 TO_REMOVE+=/usr/include/dev/disk/mpt/mpilib/fc_log.h
 TO_REMOVE+=/boot/kernel/ipl.ko
@@ -1556,83 +1029,53 @@ TO_REMOVE+=/etc/rc.d/ipfs
 TO_REMOVE+=/etc/rc.d/ipmon
 TO_REMOVE+=/etc/rc.d/ipnat
 TO_REMOVE+=/sbin/ipf
-TO_REMOVE+=/usr/share/man/cat8/ipf.8.gz
 TO_REMOVE+=/usr/share/man/man8/ipf.8.gz
 TO_REMOVE+=/sbin/ipfs
-TO_REMOVE+=/usr/share/man/cat8/ipfs.8.gz
 TO_REMOVE+=/usr/share/man/man8/ipfs.8.gz
 TO_REMOVE+=/sbin/ipfstat
-TO_REMOVE+=/usr/share/man/cat8/ipfstat.8.gz
 TO_REMOVE+=/usr/share/man/man8/ipfstat.8.gz
 TO_REMOVE+=/sbin/ipmon
-TO_REMOVE+=/usr/share/man/cat8/ipmon.8.gz
 TO_REMOVE+=/usr/share/man/man8/ipmon.8.gz
 TO_REMOVE+=/sbin/ipnat
-TO_REMOVE+=/usr/share/man/cat8/ipnat.8.gz
 TO_REMOVE+=/usr/share/man/man8/ipnat.8.gz
 TO_REMOVE+=/usr/sbin/ipftest
-TO_REMOVE+=/usr/share/man/cat1/ipftest.1.gz
 TO_REMOVE+=/usr/share/man/man1/ipftest.1.gz
 TO_REMOVE+=/usr/sbin/ipresend
-TO_REMOVE+=/usr/share/man/cat1/ipresend.1.gz
 TO_REMOVE+=/usr/share/man/man1/ipresend.1.gz
 TO_REMOVE+=/usr/sbin/ipsend
-TO_REMOVE+=/usr/share/man/cat1/ipsend.1.gz
 TO_REMOVE+=/usr/share/man/man1/ipsend.1.gz
 TO_REMOVE+=/usr/sbin/iptest
-TO_REMOVE+=/usr/share/man/cat1/iptest.1.gz
 TO_REMOVE+=/usr/share/man/man1/iptest.1.gz
 TO_REMOVE+=/usr/share/examples/ipfilter
-TO_REMOVE+=/usr/share/man/cat4/ipf.4.gz
 TO_REMOVE+=/usr/share/man/man4/ipf.4.gz
-TO_REMOVE+=/usr/share/man/cat4/ipl.4.gz
 TO_REMOVE+=/usr/share/man/man4/ipl.4.gz
-TO_REMOVE+=/usr/share/man/cat4/ipnat.4.gz
 TO_REMOVE+=/usr/share/man/man4/ipnat.4.gz
-TO_REMOVE+=/usr/share/man/cat5/ipf.5.gz
 TO_REMOVE+=/usr/share/man/man5/ipf.5.gz
-TO_REMOVE+=/usr/share/man/cat5/ipnat.5.gz
 TO_REMOVE+=/usr/share/man/man5/ipnat.5.gz
-TO_REMOVE+=/usr/share/man/cat5/ipsend.5.gz
 TO_REMOVE+=/usr/share/man/man5/ipsend.5.gz
 TO_REMOVE+=/var/db/ipf
 TO_REMOVE+=/usr/include/gnuregex.h
 TO_REMOVE+=/usr/lib/libgnuregex.a
 TO_REMOVE+=/usr/lib/profile/libgnuregex.a
 TO_REMOVE+=/usr/share/info/regex.info.gz
-TO_REMOVE+=/usr/share/man/cat3/evasprintf.3.gz
 TO_REMOVE+=/usr/share/man/man3/evasprintf.3.gz
-TO_REMOVE+=/usr/share/man/cat3/esetfun.3.gz
 TO_REMOVE+=/usr/share/man/man3/esetfun.3.gz
 TO_REMOVE+=/usr/bin/cxxfilt
 TO_REMOVE+=/usr/libexec/gcc41/c++filt
 TO_REMOVE+=/usr/libexec/gcc44/c++filt
 TO_REMOVE+=/usr/libexec/binutils217
-TO_REMOVE+=/usr/share/man/cat1/addr2line217.1.gz
 TO_REMOVE+=/usr/share/man/man1/addr2line217.1.gz
-TO_REMOVE+=/usr/share/man/cat1/ar217.1.gz
 TO_REMOVE+=/usr/share/man/man1/ar217.1.gz
-TO_REMOVE+=/usr/share/man/cat1/as217.1.gz
 TO_REMOVE+=/usr/share/man/man1/as217.1.gz
-TO_REMOVE+=/usr/share/man/cat1/ld217.1.gz
 TO_REMOVE+=/usr/share/man/man1/ld217.1.gz
-TO_REMOVE+=/usr/share/man/cat1/nm217.1.gz
 TO_REMOVE+=/usr/share/man/man1/nm217.1.gz
-TO_REMOVE+=/usr/share/man/cat1/objcopy217.1.gz
 TO_REMOVE+=/usr/share/man/man1/objcopy217.1.gz
-TO_REMOVE+=/usr/share/man/cat1/objdump217.1.gz
 TO_REMOVE+=/usr/share/man/man1/objdump217.1.gz
-TO_REMOVE+=/usr/share/man/cat1/ranlib217.1.gz
 TO_REMOVE+=/usr/share/man/man1/ranlib217.1.gz
-TO_REMOVE+=/usr/share/man/cat1/readelf217.1.gz
 TO_REMOVE+=/usr/share/man/man1/readelf217.1.gz
-TO_REMOVE+=/usr/share/man/cat1/size217.1.gz
 TO_REMOVE+=/usr/share/man/man1/size217.1.gz
-TO_REMOVE+=/usr/share/man/cat1/strings217.1.gz
 TO_REMOVE+=/usr/share/man/man1/strings217.1.gz
-TO_REMOVE+=/usr/share/man/cat1/strip217.1.gz
 TO_REMOVE+=/usr/share/man/man1/strip217.1.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/est.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/est.4.gz
 TO_REMOVE+=/boot/kernel/aha.ko
 TO_REMOVE+=/usr/bin/sasc
@@ -1643,25 +1086,6 @@ TO_REMOVE+=/usr/libexec/xtend
 TO_REMOVE+=/usr/sbin/sgsc
 TO_REMOVE+=/usr/sbin/wlconfig
 TO_REMOVE+=/usr/sbin/xten
-TO_REMOVE+=/usr/share/man/cat1/sasc.1.gz
-TO_REMOVE+=/usr/share/man/cat1/sgsc.1.gz
-TO_REMOVE+=/usr/share/man/cat1/xten.1.gz
-TO_REMOVE+=/usr/share/man/cat4/aha.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/asc.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/dgb.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/el.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/gsc.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/ie.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/labpc.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/le.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/mse.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/rc.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/rdp.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/tw.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/wl.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/wt.4.gz
-TO_REMOVE+=/usr/share/man/cat8/wlconfig.8.gz
-TO_REMOVE+=/usr/share/man/cat8/xtend.8.gz
 TO_REMOVE+=/usr/share/man/man1/sasc.1.gz
 TO_REMOVE+=/usr/share/man/man1/sgsc.1.gz
 TO_REMOVE+=/usr/share/man/man1/xten.1.gz
@@ -1684,24 +1108,10 @@ TO_REMOVE+=/usr/share/man/man8/xtend.8.gz
 TO_REMOVE+=/usr/bin/gprof4
 TO_REMOVE+=/usr/share/misc/gprof.callg
 TO_REMOVE+=/usr/share/misc/gprof.flat
-TO_REMOVE+=/usr/share/man/cat4/i386/ndis.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/ndis.4.gz
 TO_REMOVE+=/usr/share/info/diff.info.gz
 TO_REMOVE+=/usr/include/vfs/gnu
 TO_REMOVE+=/usr/include/crypt.h
-TO_REMOVE+=/usr/share/man/cat1/addr2line220.1.gz
-TO_REMOVE+=/usr/share/man/cat1/ar220.1.gz
-TO_REMOVE+=/usr/share/man/cat1/as220.1.gz
-TO_REMOVE+=/usr/share/man/cat1/c++filt220.1.gz
-TO_REMOVE+=/usr/share/man/cat1/ld220.1.gz
-TO_REMOVE+=/usr/share/man/cat1/nm220.1.gz
-TO_REMOVE+=/usr/share/man/cat1/objcopy220.1.gz
-TO_REMOVE+=/usr/share/man/cat1/objdump220.1.gz
-TO_REMOVE+=/usr/share/man/cat1/ranlib220.1.gz
-TO_REMOVE+=/usr/share/man/cat1/readelf220.1.gz
-TO_REMOVE+=/usr/share/man/cat1/size220.1.gz
-TO_REMOVE+=/usr/share/man/cat1/strings220.1.gz
-TO_REMOVE+=/usr/share/man/cat1/strip220.1.gz
 TO_REMOVE+=/usr/share/man/man1/addr2line220.1.gz
 TO_REMOVE+=/usr/share/man/man1/ar220.1.gz
 TO_REMOVE+=/usr/share/man/man1/as220.1.gz
@@ -1719,65 +1129,36 @@ TO_REMOVE+=/usr/libexec/binutils220
 TO_REMOVE+=/usr/share/zoneinfo/Europe/Tiraspol
 TO_REMOVE+=/usr/include/netatalk
 TO_REMOVE+=/usr/include/netproto/atalk
-TO_REMOVE+=/usr/share/man/cat9/MALLOC.9.gz
 TO_REMOVE+=/usr/share/man/man9/MALLOC.9.gz
-TO_REMOVE+=/usr/share/man/cat9/FREE.9.gz
 TO_REMOVE+=/usr/share/man/man9/FREE.9.gz
-TO_REMOVE+=/usr/share/man/cat3/expmlf.3.gz
 TO_REMOVE+=/usr/share/man/man3/expmlf.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_write_disk_close.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_write_disk_close.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_write_disk_data.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_write_disk_data.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_write_disk_finish.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_write_disk_finish.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_write_disk_finish_entry.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_write_disk_finish_entry.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_write_disk_header.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_write_disk_header.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_read_data_into_buffer.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_read_data_into_buffer.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_read_support_compression_all.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_read_support_compression_all.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_read_support_compression_bzip2.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_read_support_compression_bzip2.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_read_support_compression_compress.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_read_support_compression_compress.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_read_support_compression_gzip.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_read_support_compression_gzip.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_read_support_compression_lzma.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_read_support_compression_lzma.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_read_support_compression_none.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_read_support_compression_none.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_read_support_compression_xz.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_read_support_compression_xz.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_read_support_compression_program.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_read_support_compression_program.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_read_support_compression_program_signature.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_read_support_compression_program_signature.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_write_set_compression_bzip2.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_write_set_compression_bzip2.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_write_set_compression_compress.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_write_set_compression_compress.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_write_set_compression_gzip.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_write_set_compression_gzip.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_write_set_compression_none.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_write_set_compression_none.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_write_set_compression_program.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_write_set_compression_program.3.gz
 TO_REMOVE+=/usr/share/man/man3/archive_write_set_format_shar_binary.3.gz
-TO_REMOVE+=/usr/share/man/cat3/archive_write_set_format_shar_binary.3.gz
 TO_REMOVE+=/sbin/atacontrol
-TO_REMOVE+=/usr/share/man/cat8/atacontrol.8.gz
 TO_REMOVE+=/usr/share/man/man8/atacontrol.8.gz
-TO_REMOVE+=/usr/share/man/cat4/ata.4.gz
 TO_REMOVE+=/usr/share/man/man4/ata.4.gz
-TO_REMOVE+=/usr/share/man/cat4/atapicam.4.gz
 TO_REMOVE+=/usr/share/man/man4/atapicam.4.gz
 TO_REMOVE+=/usr/include/pcap-int.h
-TO_REMOVE+=/usr/share/man/cat4/i386/asr.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/asr.4.gz
 TO_REMOVE+=/etc/isdn
 TO_REMOVE+=/etc/rc.d/isdnd
@@ -1797,83 +1178,47 @@ TO_REMOVE+=/usr/share/examples/isdn
 TO_REMOVE+=/usr/share/examples/ppp/isdnd.rc
 TO_REMOVE+=/usr/share/examples/ppp/ppp.conf.isdn
 TO_REMOVE+=/usr/share/isdn
-TO_REMOVE+=/usr/share/man/cat1/dtmfdecode.1.gz
 TO_REMOVE+=/usr/share/man/man1/dtmfdecode.1.gz
-TO_REMOVE+=/usr/share/man/cat1/g711conv.1.gz
 TO_REMOVE+=/usr/share/man/man1/g711conv.1.gz
-TO_REMOVE+=/usr/share/man/cat4/i4b.4.gz
 TO_REMOVE+=/usr/share/man/man4/i4b.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i4bcapi.4.gz
 TO_REMOVE+=/usr/share/man/man4/i4bcapi.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i4bctl.4.gz
 TO_REMOVE+=/usr/share/man/man4/i4bctl.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i4bing.4.gz
 TO_REMOVE+=/usr/share/man/man4/i4bing.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i4bipr.4.gz
 TO_REMOVE+=/usr/share/man/man4/i4bipr.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i4bisppp.4.gz
 TO_REMOVE+=/usr/share/man/man4/i4bisppp.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i4bq921.4.gz
 TO_REMOVE+=/usr/share/man/man4/i4bq921.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i4bq931.4.gz
 TO_REMOVE+=/usr/share/man/man4/i4bq931.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i4brbch.4.gz
 TO_REMOVE+=/usr/share/man/man4/i4brbch.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i4btel.4.gz
 TO_REMOVE+=/usr/share/man/man4/i4btel.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i4btrc.4.gz
 TO_REMOVE+=/usr/share/man/man4/i4btrc.4.gz
-TO_REMOVE+=/usr/share/man/cat4/iavc.4.gz
 TO_REMOVE+=/usr/share/man/man4/iavc.4.gz
-TO_REMOVE+=/usr/share/man/cat4/ifpi.4.gz
 TO_REMOVE+=/usr/share/man/man4/ifpi.4.gz
-TO_REMOVE+=/usr/share/man/cat4/ifpi2.4.gz
 TO_REMOVE+=/usr/share/man/man4/ifpi2.4.gz
-TO_REMOVE+=/usr/share/man/cat4/ifpnp.4.gz
 TO_REMOVE+=/usr/share/man/man4/ifpnp.4.gz
-TO_REMOVE+=/usr/share/man/cat4/ihfc.4.gz
 TO_REMOVE+=/usr/share/man/man4/ihfc.4.gz
-TO_REMOVE+=/usr/share/man/cat4/isic.4.gz
 TO_REMOVE+=/usr/share/man/man4/isic.4.gz
-TO_REMOVE+=/usr/share/man/cat4/itjc.4.gz
 TO_REMOVE+=/usr/share/man/man4/itjc.4.gz
-TO_REMOVE+=/usr/share/man/cat4/iwic.4.gz
 TO_REMOVE+=/usr/share/man/man4/iwic.4.gz
-TO_REMOVE+=/usr/share/man/cat5/isdnd.acct.5.gz
 TO_REMOVE+=/usr/share/man/man5/isdnd.acct.5.gz
-TO_REMOVE+=/usr/share/man/cat5/isdnd.rates.5.gz
 TO_REMOVE+=/usr/share/man/man5/isdnd.rates.5.gz
-TO_REMOVE+=/usr/share/man/cat5/isdnd.rc.5.gz
 TO_REMOVE+=/usr/share/man/man5/isdnd.rc.5.gz
-TO_REMOVE+=/usr/share/man/cat8/isdnd.8.gz
 TO_REMOVE+=/usr/share/man/man8/isdnd.8.gz
-TO_REMOVE+=/usr/share/man/cat8/isdndebug.8.gz
 TO_REMOVE+=/usr/share/man/man8/isdndebug.8.gz
-TO_REMOVE+=/usr/share/man/cat8/isdndecode.8.gz
 TO_REMOVE+=/usr/share/man/man8/isdndecode.8.gz
-TO_REMOVE+=/usr/share/man/cat8/isdnmonitor.8.gz
 TO_REMOVE+=/usr/share/man/man8/isdnmonitor.8.gz
-TO_REMOVE+=/usr/share/man/cat8/isdnphone.8.gz
 TO_REMOVE+=/usr/share/man/man8/isdnphone.8.gz
-TO_REMOVE+=/usr/share/man/cat8/isdntel.8.gz
 TO_REMOVE+=/usr/share/man/man8/isdntel.8.gz
-TO_REMOVE+=/usr/share/man/cat8/isdntelctl.8.gz
 TO_REMOVE+=/usr/share/man/man8/isdntelctl.8.gz
-TO_REMOVE+=/usr/share/man/cat8/isdntrace.8.gz
 TO_REMOVE+=/usr/share/man/man8/isdntrace.8.gz
 TO_REMOVE+=/usr/libexec/binutils221/elf/ld
 TO_REMOVE+=/usr/libexec/binutils222/elf/ld
 TO_REMOVE+=/usr/include/sys/dataacq.h
-TO_REMOVE+=/usr/share/man/cat4/bfq.4.gz
 TO_REMOVE+=/usr/share/man/man4/bfq.4.gz
 TO_REMOVE+=/usr/include/bus/pci/dc21040reg.h
 TO_REMOVE+=/usr/lib/profile/libtinfo.aa
 TO_REMOVE+=/usr/bin/kzip
-TO_REMOVE+=/usr/share/man/cat8/kzip.8.gz
 TO_REMOVE+=/usr/share/man/man8/kzip.8.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/aic.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/aic.4.gz
-TO_REMOVE+=/usr/share/man/cat3/lintf.3.gz
 TO_REMOVE+=/usr/share/man/man3/lintf.3.gz
 TO_REMOVE+=/usr/include/openssl/aes_locl.h
 TO_REMOVE+=/usr/include/openssl/e_os.h
@@ -1887,24 +1232,18 @@ TO_REMOVE+=/usr/lib/profile/libmytinfo.a
 TO_REMOVE+=/usr/include/sys/ccms.h
 TO_REMOVE+=/usr/bin/doscmd
 TO_REMOVE+=/usr/libdata/doscmd
-TO_REMOVE+=/usr/share/man/cat1/doscmd.1.gz
 TO_REMOVE+=/usr/share/man/man1/doscmd.1.gz
-TO_REMOVE+=/usr/share/man/cat3/puffs_fuse_unlink.3.gz
 TO_REMOVE+=/usr/share/man/man3/puffs_fuse_unlink.3.gz
 TO_REMOVE+=/usr/include/netgraph7/ng_tty.h
 TO_REMOVE+=/etc/pam.d/gdm
 TO_REMOVE+=/etc/pam.d/kde
 TO_REMOVE+=/etc/rc.d/vfs_accounting
-TO_REMOVE+=/usr/share/man/cat3/svc_control.3.gz
 TO_REMOVE+=/usr/share/man/man3/svc_control.3.gz
-TO_REMOVE+=/usr/share/man/cat9/mtx_spinlock_ex.9.gz
 TO_REMOVE+=/usr/share/man/man9/mtx_spinlock_ex.9.gz
-TO_REMOVE+=/usr/share/man/cat9/mtx_spinlock_sh.9.gz
 TO_REMOVE+=/usr/share/man/man9/mtx_spinlock_sh.9.gz
 TO_REMOVE+=/usr/include/machine/mtpr.h
 TO_REMOVE+=/usr/include/machine/ultrasound.h
 TO_REMOVE+=/usr/include/bus/pci/pcidevs_data.h
-TO_REMOVE+=/usr/share/man/cat4/i386/apm.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/apm.4.gz
 TO_REMOVE+=/usr/include/c++/4.1
 TO_REMOVE+=/usr/lib/gcc41
@@ -1920,84 +1259,51 @@ TO_REMOVE+=/usr/share/info/cpp41.info.gz
 TO_REMOVE+=/usr/share/info/cppinternals41.info.gz
 TO_REMOVE+=/usr/share/info/gcc41.info.gz
 TO_REMOVE+=/usr/share/info/gccint41.info.gz
-TO_REMOVE+=/usr/share/man/cat1/cpp41.1.gz
-TO_REMOVE+=/usr/share/man/cat1/g++41.1.gz
-TO_REMOVE+=/usr/share/man/cat1/gcc41.1.gz
-TO_REMOVE+=/usr/share/man/cat1/gcov41.1.gz
 TO_REMOVE+=/usr/include/sys/caps.h
-TO_REMOVE+=/usr/share/man/cat2/caps_sys_abort.2.gz
 TO_REMOVE+=/usr/share/man/man2/caps_sys_abort.2.gz
-TO_REMOVE+=/usr/share/man/cat2/caps_sys_client.2.gz
 TO_REMOVE+=/usr/share/man/man2/caps_sys_client.2.gz
-TO_REMOVE+=/usr/share/man/cat2/caps_sys_close.2.gz
 TO_REMOVE+=/usr/share/man/man2/caps_sys_close.2.gz
-TO_REMOVE+=/usr/share/man/cat2/caps_sys_get.2.gz
 TO_REMOVE+=/usr/share/man/man2/caps_sys_get.2.gz
-TO_REMOVE+=/usr/share/man/cat2/caps_sys_getgen.2.gz
 TO_REMOVE+=/usr/share/man/man2/caps_sys_getgen.2.gz
-TO_REMOVE+=/usr/share/man/cat2/caps_sys_put.2.gz
 TO_REMOVE+=/usr/share/man/man2/caps_sys_put.2.gz
-TO_REMOVE+=/usr/share/man/cat2/caps_sys_reply.2.gz
 TO_REMOVE+=/usr/share/man/man2/caps_sys_reply.2.gz
-TO_REMOVE+=/usr/share/man/cat2/caps_sys_service.2.gz
 TO_REMOVE+=/usr/share/man/man2/caps_sys_service.2.gz
-TO_REMOVE+=/usr/share/man/cat2/caps_sys_setgen.2.gz
 TO_REMOVE+=/usr/share/man/man2/caps_sys_setgen.2.gz
-TO_REMOVE+=/usr/share/man/cat2/caps_sys_wait.2.gz
 TO_REMOVE+=/usr/share/man/man2/caps_sys_wait.2.gz
 TO_REMOVE+=/var/caps
 TO_REMOVE+=/usr/include/objc
 TO_REMOVE+=/usr/include/machine/pc/msdos.h
-TO_REMOVE+=/usr/share/man/cat4/i386/stli.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/stli.4.gz
 TO_REMOVE+=/usr/include/netgraph7/ng_eiface.h
 TO_REMOVE+=/usr/sbin/stlload
-TO_REMOVE+=/usr/share/man/cat8/i386/stlload.8.gz
 TO_REMOVE+=/usr/share/man/man8/i386/stlload.8.gz
 TO_REMOVE+=/usr/sbin/stlstty
-TO_REMOVE+=/usr/share/man/cat8/i386/stlstty.8.gz
 TO_REMOVE+=/usr/share/man/man8/i386/stlstty.8.gz
 TO_REMOVE+=/usr/libdata/stallion
 TO_REMOVE+=/usr/include/bus/isa/isa_compat.h
 TO_REMOVE+=/usr/include/sys/upcall.h
-TO_REMOVE+=/usr/share/man/cat2/upc_control.2.gz
 TO_REMOVE+=/usr/share/man/man2/upc_control.2.gz
-TO_REMOVE+=/usr/share/man/cat2/upc_register.2.gz
 TO_REMOVE+=/usr/share/man/man2/upc_register.2.gz
-TO_REMOVE+=/usr/share/man/cat9/VFS_INIT.9.gz
 TO_REMOVE+=/usr/share/man/man9/VFS_INIT.9.gz
 TO_REMOVE+=/sbin/mknod
-TO_REMOVE+=/usr/share/man/cat8/mknod.8.gz
 TO_REMOVE+=/usr/share/man/man8/mknod.8.gz
-TO_REMOVE+=/usr/share/man/cat2/aio_cancel.2.gz
 TO_REMOVE+=/usr/share/man/man2/aio_cancel.2.gz
-TO_REMOVE+=/usr/share/man/cat2/aio_error.2.gz
 TO_REMOVE+=/usr/share/man/man2/aio_error.2.gz
-TO_REMOVE+=/usr/share/man/cat2/aio_read.2.gz
 TO_REMOVE+=/usr/share/man/man2/aio_read.2.gz
-TO_REMOVE+=/usr/share/man/cat2/aio_return.2.gz
 TO_REMOVE+=/usr/share/man/man2/aio_return.2.gz
-TO_REMOVE+=/usr/share/man/cat2/aio_suspend.2.gz
 TO_REMOVE+=/usr/share/man/man2/aio_suspend.2.gz
-TO_REMOVE+=/usr/share/man/cat2/aio_waitcomplete.2.gz
 TO_REMOVE+=/usr/share/man/man2/aio_waitcomplete.2.gz
-TO_REMOVE+=/usr/share/man/cat2/aio_write.2.gz
 TO_REMOVE+=/usr/share/man/man2/aio_write.2.gz
 TO_REMOVE+=/usr/include/c++/FlexLexer.h
-TO_REMOVE+=/usr/share/man/cat3/liby.3.gz
 TO_REMOVE+=/usr/share/man/man3/liby.3.gz
 TO_REMOVE+=/usr/bin/yyfix
-TO_REMOVE+=/usr/share/man/cat1/yyfix.1.gz
 TO_REMOVE+=/usr/share/man/man1/yyfix.1.gz
 TO_REMOVE+=/usr/bin/lint
 TO_REMOVE+=/usr/libdata/lint
 TO_REMOVE+=/usr/libexec/lint1
 TO_REMOVE+=/usr/libexec/lint2
-TO_REMOVE+=/usr/share/man/cat1/lint.1.gz
 TO_REMOVE+=/usr/share/man/man1/lint.1.gz
-TO_REMOVE+=/usr/share/openssl/man/cat3/EVP_PKEY_verifyrecover.3.gz
 TO_REMOVE+=/usr/share/openssl/man/man3/EVP_PKEY_verifyrecover.3.gz
-TO_REMOVE+=/usr/share/openssl/man/cat3/EVP_PKEY_verifyrecover_init.3.gz
 TO_REMOVE+=/usr/share/openssl/man/man3/EVP_PKEY_verifyrecover_init.3.gz
 TO_REMOVE+=/boot/kernel/snd_ad1816.ko
 TO_REMOVE+=/boot/kernel/snd_ess.ko
@@ -2005,104 +1311,60 @@ TO_REMOVE+=/boot/kernel/snd_mss.ko
 TO_REMOVE+=/boot/kernel/snd_sb8.ko
 TO_REMOVE+=/boot/kernel/snd_sb16.ko
 TO_REMOVE+=/boot/kernel/snd_sbc.ko
-TO_REMOVE+=/usr/share/man/cat4/gusc.4.gz
 TO_REMOVE+=/usr/share/man/man4/gusc.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/sb.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/sb.4.gz
-TO_REMOVE+=/usr/share/man/cat4/sbc.4.gz
 TO_REMOVE+=/usr/share/man/man4/sbc.4.gz
-TO_REMOVE+=/usr/share/man/cat4/snd_ad1816.4.gz
 TO_REMOVE+=/usr/share/man/man4/snd_ad1816.4.gz
-TO_REMOVE+=/usr/share/man/cat4/snd_ess.4.gz
 TO_REMOVE+=/usr/share/man/man4/snd_ess.4.gz
-TO_REMOVE+=/usr/share/man/cat4/snd_gusc.4.gz
 TO_REMOVE+=/usr/share/man/man4/snd_gusc.4.gz
-TO_REMOVE+=/usr/share/man/cat4/snd_mss.4.gz
 TO_REMOVE+=/usr/share/man/man4/snd_mss.4.gz
-TO_REMOVE+=/usr/share/man/cat4/snd_sb8.4.gz
 TO_REMOVE+=/usr/share/man/man4/snd_sb8.4.gz
-TO_REMOVE+=/usr/share/man/cat4/snd_sb16.4.gz
 TO_REMOVE+=/usr/share/man/man4/snd_sb16.4.gz
-TO_REMOVE+=/usr/share/man/cat4/snd_sbc.4.gz
 TO_REMOVE+=/usr/share/man/man4/snd_sbc.4.gz
 TO_REMOVE+=/usr/share/locale/fo_FO.UTF-8
 TO_REMOVE+=/usr/share/locale/hi_IN.UTF-8
 TO_REMOVE+=/usr/share/examples/dialog
 TO_REMOVE+=/usr/share/examples/libdialog
-TO_REMOVE+=/usr/share/man/cat3/draw_box.3.gz
 TO_REMOVE+=/usr/share/man/man3/draw_box.3.gz
-TO_REMOVE+=/usr/share/man/cat3/draw_shadow.3.gz
 TO_REMOVE+=/usr/share/man/man3/draw_shadow.3.gz
-TO_REMOVE+=/usr/share/man/cat3/line_edit.3.gz
 TO_REMOVE+=/usr/share/man/man3/line_edit.3.gz
-TO_REMOVE+=/usr/share/man/cat3/strheight.3.gz
 TO_REMOVE+=/usr/share/man/man3/strheight.3.gz
-TO_REMOVE+=/usr/share/man/cat3/strwidth.3.gz
 TO_REMOVE+=/usr/share/man/man3/strwidth.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_checklist.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_checklist.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_clear.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_clear.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_clear_norefresh.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_clear_norefresh.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_create_rc.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_create_rc.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_fselect.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_fselect.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_ftree.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_ftree.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_gauge.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_gauge.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_inputbox.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_inputbox.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_menu.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_menu.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_mesgbox.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_mesgbox.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_msgbox.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_msgbox.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_notify.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_notify.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_noyes.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_noyes.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_prgbox.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_prgbox.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_radiolist.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_radiolist.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_textbox.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_textbox.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_tree.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_tree.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_update.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_update.3.gz
-TO_REMOVE+=/usr/share/man/cat3/dialog_yesno.3.gz
 TO_REMOVE+=/usr/share/man/man3/dialog_yesno.3.gz
-TO_REMOVE+=/usr/share/man/cat3/end_dialog.3.gz
 TO_REMOVE+=/usr/share/man/man3/end_dialog.3.gz
-TO_REMOVE+=/usr/share/man/cat3/get_helpline.3.gz
 TO_REMOVE+=/usr/share/man/man3/get_helpline.3.gz
-TO_REMOVE+=/usr/share/man/cat3/init_dialog.3.gz
 TO_REMOVE+=/usr/share/man/man3/init_dialog.3.gz
-TO_REMOVE+=/usr/share/man/cat3/restore_helpline.3.gz
 TO_REMOVE+=/usr/share/man/man3/restore_helpline.3.gz
-TO_REMOVE+=/usr/share/man/cat3/use_helpfile.3.gz
 TO_REMOVE+=/usr/share/man/man3/use_helpfile.3.gz
-TO_REMOVE+=/usr/share/man/cat3/use_helpline.3.gz
 TO_REMOVE+=/usr/share/man/man3/use_helpline.3.gz
 TO_REMOVE+=/usr/include/machine/apm_segments.h
-TO_REMOVE+=/usr/share/man/cat4/spic.4.gz
 TO_REMOVE+=/usr/share/man/man4/spic.4.gz
 TO_REMOVE+=/usr/include/machine/ioctl_ctx.h
 TO_REMOVE+=/usr/include/machine/wtio.h
 TO_REMOVE+=/usr/include/machine/if_wl_wavelan.h
 TO_REMOVE+=/usr/include/machine/pcaudioio.h
 TO_REMOVE+=/usr/include/machine/speaker.h
-TO_REMOVE+=/usr/share/man/cat4/i386/spkr.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/spkr.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/speaker.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/speaker.4.gz
 TO_REMOVE+=/usr/sbin/spkrtest
-TO_REMOVE+=/usr/share/man/cat8/spkrtest.8.gz
 TO_REMOVE+=/usr/share/man/man8/spkrtest.8.gz
 TO_REMOVE+=/usr/include/machine/uvparam.h
 TO_REMOVE+=/usr/include/cpu/float.h
@@ -2110,27 +1372,19 @@ TO_REMOVE+=/usr/include/machine/float.h
 TO_REMOVE+=/usr/include/cpu/floatingpoint.h
 TO_REMOVE+=/usr/include/machine/floatingpoint.h
 TO_REMOVE+=/usr/include/cpu/ieee.h
-TO_REMOVE+=/usr/include/machine/ieee.h
 TO_REMOVE+=/usr/include/cpu/math.h
 TO_REMOVE+=/usr/include/machine/math.h
 TO_REMOVE+=/usr/libdata/gcc44/tgmath.h
 TO_REMOVE+=/usr/libdata/gcc47/tgmath.h
-TO_REMOVE+=/usr/share/man/cat4/i386/pcf.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/pcf.4.gz
-TO_REMOVE+=/usr/share/man/cat3/fpsetsticky.3.gz
 TO_REMOVE+=/usr/share/man/man3/fpsetsticky.3.gz
 TO_REMOVE+=/usr/include/sys/bitstring.h
-TO_REMOVE+=/usr/share/man/cat4/pst.4.gz
 TO_REMOVE+=/usr/share/man/man4/pst.4.gz
 TO_REMOVE+=/usr/share/man/man8/loader.8.gz.old
-TO_REMOVE+=/usr/share/man/cat2/syslink.2.gz
 TO_REMOVE+=/usr/share/man/man2/syslink.2.gz
-TO_REMOVE+=/usr/share/man/cat4/uhidev.4.gz
 TO_REMOVE+=/usr/share/man/man4/uhidev.4.gz
 TO_REMOVE+=/boot/kernel/drmn.ko
 TO_REMOVE+=/boot/kernel/i915.ko
-TO_REMOVE+=/usr/share/man/cat4/i915drm.4.gz
-TO_REMOVE+=/usr/share/man/man4/i915drm.4.gz
 TO_REMOVE+=/usr/include/regexp.h
 TO_REMOVE+=/usr/include/sys/localedef.h
 TO_REMOVE+=/usr/share/locale/ASCII
@@ -2219,9 +1473,7 @@ TO_REMOVE+=/usr/share/locale/sv_SE.ISO_8859-15
 TO_REMOVE+=/usr/share/locale/tr_TR.ISO_8859-9
 TO_REMOVE+=/usr/share/locale/zh_CN.EUC
 TO_REMOVE+=/usr/share/locale/zh_TW.eucTW
-TO_REMOVE+=/usr/share/man/cat3/regexp.3.gz
 TO_REMOVE+=/usr/share/man/man3/regexp.3.gz
-TO_REMOVE+=/usr/share/man/cat3/regsub.3.gz
 TO_REMOVE+=/usr/share/man/man3/regsub.3.gz
 TO_REMOVE+=/usr/share/nls/ASCII
 TO_REMOVE+=/usr/share/nls/US-ASCII
@@ -2336,7 +1588,6 @@ TO_REMOVE+=/usr/share/vi/catalog/pl_PL.ISO_8859-2
 TO_REMOVE+=/usr/share/vi/catalog/ru_SU.KOI8-R
 TO_REMOVE+=/usr/share/vi/catalog/sv_SE.ISO_8859-1
 TO_REMOVE+=/usr/share/vi/catalog/sv_SE.ISO_8859-15
-TO_REMOVE+=/usr/share/man/cat9/idr_init1.9.gz
 TO_REMOVE+=/usr/share/man/man9/idr_init1.9.gz
 TO_REMOVE+=/boot/kernel/radeon.ko
 TO_REMOVE+=/usr/include/sys/syscall-hide.h
@@ -2348,105 +1599,31 @@ TO_REMOVE+=/usr/lib/libxpg4.so
 TO_REMOVE+=/usr/lib/libxpg4.so.4
 TO_REMOVE+=/usr/lib/profile/libxpg4.a
 TO_REMOVE+=/usr/libexec/binutils221
-TO_REMOVE+=/usr/share/man/cat1/addr2line221.1.gz
 TO_REMOVE+=/usr/share/man/man1/addr2line221.1.gz
-TO_REMOVE+=/usr/share/man/cat1/ar221.1.gz
 TO_REMOVE+=/usr/share/man/man1/ar221.1.gz
-TO_REMOVE+=/usr/share/man/cat1/as221.1.gz
 TO_REMOVE+=/usr/share/man/man1/as221.1.gz
-TO_REMOVE+=/usr/share/man/cat1/c++filt221.1.gz
 TO_REMOVE+=/usr/share/man/man1/c++filt221.1.gz
-TO_REMOVE+=/usr/share/man/cat1/elfedit221.1.gz
 TO_REMOVE+=/usr/share/man/man1/elfedit221.1.gz
-TO_REMOVE+=/usr/share/man/cat1/gprof221.1.gz
 TO_REMOVE+=/usr/share/man/man1/gprof221.1.gz
-TO_REMOVE+=/usr/share/man/cat1/ld221.1.gz
 TO_REMOVE+=/usr/share/man/man1/ld221.1.gz
-TO_REMOVE+=/usr/share/man/cat1/nm221.1.gz
 TO_REMOVE+=/usr/share/man/man1/nm221.1.gz
-TO_REMOVE+=/usr/share/man/cat1/objcopy221.1.gz
 TO_REMOVE+=/usr/share/man/man1/objcopy221.1.gz
-TO_REMOVE+=/usr/share/man/cat1/objdump221.1.gz
 TO_REMOVE+=/usr/share/man/man1/objdump221.1.gz
-TO_REMOVE+=/usr/share/man/cat1/ranlib221.1.gz
 TO_REMOVE+=/usr/share/man/man1/ranlib221.1.gz
-TO_REMOVE+=/usr/share/man/cat1/readelf221.1.gz
 TO_REMOVE+=/usr/share/man/man1/readelf221.1.gz
-TO_REMOVE+=/usr/share/man/cat1/size221.1.gz
 TO_REMOVE+=/usr/share/man/man1/size221.1.gz
-TO_REMOVE+=/usr/share/man/cat1/strings221.1.gz
 TO_REMOVE+=/usr/share/man/man1/strings221.1.gz
-TO_REMOVE+=/usr/share/man/cat1/strip221.1.gz
 TO_REMOVE+=/usr/share/man/man1/strip221.1.gz
 TO_REMOVE+=/usr/include/tzfile.h
 TO_REMOVE+=/usr/share/zoneinfo/America/Shiprock
 TO_REMOVE+=/usr/share/zoneinfo/Antarctica/South_Pole
-TO_REMOVE+=/usr/share/man/cat3/strtoq_l.3.gz
 TO_REMOVE+=/usr/share/man/man3/strtoq_l.3.gz
-TO_REMOVE+=/usr/share/man/cat3/strtouq_l.3.gz
 TO_REMOVE+=/usr/share/man/man3/strtouq_l.3.gz
-TO_REMOVE+=/usr/share/man/cat5/utf2.5.gz
 TO_REMOVE+=/usr/share/man/man5/utf2.5.gz
 TO_REMOVE+=/boot/kernel/if_ixgbe.ko
 TO_REMOVE+=/usr/include/bus/smbus/smb.h
 TO_REMOVE+=/usr/sbin/acpidb
-TO_REMOVE+=/usr/share/man/cat8/acpidb.8.gz
 TO_REMOVE+=/usr/share/man/man8/acpidb.8.gz
-TO_REMOVE+=/usr/share/man/cat9/usb_detach_wait.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usb_detach_wakeup.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usb_find_desc.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_abort_default_pipe.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_abort_pipe.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_alloc_buffer.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_alloc_xfer.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_bulk_transfer.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_clear_endpoint_stall.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_clear_endpoint_stall_async.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_clear_endpoint_toggle.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_close_pipe.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_device2interface_handle.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_devinfo.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_do_request_async.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_do_request_flags_pipe.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_dopoll.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_endpoint_count.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_fill_deviceinfo.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_find_edesc.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_find_idesc.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_free_buffer.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_free_xfer.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_get_buffer.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_get_config.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_get_config_desc.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_get_config_desc_full.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_get_config_descriptor.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_get_device_descriptor.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_get_endpoint_descriptor.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_get_interface_altindex.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_get_interface_descriptor.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_get_no_alts.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_get_quirks.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_get_speed.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_get_string.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_get_string_desc.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_get_xfer_status.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_interface2device_handle.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_interface2endpoint_descriptor.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_interface_count.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_intr_transfer.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_open_pipe.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_open_pipe_intr.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_pipe2device_handle.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_ratecheck.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_set_config_index.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_set_config_no.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_set_interface.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_set_polling.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_setup_default_xfer.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_setup_isoc_xfer.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_setup_xfer.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_sync_transfer.9.gz
-TO_REMOVE+=/usr/share/man/cat9/usbd_transfer.9.gz
 TO_REMOVE+=/usr/share/man/man9/usb_detach_wait.9.gz
 TO_REMOVE+=/usr/share/man/man9/usb_detach_wakeup.9.gz
 TO_REMOVE+=/usr/share/man/man9/usb_find_desc.9.gz
@@ -2503,13 +1680,6 @@ TO_REMOVE+=/usr/share/man/man9/usbd_setup_xfer.9.gz
 TO_REMOVE+=/usr/share/man/man9/usbd_sync_transfer.9.gz
 TO_REMOVE+=/usr/share/man/man9/usbd_transfer.9.gz
 TO_REMOVE+=/usr/include/bus/u4b/usbdevs_data.h
-TO_REMOVE+=/usr/share/man/cat3/tc_api_check_cipher.3.gz
-TO_REMOVE+=/usr/share/man/cat3/tc_api_check_prf_hash.3.gz
-TO_REMOVE+=/usr/share/man/cat3/tc_api_create_volume.3.gz
-TO_REMOVE+=/usr/share/man/cat3/tc_api_get_error_msg.3.gz
-TO_REMOVE+=/usr/share/man/cat3/tc_api_get_summary.3.gz
-TO_REMOVE+=/usr/share/man/cat3/tc_api_map_volume.3.gz
-TO_REMOVE+=/usr/share/man/cat3/tc_api_unmap_volume.3.gz
 TO_REMOVE+=/usr/share/man/man3/tc_api_check_cipher.3.gz
 TO_REMOVE+=/usr/share/man/man3/tc_api_check_prf_hash.3.gz
 TO_REMOVE+=/usr/share/man/man3/tc_api_create_volume.3.gz
@@ -2517,7 +1687,6 @@ TO_REMOVE+=/usr/share/man/man3/tc_api_get_error_msg.3.gz
 TO_REMOVE+=/usr/share/man/man3/tc_api_get_summary.3.gz
 TO_REMOVE+=/usr/share/man/man3/tc_api_map_volume.3.gz
 TO_REMOVE+=/usr/share/man/man3/tc_api_unmap_volume.3.gz
-TO_REMOVE+=/usr/share/man/cat9/sbuf_overflowed.9.gz
 TO_REMOVE+=/usr/share/man/man9/sbuf_overflowed.9.gz
 TO_REMOVE+=/usr/sbin/acpisrc
 TO_REMOVE+=/boot/kernel/initrd.img
@@ -2571,25 +1740,15 @@ TO_REMOVE+=/usr/lib/profile/libipx.a
 TO_REMOVE+=/usr/lib/profile/libncp.a
 TO_REMOVE+=/usr/sbin/IPXrouted
 TO_REMOVE+=/usr/share/examples/nwclient
-TO_REMOVE+=/usr/share/man/cat1/ncplist.1.gz
 TO_REMOVE+=/usr/share/man/man1/ncplist.1.gz
-TO_REMOVE+=/usr/share/man/cat1/ncplogin.1.gz
 TO_REMOVE+=/usr/share/man/man1/ncplogin.1.gz
-TO_REMOVE+=/usr/share/man/cat1/ncplogout.1.gz
 TO_REMOVE+=/usr/share/man/man1/ncplogout.1.gz
-TO_REMOVE+=/usr/share/man/cat3/ipx.3.gz
 TO_REMOVE+=/usr/share/man/man3/ipx.3.gz
-TO_REMOVE+=/usr/share/man/cat3/ipx_addr.3.gz
 TO_REMOVE+=/usr/share/man/man3/ipx_addr.3.gz
-TO_REMOVE+=/usr/share/man/cat3/ipx_ntoa.3.gz
 TO_REMOVE+=/usr/share/man/man3/ipx_ntoa.3.gz
-TO_REMOVE+=/usr/share/man/cat4/ef.4.gz
 TO_REMOVE+=/usr/share/man/man4/ef.4.gz
-TO_REMOVE+=/usr/share/man/cat4/if_ef.4.gz
 TO_REMOVE+=/usr/share/man/man4/if_ef.4.gz
-TO_REMOVE+=/usr/share/man/cat8/IPXrouted.8.gz
 TO_REMOVE+=/usr/share/man/man8/IPXrouted.8.gz
-TO_REMOVE+=/usr/share/man/cat8/mount_nwfs.8.gz
 TO_REMOVE+=/usr/share/man/man8/mount_nwfs.8.gz
 TO_REMOVE+=/boot/kernel/ng_atmllc.ko
 TO_REMOVE+=/etc/rc.d/atm1
@@ -2614,27 +1773,18 @@ TO_REMOVE+=/usr/lib/profile/libatm.a
 TO_REMOVE+=/usr/sbin/atmarpd
 TO_REMOVE+=/usr/sbin/scspd
 TO_REMOVE+=/usr/share/examples/atm
-TO_REMOVE+=/usr/share/man/cat4/i386/en.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/en.4.gz
-TO_REMOVE+=/usr/share/man/cat4/natm.4.gz
 TO_REMOVE+=/usr/share/man/man4/natm.4.gz
-TO_REMOVE+=/usr/share/man/cat8/atm.8.gz
 TO_REMOVE+=/usr/share/man/man8/atm.8.gz
-TO_REMOVE+=/usr/share/man/cat8/atmarpd.8.gz
 TO_REMOVE+=/usr/share/man/man8/atmarpd.8.gz
-TO_REMOVE+=/usr/share/man/cat8/fore_dnld.8.gz
 TO_REMOVE+=/usr/share/man/man8/fore_dnld.8.gz
-TO_REMOVE+=/usr/share/man/cat8/ilmid.8.gz
 TO_REMOVE+=/usr/share/man/man8/ilmid.8.gz
-TO_REMOVE+=/usr/share/man/cat8/scspd.8.gz
 TO_REMOVE+=/usr/share/man/man8/scspd.8.gz
 TO_REMOVE+=/boot/kernel/.ko
-TO_REMOVE+=/usr/share/man/cat4/ed.4.gz
 TO_REMOVE+=/usr/share/man/man4/ed.4.gz
 TO_REMOVE+=/usr/share/zoneinfo/Asia/Chongqing
 TO_REMOVE+=/usr/share/zoneinfo/Asia/Harbin
 TO_REMOVE+=/usr/share/zoneinfo/Asia/Kashgar
-TO_REMOVE+=/usr/share/openssl/man/cat3/CMS_sign_add1_signer.3.gz
 TO_REMOVE+=/usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz
 TO_REMOVE+=/boot/kernel/mach64.ko
 TO_REMOVE+=/boot/kernel/mga.ko
@@ -2642,17 +1792,6 @@ TO_REMOVE+=/boot/kernel/r128.ko
 TO_REMOVE+=/boot/kernel/savage.ko
 TO_REMOVE+=/boot/kernel/sis.ko
 TO_REMOVE+=/boot/kernel/tdfx.ko
-TO_REMOVE+=/usr/share/man/cat4/mach64.4.gz
-TO_REMOVE+=/usr/share/man/cat4/mach64drm.4.gz
-TO_REMOVE+=/usr/share/man/cat4/mga.4.gz
-TO_REMOVE+=/usr/share/man/cat4/mgadrm.4.gz
-TO_REMOVE+=/usr/share/man/cat4/r128.4.gz
-TO_REMOVE+=/usr/share/man/cat4/r128drm.4.gz
-TO_REMOVE+=/usr/share/man/cat4/savage.4.gz
-TO_REMOVE+=/usr/share/man/cat4/savagedrm.4.gz
-TO_REMOVE+=/usr/share/man/cat4/sisdrm.4.gz
-TO_REMOVE+=/usr/share/man/cat4/tdfx.4.gz
-TO_REMOVE+=/usr/share/man/cat4/tdfxdrm.4.gz
 TO_REMOVE+=/usr/share/man/man4/mach64.4.gz
 TO_REMOVE+=/usr/share/man/man4/mach64drm.4.gz
 TO_REMOVE+=/usr/share/man/man4/mga.4.gz
@@ -2668,11 +1807,8 @@ TO_REMOVE+=/etc/periodic/security/670.pkgsrcaudit
 TO_REMOVE+=/etc/pkg_radd.conf
 TO_REMOVE+=/usr/bin/pkg_radd
 TO_REMOVE+=/usr/bin/pkg_search
-TO_REMOVE+=/usr/share/man/cat1/pkg_radd.1.gz
 TO_REMOVE+=/usr/share/man/man1/pkg_radd.1.gz
-TO_REMOVE+=/usr/share/man/cat1/pkg_search.1.gz
 TO_REMOVE+=/usr/share/man/man1/pkg_search.1.gz
-TO_REMOVE+=/usr/share/man/cat7/pkgsrc.7.gz
 TO_REMOVE+=/usr/share/man/man7/pkgsrc.7.gz
 TO_REMOVE+=/boot/kernel/if_lgue.ko
 TO_REMOVE+=/boot/kernel/if_rue.ko
@@ -2689,37 +1825,16 @@ TO_REMOVE+=/usr/include/bus/usb
 TO_REMOVE+=/usr/sbin/usbd
 TO_REMOVE+=/usr/sbin/usbdevs
 TO_REMOVE+=/usr/share/examples/etc/usbd.conf
-TO_REMOVE+=/usr/share/man/cat4/if_lgue.4.gz
 TO_REMOVE+=/usr/share/man/man4/if_lgue.4.gz
-TO_REMOVE+=/usr/share/man/cat4/if_rue.4.gz
 TO_REMOVE+=/usr/share/man/man4/if_rue.4.gz
-TO_REMOVE+=/usr/share/man/cat4/if_ural.4.gz
 TO_REMOVE+=/usr/share/man/man4/if_ural.4.gz
-TO_REMOVE+=/usr/share/man/cat4/lgue.4.gz
 TO_REMOVE+=/usr/share/man/man4/lgue.4.gz
-TO_REMOVE+=/usr/share/man/cat4/rue.4.gz
 TO_REMOVE+=/usr/share/man/man4/rue.4.gz
-TO_REMOVE+=/usr/share/man/cat4/ural.4.gz
 TO_REMOVE+=/usr/share/man/man4/ural.4.gz
-TO_REMOVE+=/usr/share/man/cat5/usbd.conf.5.gz
-TO_REMOVE+=/usr/share/man/cat8/usbd.8.gz
-TO_REMOVE+=/usr/share/man/cat8/usbdevs.8.gz
 TO_REMOVE+=/usr/share/man/man5/usbd.conf.5.gz
 TO_REMOVE+=/usr/share/man/man8/usbd.8.gz
 TO_REMOVE+=/usr/share/man/man8/usbdevs.8.gz
 TO_REMOVE+=/usr/include/sys/reaper.h
-TO_REMOVE+=/usr/share/man/cat9/VOP_CREATE.9.gz
-TO_REMOVE+=/usr/share/man/cat9/VOP_MKDIR.9.gz
-TO_REMOVE+=/usr/share/man/cat9/VOP_MKNOD.9.gz
-TO_REMOVE+=/usr/share/man/cat9/VOP_SYMLINK.9.gz
-TO_REMOVE+=/usr/share/man/cat9/VOP_LEASE.9.gz
-TO_REMOVE+=/usr/share/man/cat9/VOP_LINK.9.gz
-TO_REMOVE+=/usr/share/man/cat9/VOP_LOCK.9.gz
-TO_REMOVE+=/usr/share/man/cat9/VOP_LOOKUP.9.gz
-TO_REMOVE+=/usr/share/man/cat9/VOP_REMOVE.9.gz
-TO_REMOVE+=/usr/share/man/cat9/VOP_RMDIR.9.gz
-TO_REMOVE+=/usr/share/man/cat9/VOP_RENAME.9.gz
-TO_REMOVE+=/usr/share/man/cat9/VOP_STRATEGY.9.gz
 TO_REMOVE+=/usr/share/man/man9/VOP_CREATE.9.gz
 TO_REMOVE+=/usr/share/man/man9/VOP_MKDIR.9.gz
 TO_REMOVE+=/usr/share/man/man9/VOP_MKNOD.9.gz
@@ -2732,17 +1847,11 @@ TO_REMOVE+=/usr/share/man/man9/VOP_REMOVE.9.gz
 TO_REMOVE+=/usr/share/man/man9/VOP_RMDIR.9.gz
 TO_REMOVE+=/usr/share/man/man9/VOP_RENAME.9.gz
 TO_REMOVE+=/usr/share/man/man9/VOP_STRATEGY.9.gz
-TO_REMOVE+=/usr/share/man/cat3/libm.3.gz
 TO_REMOVE+=/usr/share/man/man3/libm.3.gz
-TO_REMOVE+=/usr/share/man/cat9/kobj_class_compile.9.gz
-TO_REMOVE+=/usr/share/man/cat9/kobj_class_free.9.gz
 TO_REMOVE+=/usr/share/man/man9/kobj_class_compile.9.gz
 TO_REMOVE+=/usr/share/man/man9/kobj_class_free.9.gz
-TO_REMOVE+=/usr/share/man/cat4/moscom.4.gz
 TO_REMOVE+=/usr/share/man/man4/moscom.4.gz
-TO_REMOVE+=/usr/share/man/cat4/uscanner.4.gz
 TO_REMOVE+=/usr/share/man/man4/uscanner.4.gz
-TO_REMOVE+=/usr/share/man/cat4/uticom.4.gz
 TO_REMOVE+=/usr/share/man/man4/uticom.4.gz
 TO_REMOVE+=/usr/include/netinet6/in6_prefix.h
 TO_REMOVE+=/usr/include/netinet/sctp.h
@@ -2771,12 +1880,6 @@ TO_REMOVE+=/usr/lib/profile/libsctp.a
 TO_REMOVE+=/boot/kernel/snd_csa.ko
 TO_REMOVE+=/boot/kernel/snd_ds1.ko
 TO_REMOVE+=/boot/kernel/snd_maestro3.ko
-TO_REMOVE+=/usr/share/man/cat4/csa.4.gz
-TO_REMOVE+=/usr/share/man/cat4/ds1.4.gz
-TO_REMOVE+=/usr/share/man/cat4/maestro3.4.gz
-TO_REMOVE+=/usr/share/man/cat4/snd_csa.4.gz
-TO_REMOVE+=/usr/share/man/cat4/snd_ds1.4.gz
-TO_REMOVE+=/usr/share/man/cat4/snd_maestro3.4.gz
 TO_REMOVE+=/usr/share/man/man4/csa.4.gz
 TO_REMOVE+=/usr/share/man/man4/ds1.4.gz
 TO_REMOVE+=/usr/share/man/man4/maestro3.4.gz
@@ -2784,7 +1887,6 @@ TO_REMOVE+=/usr/share/man/man4/snd_csa.4.gz
 TO_REMOVE+=/usr/share/man/man4/snd_ds1.4.gz
 TO_REMOVE+=/usr/share/man/man4/snd_maestro3.4.gz
 TO_REMOVE+=/usr/bin/ssh-vulnkey
-TO_REMOVE+=/usr/share/man/cat1/ssh-vulnkey.1.gz
 TO_REMOVE+=/usr/share/man/man1/ssh-vulnkey.1.gz
 TO_REMOVE+=/etc/ssh/blacklist.DSA-1024
 TO_REMOVE+=/etc/ssh/blacklist.DSA-2048
@@ -2792,9 +1894,7 @@ TO_REMOVE+=/etc/ssh/blacklist.RSA-1024
 TO_REMOVE+=/etc/ssh/blacklist.RSA-2048
 TO_REMOVE+=/etc/ssh/blacklist.RSA-4096
 TO_REMOVE+=/usr/include/sys/_posix.h
-TO_REMOVE+=/usr/share/man/cat9/posix4.9.gz
 TO_REMOVE+=/usr/share/man/man9/posix4.9.gz
-TO_REMOVE+=/usr/share/man/cat9/p1003_1b.9.gz
 TO_REMOVE+=/usr/share/man/man9/p1003_1b.9.gz
 TO_REMOVE+=/usr/include/c++/4.4
 TO_REMOVE+=/usr/lib/gcc44
@@ -2804,13 +1904,6 @@ TO_REMOVE+=/usr/share/info/cpp44.info.gz
 TO_REMOVE+=/usr/share/info/cppinternals44.info.gz
 TO_REMOVE+=/usr/share/info/gcc44.info.gz
 TO_REMOVE+=/usr/share/info/gccint44.info.gz
-TO_REMOVE+=/usr/share/man/cat1/CC44.1.gz
-TO_REMOVE+=/usr/share/man/cat1/c++44.1.gz
-TO_REMOVE+=/usr/share/man/cat1/cc44.1.gz
-TO_REMOVE+=/usr/share/man/cat1/cpp44.1.gz
-TO_REMOVE+=/usr/share/man/cat1/g++44.1.gz
-TO_REMOVE+=/usr/share/man/cat1/gcc44.1.gz
-TO_REMOVE+=/usr/share/man/cat1/gcov44.1.gz
 TO_REMOVE+=/usr/share/man/man1/CC44.1.gz
 TO_REMOVE+=/usr/share/man/man1/c++44.1.gz
 TO_REMOVE+=/usr/share/man/man1/cc44.1.gz
@@ -2821,9 +1914,7 @@ TO_REMOVE+=/usr/share/man/man1/gcov44.1.gz
 TO_REMOVE+=/usr/share/mk/bsd.cpu.gcc44.mk
 TO_REMOVE+=/usr/libdata/gcc50/stddef.h
 TO_REMOVE+=/usr/share/man/man3/libhammer_get_volinfo.3.gz
-TO_REMOVE+=/usr/share/man/cat3/libhammer_get_volinfo.3.gz
 TO_REMOVE+=/usr/share/man/man3/libhammer_free_volinfo.3.gz
-TO_REMOVE+=/usr/share/man/cat3/libhammer_free_volinfo.3.gz
 TO_REMOVE+=/usr/share/examples/cvsup
 TO_REMOVE+=/usr/include/sys/xwait.h
 TO_REMOVE+=/bin/rmail
@@ -2840,72 +1931,52 @@ TO_REMOVE+=/usr/lib/profile/libmilter.a
 TO_REMOVE+=/usr/libexec/mail.local
 TO_REMOVE+=/usr/libexec/smrsh
 TO_REMOVE+=/usr/libexec/sendmail
-TO_REMOVE+=/usr/share/man/cat1/mailq.1.gz
 TO_REMOVE+=/usr/share/man/man1/mailq.1.gz
-TO_REMOVE+=/usr/share/man/cat1/newaliases.1.gz
 TO_REMOVE+=/usr/share/man/man1/newaliases.1.gz
-TO_REMOVE+=/usr/share/man/cat1/vacation.1.gz
 TO_REMOVE+=/usr/share/man/man1/vacation.1.gz
-TO_REMOVE+=/usr/share/man/cat5/aliases.5.gz
 TO_REMOVE+=/usr/share/man/man5/aliases.5.gz
-TO_REMOVE+=/usr/share/man/cat8/editmap.8.gz
 TO_REMOVE+=/usr/share/man/man8/editmap.8.gz
-TO_REMOVE+=/usr/share/man/cat8/hoststat.8.gz
 TO_REMOVE+=/usr/share/man/man8/hoststat.8.gz
-TO_REMOVE+=/usr/share/man/cat8/mail.local.8.gz
 TO_REMOVE+=/usr/share/man/man8/mail.local.8.gz
-TO_REMOVE+=/usr/share/man/cat8/mailstats.8.gz
 TO_REMOVE+=/usr/share/man/man8/mailstats.8.gz
-TO_REMOVE+=/usr/share/man/cat8/makemap.8.gz
 TO_REMOVE+=/usr/share/man/man8/makemap.8.gz
-TO_REMOVE+=/usr/share/man/cat8/praliases.8.gz
 TO_REMOVE+=/usr/share/man/man8/praliases.8.gz
-TO_REMOVE+=/usr/share/man/cat8/purgestat.8.gz
 TO_REMOVE+=/usr/share/man/man8/purgestat.8.gz
-TO_REMOVE+=/usr/share/man/cat8/rmail.8.gz
 TO_REMOVE+=/usr/share/man/man8/rmail.8.gz
-TO_REMOVE+=/usr/share/man/cat8/sendmail.8.gz
 TO_REMOVE+=/usr/share/man/man8/sendmail.8.gz
-TO_REMOVE+=/usr/share/man/cat8/smrsh.8.gz
 TO_REMOVE+=/usr/share/man/man8/smrsh.8.gz
 TO_REMOVE+=/usr/share/sendmail
 TO_REMOVE+=/usr/share/libg++
 TO_REMOVE+=/etc/mail/helpfile
 TO_REMOVE+=/etc/mtree/BSD.sendmail.dist
 TO_REMOVE+=/boot/kernel/if_acx.ko
-TO_REMOVE+=/usr/share/man/cat4/acx.4.gz
 TO_REMOVE+=/usr/share/man/man4/acx.4.gz
 TO_REMOVE+=/boot/kernel/if_bwi.ko
-TO_REMOVE+=/usr/share/man/cat4/bwi.4.gz
 TO_REMOVE+=/usr/share/man/man4/bwi.4.gz
 TO_REMOVE+=/boot/kernel/if_iwl.ko
-TO_REMOVE+=/usr/share/man/cat4/iwl.4.gz
 TO_REMOVE+=/usr/share/man/man4/iwl.4.gz
 TO_REMOVE+=/boot/kernel/if_rtw.ko
-TO_REMOVE+=/usr/share/man/cat4/rtw.4.gz
 TO_REMOVE+=/usr/share/man/man4/rtw.4.gz
 TO_REMOVE+=/boot/kernel/fdesc.ko
 TO_REMOVE+=/sbin/mount_fdesc
-TO_REMOVE+=/usr/share/man/cat5/fdesc.5.gz
 TO_REMOVE+=/usr/share/man/man5/fdesc.5.gz
-TO_REMOVE+=/usr/share/man/cat8/mount_fdesc.8.gz
 TO_REMOVE+=/usr/share/man/man8/mount_fdesc.8.gz
 TO_REMOVE+=/usr/libexec/binutils222
-TO_REMOVE+=/usr/share/man/[cm]a[nt]1/addr2line222.1.gz
-TO_REMOVE+=/usr/share/man/[cm]a[nt]1/ar222.1.gz
-TO_REMOVE+=/usr/share/man/[cm]a[nt]1/as222.1.gz
-TO_REMOVE+=/usr/share/man/[cm]a[nt]1/c++filt222.1.gz
-TO_REMOVE+=/usr/share/man/[cm]a[nt]1/elfedit222.1.gz
-TO_REMOVE+=/usr/share/man/[cm]a[nt]1/gprof222.1.gz
-TO_REMOVE+=/usr/share/man/[cm]a[nt]1/ld222.1.gz
-TO_REMOVE+=/usr/share/man/[cm]a[nt]1/nm222.1.gz
-TO_REMOVE+=/usr/share/man/[cm]a[nt]1/objcopy222.1.gz
-TO_REMOVE+=/usr/share/man/[cm]a[nt]1/objdump222.1.gz
-TO_REMOVE+=/usr/share/man/[cm]a[nt]1/ranlib222.1.gz
-TO_REMOVE+=/usr/share/man/[cm]a[nt]1/readelf222.1.gz
-TO_REMOVE+=/usr/share/man/[cm]a[nt]1/size222.1.gz
-TO_REMOVE+=/usr/share/man/[cm]a[nt]1/strings222.1.gz
-TO_REMOVE+=/usr/share/man/[cm]a[nt]1/strip222.1.gz
+TO_REMOVE+=/usr/share/man/man1/addr2line222.1.gz
+TO_REMOVE+=/usr/share/man/man1/ar222.1.gz
+TO_REMOVE+=/usr/share/man/man1/as222.1.gz
+TO_REMOVE+=/usr/share/man/man1/c++filt222.1.gz
+TO_REMOVE+=/usr/share/man/man1/elfedit222.1.gz
+TO_REMOVE+=/usr/share/man/man1/gprof222.1.gz
+TO_REMOVE+=/usr/share/man/man1/ld222.1.gz
+TO_REMOVE+=/usr/share/man/man1/nm222.1.gz
+TO_REMOVE+=/usr/share/man/man1/objcopy222.1.gz
+TO_REMOVE+=/usr/share/man/man1/objdump222.1.gz
+TO_REMOVE+=/usr/share/man/man1/ranlib222.1.gz
+TO_REMOVE+=/usr/share/man/man1/readelf222.1.gz
+TO_REMOVE+=/usr/share/man/man1/size222.1.gz
+TO_REMOVE+=/usr/share/man/man1/strings222.1.gz
+TO_REMOVE+=/usr/share/man/man1/strip222.1.gz
 TO_REMOVE+=/usr/share/locale/gl_ES.ISO8859-1
 TO_REMOVE+=/usr/share/man/ja
 TO_REMOVE+=/usr/share/man/en.ISO8859-1
@@ -3016,27 +2087,84 @@ TO_REMOVE+=/usr/share/nls/zh_HK.Big5HKSCS
 TO_REMOVE+=/usr/share/nls/zh_HK.UTF-8
 TO_REMOVE+=/usr/share/nls/zh_TW.Big5
 TO_REMOVE+=/usr/share/nls/zh_TW.UTF-8
+TO_REMOVE+=/usr/share/info
+TO_REMOVE+=/usr/bin/info
+TO_REMOVE+=/usr/bin/infokey
+TO_REMOVE+=/usr/bin/install-info
+TO_REMOVE+=/usr/bin/makeinfo
+TO_REMOVE+=/usr/bin/pdftexi2dvi
+TO_REMOVE+=/usr/bin/texi2dvi
+TO_REMOVE+=/usr/bin/texi2pdf
+TO_REMOVE+=/usr/bin/texindex
+TO_REMOVE+=/usr/share/man/man1/info.1.gz
+TO_REMOVE+=/usr/share/man/man1/infokey.1.gz
+TO_REMOVE+=/usr/share/man/man1/install-info.1.gz
+TO_REMOVE+=/usr/share/man/man1/makeinfo.1.gz
+TO_REMOVE+=/usr/share/man/man1/pdftexi2dvi.1.gz
+TO_REMOVE+=/usr/share/man/man1/texi2dvi.1.gz
+TO_REMOVE+=/usr/share/man/man1/texi2pdf.1.gz
+TO_REMOVE+=/usr/share/man/man1/texindex.1.gz
+TO_REMOVE+=/usr/share/man/man5/info.5.gz
+TO_REMOVE+=/usr/share/man/man5/texinfo.5.gz
+TO_REMOVE+=/usr/share/mk/bsd.info.mk
+TO_REMOVE+=/usr/share/man/en.ISO8859-15
+TO_REMOVE+=/usr/share/zoneinfo/America/Montreal
+TO_REMOVE+=/usr/include/gnu/vfs/ext2fs/ext2mount.h
+TO_REMOVE+=/usr/include/bus/u4b/usb_freebsd.h
+TO_REMOVE+=/etc/apmd.conf
+TO_REMOVE+=/etc/rc.d/apm
+TO_REMOVE+=/etc/rc.d/apmd
+TO_REMOVE+=/etc/rc.d/battd
+TO_REMOVE+=/usr/sbin/apmd
+TO_REMOVE+=/usr/sbin/battd
+TO_REMOVE+=/usr/sbin/zzz
+TO_REMOVE+=/usr/share/examples/etc/apmd.conf
+TO_REMOVE+=/usr/share/man/man4/apm.4.gz
+TO_REMOVE+=/usr/share/man/man8/apmconf.8.gz
+TO_REMOVE+=/usr/share/man/man8/apmd.8.gz
+TO_REMOVE+=/usr/share/man/man8/battd.8.gz
+TO_REMOVE+=/usr/share/man/man8/zzz.8.gz
+TO_REMOVE+=/usr/lib/compat
+TO_REMOVE+=/boot/kernel/if_ar.ko
+TO_REMOVE+=/boot/kernel/if_ed.ko
+TO_REMOVE+=/boot/kernel/if_sbni.ko
+TO_REMOVE+=/boot/kernel/if_sr.ko
+TO_REMOVE+=/boot/kernel/ng_sync_ar.ko
+TO_REMOVE+=/boot/kernel/ng_sync_sr.ko
+TO_REMOVE+=/usr/include/gnu/vfs/ext2fs/i386-bitops.h
+TO_REMOVE+=/usr/share/man/man3/ieee_test.3.gz
+TO_REMOVE+=/etc/rc.d/hostapd
+TO_REMOVE+=/usr/sbin/hostapd
+TO_REMOVE+=/usr/sbin/hostapd_cli
+TO_REMOVE+=/usr/share/man/man8/hostapd.8.gz
+TO_REMOVE+=/usr/share/man/man8/hostapd_cli.8.gz
+TO_REMOVE+=/usr/share/man/man5/hostapd.conf.5.gz
+TO_REMOVE+=/usr/share/examples/etc/hostapd.conf
+TO_REMOVE+=/usr/share/locale/*/*.UTF-8
+TO_REMOVE+=/usr/share/locale/hi_IN/hi_IN.ISCII-DEV
+TO_REMOVE+=/usr/share/locale/la_LN/la_LN.ISO8859-1
+TO_REMOVE+=/usr/share/locale/no_NO*
+TO_REMOVE+=/usr/share/locale/mn_MN*
+TO_REMOVE+=/usr/share/locale/sr_YU*
+TO_REMOVE+=/usr/share/locale/zh_CN*
+TO_REMOVE+=/usr/share/locale/zh_HK*
+TO_REMOVE+=/usr/share/locale/zh_TW*
+TO_REMOVE+=/usr/share/locale/zh_han*
+TO_REMOVE+=/usr/share/nls/no_NO.ISO8859-1
+TO_REMOVE+=/usr/share/nls/mn_MN.UTF-8
+TO_REMOVE+=/usr/share/nls/zh_CN.*
+TO_REMOVE+=/usr/share/nls/zh_hans_CN.*
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/sbin/stlstats
-TO_REMOVE+=/usr/share/man/cat8/i386/stlstats.8.gz
 TO_REMOVE+=/usr/share/man/man8/i386/stlstats.8.gz
-TO_REMOVE+=/usr/share/man/cat4/i386/stl.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/stl.4.gz
 TO_REMOVE+=/usr/sbin/kgzip
-TO_REMOVE+=/usr/share/man/cat8/kgzip.8.gz
 TO_REMOVE+=/usr/share/man/man8/kgzip.8.gz
 TO_REMOVE+=/usr/sbin/pnpinfo
-TO_REMOVE+=/usr/share/man/cat8/pnpinfo.8.gz
 TO_REMOVE+=/usr/share/man/man8/pnpinfo.8.gz
-TO_REMOVE+=/boot/kernel/if_ar.ko
 TO_REMOVE+=/boot/kernel/glxsb.ko
-TO_REMOVE+=/boot/kernel/if_sbni.ko
 TO_REMOVE+=/boot/kernel/pst.ko
-TO_REMOVE+=/boot/kernel/if_ed.ko
-TO_REMOVE+=/boot/kernel/if_sr.ko
-TO_REMOVE+=/boot/kernel/ng_sync_ar.ko
-TO_REMOVE+=/boot/kernel/ng_sync_sr.ko
 .endif
 
 .if !defined(WANT_INSTALLER)
@@ -3046,10 +2174,8 @@ TO_REMOVE+=/usr/sbin/installer
 TO_REMOVE+=/usr/share/installer/cmdnames.conf
 TO_REMOVE+=/usr/share/installer/fred.txt
 TO_REMOVE+=/usr/share/installer/sources.conf
-TO_REMOVE+=/usr/share/man/cat8/installer.8.gz
 TO_REMOVE+=/usr/share/man/man8/installer.8.gz
 .endif
 
 # XXX Remove when pfsync(4) has been fixed
-TO_REMOVE+=/usr/share/man/cat4/pfsync.4.gz
 TO_REMOVE+=/usr/share/man/man4/pfsync.4.gz