less(1): Upgrade from version 458 to 471
[dragonfly.git] / Makefile_upgrade.inc
index 5412696..b64caa4 100644 (file)
@@ -712,8 +712,6 @@ 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/man4/snd_emu10kx.4.gz
-TO_REMOVE+=/usr/share/man/cat4/snd_emu10kx.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
@@ -977,12 +975,8 @@ 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_getreg.3.gz
-TO_REMOVE+=/usr/share/man/man3/svc_getreg.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/cat3/xdr_authunix_parms.3.gz
-TO_REMOVE+=/usr/share/man/man3/xdr_authunix_parms.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
@@ -1099,12 +1093,6 @@ 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/bin/crunchgen
-TO_REMOVE+=/usr/share/man/cat1/crunchgen.1.gz
-TO_REMOVE+=/usr/share/man/man1/crunchgen.1.gz
-TO_REMOVE+=/usr/bin/crunchide
-TO_REMOVE+=/usr/share/man/cat1/crunchide.1.gz
-TO_REMOVE+=/usr/share/man/man1/crunchide.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
@@ -1539,10 +1527,6 @@ 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/share/man/cat3/magic_errno.3.gz
-TO_REMOVE+=/usr/share/man/man3/magic_errno.3.gz
-TO_REMOVE+=/usr/share/man/cat3/magic_file.3.gz
-TO_REMOVE+=/usr/share/man/man3/magic_file.3.gz
 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
@@ -1966,6 +1950,7 @@ 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
@@ -2517,6 +2502,370 @@ TO_REMOVE+=/usr/share/man/man9/usbd_setup_isoc_xfer.9.gz
 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
+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
+TO_REMOVE+=/usr/lib/libalias.so.5
+TO_REMOVE+=/usr/lib/libatm.so.3
+TO_REMOVE+=/usr/lib/libbsdxml.so.4
+TO_REMOVE+=/usr/lib/libc.so.8
+TO_REMOVE+=/usr/lib/libcam.so.3
+TO_REMOVE+=/usr/lib/libcrypt.so.4
+TO_REMOVE+=/usr/lib/libcrypto.so.5
+TO_REMOVE+=/usr/lib/libdevattr.so.3
+TO_REMOVE+=/usr/lib/libdm.so.3
+TO_REMOVE+=/usr/lib/libedit.so.5
+TO_REMOVE+=/usr/lib/libfsid.so.3
+TO_REMOVE+=/usr/lib/libhammer.so.0
+TO_REMOVE+=/usr/lib/libipsec.so.2
+TO_REMOVE+=/usr/lib/libipx.so.3
+TO_REMOVE+=/usr/lib/libkvm.so.3
+TO_REMOVE+=/usr/lib/libm.so.4
+TO_REMOVE+=/usr/lib/libmd.so.3
+TO_REMOVE+=/usr/lib/libncp.so.2
+TO_REMOVE+=/usr/lib/libncurses.so.6
+TO_REMOVE+=/usr/lib/libncursesw.so.6
+TO_REMOVE+=/usr/lib/libprop.so.3
+TO_REMOVE+=/usr/lib/libsbuf.so.3
+TO_REMOVE+=/usr/lib/libutil.so.4
+TO_REMOVE+=/usr/lib/libz.so.3
+TO_REMOVE+=/boot/kernel/if_ef.ko
+TO_REMOVE+=/boot/kernel/ncp.ko
+TO_REMOVE+=/boot/kernel/nwfs.ko
+TO_REMOVE+=/etc/rc.d/ipxrouted
+TO_REMOVE+=/lib/libipx.so.3
+TO_REMOVE+=/lib/libncp.so.2
+TO_REMOVE+=/sbin/mount_nwfs
+TO_REMOVE+=/usr/bin/ncplist
+TO_REMOVE+=/usr/bin/ncplogin
+TO_REMOVE+=/usr/bin/ncplogout
+TO_REMOVE+=/usr/include/netipx
+TO_REMOVE+=/usr/include/netncp
+TO_REMOVE+=/usr/include/netproto/ipx
+TO_REMOVE+=/usr/include/netproto/ncp
+TO_REMOVE+=/usr/include/nwfs
+TO_REMOVE+=/usr/include/vfs/nwfs
+TO_REMOVE+=/usr/lib/compat/libipx.so.2
+TO_REMOVE+=/usr/lib/compat/libncp.so.1
+TO_REMOVE+=/usr/lib/libipx.a
+TO_REMOVE+=/usr/lib/libipx.so
+TO_REMOVE+=/usr/lib/libncp.a
+TO_REMOVE+=/usr/lib/libncp.so
+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
+TO_REMOVE+=/etc/rc.d/atm2
+TO_REMOVE+=/etc/rc.d/atm3
+TO_REMOVE+=/lib/libatm.so.3
+TO_REMOVE+=/sbin/atm
+TO_REMOVE+=/sbin/fore_dnld
+TO_REMOVE+=/sbin/ilmid
+TO_REMOVE+=/usr/include/libatm.h
+TO_REMOVE+=/usr/include/net/if_atm.h
+TO_REMOVE+=/usr/include/netatm
+TO_REMOVE+=/usr/include/netgraph7/atmllc
+TO_REMOVE+=/usr/include/netinet/if_atm.h
+TO_REMOVE+=/usr/include/netnatm
+TO_REMOVE+=/usr/include/netproto/atm
+TO_REMOVE+=/usr/include/netproto/natm
+TO_REMOVE+=/usr/lib/compat/libatm.so.2
+TO_REMOVE+=/usr/lib/libatm.a
+TO_REMOVE+=/usr/lib/libatm.so
+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
+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
+TO_REMOVE+=/usr/share/man/man4/mgadrm.4.gz
+TO_REMOVE+=/usr/share/man/man4/r128.4.gz
+TO_REMOVE+=/usr/share/man/man4/r128drm.4.gz
+TO_REMOVE+=/usr/share/man/man4/savage.4.gz
+TO_REMOVE+=/usr/share/man/man4/savagedrm.4.gz
+TO_REMOVE+=/usr/share/man/man4/sisdrm.4.gz
+TO_REMOVE+=/usr/share/man/man4/tdfx.4.gz
+TO_REMOVE+=/usr/share/man/man4/tdfxdrm.4.gz
+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
+TO_REMOVE+=/boot/kernel/if_ural.ko
+TO_REMOVE+=/boot/kernel/moscom.ko
+TO_REMOVE+=/boot/kernel/natausb.ko
+TO_REMOVE+=/boot/kernel/snd_uaudio.ko
+TO_REMOVE+=/boot/kernel/ubt.ko
+TO_REMOVE+=/boot/kernel/ugen.ko
+TO_REMOVE+=/boot/kernel/uscanner.ko
+TO_REMOVE+=/boot/kernel/uticom.ko
+TO_REMOVE+=/etc/rc.d/usbd
+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
+TO_REMOVE+=/usr/share/man/man9/VOP_SYMLINK.9.gz
+TO_REMOVE+=/usr/share/man/man9/VOP_LEASE.9.gz
+TO_REMOVE+=/usr/share/man/man9/VOP_LINK.9.gz
+TO_REMOVE+=/usr/share/man/man9/VOP_LOCK.9.gz
+TO_REMOVE+=/usr/share/man/man9/VOP_LOOKUP.9.gz
+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
+TO_REMOVE+=/usr/include/netinet/sctp_asconf.h
+TO_REMOVE+=/usr/include/netinet/sctp_callout.h
+TO_REMOVE+=/usr/include/netinet/sctp_constants.h
+TO_REMOVE+=/usr/include/netinet/sctp_crc32.h
+TO_REMOVE+=/usr/include/netinet/sctp_hashdriver.h
+TO_REMOVE+=/usr/include/netinet/sctp_header.h
+TO_REMOVE+=/usr/include/netinet/sctp_indata.h
+TO_REMOVE+=/usr/include/netinet/sctp_input.h
+TO_REMOVE+=/usr/include/netinet/sctp_output.h
+TO_REMOVE+=/usr/include/netinet/sctp_pcb.h
+TO_REMOVE+=/usr/include/netinet/sctp_peeloff.h
+TO_REMOVE+=/usr/include/netinet/sctp_sha1.h
+TO_REMOVE+=/usr/include/netinet/sctp_structs.h
+TO_REMOVE+=/usr/include/netinet/sctp_timer.h
+TO_REMOVE+=/usr/include/netinet/sctp_uio.h
+TO_REMOVE+=/usr/include/netinet/sctp_var.h
+TO_REMOVE+=/usr/include/netinet/sctputil.h
+TO_REMOVE+=/usr/include/netinet6/sctp6_var.h
+TO_REMOVE+=/usr/lib/libsctp.a
+TO_REMOVE+=/usr/lib/libsctp.so
+TO_REMOVE+=/usr/lib/libsctp.so.3
+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
+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
+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
+TO_REMOVE+=/usr/libdata/gcc44
+TO_REMOVE+=/usr/libexec/gcc44
+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
+TO_REMOVE+=/usr/share/man/man1/cpp44.1.gz
+TO_REMOVE+=/usr/share/man/man1/g++44.1.gz
+TO_REMOVE+=/usr/share/man/man1/gcc44.1.gz
+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
+TO_REMOVE+=/usr/bin/vacation
+TO_REMOVE+=/usr/sbin/editmap
+TO_REMOVE+=/usr/sbin/mailstats
+TO_REMOVE+=/usr/sbin/makemap
+TO_REMOVE+=/usr/sbin/praliases
+TO_REMOVE+=/usr/lib/libmilter.a
+TO_REMOVE+=/usr/lib/libmilter.so
+TO_REMOVE+=/usr/lib/libmilter.so.3
+TO_REMOVE+=/usr/libexec/mail.local
+TO_REMOVE+=/usr/libexec/smrsh
+TO_REMOVE+=/usr/libexec/sendmail
+TO_REMOVE+=/usr/share/man/man1/mailq.1.gz
+TO_REMOVE+=/usr/share/man/man1/newaliases.1.gz
+TO_REMOVE+=/usr/share/man/man1/vacation.1.gz
+TO_REMOVE+=/usr/share/man/man8/editmap.8.gz
+TO_REMOVE+=/usr/share/man/man8/hoststat.8.gz
+TO_REMOVE+=/usr/share/man/man8/mail.local.8.gz
+TO_REMOVE+=/usr/share/man/man8/mailstats.8.gz
+TO_REMOVE+=/usr/share/man/man8/makemap.8.gz
+TO_REMOVE+=/usr/share/man/man8/praliases.8.gz
+TO_REMOVE+=/usr/share/man/man8/purgestat.8.gz
+TO_REMOVE+=/usr/share/man/man8/rmail.8.gz
+TO_REMOVE+=/usr/share/man/man8/sendmail.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+=/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
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/sbin/stlstats
@@ -2534,108 +2883,21 @@ 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)
+TO_REMOVE+=/usr/sbin/dfuibe_installer
+TO_REMOVE+=/usr/sbin/dfuife_curses
+TO_REMOVE+=/usr/sbin/installer
+TO_REMOVE+=/usr/share/installer
+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
-
-# XXX Remove when adjusted to the new 802.11 framework
-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/if_ural.ko
-TO_REMOVE+=/usr/share/man/cat4/ural.4.gz
-TO_REMOVE+=/usr/share/man/man4/ural.4.gz
-
-# Clean up old USB stuff when the new stack is requested
-# and vice versa
-.if !defined(WANT_OLDUSB)
-TO_REMOVE+=/boot/kernel/if_aue.ko
-TO_REMOVE+=/boot/kernel/if_cue.ko
-TO_REMOVE+=/boot/kernel/if_kue.ko
-TO_REMOVE+=/boot/kernel/if_lgue.ko
-TO_REMOVE+=/boot/kernel/if_rue.ko
-TO_REMOVE+=/boot/kernel/moscom.ko
-TO_REMOVE+=/boot/kernel/snd_uaudio.ko
-TO_REMOVE+=/boot/kernel/ubt.ko
-TO_REMOVE+=/boot/kernel/ufm.ko
-TO_REMOVE+=/boot/kernel/ugen.ko
-TO_REMOVE+=/boot/kernel/uscanner.ko
-TO_REMOVE+=/boot/kernel/uticom.ko
-TO_REMOVE+=/usr/sbin/usbd
-TO_REMOVE+=/usr/share/man/cat5/usbd.conf.5.gz
-TO_REMOVE+=/usr/share/man/man5/usbd.conf.5.gz
-TO_REMOVE+=/usr/share/man/cat8/usbd.8.gz
-TO_REMOVE+=/usr/share/man/man8/usbd.8.gz
-TO_REMOVE+=/usr/sbin/usbdevs
-TO_REMOVE+=/usr/share/man/cat8/usbdevs.8.gz
-TO_REMOVE+=/usr/share/man/man8/usbdevs.8.gz
-.else
-TO_REMOVE+=/boot/kernel/if_udav.ko
-TO_REMOVE+=/boot/kernel/ohci.ko
-TO_REMOVE+=/boot/kernel/u3g.ko
-TO_REMOVE+=/usr/share/man/cat4/u3g.4.gz
-TO_REMOVE+=/usr/share/man/man4/u3g.4.gz
-TO_REMOVE+=/boot/kernel/uaudio.ko
-TO_REMOVE+=/boot/kernel/ubser.ko
-TO_REMOVE+=/usr/share/man/cat4/ubser.4.gz
-TO_REMOVE+=/usr/share/man/man4/ubser.4.gz
-TO_REMOVE+=/boot/kernel/ucycom.ko
-TO_REMOVE+=/usr/share/man/cat4/ucycom.4.gz
-TO_REMOVE+=/usr/share/man/man4/ucycom.4.gz
-TO_REMOVE+=/boot/kernel/uep.ko
-TO_REMOVE+=/boot/kernel/uether.ko
-TO_REMOVE+=/boot/kernel/ufoma.ko
-TO_REMOVE+=/boot/kernel/uhci.ko
-TO_REMOVE+=/boot/kernel/uipaq.ko
-TO_REMOVE+=/usr/share/man/cat4/uipaq.4.gz
-TO_REMOVE+=/usr/share/man/man4/uipaq.4.gz
-TO_REMOVE+=/boot/kernel/umcs.ko
-TO_REMOVE+=/usr/share/man/cat4/umcs.4.gz
-TO_REMOVE+=/usr/share/man/man4/umcs.4.gz
-TO_REMOVE+=/boot/kernel/umoscom.ko
-TO_REMOVE+=/boot/kernel/usb_quirk.ko
-TO_REMOVE+=/boot/kernel/usfs.ko
-TO_REMOVE+=/boot/kernel/xhci.ko
-TO_REMOVE+=/usr/lib/libusb.a
-TO_REMOVE+=/usr/lib/libusb.so.2
-TO_REMOVE+=/usr/lib/libusb.so
-TO_REMOVE+=/usr/lib/profile/libusb.a
-TO_REMOVE+=/usr/sbin/usbcontrol
-TO_REMOVE+=/usr/share/man/cat8/usbcontrol.8.gz
-TO_REMOVE+=/usr/share/man/man8/usbcontrol.8.gz
-TO_REMOVE+=/boot/kernel/if_rum.ko
-TO_REMOVE+=/usr/share/man/cat4/rum.4.gz
-TO_REMOVE+=/usr/share/man/man4/rum.4.gz
-TO_REMOVE+=/boot/kernel/if_run.ko
-TO_REMOVE+=/boot/kernel/runfw.ko
-TO_REMOVE+=/usr/share/man/cat4/run.4.gz
-TO_REMOVE+=/usr/share/man/man4/run.4.gz
-TO_REMOVE+=/usr/share/man/cat4/runfw.4.gz
-TO_REMOVE+=/usr/share/man/man4/runfw.4.gz
-TO_REMOVE+=/boot/kernel/if_urtwn.ko
-TO_REMOVE+=/boot/kernel/urtwn-rtl8192cfwT.ko
-TO_REMOVE+=/boot/kernel/urtwn-rtl8192cfwU.ko
-TO_REMOVE+=/usr/share/man/cat4/urtwn.4.gz
-TO_REMOVE+=/usr/share/man/man4/urtwn.4.gz
-TO_REMOVE+=/usr/share/man/cat4/urtwnfw.4.gz
-TO_REMOVE+=/usr/share/man/man4/urtwnfw.4.gz
-TO_REMOVE+=/usr/share/man/cat4/usb_quirk.4.gz
-TO_REMOVE+=/usr/share/man/man4/usb_quirk.4.gz
-TO_REMOVE+=/usr/bin/usbhidaction
-TO_REMOVE+=/usr/share/man/cat1/usbhidaction.1.gz
-TO_REMOVE+=/usr/share/man/man1/usbhidaction.1.gz
-TO_REMOVE+=/usr/sbin/usbdump
-TO_REMOVE+=/usr/share/man/cat8/usbdump.8.gz
-TO_REMOVE+=/usr/share/man/man8/usbdump.8.gz
-.endif