rough Qemu 0.10.1 package

[Reinoud Zandijk <reinoud%NetBSD.org@localhost>]

Hi folks,

i've got a rough package here for qemu version 0.10.1 that compiles and runs
here for i386. Note that the package won't compile when patched. You have to
manually disable sparc64-bsd-userland in the `configure'/build session or it
will bomb out on a compilation bug i couldn't easily fix.

Note that some *dragonflybsd* patches might have been disabled/deleted; those
need attention.

With regards,
Reinoud


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- Makefile    24 Mar 2009 15:13:40 -0000      1.55
+++ Makefile    28 Mar 2009 10:11:18 -0000
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.55 2009/03/24 15:13:40 abs Exp $
 #
 
-DISTNAME=              qemu-0.9.1
+DISTNAME=              qemu-0.10.1
 CATEGORIES=            emulators
-MASTER_SITES=          http://bellard.org/qemu/
+MASTER_SITES= http://download.savannah.gnu.org/releases/qemu/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://bellard.org/qemu/
@@ -21,15 +21,15 @@
 
 # Workaround for PR/41007 - ensure WRKSRC comes before any buildlinked
 # directories so we pickup our audio/audio.h. Cannot use CPPFLAGS for this
-CFLAGS+=       -I${WRKSRC}
+CFLAGS+=       -I${WRKSRC} -I${WRKSRC}/slirp
 
 .include "../../mk/bsd.prefs.mk"
 
-GCC_REQD+=             3.0
+#GCC_REQD+=            3.0
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*)
-USE_PKGSRC_GCC=        yes
-.endif
+#.if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*)
+#USE_PKGSRC_GCC=       yes
+#.endif
 
 CONFIGURE_ENV+=                PKGMANDIR=${PKGMANDIR}
 CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
@@ -55,6 +55,15 @@
 SUBST_SED.smbd=                -e s,/usr/sbin/smbd,${PREFIX:Q}/sbin/smbd,g
 SUBST_MESSAGE.smbd=    Fixing hardcoded paths.
 
+pre-patch:
+       mv ${WRKSRC}/audio/audio.h ${WRKSRC}/audio/qaudio.h
+
+SUBST_CLASSES+=                qaudio
+SUBST_STAGE.qaudio=    pre-configure
+SUBST_FILES.qaudio= *.c audio/*.c hw/*.c
+SUBST_SED.qaudio=      -e s,audio.h\",qaudio.h\",g
+SUBST_MESSAGE.qaudio=  Fixing audio.h confusion
+
 REPLACE_PERL+=         texi2pod.pl
 
 # Remove -march/-mcpu from CFLAGS, otherwise it will fail
@@ -69,11 +78,11 @@
 CFLAGS+=               -fno-stack-protector
 .endif
 
-.include "../../mk/compiler.mk"
+#.include "../../mk/compiler.mk"
 
-.if !empty(CC_VERSION:Mgcc-4*)
-CONFIGURE_ARGS+=       --disable-gcc-check
-.endif
+#.if !empty(CC_VERSION:Mgcc-4*)
+#CONFIGURE_ARGS+=      --disable-gcc-check
+#.endif
 
 
 INSTALLATION_DIRS=     ${PKGMANDIR}/man1 share/doc/qemu
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/PLIST,v
retrieving revision 1.17
diff -u -r1.17 PLIST
--- PLIST       22 Jan 2009 07:27:28 -0000      1.17
+++ PLIST       28 Mar 2009 10:11:18 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/01/22 07:27:28 jmmv Exp $
+@comment $NetBSD$
 bin/qemu
 bin/qemu-img
 bin/qemu-system-arm
@@ -17,9 +17,13 @@
 bin/qemu-system-x86_64
 man/man1/qemu-img.1
 man/man1/qemu.1
-share/doc/qemu/Makefile.multinode-NetBSD
+share/doc/qemu/Makefile.multinode-${OPSYS}
 share/doc/qemu/qemu-doc.html
 share/doc/qemu/qemu-tech.html
+share/man/man1/qemu-img.1
+share/man/man1/qemu.1
+share/man/man8/qemu-nbd.8
+share/qemu/bamboo.dtb
 share/qemu/bios.bin
 share/qemu/keymaps/ar
 share/qemu/keymaps/common
@@ -56,8 +60,11 @@
 share/qemu/keymaps/sv
 share/qemu/keymaps/th
 share/qemu/keymaps/tr
+share/qemu/openbios-ppc
 share/qemu/openbios-sparc32
+share/qemu/openbios-sparc64
 share/qemu/ppc_rom.bin
+share/qemu/pxe-e1000.bin
 share/qemu/pxe-ne2k_pci.bin
 share/qemu/pxe-pcnet.bin
 share/qemu/pxe-rtl8139.bin
@@ -66,4 +73,7 @@
 share/qemu/video.x
 @dirrm share/qemu/keymaps
 @dirrm share/qemu
+@dirrm share/man/man8
+@dirrm share/man/man1
+@dirrm share/man
 @dirrm share/doc/qemu
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/distinfo,v
retrieving revision 1.41
diff -u -r1.41 distinfo
--- distinfo    23 Jan 2009 08:15:27 -0000      1.41
+++ distinfo    28 Mar 2009 10:11:18 -0000
@@ -1,20 +1,9 @@
 $NetBSD: distinfo,v 1.41 2009/01/23 08:15:27 jmmv Exp $
 
-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) = ba77da578f528ca549c48336b40378dcbb2a2fbb
-SHA1 (patch-ac) = 2f5abda6af41418af0a0f8bed320ebde160832a8
-SHA1 (patch-ad) = ac69a03e4945e8c8fd5aadca070b876d0970910d
-SHA1 (patch-ae) = a82f6c1a02c6bc03f4da9bc2b52f817b260ced8a
-SHA1 (patch-ag) = 3469af1ec2a4f95c09a67c16b1071f0ec27dab74
-SHA1 (patch-ak) = ed5766e36d5a192cf4559142e6ef9e0287e61b43
-SHA1 (patch-am) = a22a3b23284c377afa8113768d68c8ef40c514f9
+SHA1 (qemu-0.10.1.tar.gz) = d1cafd4751e4feee606feb844dec4762713b2b69
+RMD160 (qemu-0.10.1.tar.gz) = f1dcd14a6981180b40b3048769bf861ac86fa0b3
+Size (qemu-0.10.1.tar.gz) = 3658024 bytes
 SHA1 (patch-ao) = e515093b6ea99f9cba665de022fd62f3be911569
 SHA1 (patch-au) = 2892cae63796c76014288f4a700acbee5aadc529
 SHA1 (patch-av) = 715e9680d70c1aa1c83bda0270125144a26d6140
-SHA1 (patch-aw) = f3bc77cdec3a876fa69406c91590d02161e80753
-SHA1 (patch-ax) = 66b060005ecbf9fd0451f7960e81eccbabf959ca
-SHA1 (patch-ay) = f41e230bd0fef6437aa187b346fc06ef4f32a31c
 SHA1 (patch-ba) = 7c5043a39405f52b512e479a46fc76108580b7bc
cvs diff: cannot find patches/patch-aa
cvs diff: cannot find patches/patch-ab
cvs diff: cannot find patches/patch-ac
cvs diff: cannot find patches/patch-ad
cvs diff: cannot find patches/patch-ae
cvs diff: cannot find patches/patch-ag
cvs diff: cannot find patches/patch-ak
cvs diff: cannot find patches/patch-am
cvs diff: cannot find patches/patch-aw
cvs diff: cannot find patches/patch-ax
cvs diff: cannot find patches/patch-ay