From 09533e9ce452eb21d128ae507289a03d4d0e9b9d Mon Sep 17 00:00:00 2001
From: todd <todd@openbsd.org>
Date: Mon, 31 Mar 2008 14:25:59 +0000
Subject: [PATCH] fix -smb option, from viq at viq dot ath dot cx

---
 emulators/qemu/Makefile                    |  7 ++++--
 emulators/qemu/patches/patch-qemu-doc_texi | 27 ++++++++++++++--------
 emulators/qemu/patches/patch-vl_c          | 15 +++++++++---
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index dfc39968c83..8c2dfca2d20 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2008/03/31 06:49:27 todd Exp $
+# $OpenBSD: Makefile,v 1.27 2008/03/31 14:25:59 todd Exp $
 
 # no success building on other archs yet
 ONLY_FOR_ARCHS=		amd64 arm i386 powerpc
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS=		amd64 arm i386 powerpc
 COMMENT=		multi system emulator
 
 DISTNAME=		qemu-0.9.0
-PKGNAME=		${DISTNAME}p2
+PKGNAME=		${DISTNAME}p3
 CATEGORIES=		emulators
 
 HOMEPAGE=		http://fabrice.bellard.free.fr/qemu/
@@ -51,6 +51,9 @@ USE_X11=		Yes
 WANTLIB+=		X11 Xext pthread usbhid
 .endif
 
+pre-configure:
+	@perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g;" ${WRKSRC}/vl.c ${WRKSRC}/qemu-doc.texi
+
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qemu
 	@${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup ${PREFIX}/share/examples/qemu
diff --git a/emulators/qemu/patches/patch-qemu-doc_texi b/emulators/qemu/patches/patch-qemu-doc_texi
index f2b7d8cd398..8491a0f288a 100644
--- a/emulators/qemu/patches/patch-qemu-doc_texi
+++ b/emulators/qemu/patches/patch-qemu-doc_texi
@@ -1,10 +1,21 @@
-$OpenBSD: patch-qemu-doc_texi,v 1.1 2008/01/21 20:40:20 sthen Exp $
---- qemu-doc.texi.orig	Mon Jan 21 14:11:49 2008
-+++ qemu-doc.texi	Mon Jan 21 14:11:51 2008
-@@ -513,6 +513,16 @@ Use @var{file} as initial ram disk.
+$OpenBSD: patch-qemu-doc_texi,v 1.2 2008/03/31 14:26:00 todd Exp $
+--- qemu-doc.texi.orig	Tue Feb  6 00:01:54 2007
++++ qemu-doc.texi	Sun Feb 10 02:32:12 2008
+@@ -461,7 +461,7 @@ or @file{C:\WINNT\SYSTEM32\DRIVERS\ETC\LMHOSTS} (Windo
+ Then @file{dir} can be accessed in @file{\\smbserver\qemu}.
  
- @end table
+ Note that a SAMBA server must be installed on the host OS in
+-@file{/usr/sbin/smbd}. QEMU was tested successfully with smbd version
++@file{!!LOCALBASE!!/libexec/smbd}. QEMU was tested successfully with smbd version
+ 2.2.7a from the Red Hat 9 and version 3.0.10-1.fc3 from Fedora Core 3.
  
+ @item -redir [tcp|udp]:host-port:[guest-host]:guest-port
+@@ -511,6 +511,16 @@ Use @var{cmdline} as kernel command line
+ @item -initrd file
+ Use @var{file} as initial ram disk.
+ 
++@end table
++
 +Kernel QEMU options:
 +@table @option
 +
@@ -13,8 +24,6 @@ $OpenBSD: patch-qemu-doc_texi,v 1.1 2008/01/21 20:40:20 sthen Exp $
 +
 +@item -no-kqemu
 +Disable KQEMU kernel module usage.
-+@end table
-+
- Debug/Expert options:
- @table @option
+ @end table
  
+ Debug/Expert options:
diff --git a/emulators/qemu/patches/patch-vl_c b/emulators/qemu/patches/patch-vl_c
index a0b3d638550..8b974308762 100644
--- a/emulators/qemu/patches/patch-vl_c
+++ b/emulators/qemu/patches/patch-vl_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-vl_c,v 1.14 2007/05/01 12:55:14 todd Exp $
---- vl.c.orig	Mon Feb  5 17:01:54 2007
-+++ vl.c	Sat Apr 21 19:48:30 2007
+$OpenBSD: patch-vl_c,v 1.15 2008/03/31 14:26:00 todd Exp $
+--- vl.c.orig	Tue Feb  6 00:01:54 2007
++++ vl.c	Sun Feb 10 02:30:48 2008
 @@ -44,7 +44,8 @@
  #include <netdb.h>
  #ifdef _BSD
@@ -11,6 +11,15 @@ $OpenBSD: patch-vl_c,v 1.14 2007/05/01 12:55:14 todd Exp $
  #include <libutil.h>
  #endif
  #else
+@@ -92,7 +93,7 @@
+ #ifdef __sun__
+ #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
+ #else
+-#define SMBD_COMMAND "/usr/sbin/smbd"
++#define SMBD_COMMAND "!!LOCALBASE!!/libexec/smbd"
+ #endif
+ 
+ //#define DEBUG_UNUSED_IOPORT
 @@ -168,6 +169,7 @@ const char *vnc_display;
  int acpi_enabled = 1;
  int fd_bootchk = 1;