diff options
| author | mezz <mezz@FreeBSD.org> | 2004-06-15 10:19:41 +0800 |
|---|---|---|
| committer | mezz <mezz@FreeBSD.org> | 2004-06-15 10:19:41 +0800 |
| commit | 7b5344bc2a500500953ed2e104db90b8e59de1d8 (patch) | |
| tree | 0fb4fe2e06f2161b57209501f526cb62cfe42794 /emulators | |
| parent | 33b678902bda43b2faee50e4561264a8140d31a4 (diff) | |
| download | freebsd-ports-gnome-7b5344bc2a500500953ed2e104db90b8e59de1d8.tar.gz freebsd-ports-gnome-7b5344bc2a500500953ed2e104db90b8e59de1d8.tar.zst freebsd-ports-gnome-7b5344bc2a500500953ed2e104db90b8e59de1d8.zip | |
Update to 0615 snapshot.
PR: ports/67950
Submitted by: Juergen Lock <nox@jelal.kn-bremen.de> (maintainer)
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-bt | 15 | ||||
| -rw-r--r-- | emulators/qemu/Makefile | 6 | ||||
| -rw-r--r-- | emulators/qemu/distinfo | 4 | ||||
| -rw-r--r-- | emulators/qemu/files/patch-bt | 15 |
6 files changed, 34 insertions, 16 deletions
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index 4e9d02cf1887..73a7509b6740 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -6,10 +6,10 @@ # PORTNAME= qemu -PORTVERSION= 0.5.5.s.20040610 +PORTVERSION= 0.5.5.s.20040615 CATEGORIES= emulators -MASTER_SITES= http://dad-answers.com/qemu/ -DISTNAME= ${PORTNAME}-snapshot-2004-06-10_23-40 +MASTER_SITES= http://dad-answers.com/qemu/FreeBSD/ +DISTNAME= ${PORTNAME}-snapshot-2004-06-15_00 MAINTAINER= nox@jelal.kn-bremen.de COMMENT= QEMU CPU Emulator diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo index f475b7ea7ea3..9b19e26e5f56 100644 --- a/emulators/qemu-devel/distinfo +++ b/emulators/qemu-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (qemu-snapshot-2004-06-10_23-40.tar.bz2) = 639ccb380f3c5f8128ac1e96ddfbaee4 -SIZE (qemu-snapshot-2004-06-10_23-40.tar.bz2) = 662005 +MD5 (qemu-snapshot-2004-06-15_00.tar.bz2) = a42d32f3120526e8f9b7a98e40a08b45 +SIZE (qemu-snapshot-2004-06-15_00.tar.bz2) = 662037 diff --git a/emulators/qemu-devel/files/patch-bt b/emulators/qemu-devel/files/patch-bt index 7ebddc06f332..bba4776a22d5 100644 --- a/emulators/qemu-devel/files/patch-bt +++ b/emulators/qemu-devel/files/patch-bt @@ -9,7 +9,7 @@ Index: qemu/vl.c #else #include <linux/if.h> #include <linux/if_tun.h> -@@ -1022,6 +1025,34 @@ +@@ -1059,6 +1062,34 @@ #endif /* CONFIG_SLIRP */ @@ -44,14 +44,23 @@ Index: qemu/vl.c #if !defined(_WIN32) #ifdef _BSD static int tun_open(char *ifname, int ifname_size) -@@ -1030,11 +1061,46 @@ +@@ -1067,11 +1098,55 @@ char *dev; struct stat s; +#ifdef __FreeBSD__ + int i, kldtried = 0, enoentcount = 0, err = 0; + char dname[100]; -+ for (i = -1; i < 10; i++) { ++#ifdef USE_DEVTAP ++ /* ++ * 5.x has /dev/tap, but that seems to just blindly increase its ++ * couter on every open() for some people(??), i.e. on every qemu run. ++ */ ++ i = -1; ++#else ++ i = 0; ++#endif ++ for (; i < 10; i++) { + if (i == -1) + strcpy(dname, "/dev/tap"); + else diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 4e9d02cf1887..73a7509b6740 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -6,10 +6,10 @@ # PORTNAME= qemu -PORTVERSION= 0.5.5.s.20040610 +PORTVERSION= 0.5.5.s.20040615 CATEGORIES= emulators -MASTER_SITES= http://dad-answers.com/qemu/ -DISTNAME= ${PORTNAME}-snapshot-2004-06-10_23-40 +MASTER_SITES= http://dad-answers.com/qemu/FreeBSD/ +DISTNAME= ${PORTNAME}-snapshot-2004-06-15_00 MAINTAINER= nox@jelal.kn-bremen.de COMMENT= QEMU CPU Emulator diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index f475b7ea7ea3..9b19e26e5f56 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,2 +1,2 @@ -MD5 (qemu-snapshot-2004-06-10_23-40.tar.bz2) = 639ccb380f3c5f8128ac1e96ddfbaee4 -SIZE (qemu-snapshot-2004-06-10_23-40.tar.bz2) = 662005 +MD5 (qemu-snapshot-2004-06-15_00.tar.bz2) = a42d32f3120526e8f9b7a98e40a08b45 +SIZE (qemu-snapshot-2004-06-15_00.tar.bz2) = 662037 diff --git a/emulators/qemu/files/patch-bt b/emulators/qemu/files/patch-bt index 7ebddc06f332..bba4776a22d5 100644 --- a/emulators/qemu/files/patch-bt +++ b/emulators/qemu/files/patch-bt @@ -9,7 +9,7 @@ Index: qemu/vl.c #else #include <linux/if.h> #include <linux/if_tun.h> -@@ -1022,6 +1025,34 @@ +@@ -1059,6 +1062,34 @@ #endif /* CONFIG_SLIRP */ @@ -44,14 +44,23 @@ Index: qemu/vl.c #if !defined(_WIN32) #ifdef _BSD static int tun_open(char *ifname, int ifname_size) -@@ -1030,11 +1061,46 @@ +@@ -1067,11 +1098,55 @@ char *dev; struct stat s; +#ifdef __FreeBSD__ + int i, kldtried = 0, enoentcount = 0, err = 0; + char dname[100]; -+ for (i = -1; i < 10; i++) { ++#ifdef USE_DEVTAP ++ /* ++ * 5.x has /dev/tap, but that seems to just blindly increase its ++ * couter on every open() for some people(??), i.e. on every qemu run. ++ */ ++ i = -1; ++#else ++ i = 0; ++#endif ++ for (; i < 10; i++) { + if (i == -1) + strcpy(dname, "/dev/tap"); + else |