svn commit: r395861 - in head/emulators/qemu-devel: . files

[Sean Bruno]

Author: sbruno
Date: Wed Sep  2 16:12:36 2015
New Revision: 395861
URL: https://svnweb.freebsd.org/changeset/ports/395861

Log:
  QEMU update to 2.4.0
  - remove patch files accepted and merge upstream
  - Add new vgabios-virtio

Deleted:
  head/emulators/qemu-devel/files/patch-90_security
  head/emulators/qemu-devel/files/patch-CVE-2015-3209
  head/emulators/qemu-devel/files/patch-CVE-2015-3456
  head/emulators/qemu-devel/files/patch-include-qemu-aes.h
  head/emulators/qemu-devel/files/patch-tapclose
Modified:
  head/emulators/qemu-devel/Makefile
  head/emulators/qemu-devel/distinfo
  head/emulators/qemu-devel/pkg-plist

Modified: head/emulators/qemu-devel/Makefile
==============================================================================
--- head/emulators/qemu-devel/Makefile	Wed Sep  2 16:06:06 2015	(r395860)
+++ head/emulators/qemu-devel/Makefile	Wed Sep  2 16:12:36 2015	(r395861)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qemu
-PORTVERSION=	2.3.0
-PORTREVISION=	2
+PORTVERSION=	2.4.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/:release \
 		LOCAL/nox:snapshot
@@ -119,7 +118,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} --cc
 	--smbd=${LOCALBASE}/sbin/smbd \
 	--enable-debug \
 	--enable-debug-info \
-	--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"${PREFIX}\\\"
+	--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\"
 
 .if empty(PORT_OPTIONS:MX11)
 CONFIGURE_ARGS+=	--disable-sdl
@@ -277,8 +276,6 @@ post-install:
 .endif
 	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc
-	@(cd ${STAGEDIR}${PREFIX}/etc/qemu && \
-		${MV} -i target-x86_64.conf target-x86_64.conf.sample)
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-*
 .endif
 

Modified: head/emulators/qemu-devel/distinfo
==============================================================================
--- head/emulators/qemu-devel/distinfo	Wed Sep  2 16:06:06 2015	(r395860)
+++ head/emulators/qemu-devel/distinfo	Wed Sep  2 16:12:36 2015	(r395861)
@@ -1,2 +1,2 @@
-SHA256 (qemu/2.3.0/qemu-2.3.0.tar.bz2) = b6bab7f763d5be73e7cb5ee7d4c8365b7a8df2972c52fa5ded18893bd8281588
-SIZE (qemu/2.3.0/qemu-2.3.0.tar.bz2) = 24683085
+SHA256 (qemu/2.4.0/qemu-2.4.0.tar.bz2) = 72b0b991bbcc540663a019e1e8c4f714053b691dda32c9b9ee80b25f367e6620
+SIZE (qemu/2.4.0/qemu-2.4.0.tar.bz2) = 25070979

Modified: head/emulators/qemu-devel/pkg-plist
==============================================================================
--- head/emulators/qemu-devel/pkg-plist	Wed Sep  2 16:06:06 2015	(r395860)
+++ head/emulators/qemu-devel/pkg-plist	Wed Sep  2 16:12:36 2015	(r395861)
@@ -44,7 +44,6 @@
 %%SOFTMMU%%man/man8/qemu-nbd.8.gz
 %%SOFTMMU%%@sample etc/qemu-ifup.sample
 %%SOFTMMU%%@sample etc/qemu-ifdown.sample
-%%SOFTMMU%%@sample etc/qemu/target-x86_64.conf.sample
 %%SOFTMMU%%%%DATADIR%%/QEMU,tcx.bin
 %%SOFTMMU%%%%DATADIR%%/QEMU,cgthree.bin
 %%SOFTMMU%%%%DATADIR%%/acpi-dsdt.aml
@@ -62,6 +61,7 @@
 %%SOFTMMU%%%%DATADIR%%/vgabios-cirrus.bin
 %%SOFTMMU%%%%DATADIR%%/vgabios-qxl.bin
 %%SOFTMMU%%%%DATADIR%%/vgabios-stdvga.bin
+%%SOFTMMU%%%%DATADIR%%/vgabios-virtio.bin
 %%SOFTMMU%%%%DATADIR%%/vgabios-vmware.bin
 %%SOFTMMU%%%%DATADIR%%/palcode-clipper
 %%SOFTMMU%%%%DATADIR%%/ppc_rom.bin