pkgsrc/emulators/qemu 0.9.1 compilations fails on amd64 -current

[Markus W Kilbinger <mk%kilbi.de@localhost>]

Hi!

Updating qemu 0.9.0 -> 0.9.1 via pkgsrc failed on my amd64 machine
with -current kernel + userland when compiling qemu-0.9.1/hw/wm8750.c:

  # make
  => Bootstrap dependency digest>=20010302: found digest-20080510
  => Checksum SHA1 OK for qemu-0.9.1.tar.gz
  => Checksum RMD160 OK for qemu-0.9.1.tar.gz
  ===> Installing dependencies for qemu-0.9.1
  [...]
  ===> Configuring for qemu-0.9.1
  => fixing hardcoded paths to libraries.
  => Fixing hardcoded audio device.
  => Fixing hardcoded paths.
  => Replacing Perl interpreter in texi2pod.pl.
  Install prefix    /usr/pkg
  BIOS directory    /usr/pkg/share/qemu
  binary directory  /usr/pkg/bin
  Manual directory  /usr/pkg/man
  ELF interp prefix /usr/pkg/share/qemu
  Source path       /usr/obj/pkg/emulators/qemu/work.x86_64/qemu-0.9.1
  C compiler        gcc
  Host C compiler   gcc
  make              gmake
  install           install
  host CPU          x86_64
  host big endian   no
  target list       i386-softmmu sparc-softmmu x86_64-softmmu
  mips-softmmu mipsel-softmmu mips64-softmmu mips64el-softmmu
  arm-softmmu ppc-softmmu ppcemb-softmmu ppc64-softmmu m68k-softmmu
  sh4-softmmu sh4eb-softmmu cris-softmmu
  gprof enabled     no
  profiler          no
  static build      no
  -Werror enabled   no
  SDL support       yes
  SDL static link   yes
  mingw32 support   no
  Adlib support     no
  CoreAudio support no
  ALSA support      no
  DSound support    no
  FMOD support      no
  OSS support       yes
  VNC TLS support   no
  kqemu support     no
  Documentation     yes
  The error log from compiling the libSDL test is:
  /usr/pkg/lib/libaudio.so.2: warning: warning: reference to
  compatibility select(); include <sys/select.h> to generate correct
  reference
  /usr/X11R7/lib/libXt.so.6: warning: warning: reference to
  compatibility __stat30(); include <sys/stat.h> to generate correct
  reference
  /usr/X11R7/lib/libXt.so.6: warning: warning: reference to
  compatibility gettimeofday(); include <sys/time.h> to generate correct
  reference
  /usr/X11R7/lib/libXt.so.6: warning: warning: reference to
  compatibility getpwuid_r(); include <pwd.h> to generate correct
  reference
  /usr/X11R7/lib/libXt.so.6: warning: warning: reference to
  compatibility getpwnam_r(); include <pwd.h> to generate correct
  reference
  /usr/X11R7/lib/libXau.so.6: warning: warning: reference to
  compatibility time(); include <time.h> for correct reference
  /usr/X11R7/lib/libX11.so.6: warning: warning: reference to
  compatibility __shmctl13(); include <sys/shm.h> to generate correct
  reference
  /usr/X11R7/lib/libX11.so.6: warning: warning: reference to
  compatibility __fstat30(); include <sys/stat.h> to generate correct
  reference
  /usr/X11R7/lib/libICE.so.6: warning: warning: reference to
  compatibility __lstat30(); include <sys/stat.h> to generate correct
  reference
  ===> Building for qemu-0.9.1
  gcc -O2 -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -Wall
  -O2 -g -fno-strict-aliasing -I/usr/pkg/include -I/usr/X11R7/include
  -I/usr/include -I.
  -I/usr/obj/pkg/emulators/qemu/work.x86_64/qemu-0.9.1 -MMD -MP
  -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
  -I/usr/obj/pkg/emulators/qemu/work.x86_64/qemu-0.9.1/slirp    -c -o
  qemu-img.o qemu-img.c
  [...]
  gcc -O2 -I/usr/pkg/include -I/usr/X11R7/include -I/usr/include -Wall
  -O2 -g -fno-strict-aliasing -I/usr/pkg/include -I/usr/X11R7/include
  -I/usr/include -I.
  -I/usr/obj/pkg/emulators/qemu/work.x86_64/qemu-0.9.1 -MMD -MP
  -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
  -I/usr/obj/pkg/emulators/qemu/work.x86_64/qemu-0.9.1/slirp    -c -o
  wm8750.o
  /usr/obj/pkg/emulators/qemu/work.x86_64/qemu-0.9.1/hw/wm8750.c
  /usr/obj/pkg/emulators/qemu/work.x86_64/qemu-0.9.1/hw/wm8750.c:24:
  error: syntax error before "QEMUSoundCard"
  /usr/obj/pkg/emulators/qemu/work.x86_64/qemu-0.9.1/hw/wm8750.c:24:
  warning: no semicolon at end of struct or union
  /usr/obj/pkg/emulators/qemu/work.x86_64/qemu-0.9.1/hw/wm8750.c:25:
  warning: type defaults to `int' in declaration of `adc_voice'
  [...]

Has anybody managed to compile pkgsrc qemu 0.9.1?
Did I miss something?

Markus.