I must have picked the wrong day to stop sniffing glue...

I supped my 1.3.2 source tree to current from sup.netbsd.org...and now, it
blows up badly when I try to build it. At first, I got complaints about
invalid redefinitions of lock data types; after trying "make depend", now I
get:

cc  -O2 -Werror -Wall -Wmissing-prototypes -Wstrict-prototypes -I. -I../../../..
/arch -I../../../.. -nostdinc -DVAX8600 -DVAX8200 -DVAX780 -DVAX750 -DVAX630 -DV
AX650 -DVAX410 -DVAX43 -DDDB -DKTRACE -DINET -DNFSSERVER -DSYSVMSG -DSYSVSEM -DS
YSVSHM -DCOMPAT_43 -DCOMPAT_09 -DCOMPAT_10 -DCOMPAT_11 -DCOMPAT_12 -DCOMPAT_13 -
DLKM -DMAXUSERS=8 -D_KERNEL  -D_VAX_INLINE_  -c param.c
In file included from ../../../../sys/vnode.h:51,
                 from param.c:49:
../../../../uvm/uvm_object.h:53: syntax error before `simple_lock_data_t'
*** Error code 1

I realize that -current is a moving target, but it'd be nice if it held
still long enough for me to get a good build out of it...

I also tried building the boot program, since that's where my efforts are
concentrated at the moment...but I get:

cc -c -O -O -I. -I../../../../.. -I../../../.. -I../../.. -I../.. -I../../../lib
/libsa -DSTANDALONE -DRELOC=0x100000 -DXXRPB=0x0F4240 boot.c
In file included from boot.c:162:
../include/mtpr.h:38: machine/macros.h: No such file or directory
*** Error code 1

This is probably because my vax source tree is not rooted at /usr/src, but
rather /mnt/plotz/root/usr/src; /usr/src is, instead, an i386 source tree. I
know I'm missing something simple to make this work, but darned if I can
find it. Help?