Date: Sat, 10 Jul 2004 22:46:28 +0200 (CEST) From: Juergen Lock <nox@jelal.kn-bremen.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/68897: update emulators/qemu to 0.6.0 Message-ID: <200407102046.i6AKkSK85413@saturn.kn-bremen.de> Resent-Message-ID: <200407102040.i6AKeDmt097076@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 68897 >Category: ports >Synopsis: update emulators/qemu to 0.6.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jul 10 20:40:12 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Juergen Lock >Release: FreeBSD 5.2.1-SECURITY i386 >Organization: me? organized?? >Environment: System: FreeBSD neptun 5.2.1-SECURITY FreeBSD 5.2.1-SECURITY #0: Wed May 26 04:19:54 GMT 2004 root@builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: cirrusvga vesa bios + 24bpp fix, openbsd guest ne2000 fix, etc. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- Makefile 26 Jun 2004 05:21:59 -0000 1.11 +++ Makefile 10 Jul 2004 18:56:14 -0000 @@ -6,10 +6,9 @@ # PORTNAME= qemu -PORTVERSION= 0.5.5.s.20040624 +PORTVERSION= 0.6.0 CATEGORIES= emulators -MASTER_SITES= http://dad-answers.com/qemu/FreeBSD/ -DISTNAME= ${PORTNAME}-snapshot-2004-06-24_23 +MASTER_SITES= http://fabrice.bellard.free.fr/qemu/ MAINTAINER= nox@jelal.kn-bremen.de COMMENT= QEMU CPU Emulator @@ -17,7 +16,6 @@ BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html HAS_CONFIGURE= yes -USE_BZIP2= yes USE_GMAKE= yes USE_GETOPT_LONG= yes USE_SDL= sdl Index: distinfo =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/distinfo,v retrieving revision 1.8 diff -u -r1.8 distinfo --- distinfo 25 Jun 2004 07:37:31 -0000 1.8 +++ distinfo 10 Jul 2004 18:52:03 -0000 @@ -1,2 +1,2 @@ -MD5 (qemu-snapshot-2004-06-24_23.tar.bz2) = cc23ade5426a2caf2289999189c1e92c -SIZE (qemu-snapshot-2004-06-24_23.tar.bz2) = 711284 +MD5 (qemu-0.6.0.tar.gz) = cdbc7258f122f381cba7ac1ca6ce0722 +SIZE (qemu-0.6.0.tar.gz) = 874397 Index: files/patch-aa =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/files/patch-aa,v retrieving revision 1.1 diff -u -r1.1 patch-aa --- files/patch-aa 3 Jun 2004 02:12:52 -0000 1.1 +++ files/patch-aa 9 Jul 2004 21:40:33 -0000 @@ -110,21 +110,6 @@ size = lseek64(fd, 0, SEEK_END); bs->total_sectors = size / 512; Only in qemu-0.5.5: block.c.bck -diff -urd --exclude=CVS ../cvs/qemu/configure qemu-0.5.5/configure ---- ../cvs/qemu/configure Thu May 20 14:23:39 2004 -+++ qemu-0.5.5/configure Sun May 30 05:42:05 2004 -@@ -419,9 +419,11 @@ - if [ "$bsd" = "yes" ] ; then - echo "#define O_LARGEFILE 0" >> $config_h - echo "#define lseek64 lseek" >> $config_h -+ echo "#define mkstemp64 mkstemp" >> $config_h - echo "#define ftruncate64 ftruncate" >> $config_h - echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_h - echo "#define _BSD 1" >> $config_h -+ echo "#define off64_t off_t" >> $config_h - fi - - for target in $target_list; do Only in qemu-0.5.5: qemu.1 diff -urd --exclude=CVS ../cvs/qemu/target-i386/cpu.h qemu-0.5.5/target-i386/cpu.h --- ../cvs/qemu/target-i386/cpu.h Thu May 20 15:01:56 2004 @@ -344,22 +329,3 @@ #else { struct tms tp; -@@ -828,6 +836,7 @@ - the emulated kernel requested a too high timer frequency */ - getitimer(ITIMER_REAL, &itv); - -+#if defined(__linux__) - if (itv.it_interval.tv_usec > 1000) { - /* try to use /dev/rtc to have a faster timer */ - if (start_rtc_timer() < 0) -@@ -843,7 +852,9 @@ - sigaction(SIGIO, &act, NULL); - fcntl(rtc_fd, F_SETFL, O_ASYNC); - fcntl(rtc_fd, F_SETOWN, getpid()); -- } else { -+ } else -+#endif -+ { - use_itimer: - pit_min_timer_count = ((uint64_t)itv.it_interval.tv_usec * - PIT_FREQ) / 1000000; Index: files/patch-bh =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/files/patch-bh,v retrieving revision 1.1 diff -u -r1.1 patch-bh --- files/patch-bh 25 Jun 2004 07:37:31 -0000 1.1 +++ files/patch-bh 10 Jul 2004 18:55:34 -0000 @@ -1,19 +1,3 @@ -Index: qemu/configure -=================================================================== -RCS file: /cvsroot/qemu/qemu/configure,v -retrieving revision 1.39 -diff -w -u -d -r1.39 configure ---- configure 20 May 2004 13:23:39 -0000 1.39 -+++ configure 21 May 2004 15:00:41 -0000 -@@ -93,7 +93,7 @@ - - if [ "$bsd" = "yes" ] ; then - make="gmake" -- target_list="i386-softmmu" -+ target_list="i386-softmmu ppc-softmmu" - fi - - # find source path Index: qemu/dyngen-exec.h =================================================================== RCS file: /cvsroot/qemu/qemu/dyngen-exec.h,v @@ -105,11 +89,3 @@ } void do_fnmadds (void) -@@ -379,7 +404,6 @@ - - /*****************************************************************************/ - /* Special helpers for debug */ --extern FILE *stdout; - - void dump_state (void) - { Index: files/patch-bt =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/files/patch-bt,v retrieving revision 1.2 diff -u -r1.2 patch-bt --- files/patch-bt 15 Jun 2004 02:19:41 -0000 1.2 +++ files/patch-bt 9 Jul 2004 21:45:24 -0000 @@ -1,8 +1,8 @@ Index: qemu/vl.c -@@ -41,6 +41,9 @@ - #ifdef _BSD - #include <sys/stat.h> +@@ -43,6 +43,9 @@ + #ifndef __APPLE__ #include <libutil.h> + #endif +#ifdef __FreeBSD__ +#include <sys/module.h> +#endif >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407102046.i6AKkSK85413>