diff options
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/qemu-devel/Makefile | 6 | ||||
-rw-r--r-- | emulators/qemu-devel/distinfo | 4 | ||||
-rw-r--r-- | emulators/qemu-devel/files/patch-aa | 34 | ||||
-rw-r--r-- | emulators/qemu-devel/files/patch-bh | 24 | ||||
-rw-r--r-- | emulators/qemu-devel/files/patch-bt | 6 | ||||
-rw-r--r-- | emulators/qemu/Makefile | 6 | ||||
-rw-r--r-- | emulators/qemu/distinfo | 4 | ||||
-rw-r--r-- | emulators/qemu/files/patch-aa | 34 | ||||
-rw-r--r-- | emulators/qemu/files/patch-bh | 24 | ||||
-rw-r--r-- | emulators/qemu/files/patch-bt | 6 |
10 files changed, 14 insertions, 134 deletions
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index dc1d1a75f4d5..ccff9b8a6fa1 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -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 @@ COMMENT= QEMU CPU Emulator BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html HAS_CONFIGURE= yes -USE_BZIP2= yes USE_GMAKE= yes USE_GETOPT_LONG= yes USE_SDL= sdl diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo index 885497cfdace..0ca9916b5f93 100644 --- a/emulators/qemu-devel/distinfo +++ b/emulators/qemu-devel/distinfo @@ -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 diff --git a/emulators/qemu-devel/files/patch-aa b/emulators/qemu-devel/files/patch-aa index ad6a1ebaca49..dbec12e4ab30 100644 --- a/emulators/qemu-devel/files/patch-aa +++ b/emulators/qemu-devel/files/patch-aa @@ -110,21 +110,6 @@ diff -urd --exclude=CVS ../cvs/qemu/block.c qemu-0.5.5/block.c 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 @@ diff -urd --exclude=CVS ../cvs/qemu/vl.c qemu-0.5.5/vl.c #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; diff --git a/emulators/qemu-devel/files/patch-bh b/emulators/qemu-devel/files/patch-bh index ebb476a2ce9e..52dff1c7160e 100644 --- a/emulators/qemu-devel/files/patch-bh +++ b/emulators/qemu-devel/files/patch-bh @@ -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 @@ diff -w -u -d -r1.6 op_helper.c } void do_fnmadds (void) -@@ -379,7 +404,6 @@ - - /*****************************************************************************/ - /* Special helpers for debug */ --extern FILE *stdout; - - void dump_state (void) - { diff --git a/emulators/qemu-devel/files/patch-bt b/emulators/qemu-devel/files/patch-bt index bba4776a22d5..62e8924722b3 100644 --- a/emulators/qemu-devel/files/patch-bt +++ b/emulators/qemu-devel/files/patch-bt @@ -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 diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index dc1d1a75f4d5..ccff9b8a6fa1 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -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 @@ COMMENT= QEMU CPU Emulator BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html HAS_CONFIGURE= yes -USE_BZIP2= yes USE_GMAKE= yes USE_GETOPT_LONG= yes USE_SDL= sdl diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index 885497cfdace..0ca9916b5f93 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -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 diff --git a/emulators/qemu/files/patch-aa b/emulators/qemu/files/patch-aa index ad6a1ebaca49..dbec12e4ab30 100644 --- a/emulators/qemu/files/patch-aa +++ b/emulators/qemu/files/patch-aa @@ -110,21 +110,6 @@ diff -urd --exclude=CVS ../cvs/qemu/block.c qemu-0.5.5/block.c 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 @@ diff -urd --exclude=CVS ../cvs/qemu/vl.c qemu-0.5.5/vl.c #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; diff --git a/emulators/qemu/files/patch-bh b/emulators/qemu/files/patch-bh index ebb476a2ce9e..52dff1c7160e 100644 --- a/emulators/qemu/files/patch-bh +++ b/emulators/qemu/files/patch-bh @@ -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 @@ diff -w -u -d -r1.6 op_helper.c } void do_fnmadds (void) -@@ -379,7 +404,6 @@ - - /*****************************************************************************/ - /* Special helpers for debug */ --extern FILE *stdout; - - void dump_state (void) - { diff --git a/emulators/qemu/files/patch-bt b/emulators/qemu/files/patch-bt index bba4776a22d5..62e8924722b3 100644 --- a/emulators/qemu/files/patch-bt +++ b/emulators/qemu/files/patch-bt @@ -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 |