Update to QEMU 1.1.0.

from Brad (maintainer)

emulators/qemu/Makefile

@@ -1,13 +1,17 @@
-# $OpenBSD: Makefile,v 1.85 2012/03/16 11:40:53 fgsch Exp $
+# $OpenBSD: Makefile,v 1.86 2012/06/15 11:53:28 ajacoutot Exp $
 
 ONLY_FOR_ARCHS=	amd64 arm hppa i386 mips64 mips64el powerpc sparc sparc64
 BROKEN-hppa=	compiler bug with gcc 4.2
 
 COMMENT=	multi system emulator
 
-DISTNAME=	qemu-1.0.1
+DISTNAME=	qemu-1.1.0-1
+PKGNAME=	qemu-1.1.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
+EXTRACT_SUFX=	.tar.bz2
+
+WRKDIST=	${WRKDIR}/qemu-1.1.0
 
 HOMEPAGE=	http://www.qemu.org/
 
@@ -34,7 +38,7 @@ LIB_DEPENDS=	devel/glib2 \
 MODPY_RUNDEP=	No
 
 MAKE_ENV=	V=1
-FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples
+FAKE_FLAGS=	qemu_confdir=${PREFIX}/share/examples/qemu
 
 EXTRA_CFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include
 EXTRA_LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
@@ -75,13 +79,15 @@ FLAVORS=	debug
 FLAVOR?=
 
 .if ${FLAVOR:Mdebug}
+CFLAGS+=	-O0
 CONFIGURE_ARGS+=--enable-debug
+.else
+CONFIGURE_ARGS+=--disable-debug-info
 .endif
 
 NO_REGRESS=	Yes
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qemu
 	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup \
 	    ${PREFIX}/share/examples/qemu
 	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown \

emulators/qemu/distinfo

@@ -1,5 +1,5 @@
-MD5 (qemu-1.0.1.tar.gz) = Xv0QkfAeO8Mb/ewnuO3rAA==
-RMD160 (qemu-1.0.1.tar.gz) = 3O80TxUOI4iAhxdo8vB8y26OzOc=
-SHA1 (qemu-1.0.1.tar.gz) = TQi1qDU4/NeyIr7G8cWE2o0SSXo=
-SHA256 (qemu-1.0.1.tar.gz) = GYkC4QeCUX9gfJ7Z5im153COo56zc+0+w/HIoWnZg3g=
-SIZE (qemu-1.0.1.tar.gz) = 10853005
+MD5 (qemu-1.1.0-1.tar.bz2) = 9chcIpt4C8OSaIRbbzZfwQ==
+RMD160 (qemu-1.1.0-1.tar.bz2) = hcjCYLZwBW30qCoGuSVb6H8Xe2g=
+SHA1 (qemu-1.1.0-1.tar.bz2) = hgB2WDHBN6gzhU8arAMT8lCJogA=
+SHA256 (qemu-1.1.0-1.tar.bz2) = HlZvjLwz5ft9XzZMD9HN3p6SHmRyI7XXrn5flVRLJY0=
+SIZE (qemu-1.1.0-1.tar.bz2) = 9630116

emulators/qemu/patches/patch-configure

@@ -1,29 +1,14 @@
-$OpenBSD: patch-configure,v 1.22 2012/03/16 11:40:53 fgsch Exp $
---- configure.orig	Fri Feb 17 14:45:39 2012
-+++ configure	Fri Feb 17 16:02:57 2012
-@@ -235,13 +235,11 @@ sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}"
- 
- # default flags for all hosts
- QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
--CFLAGS="-g $CFLAGS"
- QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
- QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
- QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
- QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
- QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu"
--LDFLAGS="-g $LDFLAGS"
- 
- # make source path absolute
- source_path=`cd "$source_path"; pwd`
-@@ -2684,8 +2682,9 @@ fi
+$OpenBSD: patch-configure,v 1.23 2012/06/15 11:53:28 ajacoutot Exp $
+--- configure.orig	Wed May 30 20:54:30 2012
++++ configure	Thu May 31 22:41:49 2012
+@@ -2850,10 +2850,6 @@ fi
  # End of CC checks
  # After here, no more $cc or $ld runs
  
 -if test "$debug" = "no" ; then
 -  CFLAGS="-O2 $CFLAGS"
-+if test "$debug" = "yes" ; then
-+  CFLAGS="$CFLAGS -O0 -g"
-+  LDFLAGS="$LDFLAGS -g"
- fi
- 
+-fi
+-
  # Consult white-list to determine whether to enable werror
+ # by default.  Only enable by default for git builds
+ z_version=`cut -f3 -d. $source_path/VERSION`

emulators/qemu/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.20 2011/12/12 10:56:56 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.21 2012/06/15 11:53:28 ajacoutot Exp $
 @conflict kqemu-*
 @conflict qemu-*
 @pkgpath emulators/kqemu
@@ -53,6 +53,7 @@ share/examples/qemu/target-x86_64.conf
 share/qemu/
 share/qemu/bamboo.dtb
 share/qemu/bios.bin
+share/qemu/cpus-x86_64.conf
 share/qemu/keymaps/
 share/qemu/keymaps/ar
 share/qemu/keymaps/common
@@ -89,6 +90,7 @@ share/qemu/keymaps/sl
 share/qemu/keymaps/sv
 share/qemu/keymaps/th
 share/qemu/keymaps/tr
+share/qemu/kvmvapic.bin
 share/qemu/linuxboot.bin
 share/qemu/mpc8544ds.dtb
 share/qemu/multiboot.bin
@@ -105,6 +107,7 @@ share/qemu/pxe-ne2k_pci.rom
 share/qemu/pxe-pcnet.rom
 share/qemu/pxe-rtl8139.rom
 share/qemu/pxe-virtio.rom
+share/qemu/qemu-icon.bmp
 share/qemu/s390-zipl.rom
 share/qemu/sgabios.bin
 share/qemu/slof.bin