Really exclude the ndis(4) manual page from the build for now.

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index d3d57c7..2eac9fe 100644 (file)
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -1243,8 +1243,8 @@ 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/ndis.4.gz
-TO_REMOVE+=/usr/share/man/man4/ndis.4.gz
+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

diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index 4cc19b7..496cabc 100644 (file)
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -5,13 +5,16 @@ MAN=  aic.4 alpm.4 amdpm.4 apm.4 ar.4 asc.4 asr.4 \
        cs.4 cy.4 \
        dgb.4 digi.4 el.4 en.4 ep.4 est.4 ex.4 fe.4 glxsb.4 gsc.4 \
        ie.4 io.4 labpc.4 le.4 linux.4 lnc.4 longrun.4 \
-       meteor.4 mse.4 ndis.4 npx.4 \
+       meteor.4 mse.4 npx.4 \
        pcf.4 perfmon.4 pnp.4 pnpbios.4 \
        rdp.4 sb.4 sbni.4 \
        spkr.4 sr.4 tw.4 \
        tx.4 viapm.4 vx.4 \
        wl.4 wt.4
 
+# XXX re-add when adjusted to the new 802.11 framework
+#MAN+= ndis.4 \
+
 MLINKS=        spkr.4 speaker.4
 
 MANSUBDIR=/i386