aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--emulators/qemu-devel/Makefile6
-rw-r--r--emulators/qemu-devel/distinfo6
-rw-r--r--emulators/qemu-devel/files/patch-configure10
-rw-r--r--emulators/qemu-devel/files/patch-fbsd42
-rw-r--r--emulators/qemu-devel/files/patch-slirp-mbuf.c26
-rw-r--r--emulators/qemu/Makefile6
-rw-r--r--emulators/qemu/distinfo6
-rw-r--r--emulators/qemu/files/patch-configure10
-rw-r--r--emulators/qemu/files/patch-fbsd42
-rw-r--r--emulators/qemu/files/patch-slirp-mbuf.c26
10 files changed, 56 insertions, 124 deletions
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 3365ccc7084a..6d05c6eabf19 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= qemu
-PORTVERSION= 0.8.0s.20060426
+PORTVERSION= 0.8.1
CATEGORIES= emulators
MASTER_SITES= http://www.qemu.org/:release \
http://people.fruitsalad.org/nox/qemu/:snapshot \
@@ -14,8 +14,7 @@ MASTER_SITES= http://www.qemu.org/:release \
http://qemu.dad-answers.com/download/qemu/:snapshot \
http://people.brandeis.edu/~jcoiner/qemu_idedma/:idedma \
http://people.freebsd.org/~maho/qemu/:misc
-DISTNAME= ${PORTNAME}-snapshot-2006-04-26_23
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:snapshot
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:release
.if defined (WITH_HACKS_CIRRUS) || defined (WITH_HACKS)
DISTFILES+= patch3_cirrus:misc
.endif
@@ -34,7 +33,6 @@ BUILD_DEPENDS+= kqemu-kmod>=1.3.0pre5:${PORTSDIR}/emulators/kqemu-kmod
.endif
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 33ddebd044e5..21465ff94a0e 100644
--- a/emulators/qemu-devel/distinfo
+++ b/emulators/qemu-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (qemu/qemu-snapshot-2006-04-26_23.tar.bz2) = 2f0a7b7a87d4fbe3dc878ae15ddf7dcb
-SHA256 (qemu/qemu-snapshot-2006-04-26_23.tar.bz2) = 2d412995e56444cf5aadbda8af6f3cc1b7282446b628172f2f7213e406c871a0
-SIZE (qemu/qemu-snapshot-2006-04-26_23.tar.bz2) = 1301091
+MD5 (qemu/qemu-0.8.1.tar.gz) = 67d924324a5ab79d017bd97a1e767285
+SHA256 (qemu/qemu-0.8.1.tar.gz) = a1f83666f5c05eaee9bfc608a3a5034ad95d0fd3c99937bb399bf9235a6aa0c9
+SIZE (qemu/qemu-0.8.1.tar.gz) = 1623264
MD5 (qemu/patch3_cirrus) = ebe7ed9fce804c49e024bc93bfdfc810
SHA256 (qemu/patch3_cirrus) = e862371834b7d895a896fbdb84fd9f70d17b5729a6f6789a48a61504fc941e11
SIZE (qemu/patch3_cirrus) = 8817
diff --git a/emulators/qemu-devel/files/patch-configure b/emulators/qemu-devel/files/patch-configure
deleted file mode 100644
index 1036edd69c21..000000000000
--- a/emulators/qemu-devel/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: qemu/configure
-@@ -157,7 +157,7 @@
- fi
-
- for opt do
-- optarg=`expr "$opt" : '[^=]*=\(.*\)'`
-+ optarg=`echo "$opt" |sed 's/^[^=]*=//'`
- case "$opt" in
- --help|-h) show_help=yes
- ;;
diff --git a/emulators/qemu-devel/files/patch-fbsd b/emulators/qemu-devel/files/patch-fbsd
index 8a7823279624..88b01def0e4d 100644
--- a/emulators/qemu-devel/files/patch-fbsd
+++ b/emulators/qemu-devel/files/patch-fbsd
@@ -63,12 +63,24 @@ Index: qemu/fpu/softfloat-native.c
#define llrint(d) ((long long)rint(d))
#endif
Index: qemu/fpu/softfloat-native.h
-@@ -1,7 +1,17 @@
+@@ -1,8 +1,28 @@
/* Native implementation of soft float functions */
#include <math.h>
--#if defined(_BSD) && !defined(__APPLE__)
-+#if defined(_BSD) && !defined(__APPLE__) && \
-+ (!defined(__FreeBSD__) || __FreeBSD_version < 500000)
+
+-#if (defined(_BSD) && !defined(__APPLE__)) || defined(HOST_SOLARIS)
++#ifdef __FreeBSD__
++#include <osreldate.h>
++long double fabsl(long double x);
++long double remainderl(long double x, long double y);
++long double sqrtl(long double x);
++long double rintl(long double x);
++long lrintl(long double x);
++long long llrintl(long double x);
++#endif
++
++#if (defined(_BSD) && !defined(__APPLE__) && \
++ (!defined(__FreeBSD__) || __FreeBSD_version < 500000)) || \
++ defined(HOST_SOLARIS)
#include <ieeefp.h>
+#if defined(__FreeBSD__)
+#define isgreater(x, y) __builtin_isgreater((x), (y))
@@ -77,29 +89,21 @@ Index: qemu/fpu/softfloat-native.h
+#define islessequal(x, y) __builtin_islessequal((x), (y))
+#define islessgreater(x, y) __builtin_islessgreater((x), (y))
+#define isunordered(x, y) __builtin_isunordered((x), (y))
-+long double fabsl(long double x);
+#endif
+ #define fabsf(f) ((float)fabs(f))
#else
#include <fenv.h>
- #endif
-@@ -33,12 +43,13 @@
+@@ -60,7 +80,9 @@
/*----------------------------------------------------------------------------
| Software IEC/IEEE floating-point rounding mode.
*----------------------------------------------------------------------------*/
--#if defined(_BSD) && !defined(__APPLE__)
-+#if defined(_BSD) && !defined(__APPLE__) && \
-+ (!defined(__FreeBSD__) || __FreeBSD_version < 500000)
+-#if (defined(_BSD) && !defined(__APPLE__)) || defined(HOST_SOLARIS)
++#if (defined(_BSD) && !defined(__APPLE__) && \
++ (!defined(__FreeBSD__) || __FreeBSD_version < 500000)) || \
++ defined(HOST_SOLARIS)
enum {
float_round_nearest_even = FP_RN,
-- float_round_down = FE_RM,
-- float_round_up = FE_RP,
-- float_round_to_zero = FE_RZ
-+ float_round_down = FP_RM,
-+ float_round_up = FP_RP,
-+ float_round_to_zero = FP_RZ
- };
- #elif defined(__arm__)
- enum {
+ float_round_down = FP_RM,
Index: qemu/fpu/softfloat.h
@@ -84,7 +84,8 @@
#define FLOAT128
diff --git a/emulators/qemu-devel/files/patch-slirp-mbuf.c b/emulators/qemu-devel/files/patch-slirp-mbuf.c
deleted file mode 100644
index 1bd32d6ad7dc..000000000000
--- a/emulators/qemu-devel/files/patch-slirp-mbuf.c
+++ /dev/null
@@ -1,26 +0,0 @@
-# http://lists.gnu.org/archive/html/qemu-devel/2005-05/msg00228.html
-
-Index: qemu/slirp/mbuf.c
-@@ -146,18 +146,19 @@
- struct mbuf *m;
- int size;
- {
-+ int datasize;
-+
- /* some compiles throw up on gotos. This one we can fake. */
- if(m->m_size>size) return;
-
- if (m->m_flags & M_EXT) {
-- /* datasize = m->m_data - m->m_ext; */
-+ datasize = m->m_data - m->m_ext;
- m->m_ext = (char *)realloc(m->m_ext,size);
- /* if (m->m_ext == NULL)
- * return (struct mbuf *)NULL;
- */
-- /* m->m_data = m->m_ext + datasize; */
-+ m->m_data = m->m_ext + datasize;
- } else {
-- int datasize;
- char *dat;
- datasize = m->m_data - m->m_dat;
- dat = (char *)malloc(size);
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 3365ccc7084a..6d05c6eabf19 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= qemu
-PORTVERSION= 0.8.0s.20060426
+PORTVERSION= 0.8.1
CATEGORIES= emulators
MASTER_SITES= http://www.qemu.org/:release \
http://people.fruitsalad.org/nox/qemu/:snapshot \
@@ -14,8 +14,7 @@ MASTER_SITES= http://www.qemu.org/:release \
http://qemu.dad-answers.com/download/qemu/:snapshot \
http://people.brandeis.edu/~jcoiner/qemu_idedma/:idedma \
http://people.freebsd.org/~maho/qemu/:misc
-DISTNAME= ${PORTNAME}-snapshot-2006-04-26_23
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:snapshot
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:release
.if defined (WITH_HACKS_CIRRUS) || defined (WITH_HACKS)
DISTFILES+= patch3_cirrus:misc
.endif
@@ -34,7 +33,6 @@ BUILD_DEPENDS+= kqemu-kmod>=1.3.0pre5:${PORTSDIR}/emulators/kqemu-kmod
.endif
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 33ddebd044e5..21465ff94a0e 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,6 +1,6 @@
-MD5 (qemu/qemu-snapshot-2006-04-26_23.tar.bz2) = 2f0a7b7a87d4fbe3dc878ae15ddf7dcb
-SHA256 (qemu/qemu-snapshot-2006-04-26_23.tar.bz2) = 2d412995e56444cf5aadbda8af6f3cc1b7282446b628172f2f7213e406c871a0
-SIZE (qemu/qemu-snapshot-2006-04-26_23.tar.bz2) = 1301091
+MD5 (qemu/qemu-0.8.1.tar.gz) = 67d924324a5ab79d017bd97a1e767285
+SHA256 (qemu/qemu-0.8.1.tar.gz) = a1f83666f5c05eaee9bfc608a3a5034ad95d0fd3c99937bb399bf9235a6aa0c9
+SIZE (qemu/qemu-0.8.1.tar.gz) = 1623264
MD5 (qemu/patch3_cirrus) = ebe7ed9fce804c49e024bc93bfdfc810
SHA256 (qemu/patch3_cirrus) = e862371834b7d895a896fbdb84fd9f70d17b5729a6f6789a48a61504fc941e11
SIZE (qemu/patch3_cirrus) = 8817
diff --git a/emulators/qemu/files/patch-configure b/emulators/qemu/files/patch-configure
deleted file mode 100644
index 1036edd69c21..000000000000
--- a/emulators/qemu/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: qemu/configure
-@@ -157,7 +157,7 @@
- fi
-
- for opt do
-- optarg=`expr "$opt" : '[^=]*=\(.*\)'`
-+ optarg=`echo "$opt" |sed 's/^[^=]*=//'`
- case "$opt" in
- --help|-h) show_help=yes
- ;;
diff --git a/emulators/qemu/files/patch-fbsd b/emulators/qemu/files/patch-fbsd
index 8a7823279624..88b01def0e4d 100644
--- a/emulators/qemu/files/patch-fbsd
+++ b/emulators/qemu/files/patch-fbsd
@@ -63,12 +63,24 @@ Index: qemu/fpu/softfloat-native.c
#define llrint(d) ((long long)rint(d))
#endif
Index: qemu/fpu/softfloat-native.h
-@@ -1,7 +1,17 @@
+@@ -1,8 +1,28 @@
/* Native implementation of soft float functions */
#include <math.h>
--#if defined(_BSD) && !defined(__APPLE__)
-+#if defined(_BSD) && !defined(__APPLE__) && \
-+ (!defined(__FreeBSD__) || __FreeBSD_version < 500000)
+
+-#if (defined(_BSD) && !defined(__APPLE__)) || defined(HOST_SOLARIS)
++#ifdef __FreeBSD__
++#include <osreldate.h>
++long double fabsl(long double x);
++long double remainderl(long double x, long double y);
++long double sqrtl(long double x);
++long double rintl(long double x);
++long lrintl(long double x);
++long long llrintl(long double x);
++#endif
++
++#if (defined(_BSD) && !defined(__APPLE__) && \
++ (!defined(__FreeBSD__) || __FreeBSD_version < 500000)) || \
++ defined(HOST_SOLARIS)
#include <ieeefp.h>
+#if defined(__FreeBSD__)
+#define isgreater(x, y) __builtin_isgreater((x), (y))
@@ -77,29 +89,21 @@ Index: qemu/fpu/softfloat-native.h
+#define islessequal(x, y) __builtin_islessequal((x), (y))
+#define islessgreater(x, y) __builtin_islessgreater((x), (y))
+#define isunordered(x, y) __builtin_isunordered((x), (y))
-+long double fabsl(long double x);
+#endif
+ #define fabsf(f) ((float)fabs(f))
#else
#include <fenv.h>
- #endif
-@@ -33,12 +43,13 @@
+@@ -60,7 +80,9 @@
/*----------------------------------------------------------------------------
| Software IEC/IEEE floating-point rounding mode.
*----------------------------------------------------------------------------*/
--#if defined(_BSD) && !defined(__APPLE__)
-+#if defined(_BSD) && !defined(__APPLE__) && \
-+ (!defined(__FreeBSD__) || __FreeBSD_version < 500000)
+-#if (defined(_BSD) && !defined(__APPLE__)) || defined(HOST_SOLARIS)
++#if (defined(_BSD) && !defined(__APPLE__) && \
++ (!defined(__FreeBSD__) || __FreeBSD_version < 500000)) || \
++ defined(HOST_SOLARIS)
enum {
float_round_nearest_even = FP_RN,
-- float_round_down = FE_RM,
-- float_round_up = FE_RP,
-- float_round_to_zero = FE_RZ
-+ float_round_down = FP_RM,
-+ float_round_up = FP_RP,
-+ float_round_to_zero = FP_RZ
- };
- #elif defined(__arm__)
- enum {
+ float_round_down = FP_RM,
Index: qemu/fpu/softfloat.h
@@ -84,7 +84,8 @@
#define FLOAT128
diff --git a/emulators/qemu/files/patch-slirp-mbuf.c b/emulators/qemu/files/patch-slirp-mbuf.c
deleted file mode 100644
index 1bd32d6ad7dc..000000000000
--- a/emulators/qemu/files/patch-slirp-mbuf.c
+++ /dev/null
@@ -1,26 +0,0 @@
-# http://lists.gnu.org/archive/html/qemu-devel/2005-05/msg00228.html
-
-Index: qemu/slirp/mbuf.c
-@@ -146,18 +146,19 @@
- struct mbuf *m;
- int size;
- {
-+ int datasize;
-+
- /* some compiles throw up on gotos. This one we can fake. */
- if(m->m_size>size) return;
-
- if (m->m_flags & M_EXT) {
-- /* datasize = m->m_data - m->m_ext; */
-+ datasize = m->m_data - m->m_ext;
- m->m_ext = (char *)realloc(m->m_ext,size);
- /* if (m->m_ext == NULL)
- * return (struct mbuf *)NULL;
- */
-- /* m->m_data = m->m_ext + datasize; */
-+ m->m_data = m->m_ext + datasize;
- } else {
-- int datasize;
- char *dat;
- datasize = m->m_data - m->m_dat;
- dat = (char *)malloc(size);
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-17 12:31:58 +0000