CFT: QEMU 1.2.0-rc1

2012-08-26 Thread Brad Smith 
Here is an update to QEMU 1.2.0-rc1 for anyone that wants to
test out the rc1 release.


Index: Makefile
===
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile8 Aug 2012 10:44:44 -   1.88
+++ Makefile24 Aug 2012 10:20:28 -
@@ -1,17 +1,13 @@
 # $OpenBSD: Makefile,v 1.88 2012/08/08 10:44:44 sthen Exp $
 
-ONLY_FOR_ARCHS=amd64 arm hppa i386 mips64 mips64el powerpc sparc 
sparc64
-BROKEN-hppa=   compiler bug with gcc 4.2
+ONLY_FOR_ARCHS=amd64 arm i386 mips64 mips64el powerpc sparc sparc64
 
 COMMENT=   multi system emulator
 
-DISTNAME=  qemu-1.1.1-1
-PKGNAME=   qemu-1.1.1
+DISTNAME=  qemu-1.2.0-rc1
 CATEGORIES=emulators
 MASTER_SITES=  http://wiki.qemu.org/download/
 EXTRACT_SUFX=  .tar.bz2
-
-WRKDIST=   ${WRKDIR}/qemu-1.1.1
 
 HOMEPAGE=  http://www.qemu.org/
 
Index: distinfo
===
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo8 Aug 2012 10:44:44 -   1.21
+++ distinfo24 Aug 2012 09:07:33 -
@@ -1,2 +1,2 @@
-SHA256 (qemu-1.1.1-1.tar.bz2) = b7r/H6darhoGlHz3yxAcNSc3EsVhuH746uySqjlzSsg=
-SIZE (qemu-1.1.1-1.tar.bz2) = 9635574
+SHA256 (qemu-1.2.0-rc1.tar.bz2) = HQ0qTvizLR50MzAu3TVzUa2D1XmNP93rwqqySbRj8xc=
+SIZE (qemu-1.2.0-rc1.tar.bz2) = 9864774
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.24
diff -u -p -r1.24 patch-configure
--- patches/patch-configure 8 Aug 2012 10:44:44 -   1.24
+++ patches/patch-configure 24 Aug 2012 09:10:20 -
@@ -1,14 +1,14 @@
 $OpenBSD: patch-configure,v 1.24 2012/08/08 10:44:44 sthen Exp $
 configure.orig Tue Jul 17 14:11:14 2012
-+++ configure  Wed Jul 18 11:40:41 2012
-@@ -2854,10 +2854,6 @@ fi
+--- configure.orig Fri Aug 24 05:09:49 2012
 configure  Fri Aug 24 05:10:05 2012
+@@ -2995,10 +2995,6 @@ fi
  # End of CC checks
  # After here, no more $cc or $ld runs
  
 -if test "$debug" = "no" ; then
--  CFLAGS="-O2 $CFLAGS"
+-  CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS"
 -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`
+ # Disable zero malloc errors for official releases unless explicitly told to
+ # enable/disable
+ if test -z "$zero_malloc" ; then
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v
retrieving revision 1.22
diff -u -p -r1.22 PLIST
--- pkg/PLIST   8 Aug 2012 10:44:44 -   1.22
+++ pkg/PLIST   24 Aug 2012 11:35:29 -
@@ -20,6 +20,7 @@
 @bin bin/qemu-system-mips64
 @bin bin/qemu-system-mips64el
 @bin bin/qemu-system-mipsel
+@bin bin/qemu-system-or32
 @bin bin/qemu-system-ppc
 @bin bin/qemu-system-ppc64
 @bin bin/qemu-system-ppcemb
@@ -28,6 +29,7 @@
 @bin bin/qemu-system-sh4eb
 @bin bin/qemu-system-sparc
 @bin bin/qemu-system-sparc64
+@bin bin/qemu-system-unicore32
 @bin bin/qemu-system-x86_64
 @bin bin/qemu-system-xtensa
 @bin bin/qemu-system-xtensaeb
@@ -57,6 +59,7 @@ share/qemu/bios.bin
 share/qemu/cpus-x86_64.conf
 share/qemu/keymaps/
 share/qemu/keymaps/ar
+share/qemu/keymaps/bepo
 share/qemu/keymaps/common
 share/qemu/keymaps/da
 share/qemu/keymaps/de
@@ -93,7 +96,6 @@ share/qemu/keymaps/th
 share/qemu/keymaps/tr
 share/qemu/kvmvapic.bin
 share/qemu/linuxboot.bin
-share/qemu/mpc8544ds.dtb
 share/qemu/multiboot.bin
 share/qemu/openbios-ppc
 share/qemu/openbios-sparc32

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

Re: CFT: QEMU 1.2.0-rc1

2012-09-04 Thread Brad Smith 
On Sun, Aug 26, 2012 at 12:43:43PM -0400, Brad Smith wrote:
> Here is an update to QEMU 1.2.0-rc1 for anyone that wants to
> test out the rc1 release.

Here is an updated diff for rc3.


Index: Makefile
===
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.90
diff -u -p -r1.90 Makefile
--- Makefile3 Sep 2012 08:47:47 -   1.90
+++ Makefile5 Sep 2012 00:09:26 -
@@ -1,18 +1,13 @@
 # $OpenBSD: Makefile,v 1.90 2012/09/03 08:47:47 ajacoutot Exp $
 
-ONLY_FOR_ARCHS=amd64 arm hppa i386 mips64 mips64el powerpc sparc 
sparc64
-BROKEN-hppa=   compiler bug with gcc 4.2
+ONLY_FOR_ARCHS=amd64 arm i386 mips64 mips64el powerpc sparc sparc64
 
 COMMENT=   multi system emulator
 
-DISTNAME=  qemu-1.1.1-1
-PKGNAME=   qemu-1.1.1
+DISTNAME=  qemu-1.2.0-rc3
 CATEGORIES=emulators
 MASTER_SITES=  http://wiki.qemu.org/download/
 EXTRACT_SUFX=  .tar.bz2
-REVISION=  1
-
-WRKDIST=   ${WRKDIR}/qemu-1.1.1
 
 HOMEPAGE=  http://www.qemu.org/
 
Index: distinfo
===
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo8 Aug 2012 10:44:44 -   1.21
+++ distinfo5 Sep 2012 00:09:40 -
@@ -1,2 +1,2 @@
-SHA256 (qemu-1.1.1-1.tar.bz2) = b7r/H6darhoGlHz3yxAcNSc3EsVhuH746uySqjlzSsg=
-SIZE (qemu-1.1.1-1.tar.bz2) = 9635574
+SHA256 (qemu-1.2.0-rc3.tar.bz2) = UzdvhmF5CosMfeivc63S6UTj6lZnFIjhbHgurtRuJMk=
+SIZE (qemu-1.2.0-rc3.tar.bz2) = 9870152
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.24
diff -u -p -r1.24 patch-configure
--- patches/patch-configure 8 Aug 2012 10:44:44 -   1.24
+++ patches/patch-configure 24 Aug 2012 09:10:20 -
@@ -1,14 +1,14 @@
 $OpenBSD: patch-configure,v 1.24 2012/08/08 10:44:44 sthen Exp $
 configure.orig Tue Jul 17 14:11:14 2012
-+++ configure  Wed Jul 18 11:40:41 2012
-@@ -2854,10 +2854,6 @@ fi
+--- configure.orig Fri Aug 24 05:09:49 2012
 configure  Fri Aug 24 05:10:05 2012
+@@ -2995,10 +2995,6 @@ fi
  # End of CC checks
  # After here, no more $cc or $ld runs
  
 -if test "$debug" = "no" ; then
--  CFLAGS="-O2 $CFLAGS"
+-  CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS"
 -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`
+ # Disable zero malloc errors for official releases unless explicitly told to
+ # enable/disable
+ if test -z "$zero_malloc" ; then
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v
retrieving revision 1.22
diff -u -p -r1.22 PLIST
--- pkg/PLIST   8 Aug 2012 10:44:44 -   1.22
+++ pkg/PLIST   24 Aug 2012 11:35:29 -
@@ -20,6 +20,7 @@
 @bin bin/qemu-system-mips64
 @bin bin/qemu-system-mips64el
 @bin bin/qemu-system-mipsel
+@bin bin/qemu-system-or32
 @bin bin/qemu-system-ppc
 @bin bin/qemu-system-ppc64
 @bin bin/qemu-system-ppcemb
@@ -28,6 +29,7 @@
 @bin bin/qemu-system-sh4eb
 @bin bin/qemu-system-sparc
 @bin bin/qemu-system-sparc64
+@bin bin/qemu-system-unicore32
 @bin bin/qemu-system-x86_64
 @bin bin/qemu-system-xtensa
 @bin bin/qemu-system-xtensaeb
@@ -57,6 +59,7 @@ share/qemu/bios.bin
 share/qemu/cpus-x86_64.conf
 share/qemu/keymaps/
 share/qemu/keymaps/ar
+share/qemu/keymaps/bepo
 share/qemu/keymaps/common
 share/qemu/keymaps/da
 share/qemu/keymaps/de
@@ -93,7 +96,6 @@ share/qemu/keymaps/th
 share/qemu/keymaps/tr
 share/qemu/kvmvapic.bin
 share/qemu/linuxboot.bin
-share/qemu/mpc8544ds.dtb
 share/qemu/multiboot.bin
 share/qemu/openbios-ppc
 share/qemu/openbios-sparc32

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