Fix up Makefile_upgrade.inc a bit.

* Remove removed modules too.

* Remove cat4 manpages too.

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index f3ab63a..b34423e 100644 (file)
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -2770,6 +2770,21 @@ 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
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/sbin/stlstats
@@ -2810,10 +2825,3 @@ 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
-
-TO_REMOVE+=/usr/share/man/man4/snd_csa.4.gz
-TO_REMOVE+=/usr/share/man/man4/csa.4.gz
-TO_REMOVE+=/usr/share/man/man4/snd_ds1.4.gz
-TO_REMOVE+=/usr/share/man/man4/ds1.4.gz
-TO_REMOVE+=/usr/share/man/man4/snd_maestro3.4.gz
-TO_REMOVE+=/usr/share/man/man4/maestro3.4.gz