portupgrade: librsvg2 errors on 5.1-CURRENT

[Tom Parquette]

Running portupgrade (cvsuped sometime Sept 20) I get the following 
errors.  This is a 5.1-CURRENT system (updated early on Sept. 20).  TIA.

cc -DHAVE_CONFIG_H -I. -I. -I. -I/usr/local/include/libgsf-1 
-I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include 
-I/usr/local/include/libxml2 -I/usr/local/include -DHAVE_SVGZ=1 -I. -I. 
-I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include 
-I/usr/local/include/libart-2.0 -I/usr/local/include/libxml2 
-I/usr/local/include -I/usr/X11R6/include/gtk-2.0 
-I/usr/X11R6/include/pango-1.0 -I/usr/X11R6/include 
-I/usr/local/include/freetype2 -I/usr/local/include/atk-1.0 
-I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include 
-I/usr/X11R6/include/gtk-2.0 -I/usr/X11R6/lib/gtk-2.0/include 
-I/usr/X11R6/include/pango-1.0 -I/usr/X11R6/include 
-I/usr/local/include/freetype2 -I/usr/local/include 
-DG_LOG_DOMAIN=\"librsvg\" -DG_DISABLE_DEPRECATED 
-DPANGO_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED 
-DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED 
-DDATADIR=\"/usr/X11R6/share\" -I/usr/local/include -O -pipe 
-mcpu=pentiumpro -c rsvg-gz.c  -fPIC -DPIC -o .libs/rsvg-gz.lo
In file included from rsvg-paint-server.h:30,
                  from rsvg-styles.h:30,
                  from rsvg-private.h:30,
                  from rsvg-gz.c:25:
/usr/local/include/libart_lgpl/art_render_gradient.h:61: error: syntax 
error before "ArtPixMaxDepth"
/usr/local/include/libart_lgpl/art_render_gradient.h:65: error: syntax 
error before '*' token
/usr/local/include/libart_lgpl/art_render_gradient.h:70: error: syntax 
error before '*' token
In file included from rsvg-styles.h:30,
                  from rsvg-private.h:30,
                  from rsvg-gz.c:25:
rsvg-paint-server.h:96: error: syntax error before '*' token
In file included from rsvg-styles.h:33,
                  from rsvg-private.h:30,
                  from rsvg-gz.c:25:
/usr/local/include/libart_lgpl/art_svp_vpath_stroke.h:41: error: syntax 
error before '*' token
/usr/local/include/libart_lgpl/art_svp_vpath_stroke.h:42: error: syntax 
error before '*' token
/usr/local/include/libart_lgpl/art_svp_vpath_stroke.h:47: warning: data 
definition has no type or storage class
/usr/local/include/libart_lgpl/art_svp_vpath_stroke.h:50: error: syntax 
error before '*' token
/usr/local/include/libart_lgpl/art_svp_vpath_stroke.h:51: error: syntax 
error before '*' token
/usr/local/include/libart_lgpl/art_svp_vpath_stroke.h:56: warning: data 
definition has no type or storage class
In file included from rsvg-styles.h:34,
                  from rsvg-private.h:30,
                  from rsvg-gz.c:25:
/usr/local/include/libart_lgpl/art_vpath_dash.h:37: error: syntax error 
before '*' token
/usr/local/include/libart_lgpl/art_vpath_dash.h:38: error: syntax error 
before '*' token
/usr/local/include/libart_lgpl/art_vpath_dash.h:38: warning: data 
definition has no type or storage class
gmake[2]: *** [rsvg-gz.lo] Error 1
gmake[2]: Leaving directory 
`/usr/ports/graphics/librsvg2/work/librsvg-2.2.5'
gmake[1]: *** [all-recursive] Error 1
gmake[1]: Leaving directory 
`/usr/ports/graphics/librsvg2/work/librsvg-2.2.5'
gmake: *** [all-recursive-am] Error 2
*** Error code 2

Stop in /usr/ports/graphics/librsvg2.
P3R-272#