X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/blobdiff_plain/0f4f8736dc77dc3db58f6947239bdefb469d76a1..8ddceaf59d8339b239d4812702f6c39ca514fc0e:/Makefile_upgrade.inc diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 0b3bbd77ca..50a3c1b9a7 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -273,11 +273,6 @@ 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+=/dev/rwcd* -TO_REMOVE+=/dev/rwst* -TO_REMOVE+=/dev/wcd* -TO_REMOVE+=/dev/wd* -TO_REMOVE+=/dev/wfd* 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 @@ -565,7 +560,6 @@ 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+=/dev/zs0 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 @@ -718,10 +712,6 @@ 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+=/dev/mcd* -TO_REMOVE+=/dev/scd* -TO_REMOVE+=/dev/MAKEDEV -TO_REMOVE+=/dev/MAKEDEV.local 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 @@ -1144,7 +1134,6 @@ 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+=/var/heimdal 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 @@ -1532,7 +1521,6 @@ 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 -TO_REMOVE+=/usr/include/openssl/krb5_asn.h TO_REMOVE+=/usr/include/openssl/md2.h TO_REMOVE+=/usr/include/openssl/pq_compat.h TO_REMOVE+=/usr/include/openssl/rc5.h @@ -1981,6 +1969,78 @@ 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 +TO_REMOVE+=/usr/include/openssl/eng_int.h +TO_REMOVE+=/usr/include/openssl/ui_locl.h +TO_REMOVE+=/usr/include/dev/disk/mpt/mpilib/mpi_inb.h +TO_REMOVE+=/usr/share/misc/map3270 +TO_REMOVE+=/usr/lib/libmytinfo.a +TO_REMOVE+=/usr/lib/libmytinfo.so +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/el_wdeletestr.3.gz +TO_REMOVE+=/usr/share/man/man3/el_wdeletestr.3.gz +TO_REMOVE+=/usr/share/man/cat3/el_wget.3.gz +TO_REMOVE+=/usr/share/man/man3/el_wget.3.gz +TO_REMOVE+=/usr/share/man/cat3/el_wgetc.3.gz +TO_REMOVE+=/usr/share/man/man3/el_wgetc.3.gz +TO_REMOVE+=/usr/share/man/cat3/el_wgets.3.gz +TO_REMOVE+=/usr/share/man/man3/el_wgets.3.gz +TO_REMOVE+=/usr/share/man/cat3/el_winsertstr.3.gz +TO_REMOVE+=/usr/share/man/man3/el_winsertstr.3.gz +TO_REMOVE+=/usr/share/man/cat3/el_wline.3.gz +TO_REMOVE+=/usr/share/man/man3/el_wline.3.gz +TO_REMOVE+=/usr/share/man/cat3/el_wparse.3.gz +TO_REMOVE+=/usr/share/man/man3/el_wparse.3.gz +TO_REMOVE+=/usr/share/man/cat3/el_wpush.3.gz +TO_REMOVE+=/usr/share/man/man3/el_wpush.3.gz +TO_REMOVE+=/usr/share/man/cat3/el_wset.3.gz +TO_REMOVE+=/usr/share/man/man3/el_wset.3.gz +TO_REMOVE+=/usr/share/man/cat3/history_w.3.gz +TO_REMOVE+=/usr/share/man/man3/history_w.3.gz +TO_REMOVE+=/usr/share/man/cat3/history_wend.3.gz +TO_REMOVE+=/usr/share/man/man3/history_wend.3.gz +TO_REMOVE+=/usr/share/man/cat3/history_winit.3.gz +TO_REMOVE+=/usr/share/man/man3/history_winit.3.gz +TO_REMOVE+=/usr/share/man/cat3/tok_wend.3.gz +TO_REMOVE+=/usr/share/man/man3/tok_wend.3.gz +TO_REMOVE+=/usr/share/man/cat3/tok_winit.3.gz +TO_REMOVE+=/usr/share/man/man3/tok_winit.3.gz +TO_REMOVE+=/usr/share/man/cat3/tok_wline.3.gz +TO_REMOVE+=/usr/share/man/man3/tok_wline.3.gz +TO_REMOVE+=/usr/share/man/cat3/tok_wreset.3.gz +TO_REMOVE+=/usr/share/man/man3/tok_wreset.3.gz +TO_REMOVE+=/usr/share/man/cat3/tok_wstr.3.gz +TO_REMOVE+=/usr/share/man/man3/tok_wstr.3.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 .if ${MACHINE_ARCH} == "x86_64" TO_REMOVE+=/usr/libdata/stallion/2681.sys @@ -1998,6 +2058,9 @@ TO_REMOVE+=/usr/share/man/cat4/i386/stl.4.gz TO_REMOVE+=/usr/share/man/man4/i386/stl.4.gz TO_REMOVE+=/usr/share/man/cat4/i386/stli.4.gz TO_REMOVE+=/usr/share/man/man4/i386/stli.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 .endif # XXX Remove when pfsync(4) has been fixed @@ -2023,8 +2086,3 @@ TO_REMOVE+=/usr/share/man/man4/rum.4.gz TO_REMOVE+=/boot/modules/if_ural.ko TO_REMOVE+=/usr/share/man/cat4/ural.4.gz TO_REMOVE+=/usr/share/man/man4/ural.4.gz - -# XXX Remove when acpi_hp(4) has been fixed -TO_REMOVE+=/boot/kernel/acpi_hp.ko -TO_REMOVE+=/usr/share/man/cat4/acpi_hp.4.gz -TO_REMOVE+=/usr/share/man/man4/acpi_hp.4.gz