Update to 0.8.2:

  - ACPI support
  - PC VGA BIOS fixes
  - switch to OpenBios for SPARC targets (Blue Swirl)
  - VNC server fixes
  - MIPS FPU support (Marius Groeger)
  - Solaris/SPARC host support (Ben Taylor)
  - PPC breakpoints and single stepping (Jason Wessel)
  - USB updates (Paul Brook)
  - UDP/TCP/telnet character devices (Jason Wessel)
  - Windows sparse file support (Frediano Ziglio)
  - RTL8139 NIC TCP segmentation offloading (Igor Kovalenko)
  - PCNET NIC support (Antony T Curtis)
  - Support for variable frequency host CPUs
  - Workaround for win32 SMP hosts
  - Support for AMD Flash memories (Jocelyn Mayer)
  - Audio capture to WAV files support (malc)

pkgsrc changes:

On systems with gcc4, force to use pkgsrc gcc34 to make it build
on NetBSD >=4.0.

8 files changed, 54 insertions, 92 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 47d181a3ece..6cfb0c5bff1 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2006/09/02 18:17:40 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2006/09/05 00:44:38 xtraeme Exp $
 #
 
-DISTNAME=		qemu-0.8.1
-PKGREVISION=		4
+DISTNAME=		qemu-0.8.2
 CATEGORIES=		emulators
 MASTER_SITES=		http://fabrice.bellard.free.fr/qemu/
 
@@ -40,10 +39,10 @@ BUILDLINK_TRANSFORM+=	rm-optarg:-march rm-optarg:-mcpu
 
 .include "../../mk/compiler.mk"
 
-# qemu cannot yet use gcc 4, see the faq/mailing lists
-# (hint: use gcc_select on darwin/macos to choose gcc 3.3 instead)
 .if !empty(CC_VERSION:Mgcc-4*)
-PKG_FAIL_REASON+=	"${PKGNAME} cannot use "${CC_VERSION:Q}
+GCC_REQD+=		3.4
+USE_PKGSRC_GCC=		yes
+CONFIGURE_ARGS+=	--disable-gcc-check
 .endif
 
 post-install:
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index e7355935cb8..551e277511e 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/09/02 18:17:40 rillig Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/09/05 00:44:38 xtraeme Exp $
 bin/qemu
 bin/qemu-img
 bin/qemu-system-arm
@@ -7,11 +7,7 @@ bin/qemu-system-mipsel
 bin/qemu-system-ppc
 bin/qemu-system-sparc
 bin/qemu-system-x86_64
-man/man1/qemu-img.1
-man/man1/qemu.1
-share/doc/qemu/Makefile.multinode-NetBSD
-share/doc/qemu/qemu-doc.html
-share/doc/qemu/qemu-tech.html
+share/doc/qemu/Makefile.multinode-${OPSYS}
 share/qemu/bios.bin
 share/qemu/keymaps/ar
 share/qemu/keymaps/common
@@ -49,8 +45,8 @@ 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/proll.elf
 share/qemu/vgabios-cirrus.bin
 share/qemu/vgabios.bin
 share/qemu/video.x
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index cb2d94437f6..3930a41b0e0 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.25 2006/09/02 18:17:40 rillig Exp $
+$NetBSD: distinfo,v 1.26 2006/09/05 00:44:38 xtraeme Exp $
 
-SHA1 (qemu-0.8.1.tar.gz) = 72c943c24bed6aa066dcc3012b198c20f04aef30
-RMD160 (qemu-0.8.1.tar.gz) = 04d163d4792bbea39fc0b1e52af124cdb7e907dc
-Size (qemu-0.8.1.tar.gz) = 1623264 bytes
+SHA1 (qemu-0.8.2.tar.gz) = d775239a545e7d0c5b677660a2122df590afde6d
+RMD160 (qemu-0.8.2.tar.gz) = 715c24997330352aa675cd7279731cec251f833a
+Size (qemu-0.8.2.tar.gz) = 1810909 bytes
 SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
 SHA1 (patch-ab) = 12838d78eed85c575214f4ce632a4b6694c6f97f
 SHA1 (patch-ac) = f1231bcfde687ebe7a7ea4898593cd3818f03142
-SHA1 (patch-af) = 221d6d85aa898cb27462806faab58ee2a9871a1c
+SHA1 (patch-af) = dbf4bfe61a3b545f82f030ed8ebaad40eb0092a2
 SHA1 (patch-ag) = 197b8f35dc62369d42236e37662eebbdb1a55974
 SHA1 (patch-ah) = 134f47583dbed94e83671ca6197106805b13f759
 SHA1 (patch-ai) = 480cc80a451488a1376f99ed152a917116759cbf
 SHA1 (patch-aj) = a177cd01c32732321d8473d5e5f4489e433fbf8f
-SHA1 (patch-ak) = 64da6f0a56cfeb0067698a1ad3d51b60bd04dc40
-SHA1 (patch-al) = 440b2ad677fd42dd667035dde13b08ab658be867
+SHA1 (patch-ak) = 75a58b8fe0acd74f40b38b9a9338a708ef2fe76a
+SHA1 (patch-al) = d61bce6a4cebae4ba1f87ce9def277c0ffc5843d
 SHA1 (patch-am) = a22a3b23284c377afa8113768d68c8ef40c514f9
 SHA1 (patch-ao) = e92d56f991cf29f83e39464f9e695caa86fe5fe0
 SHA1 (patch-ap) = 6cd565b9a3b06aea12fbedb1199e16dd0f3577ae
@@ -20,5 +20,3 @@ SHA1 (patch-as) = 0df64b325b758a88fe61590e129bab2b3f99ce63
 SHA1 (patch-au) = 29d05fb5f4717fb572491d9d0653ec74ba46ae7e
 SHA1 (patch-aw) = 6299964fb3a747e8f5dfe4354e66722030ee9a75
 SHA1 (patch-ax) = 66b060005ecbf9fd0451f7960e81eccbabf959ca
-SHA1 (patch-ay) = b1a2c96012cc24c3818f1c494eadbbd9968ea085
-SHA1 (patch-az) = 27ab658a2bb48ff78a313e47da0e1907b660f150
diff --git a/emulators/qemu/patches/patch-af b/emulators/qemu/patches/patch-af
index 07a798188b7..8a01e5a5a91 100644
--- a/emulators/qemu/patches/patch-af
+++ b/emulators/qemu/patches/patch-af
@@ -1,8 +1,6 @@
-$NetBSD: patch-af,v 1.3 2005/05/03 11:18:47 xtraeme Exp $
-
---- dyngen-exec.h.orig	2005-04-28 22:23:53.000000000 +0200
-+++ dyngen-exec.h	2005-04-28 22:25:30.000000000 +0200
-@@ -23,7 +23,9 @@
+--- dyngen-exec.h.orig	2006-09-05 01:19:38.000000000 +0200
++++ dyngen-exec.h	2006-09-05 01:21:00.000000000 +0200
+@@ -30,7 +30,9 @@
  /* NOTE: standard headers should be used with special care at this
     point because host CPU registers are used as global variables. Some
     host headers do not allow that. */
@@ -12,22 +10,22 @@ $NetBSD: patch-af,v 1.3 2005/05/03 11:18:47 xtraeme Exp $
  
  typedef unsigned char uint8_t;
  typedef unsigned short uint16_t;
-@@ -44,6 +46,7 @@
- typedef signed long long int64_t;
+@@ -62,6 +64,7 @@
+ #endif
  #endif
  
-+/*
++#if 0
  #define INT8_MIN		(-128)
  #define INT16_MIN		(-32767-1)
  #define INT32_MIN		(-2147483647-1)
-@@ -56,12 +59,17 @@
+@@ -74,12 +77,17 @@
  #define UINT16_MAX		(65535)
  #define UINT32_MAX		(4294967295U)
  #define UINT64_MAX		((uint64_t)(18446744073709551615))
-+*/
++#endif
  
 +#ifdef __NetBSD__
-+typedef        struct __sFILE FILE;
++typedef struct __sFILE FILE;
 +#else
  typedef struct FILE FILE;
  extern int fprintf(FILE *, const char *, ...);
diff --git a/emulators/qemu/patches/patch-ak b/emulators/qemu/patches/patch-ak
index 31088df0093..304b3cc63d8 100644
--- a/emulators/qemu/patches/patch-ak
+++ b/emulators/qemu/patches/patch-ak
@@ -1,21 +1,27 @@
-$NetBSD: patch-ak,v 1.7 2006/08/21 17:29:33 dbj Exp $
+$NetBSD: patch-ak,v 1.8 2006/09/05 00:44:38 xtraeme Exp $
 
---- Makefile.orig	2006-05-03 16:32:58.000000000 -0400
-+++ Makefile	2006-07-31 22:18:31.000000000 -0400
-@@ -1,10 +1,10 @@
- include config-host.mak
+--- Makefile.orig	2006-07-22 19:23:34.000000000 +0200
++++ Makefile	2006-09-05 02:37:31.000000000 +0200
+@@ -5,15 +5,15 @@
+ .PHONY: all clean distclean dvi info install install-doc tar tarbin \
+ 	speed test test2 html dvi info
  
 -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
-+#CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
++CFLAGS+=-Wall -O2 -fno-strict-aliasing -I.
  ifdef CONFIG_DARWIN
  CFLAGS+= -mdynamic-no-pic
  endif
+ ifeq ($(ARCH),sparc)
+ CFLAGS+=-mcpu=ultrasparc
+ endif
 -LDFLAGS=-g
+-LIBS=
 +#LDFLAGS=-g
- LIBS=
++#LIBS=
  DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
  TOOLS=qemu-img$(EXESUF)
-@@ -48,20 +48,20 @@
+ ifdef CONFIG_STATIC
+@@ -59,20 +59,21 @@
  common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr
  
  install-doc: $(DOCS)
@@ -32,12 +38,13 @@ $NetBSD: patch-ak,v 1.7 2006/08/21 17:29:33 dbj Exp $
 -	mkdir -p "$(DESTDIR)$(bindir)"
 -	$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
 -	mkdir -p "$(DESTDIR)$(datadir)"
-+install: all install-doc
++install: all
++install: all 
 +	$(BSD_INSTALL_PROGRAM_DIR) $(bindir)
 +	$(BSD_INSTALL_PROGRAM) $(TOOLS) $(bindir)
 +	$(BSD_INSTALL_DATA_DIR) $(datadir)
  	for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
- 			video.x proll.elf linux_boot.bin; do \
+ 			video.x openbios-sparc32 linux_boot.bin; do \
 -		$(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
 +		$(BSD_INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
  	done
diff --git a/emulators/qemu/patches/patch-al b/emulators/qemu/patches/patch-al
index 0ba984d3ff3..71f86322db5 100644
--- a/emulators/qemu/patches/patch-al
+++ b/emulators/qemu/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.2 2006/01/01 19:12:54 hubertf Exp $
+$NetBSD: patch-al,v 1.3 2006/09/05 00:44:38 xtraeme Exp $
 
---- osdep.h.orig	2005-12-19 23:51:53.000000000 +0100
-+++ osdep.h
+--- osdep.h.orig	2006-07-22 19:23:34.000000000 +0200
++++ osdep.h	2006-09-05 01:25:58.000000000 +0200
 @@ -2,6 +2,8 @@
  #define QEMU_OSDEP_H
  
@@ -11,12 +11,20 @@ $NetBSD: patch-al,v 1.2 2006/01/01 19:12:54 hubertf Exp $
  
  int qemu_vsnprintf(char *buf, int buflen, const char *fmt, va_list args);
  void qemu_vprintf(const char *fmt, va_list ap);
-@@ -31,7 +33,11 @@ extern void __longjmp(jmp_buf env, int v
+@@ -27,13 +29,19 @@
+ 
+ #include <signal.h>
+ 
++#ifndef __NetBSD__
+ struct siginfo;
++#endif
+ 
+ /* NOTE: it works only because the glibc sigset_t is >= kernel sigset_t */
  struct qemu_sigaction {
      union {
          void (*_sa_handler)(int);
 +#ifdef __NetBSD__
-+        void (*_sa_sigaction)(int, union siginfo *, void *);
++        void (*_sa_sigaction)(int, siginfo_t *, void *);
 +#else
          void (*_sa_sigaction)(int, struct siginfo *, void *);
 +#endif
diff --git a/emulators/qemu/patches/patch-ay b/emulators/qemu/patches/patch-ay
deleted file mode 100644
index 25355129e80..00000000000
--- a/emulators/qemu/patches/patch-ay
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ay,v 1.3 2006/01/06 09:17:03 xtraeme Exp $
-
---- target-sparc/op.c.orig	2005-12-19 23:51:53.000000000 +0100
-+++ target-sparc/op.c
-@@ -1299,9 +1299,10 @@ void OPPROTO op_flush_T0(void)
-     helper_flush(T0);
- }
- 
-+void fnegs_dummy() {FT0 = -FT1;}
- void OPPROTO op_fnegs(void)
- {
--    FT0 = -FT1;
-+	fnegs_dummy();
- }
- 
- void OPPROTO op_fabss(void)
diff --git a/emulators/qemu/patches/patch-az b/emulators/qemu/patches/patch-az
deleted file mode 100644
index 901d51f1a1f..00000000000
--- a/emulators/qemu/patches/patch-az
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-az,v 1.1 2006/05/07 21:33:53 xtraeme Exp $
-
-Patch to fix the mouse pointer "invisible wall":
-http://lists.gnu.org/archive/html/qemu-devel/2006-05/msg00112.html
-
---- sdl.c.orig	2006-05-07 23:29:46.000000000 +0200
-+++ sdl.c	2006-05-07 23:31:00.000000000 +0200
-@@ -280,14 +280,17 @@
- 
- static void sdl_hide_cursor(void)
- {
-+	if (kbd_mouse_is_absolute()) {
-+		SDL_ShowCursor(1);
-     SDL_SetCursor(sdl_cursor_hidden);
-+	} else
-+		SDL_ShowCursor(0);
- }
- 
- static void sdl_show_cursor(void)
- {
--    if (!kbd_mouse_is_absolute()) {
--	SDL_SetCursor(sdl_cursor_normal);
--    }
-+    if (!kbd_mouse_is_absolute())
-+	    SDL_ShowCursor(1);
- }
- 
- static void sdl_grab_start(void)