less(1): Upgrade from version 458 to 471
[dragonfly.git] / Makefile_upgrade.inc
index 5eb0abd..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
@@ -2714,6 +2708,18 @@ 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
@@ -2726,6 +2732,140 @@ 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
@@ -2749,20 +2889,15 @@ 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