8 files changed, 22 insertions, 26 deletions
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 6e7f5ca1867f..268f4991c3f2 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.3.30
-PORTREVISION=	1
+DISTVERSION=	4.3.32
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo
index 2aa2b47c4163..0bd1e6e81ca8 100644
--- a/emulators/virtualbox-ose-additions/distinfo
+++ b/emulators/virtualbox-ose-additions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.3.30.tar.bz2) = ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36
-SIZE (VirtualBox-4.3.30.tar.bz2) = 97428942
+SHA256 (VirtualBox-4.3.32.tar.bz2) = dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261
+SIZE (VirtualBox-4.3.32.tar.bz2) = 98168101
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index ae30d444bd16..8c362bf58d46 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.3.30
+DISTVERSION=	4.3.32
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
diff --git a/emulators/virtualbox-ose-kmod/distinfo b/emulators/virtualbox-ose-kmod/distinfo
index 2aa2b47c4163..0bd1e6e81ca8 100644
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.3.30.tar.bz2) = ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36
-SIZE (VirtualBox-4.3.30.tar.bz2) = 97428942
+SHA256 (VirtualBox-4.3.32.tar.bz2) = dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261
+SIZE (VirtualBox-4.3.32.tar.bz2) = 98168101
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 27c12331c59d..f16352c4b572 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.3.30
+DISTVERSION=	4.3.32
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index a5f4ef28b1fa..40a8eee6ff60 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,4 +1,4 @@
-SHA256 (VirtualBox-4.3.30.tar.bz2) = ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36
-SIZE (VirtualBox-4.3.30.tar.bz2) = 97428942
-SHA256 (VBoxGuestAdditions_4.3.30.iso) = 432c2da1d9a939de7ba1d2cfb10595031374af9ce66417a43979d1794beedbb1
-SIZE (VBoxGuestAdditions_4.3.30.iso) = 58257408
+SHA256 (VirtualBox-4.3.32.tar.bz2) = dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261
+SIZE (VirtualBox-4.3.32.tar.bz2) = 98168101
+SHA256 (VBoxGuestAdditions_4.3.32.iso) = 187f49b567dea056d9de255c155f8eaa3449dffe08ccf22ae8ab1dda708f78fe
+SIZE (VBoxGuestAdditions_4.3.32.iso) = 58349568
diff --git a/emulators/virtualbox-ose/files/patch-include_iprt_string.h b/emulators/virtualbox-ose/files/patch-include_iprt_string.h
new file mode 100644
index 000000000000..ed8c33ef6341
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-include_iprt_string.h
@@ -0,0 +1,11 @@
+--- include/iprt/string.h.orig	2015-10-15 11:50:51 UTC
++++ include/iprt/string.h
+@@ -107,7 +107,7 @@ char *strpbrk(const char *pszStr, const 
+ RT_C_DECLS_END
+ #endif
+ 
+-#if !defined(RT_OS_LINUX) || !defined(_GNU_SOURCE)
++#if !defined(RT_OS_FREEBSD) && (!defined(RT_OS_LINUX) || !defined(_GNU_SOURCE))
+ RT_C_DECLS_BEGIN
+ void *memrchr(const char *pv, int ch, size_t cb);
+ RT_C_DECLS_END
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-misc-uri.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-misc-uri.cpp
deleted file mode 100644
index 54e3c3a221a0..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-misc-uri.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/VBox/Runtime/common/misc/uri.cpp.orig	2013-12-18 11:10:34.000000000 -0500
-+++ src/VBox/Runtime/common/misc/uri.cpp	2013-12-19 20:57:32.000000000 -0500
-@@ -132,7 +132,10 @@
-             /* % encoding means the percent sign and exactly 2 hexadecimal
-              * digits describing the ASCII number of the character. */
-             ++iIn;
--            char szNum[] = { pszString[iIn++], pszString[iIn++], '\0' };
-+            char szNum[3];
-+            szNum[0] = pszString[iIn++];
-+            szNum[1] = pszString[iIn++];
-+            szNum[2] = '\0';
-             uint8_t u8;
-             rc = RTStrToUInt8Ex(szNum, NULL, 16, &u8);
-             if (RT_FAILURE(rc))