Makefile_upgrade.inc: Fix some merging artifacts.
authorSascha Wildner <saw@online.de>
Sat, 8 May 2010 22:24:43 +0000 (00:24 +0200)
committerSascha Wildner <saw@online.de>
Sat, 8 May 2010 22:24:43 +0000 (00:24 +0200)
Makefile_upgrade.inc

index e0ebf4b..5a7deea 100644 (file)
@@ -1301,40 +1301,6 @@ TO_REMOVE+=/usr/share/man/cat9/ieee80211_cancel_scan_any.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_cancel_scan_any.9.gz
 TO_REMOVE+=/usr/share/man/cat9/ieee80211_wait_for_parent.9.gz
 TO_REMOVE+=/usr/share/man/man9/ieee80211_wait_for_parent.9.gz
-
-# XXX Remove when adjusted to the new 802.11 framework
-TO_REMOVE+=/boot/modules/if_acx.ko
-TO_REMOVE+=/usr/share/man/cat4/acx.4.gz
-TO_REMOVE+=/usr/share/man/man4/acx.4.gz
-TO_REMOVE+=/boot/modules/if_bwi.ko
-TO_REMOVE+=/usr/share/man/cat4/bwi.4.gz
-TO_REMOVE+=/usr/share/man/man4/bwi.4.gz
-TO_REMOVE+=/boot/modules/if_iwi.ko
-TO_REMOVE+=/usr/share/man/cat4/iwi.4.gz
-TO_REMOVE+=/usr/share/man/man4/iwi.4.gz
-TO_REMOVE+=/boot/modules/if_iwl.ko
-TO_REMOVE+=/usr/share/man/cat4/iwl.4.gz
-TO_REMOVE+=/usr/share/man/man4/iwl.4.gz
-TO_REMOVE+=/boot/modules/if_rtw.ko
-TO_REMOVE+=/usr/share/man/cat4/rtw.4.gz
-TO_REMOVE+=/usr/share/man/man4/rtw.4.gz
-TO_REMOVE+=/boot/modules/if_rum.ko
-TO_REMOVE+=/usr/share/man/cat4/rum.4.gz
-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
-TO_REMOVE+=/boot/modules/wlan_ratectl_amrr.ko
-TO_REMOVE+=/boot/modules/wlan_ratectl_onoe.ko
-TO_REMOVE+=/boot/modules/wlan_ratectl_sample.ko
-TO_REMOVE+=/usr/include/dev/netif/wi/spectrum24t_cf.h
-TO_REMOVE+=/usr/include/netproto/802_11/if_wavelan_ieee.h
 TO_REMOVE+=/etc/rc.d/named
 TO_REMOVE+=/usr/bin/dig
 TO_REMOVE+=/usr/bin/dnssec-keygen
@@ -1386,3 +1352,32 @@ TO_REMOVE+=/usr/share/man/cat8/named.reload.8.gz
 TO_REMOVE+=/usr/share/man/cat8/named.restart.8.gz
 TO_REMOVE+=/usr/share/man/cat8/rndc-confgen.8.gz
 TO_REMOVE+=/usr/share/man/cat8/rndc.8.gz
+
+# XXX Remove when adjusted to the new 802.11 framework
+TO_REMOVE+=/boot/modules/if_acx.ko
+TO_REMOVE+=/usr/share/man/cat4/acx.4.gz
+TO_REMOVE+=/usr/share/man/man4/acx.4.gz
+TO_REMOVE+=/boot/modules/if_bwi.ko
+TO_REMOVE+=/usr/share/man/cat4/bwi.4.gz
+TO_REMOVE+=/usr/share/man/man4/bwi.4.gz
+TO_REMOVE+=/boot/modules/if_iwi.ko
+TO_REMOVE+=/usr/share/man/cat4/iwi.4.gz
+TO_REMOVE+=/usr/share/man/man4/iwi.4.gz
+TO_REMOVE+=/boot/modules/if_iwl.ko
+TO_REMOVE+=/usr/share/man/cat4/iwl.4.gz
+TO_REMOVE+=/usr/share/man/man4/iwl.4.gz
+TO_REMOVE+=/boot/modules/if_rtw.ko
+TO_REMOVE+=/usr/share/man/cat4/rtw.4.gz
+TO_REMOVE+=/usr/share/man/man4/rtw.4.gz
+TO_REMOVE+=/boot/modules/if_rum.ko
+TO_REMOVE+=/usr/share/man/cat4/rum.4.gz
+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