X-Git-Url: https://gitweb.dragonflybsd.org/~lentferj/dragonfly.git/blobdiff_plain/8987c32ba06c36230f29fa019e7641637f01ec47..43e72e79e549059473a43a7f99e1b469564c28d0:/Makefile_upgrade.inc diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index a426e810d6..8af9ff638e 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -1022,6 +1022,7 @@ 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 @@ -1130,6 +1131,7 @@ 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 @@ -1143,6 +1145,8 @@ 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+=/var/heimdal @@ -1170,9 +1174,15 @@ 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 +TO_REMOVE+=/usr/lib/libc_r.so.5 TO_REMOVE+=/usr/lib/libthread_xu.so +TO_REMOVE+=/usr/lib/libthread_xu.so.2 TO_REMOVE+=/usr/lib/libc_r.a +TO_REMOVE+=/usr/lib/libc_r_p.a +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 @@ -1540,6 +1550,7 @@ TO_REMOVE+=/boot/frames.4th TO_REMOVE+=/boot/loader.4th TO_REMOVE+=/boot/screen.4th TO_REMOVE+=/boot/support.4th +TO_REMOVE+=/usr/share/zoneinfo/Factory TO_REMOVE+=/usr/freebsd_pkg TO_REMOVE+=/boot/kernel/hotplug.ko TO_REMOVE+=/usr/include/sys/hotplug.h @@ -1557,14 +1568,14 @@ 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/cat/cat9/kref.9.gz -TO_REMOVE+=/usr/share/man/cat/man9/kref.9.gz -TO_REMOVE+=/usr/share/man/cat/cat9/kref_dec.9.gz -TO_REMOVE+=/usr/share/man/cat/man9/kref_dec.9.gz -TO_REMOVE+=/usr/share/man/cat/cat9/kref_inc.9.gz -TO_REMOVE+=/usr/share/man/cat/man9/kref_inc.9.gz -TO_REMOVE+=/usr/share/man/cat/cat9/kref_init.9.gz -TO_REMOVE+=/usr/share/man/cat/man9/kref_init.9.gz +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 @@ -1573,6 +1584,167 @@ 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 +TO_REMOVE+=/etc/periodic/security/510.ipfdenied +TO_REMOVE+=/etc/rc.d/ipfilter +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 +TO_REMOVE+=/usr/include/machine/asc_ioctl.h +TO_REMOVE+=/usr/include/machine/gsc.h +TO_REMOVE+=/usr/include/machine/spigot.h +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 +TO_REMOVE+=/usr/share/man/man4/aha.4.gz +TO_REMOVE+=/usr/share/man/man4/i386/asc.4.gz +TO_REMOVE+=/usr/share/man/man4/i386/dgb.4.gz +TO_REMOVE+=/usr/share/man/man4/i386/el.4.gz +TO_REMOVE+=/usr/share/man/man4/i386/gsc.4.gz +TO_REMOVE+=/usr/share/man/man4/i386/ie.4.gz +TO_REMOVE+=/usr/share/man/man4/i386/labpc.4.gz +TO_REMOVE+=/usr/share/man/man4/i386/le.4.gz +TO_REMOVE+=/usr/share/man/man4/i386/mse.4.gz +TO_REMOVE+=/usr/share/man/man4/i386/rc.4.gz +TO_REMOVE+=/usr/share/man/man4/i386/rdp.4.gz +TO_REMOVE+=/usr/share/man/man4/i386/tw.4.gz +TO_REMOVE+=/usr/share/man/man4/i386/wl.4.gz +TO_REMOVE+=/usr/share/man/man4/i386/wt.4.gz +TO_REMOVE+=/usr/share/man/man8/wlconfig.8.gz +TO_REMOVE+=/usr/share/man/man8/xten.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/include/vfs/gnu + +.if ${MACHINE_ARCH} == "x86_64" +TO_REMOVE+=/usr/libdata/stallion/2681.sys +TO_REMOVE+=/usr/libdata/stallion/cdk.sys +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/stlstats +TO_REMOVE+=/usr/share/man/cat8/i386/stlstats.8.gz +TO_REMOVE+=/usr/share/man/man8/i386/stlstats.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/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 +.endif # XXX Remove when pfsync(4) has been fixed TO_REMOVE+=/usr/share/man/cat4/pfsync.4.gz @@ -1597,9 +1769,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 -TO_REMOVE+=/boot/modules/ndis.ko -TO_REMOVE+=/usr/share/man/cat4/i386/ndis.4.gz -TO_REMOVE+=/usr/share/man/man4/i386/ndis.4.gz -TO_REMOVE+=/usr/sbin/ndiscvt -TO_REMOVE+=/usr/share/man/cat8/ndiscvt.8.gz -TO_REMOVE+=/usr/share/man/man8/ndiscvt.8.gz