Fix building on Mac OS X (PR#43207)

3 files changed, 23 insertions, 10 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 4b58f992a26..fdbed7791e9 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2010/11/20 14:37:42 tsutsui Exp $
-#
+# $NetBSD: Makefile,v 1.77 2010/12/27 12:33:32 adam Exp $
 
 DISTNAME=		qemu-0.13.0
 PKGREVISION=		1
@@ -24,9 +23,9 @@ BUILD_DEPENDS+=		texi2html-[0-9]*:../../textproc/texi2html
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ENV+=		mansuffix=/${PKGMANDIR}
-CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=	--interp-prefix=${PREFIX:Q}/share/qemu
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--interp-prefix=${PREFIX}/share/qemu
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 CONF_FILES=		${EGDIR}/target-x86_64.conf \
 			${PKG_SYSCONFDIR}/target-x86_64.conf
@@ -90,7 +89,10 @@ PLIST.nbd=		YES
 USER_EMUL=		i386 x86_64 sparc sparc64
 PLIST.nbd=		YES
 .elif !empty(OPSYS:MDarwin)
-USER_EMUL=		i386 x86_64 sparc sparc64 ppc
+USER_EMUL=
+CONFIGURE_ARGS+=	--disable-bsd-user
+CONFIGURE_ARGS+=	--disable-darwin-user
+PLIST.nbd=		YES
 .elif !empty(OPSYS:MLinux)
 USER_EMUL=		${UE_ARCHS}
 PLIST.nbd=		YES
@@ -105,8 +107,11 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \
 		${DESTDIR}${PREFIX}/share/doc/qemu/
 
+# On Darwin, qemu uses Cocoa and CoreAudio
+.if empty(OPSYS:MDarwin)
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
+.endif
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 1f95c3b7c8e..8ef05ccf1f4 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2010/11/09 10:37:12 jmmv Exp $
+$NetBSD: distinfo,v 1.63 2010/12/27 12:33:32 adam Exp $
 
 SHA1 (qemu-0.13.0.tar.gz) = 250bba1fdb505a787c48331b6b02f54282edfc76
 RMD160 (qemu-0.13.0.tar.gz) = 4a6faaf38d5616fb7bedc1a6408de1dbb3ec360c
@@ -14,7 +14,7 @@ SHA1 (patch-ef) = 0e1c2b364cc52aa9a7295e0e025b53498082d4a7
 SHA1 (patch-eg) = f511730d3b5640f10973d70b891e28bf140beb3c
 SHA1 (patch-eh) = 008c648dd74b273bd920521f7e01da5928c7c775
 SHA1 (patch-ei) = aee213dc347808f7aabedd7a8ce9f9477b12b9f0
-SHA1 (patch-ej) = 23199fe87a0748067a54384dbe6c2677c729c234
+SHA1 (patch-ej) = 2276235ac35ebe7ab29eac45c087ad55cd0a726b
 SHA1 (patch-ek) = a4bfeb9887c5caddaf660fecaaa59f7468eec2ed
 SHA1 (patch-el) = c8ab982a32e2c47deba9bd8a5b574d83fb80234d
 SHA1 (patch-em) = 4993ef668321e38ce63014494cb2ddb447637eb8
diff --git a/emulators/qemu/patches/patch-ej b/emulators/qemu/patches/patch-ej
index 531b599ce9e..8c7a3f89c3d 100644
--- a/emulators/qemu/patches/patch-ej
+++ b/emulators/qemu/patches/patch-ej
@@ -1,4 +1,4 @@
-$NetBSD: patch-ej,v 1.1 2010/10/27 13:24:09 tsutsui Exp $
+$NetBSD: patch-ej,v 1.2 2010/12/27 12:33:32 adam Exp $
 
 1) bswap_NN() variants are not available in CONFIG_MACHINE_BSWAP_H case
    (fixed in upstream master but not in stable-0.13 branch)
@@ -16,6 +16,14 @@ http://git.qemu.org/qemu.git/commit/?id=ad7ee4ad6c3a5388acf94dd532d291ea6d3a5972
 
 --- ui/vnc-enc-tight.c.orig	2010-07-28 10:55:42.000000000 +0900
 +++ ui/vnc-enc-tight.c	2010-08-08 17:14:17.000000000 +0900
+@@ -35,6 +35,7 @@
+ #include <stdio.h>
+ #include <jpeglib.h>
+ #endif
++#include <sys/types.h>
+ 
+ #include "qemu-common.h"
+ 
 @@ -209,7 +209,7 @@
                       d < w - x - VNC_TIGHT_DETECT_SUBROW_WIDTH; d++) {  \
                  pix = ((uint##bpp##_t *)buf)[(y+d)*w+x+d];              \