sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 0615 snapshot.

Browse source 
PR:		ports/67950
Submitted by:	Juergen Lock <nox@jelal.kn-bremen.de> (maintainer)
This commit is contained in:
Jeremy Messenger 2004-06-15 02:19:41 +00:00
parent a29a3dda2f
commit c25e186386
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=111509
6 changed files with 34 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
emulators/qemu-devel/Makefile
View file

@ -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

4
emulators/qemu-devel/distinfo
View file

@ -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

15
emulators/qemu-devel/files/patch-bt
View file

@ -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

6
emulators/qemu/Makefile
View file

@ -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

4
emulators/qemu/distinfo
View file

@ -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

15
emulators/qemu/files/patch-bt
View file

@ -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