[pkgsrc/trunk]: pkgsrc/emulators/qemu fix SDL include for vl.c on darwin

[dbj <dbj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/900175432dcd
branches:  trunk
changeset: 494573:900175432dcd
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Wed May 25 18:04:57 2005 +0000

description:
fix SDL include for vl.c on darwin

diffstat:

 emulators/qemu/distinfo         |   6 +++---
 emulators/qemu/patches/patch-ac |  15 ++++++++++++---
 emulators/qemu/patches/patch-aj |  18 ++++++++++++++----
 3 files changed, 29 insertions(+), 10 deletions(-)

diffs (82 lines):

diff -r 571e392ac298 -r 900175432dcd emulators/qemu/distinfo
--- a/emulators/qemu/distinfo   Wed May 25 17:48:13 2005 +0000
+++ b/emulators/qemu/distinfo   Wed May 25 18:04:57 2005 +0000
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.8 2005/05/03 11:18:47 xtraeme Exp $
+$NetBSD: distinfo,v 1.9 2005/05/25 18:04:57 dbj Exp $
 
 SHA1 (qemu-0.7.0.tar.gz) = ea6a5cd2cd7a6ad0daf24de000411983d9990320
 RMD160 (qemu-0.7.0.tar.gz) = 3bd1f81193ec6eb913153b02aa237dbadb94b413
 Size (qemu-0.7.0.tar.gz) = 1211802 bytes
 SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
-SHA1 (patch-ac) = 2f16687e2051934a79e32e3822ee31885aa8a244
+SHA1 (patch-ac) = a54824b658f4bbdbbdf74ad1a12bf25bce8f1164
 SHA1 (patch-af) = 221d6d85aa898cb27462806faab58ee2a9871a1c
 SHA1 (patch-ag) = 4bb7ae18fd0f0c5ecfa2ab2594d1de5b33660495
 SHA1 (patch-ah) = 134f47583dbed94e83671ca6197106805b13f759
 SHA1 (patch-ai) = 480cc80a451488a1376f99ed152a917116759cbf
-SHA1 (patch-aj) = 8eb95edbb8c33ae5a0a75f482c3a9f0ac9982328
+SHA1 (patch-aj) = d050b84489e74036994c19e982a363d74df797ab
 SHA1 (patch-ak) = 3f8cf4cd3db52451c6b02db1504da71cfb121c61
 SHA1 (patch-al) = d87d8c4bd0a422b0e1c2b52d049e9ac807cf1375
 SHA1 (patch-am) = b12f4ed6bbeb4d89c43ca06b3b3ff25c14386c47
diff -r 571e392ac298 -r 900175432dcd emulators/qemu/patches/patch-ac
--- a/emulators/qemu/patches/patch-ac   Wed May 25 17:48:13 2005 +0000
+++ b/emulators/qemu/patches/patch-ac   Wed May 25 18:04:57 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2004/11/15 11:35:30 xtraeme Exp $
+$NetBSD: patch-ac,v 1.3 2005/05/25 18:04:57 dbj Exp $
 
---- vl.c.orig  2004-11-15 12:04:03.000000000 +0100
-+++ vl.c       2004-11-15 12:04:17.000000000 +0100
+--- vl.c.orig  Wed Apr 27 16:52:05 2005
++++ vl.c       Wed May 25 11:42:18 2005
 @@ -43,8 +43,10 @@
  #ifdef _BSD
  #include <sys/stat.h>
@@ -13,3 +13,12 @@
  #else
  #include <linux/if.h>
  #include <linux/if_tun.h>
+@@ -68,7 +70,7 @@
+ 
+ #ifdef CONFIG_SDL
+ #ifdef __APPLE__
+-#include <SDL/SDL.h>
++#include <SDL.h>
+ #endif
+ #endif /* CONFIG_SDL */
+ 
diff -r 571e392ac298 -r 900175432dcd emulators/qemu/patches/patch-aj
--- a/emulators/qemu/patches/patch-aj   Wed May 25 17:48:13 2005 +0000
+++ b/emulators/qemu/patches/patch-aj   Wed May 25 18:04:57 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.3 2005/05/03 11:18:47 xtraeme Exp $
+$NetBSD: patch-aj,v 1.4 2005/05/25 18:04:57 dbj Exp $
 
---- Makefile.target.orig       2005-04-28 22:40:38.000000000 +0200
-+++ Makefile.target    2005-04-28 22:41:20.000000000 +0200
+--- Makefile.target.orig       Wed Apr 27 16:52:05 2005
++++ Makefile.target    Wed May 25 11:39:47 2005
 @@ -14,9 +14,9 @@
  VPATH+=:$(SRC_PATH)/linux-user
  DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
@@ -14,7 +14,17 @@
  LIBS=
  HELPER_CFLAGS=$(CFLAGS)
  DYNGEN=../dyngen$(EXESUF)
-@@ -463,7 +463,7 @@
+@@ -403,6 +403,9 @@
+ sdlaudio.o: sdlaudio.c
+       $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<
+ 
++vl.o: vl.c
++      $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<
++
+ depend: $(SRCS)
+       $(CC) -MM $(CFLAGS) $(DEFINES) $^ 1>.depend
+ 
+@@ -463,7 +466,7 @@
  
  install: all 
  ifneq ($(PROGS),)