Make this build on DragonFlyBSD. Patches were sent by Rumko privately.

4 files changed, 79 insertions, 5 deletions

diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 87032cb7561..5c3fcd82aec 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2006/09/17 07:51:56 xtraeme Exp $
+$NetBSD: distinfo,v 1.29 2006/12/07 13:50:58 xtraeme Exp $
 
 SHA1 (qemu-0.8.2.tar.gz) = d775239a545e7d0c5b677660a2122df590afde6d
 RMD160 (qemu-0.8.2.tar.gz) = 715c24997330352aa675cd7279731cec251f833a
@@ -7,10 +7,10 @@ SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
 SHA1 (patch-ab) = 12838d78eed85c575214f4ce632a4b6694c6f97f
 SHA1 (patch-ac) = f1231bcfde687ebe7a7ea4898593cd3818f03142
 SHA1 (patch-af) = c139e919da430c0118dc774587e1e6dd718d7926
-SHA1 (patch-ag) = 197b8f35dc62369d42236e37662eebbdb1a55974
+SHA1 (patch-ag) = 78cd16c8e627f8eff9b219e78adfce03f370faa6
 SHA1 (patch-ah) = 134f47583dbed94e83671ca6197106805b13f759
 SHA1 (patch-ai) = 480cc80a451488a1376f99ed152a917116759cbf
-SHA1 (patch-aj) = a177cd01c32732321d8473d5e5f4489e433fbf8f
+SHA1 (patch-aj) = d063a09efe4d1b7047f6a4ec4371aaff0acff159
 SHA1 (patch-ak) = 4715a464554469e8dac9cde93db83a90885b8a7e
 SHA1 (patch-al) = d61bce6a4cebae4ba1f87ce9def277c0ffc5843d
 SHA1 (patch-am) = a22a3b23284c377afa8113768d68c8ef40c514f9
@@ -20,3 +20,4 @@ SHA1 (patch-as) = 0df64b325b758a88fe61590e129bab2b3f99ce63
 SHA1 (patch-au) = 29d05fb5f4717fb572491d9d0653ec74ba46ae7e
 SHA1 (patch-aw) = 6299964fb3a747e8f5dfe4354e66722030ee9a75
 SHA1 (patch-ax) = 66b060005ecbf9fd0451f7960e81eccbabf959ca
+SHA1 (patch-ay) = 04d09931cca28169ff6b6b63ebd45c79dcbc9528
diff --git a/emulators/qemu/patches/patch-ag b/emulators/qemu/patches/patch-ag
index f41e2e8258a..a662b4e522a 100644
--- a/emulators/qemu/patches/patch-ag
+++ b/emulators/qemu/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.5 2006/09/02 18:17:40 rillig Exp $
+$NetBSD: patch-ag,v 1.6 2006/12/07 13:50:58 xtraeme Exp $
 
 --- configure.orig	2005-09-04 17:11:31.000000000 +0000
 +++ configure
@@ -20,3 +20,45 @@ $NetBSD: patch-ag,v 1.5 2006/09/02 18:17:40 rillig Exp $
  fi
  if test "$darwin" = "yes" ; then
    echo "CONFIG_DARWIN=yes" >> $config_mak
+--- configure.orig	2006-12-05 21:57:48.000000000 +0100
++++ configure	2006-12-05 21:57:14.000000000 +0100
+@@ -27,7 +27,7 @@
+ make="make"
+ install="install"
+ strip="strip"
+-cpu=`uname -m`
++cpu=`uname -p`
+ target_list=""
+ case "$cpu" in
+   i386|i486|i586|i686|i86pc|BePC)
+@@ -115,6 +115,10 @@
+     kqemu="yes"
+ fi
+ ;;
++DragonFly)
++bsd="yes"
++oss="yes"
++;;
+ NetBSD)
+ bsd="yes"
+ oss="yes"
+--- configure.orig	2006-12-06 21:56:23.000000000 +0100
++++ configure	2006-12-06 21:54:07.000000000 +0100
+@@ -118,6 +118,7 @@
+ DragonFly)
+ bsd="yes"
+ oss="yes"
++dragonfly="yes"
+ ;;
+ NetBSD)
+ bsd="yes"
+@@ -653,6 +654,9 @@
+ elif test -f "/usr/include/machine/bswap.h" ; then
+   echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h
+ fi
++if test "$dragonfly" = "yes" ; then
++  echo "CONFIG_DRAGONFLY=yes" >> $config_mak
++fi
+ if test "$darwin" = "yes" ; then
+   echo "CONFIG_DARWIN=yes" >> $config_mak
+   echo "#define CONFIG_DARWIN 1" >> $config_h
diff --git a/emulators/qemu/patches/patch-aj b/emulators/qemu/patches/patch-aj
index 8389c2911c8..a603bdce2b3 100644
--- a/emulators/qemu/patches/patch-aj
+++ b/emulators/qemu/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.5 2006/05/06 18:09:53 xtraeme Exp $
+$NetBSD: patch-aj,v 1.6 2006/12/07 13:50:58 xtraeme Exp $
 
 --- Makefile.target.orig	2006-05-06 19:30:04.000000000 +0200
 +++ Makefile.target	2006-05-06 19:31:21.000000000 +0200
@@ -33,3 +33,21 @@ $NetBSD: patch-aj,v 1.5 2006/05/06 18:09:53 xtraeme Exp $
  endif
  
  ifneq ($(wildcard .depend),)
+--- Makefile.target.orig	2006-12-06 21:54:21.000000000 +0100
++++ Makefile.target	2006-12-06 21:54:48.000000000 +0100
+@@ -400,6 +400,7 @@
+ ifndef CONFIG_SOFTMMU
+ VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386-vl.ld 
+ endif
++ifndef CONFIG_DRAGONFLY
+ ifndef CONFIG_DARWIN
+ ifndef CONFIG_WIN32
+ ifndef CONFIG_SOLARIS
+@@ -407,6 +408,7 @@
+ endif
+ endif
+ endif
++endif
+ ifdef TARGET_GPROF
+ vl.o: CFLAGS+=-p
+ VL_LDFLAGS+=-p
diff --git a/emulators/qemu/patches/patch-ay b/emulators/qemu/patches/patch-ay
new file mode 100644
index 00000000000..fb8c9261b74
--- /dev/null
+++ b/emulators/qemu/patches/patch-ay
@@ -0,0 +1,13 @@
+--- block.c.orig	2006-12-06 21:23:19.000000000 +0100
++++ block.c	2006-12-06 21:24:04.000000000 +0100
+@@ -29,8 +29,10 @@
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ #include <sys/queue.h>
++#ifndef __DragonFly__
+ #include <sys/disk.h>
+ #endif
++#endif
+ 
+ #ifdef CONFIG_COCOA
+ #include <paths.h>