less(1): Upgrade from version 458 to 471

[dragonfly.git] / Makefile_upgrade.inc

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index 428cee7..b64caa4 100644 (file)
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -2819,6 +2819,53 @@ 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
@@ -2842,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