x11/XaoS does not build with recent png

[Erik Bertelsen <bertelsen.erik%gmail.com@localhost>]

With pkgsrc sources updated as of a few hours ago, a clean rebuild of  x11/XaoS yields:

gmake[2]: Entering directory `/home/NetBSD/wrkobj/x11/XaoS/work.i386/XaoS-3.4/src/util'
cc -O2 -I/usr/pkg/include -I/usr/include -I/usr/X11R7/include  -I/usr/X11R7/include -I/usr/pkg/include -fomit-frame-pointer -DSFFE_USING -DSFFE_CMPLX_GSL -I/home/NetBSD/wrkobj/x11/XaoS/work.i386/XaoS-3.4/src/include -I/usr/pkg/include -I/usr/include -I/usr/X11R7/include  -c -o png.o png.c
png.c: In function 'writepng':
png.c:65: error: dereferencing pointer to incomplete type
png.c:77: error: 'Z_DEFAULT_COMPRESSION' undeclared (first use in this function)
png.c:77: error: (Each undeclared identifier is reported only once
png.c:77: error: for each function it appears in.)
png.c:81: error: 'Z_DEFAULT_STRATEGY' undeclared (first use in this function)
png.c:85: error: dereferencing pointer to incomplete type
png.c:86: error: dereferencing pointer to incomplete type
png.c:88: error: dereferencing pointer to incomplete type
png.c:89: error: dereferencing pointer to incomplete type
png.c:90: error: dereferencing pointer to incomplete type
png.c:91: error: dereferencing pointer to incomplete type
png.c:99: error: dereferencing pointer to incomplete type
png.c:100: error: dereferencing pointer to incomplete type
png.c:101: error: dereferencing pointer to incomplete type
png.c:102: error: dereferencing pointer to incomplete type
png.c:104: error: dereferencing pointer to incomplete type
png.c:105: error: dereferencing pointer to incomplete type
png.c:106: error: dereferencing pointer to incomplete type
png.c:107: error: dereferencing pointer to incomplete type
png.c:113: error: dereferencing pointer to incomplete type
png.c:114: error: dereferencing pointer to incomplete type
png.c:119: error: dereferencing pointer to incomplete type
png.c:120: error: dereferencing pointer to incomplete type
png.c:121: error: dereferencing pointer to incomplete type
png.c:122: error: dereferencing pointer to incomplete type
png.c:123: error: dereferencing pointer to incomplete type
png.c:126: error: dereferencing pointer to incomplete type
png.c:136: error: dereferencing pointer to incomplete type
gmake[2]: *** [png.o] Error 1
gmake[2]: Leaving directory `/home/NetBSD/wrkobj/x11/XaoS/work.i386/XaoS-3.4/src/util'
gmake[2]: Entering directory `/home/NetBSD/wrkobj/x11/XaoS/work.i386/XaoS-3.4/src/ui/ui-drv/x11'
cc -O2 -I/usr/pkg/include -I/usr/include -I/usr/X11R7/include  -I/usr/X11R7/include -I/usr/pkg/include -fomit-frame-pointer -DSFFE_USING -DSFFE_CMPLX_GSL -I/home/NetBSD/wrkobj/x11/XaoS/work.i386/XaoS-3.4/src/include -I/usr/pkg/include -I/usr/include -I/usr/X11R7/include  -c -o xlib.o xlib.c
cc -O2 -I/usr/pkg/include -I/usr/include -I/usr/X11R7/include  -I/usr/X11R7/include -I/usr/pkg/include -fomit-frame-pointer -DSFFE_USING -DSFFE_CMPLX_GSL -I/home/NetBSD/wrkobj/x11/XaoS/work.i386/XaoS-3.4/src/include -I/usr/pkg/include -I/usr/include -I/usr/X11R7/include  -c -o ui_x11.o ui_x11.c
rm -f /home/NetBSD/wrkobj/x11/XaoS/work.i386/XaoS-3.4/src/lib/libuix11.a
ar rc /home/NetBSD/wrkobj/x11/XaoS/work.i386/XaoS-3.4/src/lib/libuix11.a xlib.o ui_x11.o
ranlib /home/NetBSD/wrkobj/x11/XaoS/work.i386/XaoS-3.4/src/lib/libuix11.a 
gmake[2]: Leaving directory `/home/NetBSD/wrkobj/x11/XaoS/work.i386/XaoS-3.4/src/ui/ui-drv/x11'
cc -O2 -I/usr/pkg/include -I/usr/include -I/usr/X11R7/include  -I/usr/X11R7/include -I/usr/pkg/include -fomit-frame-pointer -DSFFE_USING -DSFFE_CMPLX_GSL -I/home/NetBSD/wrkobj/x11/XaoS/work.i386/XaoS-3.4/src/include -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -L/usr/lib -Wl,-R/usr/lib -L/usr/X11R7/lib -Wl,-R/usr/X11R7/lib -o /home/NetBSD/wrkobj/x11/XaoS/work.i386/XaoS-3.4/bin/xaos lib/libui.a lib/libui-hlp.a lib/libengine.a lib/libutil.a lib/libfilter.a lib/libuix11.a lib/libsffe.a  -lpng -lz -lm  -lXext   -L/usr/X11R7/lib -R/usr/X11R7/lib -lX11 -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lgsl -lgslcblas -lm -lintl
gcc: lib/libutil.a: No such file or directory
gmake[1]: *** [/home/NetBSD/wrkobj/x11/XaoS/work.i386/XaoS-3.4/bin/xaos] Error 1
gmake[1]: Leaving directory `/home/NetBSD/wrkobj/x11/XaoS/work.i386/XaoS-3.4/src'
gmake: *** [all] Error 2
*** Error code 2

Stop.
make: stopped in /home/NetBSD/pkgsrc/x11/XaoS
*** Error code 1

Stop.
make: stopped in /home/NetBSD/pkgsrc/x11/XaoS
*** Error code 1

Stop.
make: stopped in /home/NetBSD/pkgsrc/x11/XaoS


regards
Erik