From c7aae7d097625b2116cac75864acdca0d40299f1 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 24 Apr 2010 15:17:39 +0200 Subject: [PATCH] Adjust manual page installation for the 802.11 upgrade. --- Makefile_upgrade.inc | 38 ++++++++++++++++++++++++++++++++------ share/man/man4/Makefile | 20 +++++++++----------- 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index f765aa7821..f58b4385fc 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -1198,17 +1198,43 @@ TO_REMOVE+=/usr/share/games/fortune/fortunes2.dat TO_REMOVE+=/usr/share/man/cat8/tmpfs.8.gz TO_REMOVE+=/usr/share/man/man8/tmpfs.8.gz TO_REMOVE+=/usr/include/sys/msfbuf.h +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+=/usr/include/ktrfmt.tab.h +TO_REMOVE+=/usr/share/man/cat4/wlan_ratectl.4.gz +TO_REMOVE+=/usr/share/man/man4/wlan_ratectl.4.gz +TO_REMOVE+=/usr/share/man/cat4/wlan_ratectl_amrr.4.gz +TO_REMOVE+=/usr/share/man/man4/wlan_ratectl_amrr.4.gz +TO_REMOVE+=/usr/share/man/cat4/wlan_ratectl_onoe.4.gz +TO_REMOVE+=/usr/share/man/man4/wlan_ratectl_onoe.4.gz +TO_REMOVE+=/usr/share/man/cat4/wlan_ratectl_sample.4.gz +TO_REMOVE+=/usr/share/man/man4/wlan_ratectl_sample.4.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+=/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+=/usr/include/ktrfmt.tab.h +TO_REMOVE+=/usr/share/man/cat4/ndis.4.gz +TO_REMOVE+=/usr/share/man/man4/ndis.4.gz diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index e5ebb521d3..4d6aa64270 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -12,7 +12,6 @@ MAN= aac.4 \ acpi_thinkpad.4 \ acpi_toshiba.4 \ acpi_video.4 \ - acx.4 \ adv.4 \ adw.4 \ ae.4 \ @@ -48,7 +47,6 @@ MAN= aac.4 \ bpf.4 \ bridge.4 \ bt.4 \ - bwi.4 \ cardbus.4 \ carp.4 \ ccd.4 \ @@ -120,8 +118,6 @@ MAN= aac.4 \ isp.4 \ ispfw.4 \ it.4 \ - iwi.4 \ - iwl.4 \ jme.4 \ joy.4 \ kate.4 \ @@ -221,9 +217,7 @@ MAN= aac.4 \ rndtest.4 \ route.4 \ rp.4 \ - rtw.4 \ rue.4 \ - rum.4 \ sa.4 \ sbc.4 \ sbp.4 \ @@ -320,7 +314,6 @@ MAN= aac.4 \ ums.4 \ unix.4 \ uplcom.4 \ - ural.4 \ urio.4 \ usb.4 \ uscanner.4 \ @@ -342,7 +335,6 @@ MAN= aac.4 \ wlan.4 \ wlan_acl.4 \ wlan_ccmp.4 \ - wlan_ratectl.4 \ wlan_tkip.4 \ wlan_wep.4 \ wlan_xauth.4 \ @@ -351,6 +343,15 @@ MAN= aac.4 \ xpt.4 \ zero.4 +# XXX re-add when adjusted to the new 802.11 framework +#MAN+= acx.4 \ +# bwi.4 \ +# iwi.4 \ +# iwl.4 \ +# rtw.4 \ +# rum.4 \ +# ural.4 \ + MLINKS= acpi_thermal.4 acpi_tz.4 MLINKS+=agp.4 agpgart.4 MLINKS+=bktr.4 brooktree.4 @@ -392,9 +393,6 @@ MLINKS+=splash.4 screensaver.4 MLINKS+=syscons.4 sc.4 MLINKS+=vga.4 vesa.4 MLINKS+=vpo.4 imm.4 -MLINKS+=wlan_ratectl.4 wlan_ratectl_amrr.4 \ - wlan_ratectl.4 wlan_ratectl_onoe.4 \ - wlan_ratectl.4 wlan_ratectl_sample.4 .if ${MACHINE_ARCH} == "i386" SUBDIR= man4.${MACHINE_ARCH} -- 2.41.0