Update to 0.9.1:

  - TFTP booting from host directory (Anthony Liguori, Erwan Velu)
  - Tap device emulation for Solaris (Sittichai Palanisong)
  - Monitor multiplexing to several I/O channels (Jason Wessel)
  - ds1225y nvram support (Herve Poussineau)
  - CPU model selection support (J. Mayer, Paul Brook, Herve Poussineau)
  - Several Sparc fixes (Aurelien Jarno, Blue Swirl, Robert Reif)
  - MIPS 64-bit FPU support (Thiemo Seufer)
  - Xscale PDA emulation (Andrzej Zaborowski)
  - ColdFire system emulation (Paul Brook)
  - Improved SH4 support (Magnus Damm)
  - MIPS64 support (Aurelien Jarno, Thiemo Seufer)
  - Preliminary Alpha guest support (J. Mayer)
  - Read-only support for Parallels disk images (Alex Beregszaszi)
  - SVM (x86 virtualization) support (Alexander Graf)
  - CRIS emulation (Edgar E. Iglesias)
  - SPARC32PLUS execution support (Blue Swirl)
  - MIPS mipssim pseudo machine (Thiemo Seufer)
  - Strace for Linux userland emulation (Stuart Anderson, Thayne Harbaugh)
  - OMAP310 MPU emulation plus Palm T|E machine (Andrzej Zaborowski)
  - ARM v6, v7, NEON SIMD and SMP emulation (Paul Brook/CodeSourcery)
  - Gumstix boards: connex and verdex emulation (Thorsten Zitterell)
  - Intel mainstone II board emulation (Armin Kuster)
  - VMware SVGA II graphics card support (Andrzej Zaborowski)

12 files changed, 220 insertions, 162 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 1e0c46d5f32..4d6ebd2494a 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2008/12/30 00:54:19 hubertf Exp $
+# $NetBSD: Makefile,v 1.54 2009/01/22 07:27:28 jmmv Exp $
 #
 
-DISTNAME=		qemu-0.9.0
-PKGREVISION=		3
+DISTNAME=		qemu-0.9.1
 CATEGORIES=		emulators
 MASTER_SITES=		http://bellard.org/qemu/
 
@@ -32,14 +31,22 @@ CONFIGURE_ENV+=		PKGMANDIR=${PKGMANDIR}
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=	--interp-prefix=${PREFIX:Q}/share/qemu
 
+.if !empty(MACHINE_PLATFORM:MNetBSD-*)
+SUBST_CLASSES+=		lib
+SUBST_STAGE.lib=	pre-configure
+SUBST_FILES.lib=	x86_64.ld
+SUBST_SED.lib=		-e s,/lib64,/lib,g
+SUBST_MESSAGE.lib=	fixing hardcoded paths to libraries.
+.endif
+
 SUBST_CLASSES+=		snd
-SUBST_STAGE.snd=	post-patch
+SUBST_STAGE.snd=	pre-configure
 SUBST_FILES.snd=	audio/ossaudio.c
 SUBST_SED.snd=		-e s,/dev/dsp,${DEVOSSAUDIO:Q},g
 SUBST_MESSAGE.snd=	Fixing hardcoded audio device.
 
 SUBST_CLASSES+=		smbd
-SUBST_STAGE.smbd=	post-patch
+SUBST_STAGE.smbd=	pre-configure
 SUBST_FILES.smbd=	vl.c
 SUBST_SED.smbd=		-e s,/usr/sbin/smbd,${PREFIX:Q}/sbin/smbd,g
 SUBST_MESSAGE.smbd=	Fixing hardcoded paths.
@@ -50,6 +57,9 @@ REPLACE_PERL+=		texi2pod.pl
 # to build in the SSE code.
 BUILDLINK_TRANSFORM+=	rm-optarg:-march rm-optarg:-mcpu rm:-msse rm:-msse2
 
+BUILDLINK_PASSTHRU_DIRS+= /usr/lib
+BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib
+
 # Does not build with the stack protector
 .if ${OPSYS} == "DragonFly"
 CFLAGS+=		-fno-stack-protector
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index 2ed9837e3cb..2cee6883698 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,10 +1,18 @@
-@comment $NetBSD: PLIST,v 1.16 2007/12/18 00:16:56 joerg Exp $
+@comment $NetBSD: PLIST,v 1.17 2009/01/22 07:27:28 jmmv Exp $
 bin/qemu
 bin/qemu-img
 bin/qemu-system-arm
+bin/qemu-system-cris
+bin/qemu-system-m68k
 bin/qemu-system-mips
+bin/qemu-system-mips64
+bin/qemu-system-mips64el
 bin/qemu-system-mipsel
 bin/qemu-system-ppc
+bin/qemu-system-ppc64
+bin/qemu-system-ppcemb
+bin/qemu-system-sh4
+bin/qemu-system-sh4eb
 bin/qemu-system-sparc
 bin/qemu-system-x86_64
 man/man1/qemu-img.1
@@ -48,7 +56,6 @@ share/qemu/keymaps/sl
 share/qemu/keymaps/sv
 share/qemu/keymaps/th
 share/qemu/keymaps/tr
-share/qemu/linux_boot.bin
 share/qemu/openbios-sparc32
 share/qemu/ppc_rom.bin
 share/qemu/pxe-ne2k_pci.bin
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index e46ea65f0dc..156b7d9d9f2 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.39 2008/12/30 00:54:19 hubertf Exp $
+$NetBSD: distinfo,v 1.40 2009/01/22 07:27:28 jmmv Exp $
 
-SHA1 (qemu-0.9.0.tar.gz) = 1e57e48a06eb8729913d92601000466eecef06cb
-RMD160 (qemu-0.9.0.tar.gz) = 4296542b6da18a6ac93d20787330d3c1c2ac0a19
-Size (qemu-0.9.0.tar.gz) = 1901741 bytes
+SHA1 (qemu-0.9.1.tar.gz) = 630ea20b5989f0df00128de7f7be661c573ed041
+RMD160 (qemu-0.9.1.tar.gz) = ee7bdb55a4540df2082d4bde9ebfd2f4e6f201a5
+Size (qemu-0.9.1.tar.gz) = 2804104 bytes
 SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
-SHA1 (patch-ab) = 29870b0bec5f9fa08267dfb9208d75d1d735714a
-SHA1 (patch-ac) = f3f37f2e72de28077a6579b12ecb2ea6650eea85
+SHA1 (patch-ab) = ba77da578f528ca549c48336b40378dcbb2a2fbb
+SHA1 (patch-ac) = 2f5abda6af41418af0a0f8bed320ebde160832a8
 SHA1 (patch-ad) = ac69a03e4945e8c8fd5aadca070b876d0970910d
-SHA1 (patch-ae) = cb0da3bcba3b03bc38d3ffa0bd7b3d670eb23648
-SHA1 (patch-ag) = aae65e1ecbde56c963d1430ba0d9461ea8e24ddb
-SHA1 (patch-ak) = 11669ec0ac62c0c90b7d2bfecb1f6efe3cb82fd2
+SHA1 (patch-ae) = a82f6c1a02c6bc03f4da9bc2b52f817b260ced8a
+SHA1 (patch-ag) = 3469af1ec2a4f95c09a67c16b1071f0ec27dab74
+SHA1 (patch-ak) = ed5766e36d5a192cf4559142e6ef9e0287e61b43
 SHA1 (patch-am) = a22a3b23284c377afa8113768d68c8ef40c514f9
-SHA1 (patch-ao) = e92d56f991cf29f83e39464f9e695caa86fe5fe0
-SHA1 (patch-au) = 8dec416dcff966ecf23bd8cb7904ab5bed22d08a
+SHA1 (patch-ao) = e515093b6ea99f9cba665de022fd62f3be911569
+SHA1 (patch-au) = 2892cae63796c76014288f4a700acbee5aadc529
 SHA1 (patch-av) = 715e9680d70c1aa1c83bda0270125144a26d6140
-SHA1 (patch-aw) = 3b1472a95a2312f9e49ea1a6aa517ad81328324c
+SHA1 (patch-aw) = f3bc77cdec3a876fa69406c91590d02161e80753
 SHA1 (patch-ax) = 66b060005ecbf9fd0451f7960e81eccbabf959ca
-SHA1 (patch-ay) = 2d3051685878abe077abdbba9681bd04e04c7fb3
+SHA1 (patch-ay) = b6ed7d28a617913eff64f6c003b963c0454b06bb
 SHA1 (patch-ba) = 7c5043a39405f52b512e479a46fc76108580b7bc
diff --git a/emulators/qemu/patches/patch-ab b/emulators/qemu/patches/patch-ab
index 9e4ede5168e..d0a033f0119 100644
--- a/emulators/qemu/patches/patch-ab
+++ b/emulators/qemu/patches/patch-ab
@@ -1,28 +1,26 @@
-$NetBSD: patch-ab,v 1.8 2007/12/30 17:12:44 joerg Exp $
+$NetBSD: patch-ab,v 1.9 2009/01/22 07:27:28 jmmv Exp $
 
---- Makefile.target.orig	2007-02-05 23:01:54 +0000
+--- Makefile.target.orig	2008-01-06 20:38:41.000000000 +0100
 +++ Makefile.target
-@@ -72,6 +72,10 @@ endif
- # We require -O2 to avoid the stack setup prologue in EXIT_TB
- OP_CFLAGS = -Wall -O2 -g -fno-strict-aliasing
+@@ -115,6 +115,10 @@ OP_CFLAGS+=$(call cc-option, -fno-align-
+ OP_CFLAGS+=$(call cc-option, -fno-align-functions, $(call cc-option, -malign-functions=0, ""))
+ OP_CFLAGS+=$(call cc-option, -fno-section-anchors, "")
  
 +ifdef STACK_PROTECTOR_PRESENT
-+OP_CFLAGS += -fno-stack-protector
++OP_CFLAGS+=$(call cc-option, -fno-stack-protector, "")
 +endif
 +
  ifeq ($(ARCH),i386)
  HELPER_CFLAGS+=-fomit-frame-pointer
  OP_CFLAGS+=-mpreferred-stack-boundary=2 -fomit-frame-pointer
-@@ -440,10 +444,12 @@ endif
+@@ -537,7 +541,9 @@ endif
  ifndef CONFIG_DARWIN
  ifndef CONFIG_WIN32
  ifndef CONFIG_SOLARIS
+-VL_LIBS+=-lutil
 +ifndef CONFIG_DRAGONFLY
- VL_LIBS=-lutil -lrt
++VL_LIBS+=-lutil -lrt
++endif
  endif
  endif
  endif
-+endif
- ifdef TARGET_GPROF
- vl.o: BASE_CFLAGS+=-p
- VL_LDFLAGS+=-p
diff --git a/emulators/qemu/patches/patch-ac b/emulators/qemu/patches/patch-ac
index 30160300cea..380305b39b8 100644
--- a/emulators/qemu/patches/patch-ac
+++ b/emulators/qemu/patches/patch-ac
@@ -1,27 +1,27 @@
-$NetBSD: patch-ac,v 1.9 2007/12/18 00:16:56 joerg Exp $
+$NetBSD: patch-ac,v 1.10 2009/01/22 07:27:28 jmmv Exp $
 
---- vl.c.orig	2007-05-02 01:56:26.000000000 +0200
-+++ vl.c	2007-05-02 01:57:42.000000000 +0200
-@@ -44,7 +44,7 @@
- #include <netdb.h>
+--- vl.c.orig	2008-01-06 20:38:42.000000000 +0100
++++ vl.c
+@@ -61,7 +61,7 @@
+ #include <arpa/inet.h>
  #ifdef _BSD
  #include <sys/stat.h>
 -#ifndef __APPLE__
 +#ifndef _BSD
  #include <libutil.h>
  #endif
- #else
-@@ -1801,6 +1801,9 @@
+ #elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
+@@ -2385,6 +2385,9 @@ static int pp_hw_mode(ParallelCharDriver
  
  static int pp_ioctl(CharDriverState *chr, int cmd, void *arg)
  {
 +#ifdef __NetBSD__
 +    return ENOTSUP;
 +#endif
-     int fd = (int)chr->opaque;
+     ParallelCharDriver *drv = chr->opaque;
+     int fd = drv->fd;
      uint8_t b;
- 
-@@ -1838,6 +1841,9 @@
+@@ -2473,6 +2476,9 @@ static void pp_close(CharDriverState *ch
  
  static CharDriverState *qemu_chr_open_pp(const char *filename)
  {
@@ -29,5 +29,5 @@ $NetBSD: patch-ac,v 1.9 2007/12/18 00:16:56 joerg Exp $
 +    return ENOTSUP;
 +#endif
      CharDriverState *chr;
+     ParallelCharDriver *drv;
      int fd;
- 
diff --git a/emulators/qemu/patches/patch-ae b/emulators/qemu/patches/patch-ae
index 4edaf7c1f9b..79da278f935 100644
--- a/emulators/qemu/patches/patch-ae
+++ b/emulators/qemu/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.3 2008/12/30 00:55:10 hubertf Exp $
+$NetBSD: patch-ae,v 1.4 2009/01/22 07:27:28 jmmv Exp $
 
---- osdep.h.orig	2007-02-06 00:01:54.000000000 +0100
+--- osdep.h.orig	2008-01-06 20:38:42.000000000 +0100
 +++ osdep.h
 @@ -1,6 +1,7 @@
  #ifndef QEMU_OSDEP_H
@@ -9,4 +9,4 @@ $NetBSD: patch-ae,v 1.3 2008/12/30 00:55:10 hubertf Exp $
 +#include <sys/types.h>
  #include <stdarg.h>
  
- #define qemu_printf printf
+ #ifndef glue
diff --git a/emulators/qemu/patches/patch-ag b/emulators/qemu/patches/patch-ag
index 7b7f1ff76e3..5d741e301b6 100644
--- a/emulators/qemu/patches/patch-ag
+++ b/emulators/qemu/patches/patch-ag
@@ -1,5 +1,7 @@
---- configure.orig	2007-02-05 15:01:54 -0800
-+++ configure	2008-10-04 07:21:23 -0700
+$NetBSD: patch-ag,v 1.12 2009/01/22 07:27:28 jmmv Exp $
+
+--- configure.orig	2008-01-06 20:38:42.000000000 +0100
++++ configure
 @@ -44,7 +44,7 @@ case "$cpu" in
    alpha)
      cpu="alpha"
@@ -9,7 +11,7 @@
      cpu="powerpc"
    ;;
    mips)
-@@ -116,6 +116,12 @@ if [ "$cpu" = "i386" -o "$cpu" = "x86_64
+@@ -136,6 +136,12 @@ if [ "$cpu" = "i386" -o "$cpu" = "x86_64
      kqemu="yes"
  fi
  ;;
@@ -22,7 +24,7 @@
  NetBSD)
  bsd="yes"
  oss="yes"
-@@ -371,6 +377,16 @@ EOF
+@@ -478,6 +484,16 @@ EOF
      fi
  fi
  
@@ -39,28 +41,30 @@
  #
  # Solaris specific configure tool chain decisions
  #
-@@ -573,7 +589,7 @@ else
- if test -z "$prefix" ; then
-     prefix="/usr/local"
+@@ -680,7 +696,7 @@ else
+   if test -z "$prefix" ; then
+       prefix="/usr/local"
+   fi
+-  mansuffix="/share/man"
++  mansuffix="/$PKGMANDIR"
+   datasuffix="/share/qemu"
+   docsuffix="/share/doc/qemu"
+   binsuffix="/bin"
+@@ -848,8 +864,13 @@ int main(void) { return bswap_32(0); }
+ EOF
+   if $cc -o $TMPE $TMPC 2> /dev/null ; then
+     echo "#define HAVE_BYTESWAP_H 1" >> $config_h
++  elif test -f "/usr/include/machine/bswap.h" ; then
++    echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h
+   fi
  fi
--mandir="$prefix/share/man"
-+mandir="$prefix/$PKGMANDIR"
- datadir="$prefix/share/qemu"
- docdir="$prefix/share/doc/qemu"
- bindir="$prefix/bin"
-@@ -711,6 +727,11 @@ if test "$mingw32" = "yes" ; then
-   echo "#define CONFIG_WIN32 1" >> $config_h
- elif test -f "/usr/include/byteswap.h" ; then
-   echo "#define HAVE_BYTESWAP_H 1" >> $config_h
-+elif test -f "/usr/include/machine/bswap.h" ; then
-+  echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h
-+fi
 +if test "$dragonfly" = "yes" ; then
 +  echo "CONFIG_DRAGONFLY=yes" >> $config_mak
- fi
++fi
  if test "$darwin" = "yes" ; then
    echo "CONFIG_DARWIN=yes" >> $config_mak
-@@ -785,6 +806,10 @@ if [ "$bsd" = "yes" ] ; then
+   echo "#define CONFIG_DARWIN 1" >> $config_h
+@@ -960,6 +981,10 @@ if [ "$bsd" = "yes" ] ; then
    echo "#define _BSD 1" >> $config_h
  fi
  
@@ -70,4 +74,4 @@
 +
  echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_h
  
- for target in $target_list; do
+ tools=
diff --git a/emulators/qemu/patches/patch-ak b/emulators/qemu/patches/patch-ak
index e58757180b4..1f3c20fb67b 100644
--- a/emulators/qemu/patches/patch-ak
+++ b/emulators/qemu/patches/patch-ak
@@ -1,27 +1,30 @@
-$NetBSD: patch-ak,v 1.12 2007/12/30 17:12:45 joerg Exp $
+$NetBSD: patch-ak,v 1.13 2009/01/22 07:27:28 jmmv Exp $
 
---- Makefile.orig	2007-02-05 23:01:54 +0000
+--- Makefile.orig	2008-01-06 20:38:41.000000000 +0100
 +++ Makefile
-@@ -27,10 +27,12 @@ endif
- ifndef CONFIG_DARWIN
- ifndef CONFIG_WIN32
- ifndef CONFIG_SOLARIS
+@@ -16,6 +16,15 @@ BASE_LDFLAGS += $(OS_LDFLAGS) $(ARCH_LDF
+ CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP
+ CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ LIBS=
++ifndef CONFIG_DARWIN
++ifndef CONFIG_WIN32
++ifndef CONFIG_SOLARIS
 +ifndef CONFIG_DRAGONFLY
- LIBS+=-lrt
- endif
- endif
- endif
++LIBS+=-lrt
 +endif
- 
- all: $(TOOLS) $(DOCS) recurse-all
- 
-@@ -66,21 +68,21 @@ ar      de     en-us  fi  fr-be  hr     
++endif
++endif
++endif
+ ifdef CONFIG_STATIC
+ BASE_LDFLAGS += -static
+ endif
+@@ -164,28 +173,28 @@ ar      de     en-us  fi  fr-be  hr     
  common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr
  
  install-doc: $(DOCS)
 -	mkdir -p "$(DESTDIR)$(docdir)"
 -	$(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
-+	$(BSD_INSTALL_MAN_DIR) "$(DESTDIR)$(docdir)"
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(docdir)
 +	$(BSD_INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
  ifndef CONFIG_WIN32
  	mkdir -p "$(DESTDIR)$(mandir)/man1"
@@ -30,16 +33,25 @@ $NetBSD: patch-ak,v 1.12 2007/12/30 17:12:45 joerg Exp $
  
  install: all $(if $(BUILD_DOCS),install-doc)
 -	mkdir -p "$(DESTDIR)$(bindir)"
++	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
+ ifneq ($(TOOLS),)
 -	$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
++	$(BSD_INSTALL_PROGRAM) $(TOOLS) "$(DESTDIR)$(bindir)"
+ endif
 -	mkdir -p "$(DESTDIR)$(datadir)"
-+	$(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(bindir)
-+	$(BSD_INSTALL_PROGRAM) $(TOOLS) ${DESTDIR}$(bindir)
-+	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(datadir)
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(datadir)
  	for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
- 		video.x openbios-sparc32 linux_boot.bin pxe-ne2k_pci.bin \
+ 		video.x openbios-sparc32 pxe-ne2k_pci.bin \
  		pxe-rtl8139.bin pxe-pcnet.bin; do \
 -		$(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
 +		$(BSD_INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
  	done
  ifndef CONFIG_WIN32
- 	mkdir -p "$(DESTDIR)$(datadir)/keymaps"
+-	mkdir -p "$(DESTDIR)$(datadir)/keymaps"
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(datadir)/keymaps
+ 	for x in $(KEYMAPS); do \
+-		$(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
++		$(BSD_INSTALL_DATA) $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
+ 	done
+ endif
+ 	for d in $(TARGET_DIRS); do \
diff --git a/emulators/qemu/patches/patch-ao b/emulators/qemu/patches/patch-ao
index 84f12298f17..b69649eeef9 100644
--- a/emulators/qemu/patches/patch-ao
+++ b/emulators/qemu/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.2 2006/01/01 13:48:45 xtraeme Exp $
+$NetBSD: patch-ao,v 1.3 2009/01/22 07:27:28 jmmv Exp $
 
---- audio/mixeng.c.orig	2005-12-19 17:51:53.000000000 -0500
+--- audio/mixeng.c.orig	2008-01-06 20:38:41.000000000 +0100
 +++ audio/mixeng.c
-@@ -101,48 +101,56 @@
+@@ -145,56 +145,64 @@
  #undef IN_T
  #undef SHIFT
  
@@ -14,34 +14,42 @@ $NetBSD: patch-ao,v 1.2 2006/01/01 13:48:45 xtraeme Exp $
 +#define _NBglue(x,y,z) x ## y ## z
 +#define NBglue(x,y,z) _NBglue(x,y,z)
 +
- t_sample *mixeng_conv[2][2][2][2] = {
+ t_sample *mixeng_conv[2][2][2][3] = {
      {
          {
              {
 -                conv_natural_uint8_t_to_mono,
--                conv_natural_uint16_t_to_mono
-+		NBglue(conv_natural_, uint8_t, _to_mono), 
-+                NBglue(conv_natural_, uint16_t, _to_mono)
+-                conv_natural_uint16_t_to_mono,
+-                conv_natural_uint32_t_to_mono
++                NBglue(conv_natural_, uint8_t, _to_mono),
++                NBglue(conv_natural_, uint16_t, _to_mono),
++                NBglue(conv_natural_, uint32_t, _to_mono)
              },
              {
 -                conv_natural_uint8_t_to_mono,
--                conv_swap_uint16_t_to_mono
+-                conv_swap_uint16_t_to_mono,
+-                conv_swap_uint32_t_to_mono,
 +                NBglue(conv_natural_, uint8_t, _to_mono),
-+                NBglue(conv_swap_, uint16_t, _to_mono)
++                NBglue(conv_swap_, uint16_t, _to_mono),
++                NBglue(conv_swap_, uint32_t, _to_mono),
              }
          },
          {
              {
 -                conv_natural_int8_t_to_mono,
--                conv_natural_int16_t_to_mono
+-                conv_natural_int16_t_to_mono,
+-                conv_natural_int32_t_to_mono
 +                NBglue(conv_natural_, int8_t, _to_mono),
-+                NBglue(conv_natural_, int16_t, _to_mono)
++                NBglue(conv_natural_, int16_t, _to_mono),
++                NBglue(conv_natural_, int32_t, _to_mono)
              },
              {
 -                conv_natural_int8_t_to_mono,
--                conv_swap_int16_t_to_mono
+-                conv_swap_int16_t_to_mono,
+-                conv_swap_int32_t_to_mono
 +                NBglue(conv_natural_, int8_t, _to_mono),
-+                NBglue(conv_swap_, int16_t, _to_mono)
++                NBglue(conv_swap_, int16_t, _to_mono),
++                NBglue(conv_swap_, int32_t, _to_mono)
              }
          }
      },
@@ -49,60 +57,76 @@ $NetBSD: patch-ao,v 1.2 2006/01/01 13:48:45 xtraeme Exp $
          {
              {
 -                conv_natural_uint8_t_to_stereo,
--                conv_natural_uint16_t_to_stereo
+-                conv_natural_uint16_t_to_stereo,
+-                conv_natural_uint32_t_to_stereo
 +                NBglue(conv_natural_, uint8_t, _to_stereo),
-+                NBglue(conv_natural_, uint16_t, _to_stereo)
++                NBglue(conv_natural_, uint16_t, _to_stereo),
++                NBglue(conv_natural_, uint32_t, _to_stereo)
              },
              {
 -                conv_natural_uint8_t_to_stereo,
--                conv_swap_uint16_t_to_stereo
+-                conv_swap_uint16_t_to_stereo,
+-                conv_swap_uint32_t_to_stereo
 +                NBglue(conv_natural_, uint8_t, _to_stereo),
-+                NBglue(conv_swap_, uint16_t, _to_stereo)
++                NBglue(conv_swap_, uint16_t, _to_stereo),
++                NBglue(conv_swap_, uint32_t, _to_stereo)
              }
          },
          {
              {
 -                conv_natural_int8_t_to_stereo,
--                conv_natural_int16_t_to_stereo
+-                conv_natural_int16_t_to_stereo,
+-                conv_natural_int32_t_to_stereo
 +                NBglue(conv_natural_, int8_t, _to_stereo),
-+                NBglue(conv_natural_, int16_t, _to_stereo)
++                NBglue(conv_natural_, int16_t, _to_stereo),
++                NBglue(conv_natural_, int32_t, _to_stereo)
              },
              {
 -                conv_natural_int8_t_to_stereo,
--                conv_swap_int16_t_to_stereo
+-                conv_swap_int16_t_to_stereo,
+-                conv_swap_int32_t_to_stereo,
 +                NBglue(conv_natural_, int8_t, _to_stereo),
-+                NBglue(conv_swap_, int16_t, _to_stereo)
++                NBglue(conv_swap_, int16_t, _to_stereo),
++                NBglue(conv_swap_, int32_t, _to_stereo),
              }
          }
      }
-@@ -152,44 +160,44 @@ f_sample *mixeng_clip[2][2][2][2] = {
+@@ -204,52 +212,52 @@ f_sample *mixeng_clip[2][2][2][3] = {
      {
          {
              {
 -                clip_natural_uint8_t_from_mono,
--                clip_natural_uint16_t_from_mono
+-                clip_natural_uint16_t_from_mono,
+-                clip_natural_uint32_t_from_mono
 +                NBglue(clip_natural_, uint8_t, _from_mono),
-+                NBglue(clip_natural_, uint16_t, _from_mono)
++                NBglue(clip_natural_, uint16_t, _from_mono),
++                NBglue(clip_natural_, uint32_t, _from_mono)
              },
              {
 -                clip_natural_uint8_t_from_mono,
--                clip_swap_uint16_t_from_mono
+-                clip_swap_uint16_t_from_mono,
+-                clip_swap_uint32_t_from_mono
 +                NBglue(clip_natural_, uint8_t, _from_mono),
-+                NBglue(clip_swap_, uint16_t, _from_mono)
++                NBglue(clip_swap_, uint16_t, _from_mono),
++                NBglue(clip_swap_, uint32_t, _from_mono)
              }
          },
          {
              {
 -                clip_natural_int8_t_from_mono,
--                clip_natural_int16_t_from_mono
+-                clip_natural_int16_t_from_mono,
+-                clip_natural_int32_t_from_mono
 +                NBglue(clip_natural_, int8_t, _from_mono),
-+                NBglue(clip_natural_, int16_t, _from_mono)
++                NBglue(clip_natural_, int16_t, _from_mono),
++                NBglue(clip_natural_, int32_t, _from_mono)
              },
              {
 -                clip_natural_int8_t_from_mono,
--                clip_swap_int16_t_from_mono
+-                clip_swap_int16_t_from_mono,
+-                clip_swap_int32_t_from_mono
 +                NBglue(clip_natural_, int8_t, _from_mono),
-+                NBglue(clip_swap_, int16_t, _from_mono)
++                NBglue(clip_swap_, int16_t, _from_mono),
++                NBglue(clip_swap_, int32_t, _from_mono)
              }
          }
      },
@@ -110,29 +134,37 @@ $NetBSD: patch-ao,v 1.2 2006/01/01 13:48:45 xtraeme Exp $
          {
              {
 -                clip_natural_uint8_t_from_stereo,
--                clip_natural_uint16_t_from_stereo
+-                clip_natural_uint16_t_from_stereo,
+-                clip_natural_uint32_t_from_stereo
 +                NBglue(clip_natural_, uint8_t, _from_stereo),
-+                NBglue(clip_natural_, uint16_t, _from_stereo)
++                NBglue(clip_natural_, uint16_t, _from_stereo),
++                NBglue(clip_natural_, uint32_t, _from_stereo)
              },
              {
 -                clip_natural_uint8_t_from_stereo,
--                clip_swap_uint16_t_from_stereo
+-                clip_swap_uint16_t_from_stereo,
+-                clip_swap_uint32_t_from_stereo
 +                NBglue(clip_natural_, uint8_t, _from_stereo),
-+                NBglue(clip_swap_, uint16_t, _from_stereo)
++                NBglue(clip_swap_, uint16_t, _from_stereo),
++                NBglue(clip_swap_, uint32_t, _from_stereo)
              }
          },
          {
              {
 -                clip_natural_int8_t_from_stereo,
--                clip_natural_int16_t_from_stereo
+-                clip_natural_int16_t_from_stereo,
+-                clip_natural_int32_t_from_stereo
 +                NBglue(clip_natural_, int8_t, _from_stereo),
-+                NBglue(clip_natural_, int16_t, _from_stereo)
++                NBglue(clip_natural_, int16_t, _from_stereo),
++                NBglue(clip_natural_, int32_t, _from_stereo)
              },
              {
 -                clip_natural_int8_t_from_stereo,
--                clip_swap_int16_t_from_stereo
+-                clip_swap_int16_t_from_stereo,
+-                clip_swap_int32_t_from_stereo
 +                NBglue(clip_natural_, int8_t, _from_stereo),
-+                NBglue(clip_swap_, int16_t, _from_stereo)
++                NBglue(clip_swap_, int16_t, _from_stereo),
++                NBglue(clip_swap_, int32_t, _from_stereo)
              }
          }
      }
diff --git a/emulators/qemu/patches/patch-au b/emulators/qemu/patches/patch-au
index 93826b913b6..d822d2c69d4 100644
--- a/emulators/qemu/patches/patch-au
+++ b/emulators/qemu/patches/patch-au
@@ -1,29 +1,29 @@
-$NetBSD: patch-au,v 1.4 2007/12/18 00:16:56 joerg Exp $
+$NetBSD: patch-au,v 1.5 2009/01/22 07:27:28 jmmv Exp $
 
---- fpu/softfloat-native.h.orig	2007-02-06 00:01:54.000000000 +0100
-+++ fpu/softfloat-native.h	2007-05-02 01:54:50.000000000 +0200
+--- fpu/softfloat-native.h.orig	2008-01-06 20:38:42.000000000 +0100
++++ fpu/softfloat-native.h
 @@ -33,6 +33,24 @@
  #define isunordered(x,y)        unordered(x, y)
  #endif
  
 +#ifdef __NetBSD__
 +#ifndef isgreater
-+#define isgreater(x, y)		__builtin_isgreater(x, y)
++#define isgreater(x, y)                __builtin_isgreater(x, y)
 +#endif
 +#ifndef isgreaterequal
-+#define isgreaterequal(x, y)	__builtin_isgreaterequal(x, y)
++#define isgreaterequal(x, y)   __builtin_isgreaterequal(x, y)
 +#endif
 +#ifndef isless
-+#define isless(x, y)		__builtin_isless(x, y)
++#define isless(x, y)           __builtin_isless(x, y)
 +#endif
 +#ifndef islessequal
-+#define islessequal(x, y)	__builtin_islessequal(x, y)
++#define islessequal(x, y)      __builtin_islessequal(x, y)
 +#endif
 +#ifndef isunordered
-+#define isunordered(x, y)	__builtin_isunordered(x, y)
++#define isunordered(x, y)      __builtin_isunordered(x, y)
 +#endif
 +#endif
 +
- typedef float float32;
- typedef double float64;
- #ifdef FLOATX80
+ #if defined(__sun__) && !defined(NEED_LIBSUNMATH)
+ 
+ #ifndef isnan
diff --git a/emulators/qemu/patches/patch-aw b/emulators/qemu/patches/patch-aw
index 82ec52ee810..b03fe11d0e3 100644
--- a/emulators/qemu/patches/patch-aw
+++ b/emulators/qemu/patches/patch-aw
@@ -1,23 +1,18 @@
-$NetBSD: patch-aw,v 1.2 2007/01/06 21:21:35 xtraeme Exp $
+$NetBSD: patch-aw,v 1.3 2009/01/22 07:27:28 jmmv Exp $
 
 Workaround for x86_64 target, patch from Hubert Feyrer.
 
-Index: dyngen.c
-===================================================================
-RCS file: /cvsroot/qemu/qemu/dyngen.c,v
-retrieving revision 1.40
-diff -u -r1.40 dyngen.c
---- dyngen.c.orig	2007-01-05 20:32:17.000000000 +0000
-+++ dyngen.c	2007-01-05 20:36:45.000000000 +0000
-@@ -1624,6 +1624,7 @@
+--- dyngen.c.orig	2008-01-06 20:38:42.000000000 +0100
++++ dyngen.c
+@@ -1738,6 +1738,7 @@ void gen_code(const char *name, host_ulo
                  if(!sym_name)
                      continue;
-                 if (*sym_name && 
+                 if (*sym_name &&
 +                    !strstart(sym_name, "bswap64", NULL) && /* HF hack */
                      !strstart(sym_name, "__op_param", NULL) &&
                      !strstart(sym_name, "__op_jmp", NULL) &&
                      !strstart(sym_name, "__op_gen_label", NULL)) {
-@@ -1647,6 +1648,9 @@
+@@ -1762,6 +1763,9 @@ void gen_code(const char *name, host_ulo
  				 */
  				fprintf(outfile, "    extern char %s;\n",
  					sym_name);
diff --git a/emulators/qemu/patches/patch-ay b/emulators/qemu/patches/patch-ay
index 053636d5f44..c01342e46aa 100644
--- a/emulators/qemu/patches/patch-ay
+++ b/emulators/qemu/patches/patch-ay
@@ -1,18 +1,18 @@
-$NetBSD: patch-ay,v 1.7 2007/05/21 20:24:48 xtraeme Exp $
+$NetBSD: patch-ay,v 1.8 2009/01/22 07:27:28 jmmv Exp $
 
---- block-raw.c.orig	2007-02-06 00:01:54.000000000 +0100
-+++ block-raw.c
-@@ -25,7 +25,9 @@
+--- block-raw-posix.c.orig	2008-01-06 20:38:42.000000000 +0100
++++ block-raw-posix.c
+@@ -28,7 +28,9 @@
+ #endif
  #include "block_int.h"
  #include <assert.h>
- #ifndef _WIN32
 +#ifdef _POSIX_ASYNCHRONOUS_IO
  #include <aio.h>
 +#endif
  
- #ifndef QEMU_TOOL
- #include "exec-all.h"
-@@ -157,6 +159,7 @@ static int raw_pwrite(BlockDriverState *
+ #ifdef CONFIG_COCOA
+ #include <paths.h>
+@@ -230,6 +232,7 @@ label__raw_write__success:
      return ret;
  }
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ay,v 1.7 2007/05/21 20:24:48 xtraeme Exp $
  /***********************************************************/
  /* Unix AIO using POSIX AIO */
  
-@@ -379,6 +382,7 @@ static void raw_aio_cancel(BlockDriverAI
+@@ -455,6 +458,7 @@ static void raw_aio_cancel(BlockDriverAI
          pacb = &acb->next;
      }
  }
@@ -28,7 +28,7 @@ $NetBSD: patch-ay,v 1.7 2007/05/21 20:24:48 xtraeme Exp $
  
  static void raw_close(BlockDriverState *bs)
  {
-@@ -469,6 +473,35 @@ static void raw_flush(BlockDriverState *
+@@ -545,6 +549,35 @@ static void raw_flush(BlockDriverState *
      fsync(s->fd);
  }
  
@@ -64,10 +64,10 @@ $NetBSD: patch-ay,v 1.7 2007/05/21 20:24:48 xtraeme Exp $
  BlockDriver bdrv_raw = {
      "raw",
      sizeof(BDRVRawState),
-@@ -480,10 +513,12 @@ BlockDriver bdrv_raw = {
+@@ -556,10 +589,12 @@ BlockDriver bdrv_raw = {
      raw_create,
      raw_flush,
-     
+ 
 +#ifdef _POSIX_ASYNCHRONOUS_IO
      .bdrv_aio_read = raw_aio_read,
      .bdrv_aio_write = raw_aio_write,
@@ -77,10 +77,10 @@ $NetBSD: patch-ay,v 1.7 2007/05/21 20:24:48 xtraeme Exp $
      .protocol_name = "file",
      .bdrv_pread = raw_pread,
      .bdrv_pwrite = raw_pwrite,
-@@ -816,10 +851,12 @@ BlockDriver bdrv_host_device = {
+@@ -908,10 +943,12 @@ BlockDriver bdrv_host_device = {
      NULL,
      raw_flush,
-     
+ 
 +#ifdef _POSIX_ASYNCHRONOUS_IO
      .bdrv_aio_read = raw_aio_read,
      .bdrv_aio_write = raw_aio_write,