3 files changed, 19 insertions, 4 deletions

diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index f60902df8c61..27304e23a3f6 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	3.2.4
+DISTVERSION=	3.2.6
 CATEGORIES=	emulators kld
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -27,6 +27,7 @@ WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}_OSE
 USE_RC_SUBR=	vboxguest
 ONLY_FOR_ARCHS=	i386 amd64
 USE_BZIP2=	yes
+MAKE_JOBS_UNSAFE=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" --nofatal \
@@ -102,6 +103,10 @@ IGNORE=		requires kernel sources
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} > 900012
+EXTRA_PATCHES=	${FILESDIR}/extrapatch-include-iprt-string.h
+.endif
+
 pre-everything::
 .if ${ARCH} == "amd64"
 .if !exists(/usr/lib32)
diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo
index 26cba09e8de7..c17832c27466 100644
--- a/emulators/virtualbox-ose-additions/distinfo
+++ b/emulators/virtualbox-ose-additions/distinfo
@@ -1,3 +1,3 @@
-MD5 (VirtualBox-3.2.4-OSE.tar.bz2) = 80052833c8d9fd162c29fbf91cedd3d0
-SHA256 (VirtualBox-3.2.4-OSE.tar.bz2) = 49e69fd357a80d2537a8139f970a23af9aa5e2f6c3179eefca69d1a75e1fb25c
-SIZE (VirtualBox-3.2.4-OSE.tar.bz2) = 57492454
+MD5 (VirtualBox-3.2.6-OSE.tar.bz2) = 65b822ab3c08ff882d9621101996dc14
+SHA256 (VirtualBox-3.2.6-OSE.tar.bz2) = 0cacfc0f6360d4052c16fef5b0ca262b71f9aec8ceb3bb6fb140477b9076ce48
+SIZE (VirtualBox-3.2.6-OSE.tar.bz2) = 57899455
diff --git a/emulators/virtualbox-ose-additions/files/extrapatch-include-iprt-string.h b/emulators/virtualbox-ose-additions/files/extrapatch-include-iprt-string.h
new file mode 100644
index 000000000000..c22eebe25952
--- /dev/null
+++ b/emulators/virtualbox-ose-additions/files/extrapatch-include-iprt-string.h
@@ -0,0 +1,10 @@
+--- include/iprt/string.h.orig	2010-04-28 01:02:16.000000000 +0200
++++ include/iprt/string.h	2010-06-17 16:20:14.000000000 +0200
+@@ -60,7 +60,6 @@
+ #if    (defined(RT_OS_DARWIN) && defined(KERNEL)) \
+     || (defined(RT_OS_FREEBSD) && defined(_KERNEL))
+ RT_C_DECLS_BEGIN
+-void *memchr(const void *pv, int ch, size_t cb);
+ char *strpbrk(const char *pszStr, const char *pszChars);
+ RT_C_DECLS_END
+ #endif