On Tue, May 21, 2013 at 05:04:21PM -0400, Brad Smith wrote:
> Here is an update to QEMU 1.5.0.
> 
> Tested on amd64.
> 
> Comments? OK?

Here is an update diff for -current.


Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.105
diff -u -p -r1.105 Makefile
--- Makefile    24 May 2013 22:05:51 -0000      1.105
+++ Makefile    24 May 2013 22:10:56 -0000
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc sparc
 
 COMMENT=       multi system emulator
 
-DISTNAME=      qemu-1.4.2
+DISTNAME=      qemu-1.5.0
 CATEGORIES=    emulators
 MASTER_SITES=  http://wiki.qemu.org/download/
 EXTRACT_SUFX=  .tar.bz2
@@ -16,18 +16,24 @@ MAINTAINER= Brad Smith <[email protected]
 # GPLv2, LGPLv2 and BSD
 PERMIT_PACKAGE_CDROM=  Yes
 
-WANTLIB=       GL SDL X11 c curl glib-2.0 gnutls gthread-2.0 jpeg m ncurses \
-               pixman-1 png pthread pthread-stubs util z
+WANTLIB=       GL SDL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama \
+               Xrandr Xrender atk-1.0 c cairo curl fontconfig freetype \
+               gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gnutls gobject-2.0 \
+               gthread-2.0 gtk-x11-2.0 jpeg m ncurses pango-1.0 pangocairo-1.0 
\
+               pangoft2-1.0 pixman-1 png pthread pthread-stubs ssh2 util vte z
 
 MODULES=       devel/gettext \
                lang/python
 BUILD_DEPENDS= textproc/texi2html
 LIB_DEPENDS=   devel/glib2 \
                devel/sdl \
+               devel/vte \
                graphics/jpeg \
                graphics/png \
                net/curl \
-               security/gnutls
+               security/gnutls \
+               security/libssh2 \
+               x11/gtk+2
 
 MODPY_RUNDEP=  No
 
@@ -58,6 +64,7 @@ CONFIGURE_ARGS=       --prefix=${PREFIX} \
                --audio-drv-list=sdl \
                --disable-bsd-user \
                --disable-libiscsi \
+               --disable-libusb \
                --disable-smartcard-nss \
                --disable-spice \
                --disable-uuid \
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo    24 May 2013 22:05:51 -0000      1.28
+++ distinfo    24 May 2013 22:10:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (qemu-1.4.2.tar.bz2) = rK5skrdA/4nA4x7KIzONSr1zNDLlGwgQF3V1ebMOz5A=
-SIZE (qemu-1.4.2.tar.bz2) = 10416877
+SHA256 (qemu-1.5.0.tar.bz2) = sisw7pcSVo37Tu33Z4P0p2VG4cvEFlm5CWRrzwtIZ7s=
+SIZE (qemu-1.5.0.tar.bz2) = 11931067
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.32
diff -u -p -r1.32 patch-configure
--- patches/patch-configure     24 May 2013 22:05:51 -0000      1.32
+++ patches/patch-configure     24 May 2013 22:10:56 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.32 2013/05/24 22:05:51 brad Exp $
---- configure.orig     Fri May 24 09:37:57 2013
-+++ configure  Fri May 24 14:39:02 2013
-@@ -3198,8 +3198,6 @@ fi
+--- configure.orig     Mon May 20 11:34:39 2013
++++ configure  Fri May 24 18:10:09 2013
+@@ -3390,8 +3390,6 @@ fi
  if test "$gcov" = "yes" ; then
    CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
    LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
Index: patches/patch-include_qemu-common_h
===================================================================
RCS file: patches/patch-include_qemu-common_h
diff -N patches/patch-include_qemu-common_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-include_qemu-common_h 24 May 2013 22:10:56 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- include/qemu-common.h.orig Wed May 15 17:39:46 2013
++++ include/qemu-common.h      Thu May 16 14:23:53 2013
+@@ -45,6 +45,7 @@
+ #if defined(__GLIBC__)
+ # include <pty.h>
+ #elif defined CONFIG_BSD
++# include <termios.h>
+ # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || 
defined(__DragonFly__)
+ #  include <libutil.h>
+ # else
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/emulators/qemu/pkg/PLIST,v
retrieving revision 1.25
diff -u -p -r1.25 PLIST
--- pkg/PLIST   20 Mar 2013 00:46:01 -0000      1.25
+++ pkg/PLIST   24 May 2013 22:10:56 -0000
@@ -20,6 +20,7 @@
 @bin bin/qemu-system-mips64
 @bin bin/qemu-system-mips64el
 @bin bin/qemu-system-mipsel
+@bin bin/qemu-system-moxie
 @bin bin/qemu-system-or32
 @bin bin/qemu-system-ppc
 @bin bin/qemu-system-ppc64
@@ -53,10 +54,24 @@ share/examples/qemu/qemu-ifup
 share/examples/qemu/target-x86_64.conf
 @sample ${SYSCONFDIR}/qemu/
 @sample ${SYSCONFDIR}/qemu/target-x86_64.conf
+share/locale/de_DE/
+share/locale/de_DE/LC_MESSAGES/
+share/locale/de_DE/LC_MESSAGES/qemu.mo
+share/locale/fr_FR/
+share/locale/fr_FR/LC_MESSAGES/
+share/locale/fr_FR/LC_MESSAGES/qemu.mo
+share/locale/it/LC_MESSAGES/qemu.mo
+share/locale/tr/LC_MESSAGES/qemu.mo
 share/qemu/
 share/qemu/acpi-dsdt.aml
 share/qemu/bamboo.dtb
 share/qemu/bios.bin
+share/qemu/efi-e1000.rom
+share/qemu/efi-eepro100.rom
+share/qemu/efi-ne2k_pci.rom
+share/qemu/efi-pcnet.rom
+share/qemu/efi-rtl8139.rom
+share/qemu/efi-virtio.rom
 share/qemu/keymaps/
 share/qemu/keymaps/ar
 share/qemu/keymaps/bepo
@@ -112,6 +127,7 @@ share/qemu/pxe-rtl8139.rom
 share/qemu/pxe-virtio.rom
 share/qemu/q35-acpi-dsdt.aml
 share/qemu/qemu-icon.bmp
+share/qemu/s390-ccw.img
 share/qemu/s390-zipl.rom
 share/qemu/sgabios.bin
 share/qemu/slof.bin

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Reply via email to