Problem with xscreensaver-gnome port

[Jesse Sheidlower]

I recently tried to update my xscreensaver-gnome port from 
4.15_2 to 4.16. After the usual amount of churning, it
died with the following error:

---
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.
---

Then I got a notice about the upgrade dying with a C++ error,
which for some reason I didn't save.

Any ideas? I couldn't find anything in a quick search, and
it's holding up the builds of other Gnome ports. I'm using
FreeBSD 5.2-CURRENT, but I'd think that an error like this is
one that would be likely to show up pretty readily.

Jesse Sheidlower