Update to 0.7.1.

Changes:

  - read-only Virtual FAT support (Johannes Schindelin)
  - Windows 2000 install disk full hack (original idea from Vladimir
    N. Oleynik)
  - VMDK disk image creation (Filip Navara)
  - SPARC64 progress (Blue Swirl)
  - initial MIPS support (Jocelyn mayer)
  - MIPS improvements (Ralf Baechle)
  - 64 bit fixes in user networking (initial patch by Gwenole Beauchesne)
  - IOAPIC support (Filip Navara)

7 files changed, 25 insertions, 51 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 7b939095c90..0e148504304 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:47 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/29 16:38:15 xtraeme Exp $
 #
 
-DISTNAME=		qemu-0.7.0
+DISTNAME=		qemu-0.7.1
 CATEGORIES=		emulators
 MASTER_SITES=		http://fabrice.bellard.free.fr/qemu/
 
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index 148e301437a..f54075ecc00 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/03 11:18:47 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/07/29 16:38:15 xtraeme Exp $
 bin/qemu
 bin/qemu-img
+bin/qemu-system-mips
 bin/qemu-system-ppc
 bin/qemu-system-sparc
 bin/qemu-system-x86_64
@@ -49,6 +50,7 @@ share/qemu/ppc_rom.bin
 share/qemu/proll.elf
 share/qemu/vgabios-cirrus.bin
 share/qemu/vgabios.bin
+share/qemu/video.x
 @dirrm share/qemu/keymaps
 @dirrm share/qemu
 @dirrm share/doc/qemu
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index b55ff974bea..73bd56742b7 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2005/05/25 18:04:57 dbj Exp $
+$NetBSD: distinfo,v 1.10 2005/07/29 16:38:15 xtraeme Exp $
 
-SHA1 (qemu-0.7.0.tar.gz) = ea6a5cd2cd7a6ad0daf24de000411983d9990320
-RMD160 (qemu-0.7.0.tar.gz) = 3bd1f81193ec6eb913153b02aa237dbadb94b413
-Size (qemu-0.7.0.tar.gz) = 1211802 bytes
+SHA1 (qemu-0.7.1.tar.gz) = 88388d41ed232df4b9d76688814c64cb58b08c9d
+RMD160 (qemu-0.7.1.tar.gz) = a1e8a9e934f6a7e585aed5ba99cbf3208f24bc6a
+Size (qemu-0.7.1.tar.gz) = 1338521 bytes
 SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
 SHA1 (patch-ac) = a54824b658f4bbdbbdf74ad1a12bf25bce8f1164
 SHA1 (patch-af) = 221d6d85aa898cb27462806faab58ee2a9871a1c
@@ -10,15 +10,13 @@ SHA1 (patch-ag) = 4bb7ae18fd0f0c5ecfa2ab2594d1de5b33660495
 SHA1 (patch-ah) = 134f47583dbed94e83671ca6197106805b13f759
 SHA1 (patch-ai) = 480cc80a451488a1376f99ed152a917116759cbf
 SHA1 (patch-aj) = d050b84489e74036994c19e982a363d74df797ab
-SHA1 (patch-ak) = 3f8cf4cd3db52451c6b02db1504da71cfb121c61
+SHA1 (patch-ak) = b38286e295c8d01f20bf8e15b1b25260dfc6a02e
 SHA1 (patch-al) = d87d8c4bd0a422b0e1c2b52d049e9ac807cf1375
 SHA1 (patch-am) = b12f4ed6bbeb4d89c43ca06b3b3ff25c14386c47
 SHA1 (patch-an) = 10e1c5edae487be4ae43648649ad419a3b6d7508
 SHA1 (patch-ao) = 1899c03e37b2409df13c6f69bb21c3debf0aa4e8
-SHA1 (patch-ap) = bbcf44e65c31b0de97440a8766f40cf1620c5b61
-SHA1 (patch-aq) = a0fe72cfbc54086feeb5a554220df6fdc2aa063e
+SHA1 (patch-ap) = 613ffa8a1f03b402abe1c15c9dd8846bd55ce24c
 SHA1 (patch-as) = 0df64b325b758a88fe61590e129bab2b3f99ce63
-SHA1 (patch-at) = 258e75c3229398018f9a316c070bb9ecc99bd91a
 SHA1 (patch-au) = aa2712c382a67beef9225e710e7735ba15995a41
 SHA1 (patch-av) = bd88088f41b6b3c256eec933e5f267fc432e58fa
 SHA1 (patch-aw) = 6299964fb3a747e8f5dfe4354e66722030ee9a75
diff --git a/emulators/qemu/patches/patch-ak b/emulators/qemu/patches/patch-ak
index 34fffc993b7..58948ff5fac 100644
--- a/emulators/qemu/patches/patch-ak
+++ b/emulators/qemu/patches/patch-ak
@@ -1,7 +1,5 @@
-$NetBSD: patch-ak,v 1.3 2005/05/03 11:18:47 xtraeme Exp $
-
---- Makefile.orig	2005-04-28 22:38:00.000000000 +0200
-+++ Makefile	2005-04-28 22:39:40.000000000 +0200
+--- Makefile.orig	2005-07-29 18:18:05.000000000 +0200
++++ Makefile	2005-07-29 18:22:06.000000000 +0200
 @@ -1,10 +1,10 @@
  -include config-host.mak
  
@@ -23,17 +21,18 @@ $NetBSD: patch-ak,v 1.3 2005/05/03 11:18:47 xtraeme Exp $
 -	install -m 755 -s $(TOOLS) "$(bindir)"
 -	mkdir -p "$(datadir)"
 -	install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
-+	$(BSD_INSTALL_PROGRAM_DIR) "$(bindir)"
-+	$(BSD_INSTALL_PROGRAM) $(TOOLS) "$(bindir)"
-+	$(BSD_INSTALL_DATA_DIR) "$(datadir)"
++	$(BSD_INSTALL_PROGRAM_DIR) $(bindir)
++	$(BSD_INSTALL_PROGRAM) $(TOOLS) $(bindir)
++	$(BSD_INSTALL_DATA_DIR) $(datadir)
 +	$(BSD_INSTALL_DATA) pc-bios/bios.bin pc-bios/vgabios.bin \
                         pc-bios/vgabios-cirrus.bin \
-                        pc-bios/ppc_rom.bin \
+                        pc-bios/ppc_rom.bin pc-bios/video.x \
                         pc-bios/proll.elf \
-                        pc-bios/linux_boot.bin "$(datadir)"
+-                       pc-bios/linux_boot.bin "$(datadir)"
 -	mkdir -p "$(docdir)"
 -	install -m 644 qemu-doc.html  qemu-tech.html "$(docdir)"
-+	$(BSD_INSTALL_DATA_DIR) "$(docdir)"
++                       pc-bios/linux_boot.bin $(datadir)
++	$(BSD_INSTALL_DATA_DIR) $(docdir)
 +	$(BSD_INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(docdir)"
  ifndef CONFIG_WIN32
  	mkdir -p "$(mandir)/man1"
diff --git a/emulators/qemu/patches/patch-ap b/emulators/qemu/patches/patch-ap
index c01987f9ea3..0e552ee8342 100644
--- a/emulators/qemu/patches/patch-ap
+++ b/emulators/qemu/patches/patch-ap
@@ -1,14 +1,12 @@
-$NetBSD: patch-ap,v 1.2 2005/05/03 11:18:47 xtraeme Exp $
-
---- target-sparc/cpu.h.orig	2005-04-27 22:52:05.000000000 +0200
-+++ target-sparc/cpu.h	2005-04-29 01:11:35.000000000 +0200
-@@ -194,8 +194,7 @@
- 	cpu_set_cwp(env, _tmp & PSR_CWP & (NWINDOWS - 1));		\
+--- target-sparc/cpu.h.orig	2005-07-29 18:24:50.000000000 +0200
++++ target-sparc/cpu.h	2005-07-29 18:25:12.000000000 +0200
+@@ -284,8 +284,7 @@
      } while (0)
+ #endif
  
 -struct siginfo;
 -int cpu_sparc_signal_handler(int hostsignum, struct siginfo *info, void *puc);
 +int cpu_sparc_signal_handler(int hostsignum, siginfo_t *info, void *puc);
  
- #define TARGET_PAGE_BITS 12 /* 4k */
  #include "cpu-all.h"
+ 
diff --git a/emulators/qemu/patches/patch-aq b/emulators/qemu/patches/patch-aq
deleted file mode 100644
index 6c0da2489cf..00000000000
--- a/emulators/qemu/patches/patch-aq
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2004/11/15 11:35:30 xtraeme Exp $
-
---- target-sparc/exec.h	12 Oct 2004 22:01:28 -0000	1.6
-+++ target-sparc/exec.h	15 Nov 2004 09:09:31 -0000
-@@ -1,5 +1,6 @@
- #ifndef EXEC_SPARC_H
- #define EXEC_SPARC_H 1
-+#include "config.h"
- #include "dyngen-exec.h"
- 
- register struct CPUSPARCState *env asm(AREG0);
diff --git a/emulators/qemu/patches/patch-at b/emulators/qemu/patches/patch-at
deleted file mode 100644
index cef3728a21f..00000000000
--- a/emulators/qemu/patches/patch-at
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-at,v 1.1 2004/12/14 01:02:19 dbj Exp $
-
---- target-ppc/exec.h.orig	Sun Nov 14 15:51:33 2004
-+++ target-ppc/exec.h
-@@ -20,6 +20,7 @@
- #if !defined (__PPC_H__)
- #define __PPC_H__
- 
-+#include "config.h"
- #include "dyngen-exec.h"
- 
- register struct CPUPPCState *env asm(AREG0);