"mee too" building modules failing at netgraph/bluetooth/ubt and netgraph/bluetooth/ubtbcmfw

Hi y'all,


I'm tracking -Current via CTM.
Got src-cur and ports-cur updated as of early this AM CDT.

I think it started after these two commits:

> imp         2004-06-27 16:51:01 UTC
> 
>   FreeBSD src repository
> 
>   Modified files:
>     sys/netgraph/bluetooth/drivers/ubt ng_ubt.c
>     sys/netgraph/bluetooth/drivers/ubtbcmfw ubtbcmfw.c
>   Log:
>   MFp4: Last references to dev/usb/usbdevs.h converted.
> 
>   Revision  Changes    Path
>   1.19      +2 -1      src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
>   1.9       +2 -1      src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c

and:

> imp         2004-06-27 16:59:15 UTC
> 
>   FreeBSD src repository
> 
>   Removed files:
>     sys/dev/usb          Makefile.usbdevs devlist2h.awk usbdevs.h
>                          usbdevs_data.h
>   Log:
>   Now that all the in-tree referrences to these old files are gone, go
>   ahead and remove them.
> 
>   Revision  Changes    Path
>   1.3       +0 -16     src/sys/dev/usb/Makefile.usbdevs (dead)
>   1.4       +0 -236    src/sys/dev/usb/devlist2h.awk (dead)
>   1.191     +0 -1354   src/sys/dev/usb/usbdevs.h (dead)
>   1.191     +0 -5335   src/sys/dev/usb/usbdevs_data.h (dead)

I seem to be unable to build the two ubt thingies "with world". 
They're not needed by this workstation, but someone might be
affected out there somewhere.  ;)
All other modules are being built okay.
Snips from the log:

# cd /usr/obj
# rm -Rf *
# cd /src/sys/modules
# make -k -v cleandepend cleandir clean depend all
[...]
===> netgraph/bluetooth/h4
rm -f .depend GPATH GRTAGS GSYMS GTAGS
===> netgraph/bluetooth/ubt
rm -f .depend GPATH GRTAGS GSYMS GTAGS
===> netgraph/bluetooth/ubtbcmfw
rm -f .depend GPATH GRTAGS GSYMS GTAGS
===> netgraph/bpf
[...]
===> netgraph/bluetooth/h4
rm -f ng_h4.ko ng_h4.kld ng_h4.o _at_ machine symb.tmp tmp.o
rm -f .depend GPATH GRTAGS GSYMS GTAGS
===> netgraph/bluetooth/ubt
rm -f ng_ubt.ko ng_ubt.kld ng_ubt.o _at_ machine symb.tmp tmp.o opt_usb.h bus_if.h device_if.h vnode_if.h
rm -f .depend GPATH GRTAGS GSYMS GTAGS
===> netgraph/bluetooth/ubtbcmfw
rm -f ubtbcmfw.ko ubtbcmfw.kld ubtbcmfw.o _at_ machine symb.tmp tmp.o opt_usb.h bus_if.h device_if.h vnode_if.h
rm -f .depend GPATH GRTAGS GSYMS GTAGS
===> netgraph/bpf
rm -f ng_bpf.ko ng_bpf.kld ng_bpf.o bpf_filter.o _at_ machine symb.tmp tmp.o
rm -f .depend GPATH GRTAGS GSYMS GTAGS
[...]
===> netgraph/bluetooth/h4
rm -f ng_h4.ko ng_h4.kld ng_h4.o _at_ machine symb.tmp tmp.o
===> netgraph/bluetooth/ubt
rm -f ng_ubt.ko ng_ubt.kld ng_ubt.o _at_ machine symb.tmp tmp.o opt_usb.h bus_if.h device_if.h vnode_if.h
===> netgraph/bluetooth/ubtbcmfw
rm -f ubtbcmfw.ko ubtbcmfw.kld ubtbcmfw.o _at_ machine symb.tmp tmp.o opt_usb.h bus_if.h device_if.h vnode_if.h
===> netgraph/bpf
rm -f ng_bpf.ko ng_bpf.kld ng_bpf.o bpf_filter.o _at_ machine symb.tmp tmp.o
[...]
===> netgraph/bluetooth/h4
_at_ -> /src/sys
machine -> /src/sys/i386/include
rm -f .depend
mkdep -f .depend -a   -nostdinc -I/src/sys/modules/netgraph/bluetooth/h4/../../../../netgraph/bluetooth/include -I/src/sys/modules/netgraph/bluetooth/h4/../../../../netgraph/bluetooth/drivers/h4 -D_KERNEL -DKLD_MODULE -I- -I/src/sys/modules/netgraph/bluetooth/h4/../../../../netgraph/bluetooth/include -I/src/sys/modules/netgraph/bluetooth/h4/../../../../netgraph/bluetooth/drivers/h4 -I. -I_at_ -I_at_/contrib/altq -I_at_/../include -I/usr/include /src/sys/modules/netgraph/bluetooth/h4/../../../../netgraph/bluetooth/drivers/h4/ng_h4.c
===> netgraph/bluetooth/ubt
_at_ -> /src/sys
machine -> /src/sys/i386/include
awk -f _at_/tools/makeobjops.awk _at_/kern/bus_if.m -h
awk -f _at_/tools/makeobjops.awk _at_/kern/device_if.m -h
awk -f _at_/tools/vnode_if.awk _at_/kern/vnode_if.src -h
touch opt_usb.h
rm -f .depend
mkdep -f .depend -a   -nostdinc -I/src/sys/modules/netgraph/bluetooth/ubt/../../../../netgraph/bluetooth/include -I/src/sys/modules/netgraph/bluetooth/ubt/../../../../netgraph/bluetooth/drivers/ubt -D_KERNEL -DKLD_MODULE -I- -I/src/sys/modules/netgraph/bluetooth/ubt/../../../../netgraph/bluetooth/include -I/src/sys/modules/netgraph/bluetooth/ubt/../../../../netgraph/bluetooth/drivers/ubt -I. -I_at_ -I_at_/contrib/altq -I_at_/../include -I/usr/include /src/sys/modules/netgraph/bluetooth/ubt/../../../../netgraph/bluetooth/drivers/ubt/ng_ubt.c
/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c:60:21: usbdevs.h: No such file or directory
mkdep: compile failed
*** Error code 1 (continuing)
`depend' not remade because of errors.
===> netgraph/bluetooth/ubtbcmfw
_at_ -> /src/sys
machine -> /src/sys/i386/include
awk -f _at_/tools/makeobjops.awk _at_/kern/bus_if.m -h
awk -f _at_/tools/makeobjops.awk _at_/kern/device_if.m -h
awk -f _at_/tools/vnode_if.awk _at_/kern/vnode_if.src -h
touch opt_usb.h
rm -f .depend
mkdep -f .depend -a   -nostdinc -I/src/sys/modules/netgraph/bluetooth/ubtbcmfw/../../../../netgraph/bluetooth/include -I/src/sys/modules/netgraph/bluetooth/ubtbcmfw/../../../../netgraph/bluetooth/drivers/ubtbcmfw -D_KERNEL -DKLD_MODULE -I- -I/src/sys/modules/netgraph/bluetooth/ubtbcmfw/../../../../netgraph/bluetooth/include -I/src/sys/modules/netgraph/bluetooth/ubtbcmfw/../../../../netgraph/bluetooth/drivers/ubtbcmfw -I. -I_at_ -I_at_/contrib/altq -I_at_/../include -I/usr/include /src/sys/modules/netgraph/bluetooth/ubtbcmfw/../../../../netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c:49:21: usbdevs.h: No such file or directory
mkdep: compile failed
*** Error code 1 (continuing)
`depend' not remade because of errors.
===> netgraph/bpf
_at_ -> /src/sys
machine -> /src/sys/i386/include
rm -f .depend
mkdep -f .depend -a   -nostdinc -D_KERNEL -DKLD_MODULE -I- -I. -I_at_ -I_at_/contrib/altq -I_at_/../include -I/usr/include /src/sys/modules/netgraph/bpf/../../../netgraph/ng_bpf.c /src/sys/modules/netgraph/bpf/../../../net/bpf_filter.c
===> netgraph/bridge
[...]
===> netgraph/bluetooth/h4
Warning: Object directory not changed from original /src/sys/modules/netgraph/bluetooth/h4
cc -O -pipe -march=pentium2 -pipe -march=pentium2 -I/src/sys/modules/netgraph/bluetooth/h4/../../../../netgraph/bluetooth/include  -I/src/sys/modules/netgraph/bluetooth/h4/../../../../netgraph/bluetooth/drivers/h4 -Wall  -D_KERNEL -DKLD_MODULE -nostdinc -I-  -I/src/sys/modules/netgraph/bluetooth/h4/../../../../netgraph/bluetooth/include -I/src/sys/modules/netgraph/bluetooth/h4/../../../../netgraph/bluetooth/drivers/h4 -I. -I_at_ -I_at_/contrib/altq -I_at_/../include -finline-limit=8000 -fno-common  -mno-align-long-strings -mpreferred-stack-boundary=2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -c /src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
ld  -d -warn-common -r -d -o ng_h4.kld ng_h4.o
ld -Bshareable  -d -warn-common -o ng_h4.ko ng_h4.kld
objcopy --strip-debug ng_h4.ko
===> netgraph/bluetooth/ubt
Warning: Object directory not changed from original /src/sys/modules/netgraph/bluetooth/ubt
cc -O -pipe -march=pentium2 -pipe -march=pentium2 -I/src/sys/modules/netgraph/bluetooth/ubt/../../../../netgraph/bluetooth/include  -I/src/sys/modules/netgraph/bluetooth/ubt/../../../../netgraph/bluetooth/drivers/ubt -Wall  -D_KERNEL -DKLD_MODULE -nostdinc -I-  -I/src/sys/modules/netgraph/bluetooth/ubt/../../../../netgraph/bluetooth/include -I/src/sys/modules/netgraph/bluetooth/ubt/../../../../netgraph/bluetooth/drivers/ubt -I. -I_at_ -I_at_/contrib/altq -I_at_/../include -finline-limit=8000 -fno-common  -mno-align-long-strings -mpreferred-stack-boundary=2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -c /src/sys/modules/netgraph/bluetooth/ubt/../../../../netgraph/bluetooth/drivers/ubt/ng_ubt.c
/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c:60:21: usbdevs.h: No such file or directory
*** Error code 1 (continuing)
`all' not remade because of errors.
===> netgraph/bluetooth/ubtbcmfw
Warning: Object directory not changed from original /src/sys/modules/netgraph/bluetooth/ubtbcmfw
cc -O -pipe -march=pentium2 -pipe -march=pentium2 -I/src/sys/modules/netgraph/bluetooth/ubtbcmfw/../../../../netgraph/bluetooth/include  -I/src/sys/modules/netgraph/bluetooth/ubtbcmfw/../../../../netgraph/bluetooth/drivers/ubtbcmfw -Wall  -D_KERNEL -DKLD_MODULE -nostdinc -I-  -I/src/sys/modules/netgraph/bluetooth/ubtbcmfw/../../../../netgraph/bluetooth/include -I/src/sys/modules/netgraph/bluetooth/ubtbcmfw/../../../../netgraph/bluetooth/drivers/ubtbcmfw -I. -I_at_ -I_at_/contrib/altq -I_at_/../include -finline-limit=8000 -fno-common  -mno-align-long-strings -mpreferred-stack-boundary=2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -c /src/sys/modules/netgraph/bluetooth/ubtbcmfw/../../../../netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c:49:21: usbdevs.h: No such file or directory
/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c: In function `ubtbcmfw_match':
/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c:130: error: `USB_VENDOR_BROADCOM' undeclared (first use in this function)
/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c:130: error: (Each undeclared identifier is reported only once
/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c:130: error: for each function it appears in.)
*** Error code 1 (continuing)
`all' not remade because of errors.
===> netgraph/bpf
Warning: Object directory not changed from original /src/sys/modules/netgraph/bpf
cc -O -pipe -march=pentium2 -pipe -march=pentium2 -Wall  -D_KERNEL -DKLD_MODULE -nostdinc -I-   -I. -I_at_ -I_at_/contrib/altq -I_at_/../include -finline-limit=8000 -fno-common  -mno-align-long-strings -mpreferred-stack-boundary=2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -c /src/sys/netgraph/ng_bpf.c
cc -O -pipe -march=pentium2 -pipe -march=pentium2 -Wall  -D_KERNEL -DKLD_MODULE -nostdinc -I-   -I. -I_at_ -I_at_/contrib/altq -I_at_/../include -finline-limit=8000 -fno-common  -mno-align-long-strings -mpreferred-stack-boundary=2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -c /src/sys/net/bpf_filter.c
ld  -d -warn-common -r -d -o ng_bpf.kld ng_bpf.o bpf_filter.o
ld -Bshareable  -d -warn-common -o ng_bpf.ko ng_bpf.kld
objcopy --strip-debug ng_bpf.ko
===> netgraph/bridge
[...]

I have all NOCLEAN* vars commented in /etc/make.conf.
Other relevent lines from my /etc/make.conf:
CPUTYPE=p2
CFLAGS+= -march=pentium2 -pipe 
INSTALL=install -C 
MTREE_FOLLOWS_SYMLINKS= -L 
NO_LPR=true
NO_MODULES=true
NO_SENDMAIL=true
NOPROFILE=true
MODULES_WITH_WORLD=true
ALWAYS_CHECK_MAKE=yes
WERROR= -Wno-error 
NO_WERROR=yes
WITH_DYNAMICROOT=yes
# -- use.perl generated deltas -- #
# Created: Tue Jun  1 09:40:47 2004
# Setting to use base perl from ports:
PERL_VER=5.8.4
PERL_VERSION=5.8.4
PERL_ARCH=mach
NOPERL=yo
NO_PERL=yo
NO_PERL_WRAPPER=yo


  --  thx, Paul Seniura
           System Specialist
           State of Okla. D.O.T.