sysutils/xsi not building on -CURRENT with new gcc

Hi all,

I updated sysutils/xsi to a new version and I just found it will not
build on -CURRENT (July 2nd) in my tinderbox.  I'm getting the following
fail:


if c++ -DHAVE_CONFIG_H -I. -I. -I. -I../lib -I/usr/local/include/libxml2
-I/usr/local/include -O1 -pipe -MT freebsd.o -MD -MP -MF
".deps/freebsd.Tpo" -c -o freebsd.o freebsd.cpp;  then mv -f
".deps/freebsd.Tpo" ".deps/freebsd.Po"; else rm -f ".deps/freebsd.Tpo";
exit 1; fi
In file included from /usr/include/sys/sx.h:37,
                 from /usr/include/sys/filedesc.h:40,
                 from /usr/include/sys/proc.h:44,
                 from /usr/include/sys/user.h:47,
                 from freebsd.cpp:35:
/usr/include/sys/lock_profile.h:156: error: expected ',' or '...' before 'class'


I'm trying to avoid setting USE_GCC on this port.  How can I get around
this issue?

Thanks,
tom

-- 
| tmclaugh at sdf.lonestar.org             tmclaugh at FreeBSD.org |
| FreeBSD                                   http://www.FreeBSD.org |