xscreensaver-gnome build failing

[Jesse Sheidlower]

I'm running 5.2-CURRENT (updated some weeks ago), and have
been having trouble upgrading xscreensaver-gnome to 4.16 from
4.15_2. It dies during the build with:

---
In file included from phosphor.c:34:
/usr/local/include/util.h:95: error: syntax error before '/' token
In file included from phosphor.c:34:
/usr/local/include/util.h:21:1: unterminated #ifndef
phosphor.c:33:1: unterminated #ifdef
phosphor.c:29:1: unterminated #ifdef
gmake[1]: *** [phosphor.o] Error 1
gmake[1]: Leaving directory `/usr/ports/x11/xscreensaver-gnome/work/xscreensaver-4.16/hacks'
gmake: *** [all] Error 5
*** Error code 2

Stop in /usr/ports/x11/xscreensaver-gnome.
---

and then I get, in the list of failed packages,

    ! x11/xscreensaver-gnome (xscreensaver-gnome-4.15_2)   (bad C++ code)

I didn't have this problem upgrading to 4.16 on a box running FreeBSD 4.9,
and I haven't seen anyone else report this.

Any thoughts about cause, or fixes?

Thanks.

Jesse Sheidlower