vmware2 doesn't build

Hi,

when trying to build vmware2, I get

/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/freebsd/driver.c:301:35: 
i386/isa/intr_machdep.h: No such file or directory
*** Error code 1



After fixing the include path to i386/include/intr_machdep.h, the next
error is:

cc -O -pipe -mcpu=pentiumpro -mcpu=pentiumpro 
-I/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/include 
-I/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/common 
-I/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/freebsd 
-I/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/export/include 
-I/sys 
-I/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/../vmnet-only/freebsd/ 
-DCDEV_MAJOR_=200 -DSMP -DAPIC_IO  -D_KERNEL -Wall -Wredundant-decls 
-Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes 
-Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 
-DKLD_MODULE -nostdinc -I- 
-I/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/include 
-I/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/common 
-I/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/freebsd 
-I/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/export/include 
-I/sys 
-I/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/../vmnet-only/freebsd/ 
-I. -I_at_ -I_at_/../include -I/usr/include -finline-limit=15000 -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 
/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/freebsd/hostif.c
/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/freebsd/hostif.c: 
In function `HostIF_InitFP':
/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/freebsd/hostif.c:340: 
warning: comparison is always true due to limited range of data type
/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/freebsd/hostif.c:340: 
warning: comparison is always true due to limited range of data type
/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/freebsd/hostif.c: 
In function `HostIF_APIC_Base':
/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/freebsd/hostif.c:1043: 
error: `cpu_apic_address' undeclared (first use in this function)
/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/freebsd/hostif.c:1043: 
error: (Each undeclared identifier is reported only once
/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/freebsd/hostif.c:1043: 
error: for each function it appears in.)
/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/freebsd/hostif.c: 
In function `HostIF_IOAPIC_Base':
/usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only/freebsd/hostif.c:1072: 
error: `io_apic_address' undeclared (first use in this function)
*** Error code 1

Stop in /usr/ports/emulators/vmware2/work/vmware-distrib/vmmon-only.
*** Error code 1



It seems io_apic_address has vanished from the kernel. The next problem
is the cpu apic address.

If I hack around these two by just using the non-SMP code even in #if
SMP, it compiles.  I didn't try to run it yet, but I think I might have
a good chance it runs since I'm not on an SMP machine.

Anyways, does someone have a proper fix?

--
Regards,
Georg.