mail/htmldoc fails in -current

[Stefano Marinelli <stefano%dragas.it@localhost>]

Hi everybody,
i386 NetBSD 5.1 and current pkgsrc, just updated from CVS.
mail/htmldoc fails to build (I think because of the recent libpng upgrade):

Compiling image.cxx...
image.cxx: In function 'int image_load_png(image_t*, FILE*, int, int)':
image.cxx:1502: error: invalid use of undefined type 'struct png_struct_def'
/usr/pkgsrc/www/htmldoc/work/.buildlink/include/png.h:792: error: forward 
declaration of 'struct png_struct_def'
image.cxx:1529: error: invalid use of undefined type 'struct png_info_def'
/usr/pkgsrc/www/htmldoc/work/.buildlink/include/png.h:664: error: forward 
declaration of 'struct png_info_def'
image.cxx:1538: error: invalid use of undefined type 'struct png_info_def'
/usr/pkgsrc/www/htmldoc/work/.buildlink/include/png.h:664: error: forward 
declaration of 'struct png_info_def'
image.cxx:1543: error: invalid use of undefined type 'struct png_info_def'
/usr/pkgsrc/www/htmldoc/work/.buildlink/include/png.h:664: error: forward 
declaration of 'struct png_info_def'
image.cxx:1546: error: invalid use of undefined type 'struct png_info_def'
/usr/pkgsrc/www/htmldoc/work/.buildlink/include/png.h:664: error: forward 
declaration of 'struct png_info_def'
image.cxx:1557: error: invalid use of undefined type 'struct png_info_def'
/usr/pkgsrc/www/htmldoc/work/.buildlink/include/png.h:664: error: forward 
declaration of 'struct png_info_def'
image.cxx:1558: error: invalid use of undefined type 'struct png_info_def'
/usr/pkgsrc/www/htmldoc/work/.buildlink/include/png.h:664: error: forward 
declaration of 'struct png_info_def'
image.cxx:1560: error: invalid use of undefined type 'struct png_info_def'
/usr/pkgsrc/www/htmldoc/work/.buildlink/include/png.h:664: error: forward 
declaration of 'struct png_info_def'
image.cxx:1560: error: invalid use of undefined type 'struct png_info_def'
/usr/pkgsrc/www/htmldoc/work/.buildlink/include/png.h:664: error: forward 
declaration of 'struct png_info_def'
image.cxx:1597: error: invalid use of undefined type 'struct png_info_def'
/usr/pkgsrc/www/htmldoc/work/.buildlink/include/png.h:664: error: forward 
declaration of 'struct png_info_def'
image.cxx:1599: error: invalid use of undefined type 'struct png_info_def'
/usr/pkgsrc/www/htmldoc/work/.buildlink/include/png.h:664: error: forward 
declaration of 'struct png_info_def'
image.cxx:1613: error: invalid use of undefined type 'struct png_info_def'
/usr/pkgsrc/www/htmldoc/work/.buildlink/include/png.h:664: error: forward 
declaration of 'struct png_info_def'
image.cxx:1613: error: invalid use of undefined type 'struct png_info_def'
/usr/pkgsrc/www/htmldoc/work/.buildlink/include/png.h:664: error: forward 
declaration of 'struct png_info_def'
image.cxx:1642: error: invalid use of undefined type 'struct png_info_def'
/usr/pkgsrc/www/htmldoc/work/.buildlink/include/png.h:664: error: forward 
declaration of 'struct png_info_def'
--- image.o ---
*** [image.o] Error code 1
1 error

Bye!
Stefano