Update to 5.2.20.

https://www.virtualbox.org/wiki/Changelog#20

9 files changed, 16 insertions, 64 deletions

diff --git a/emulators/virtualbox-ose-additions-nox11/Makefile b/emulators/virtualbox-ose-additions-nox11/Makefile
index 63dbd591f09b..9c54089028b2 100644
--- a/emulators/virtualbox-ose-additions-nox11/Makefile
+++ b/emulators/virtualbox-ose-additions-nox11/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PORTREVISION=	1
 PKGNAMESUFFIX=	-additions-nox11
 
 OPTIONS_EXCLUDE=	DEBUG OPENGL X11
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 13404124b6cf..61bdcc0549ee 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-PORTVERSION=	5.2.18
-PORTREVISION=	1
+PORTVERSION=	5.2.20
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX?=	-additions
diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo
index 05fe96e8d407..093b7f748b66 100644
--- a/emulators/virtualbox-ose-additions/distinfo
+++ b/emulators/virtualbox-ose-additions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534359199
-SHA256 (VirtualBox-5.2.18.tar.bz2) = ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf
-SIZE (VirtualBox-5.2.18.tar.bz2) = 118700952
+TIMESTAMP = 1539730884
+SHA256 (VirtualBox-5.2.20.tar.bz2) = cc61986cec72a1e2ce10b8c82f5d837d46e33aeb49ff4e8abbe02bb597785540
+SIZE (VirtualBox-5.2.20.tar.bz2) = 118760364
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index bef5ba50dd84..503cdda63d66 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-PORTVERSION=	5.2.18
+PORTVERSION=	5.2.20
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX=	-kmod
diff --git a/emulators/virtualbox-ose-kmod/distinfo b/emulators/virtualbox-ose-kmod/distinfo
index 05fe96e8d407..093b7f748b66 100644
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534359199
-SHA256 (VirtualBox-5.2.18.tar.bz2) = ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf
-SIZE (VirtualBox-5.2.18.tar.bz2) = 118700952
+TIMESTAMP = 1539730884
+SHA256 (VirtualBox-5.2.20.tar.bz2) = cc61986cec72a1e2ce10b8c82f5d837d46e33aeb49ff4e8abbe02bb597785540
+SIZE (VirtualBox-5.2.20.tar.bz2) = 118760364
diff --git a/emulators/virtualbox-ose-nox11/Makefile b/emulators/virtualbox-ose-nox11/Makefile
index 212559986402..e769959f4b35 100644
--- a/emulators/virtualbox-ose-nox11/Makefile
+++ b/emulators/virtualbox-ose-nox11/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PORTREVISION=	1
 PKGNAMESUFFIX=	-nox11
 
 OPTIONS_EXCLUDE=	ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 0edbff64591c..3b5dd8332e33 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-PORTVERSION=	5.2.18
-PORTREVISION=	1
+PORTVERSION=	5.2.20
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
 DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index a41f13e17c84..a4540213cabd 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1534359199
-SHA256 (VirtualBox-5.2.18.tar.bz2) = ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf
-SIZE (VirtualBox-5.2.18.tar.bz2) = 118700952
-SHA256 (VBoxGuestAdditions_5.2.18.iso) = f98b6ad7093ee0b27d26dea565b197a5f33fdac93c4b67e73824ce889d6c964c
-SIZE (VBoxGuestAdditions_5.2.18.iso) = 57976832
+TIMESTAMP = 1539730884
+SHA256 (VirtualBox-5.2.20.tar.bz2) = cc61986cec72a1e2ce10b8c82f5d837d46e33aeb49ff4e8abbe02bb597785540
+SIZE (VirtualBox-5.2.20.tar.bz2) = 118760364
+SHA256 (VBoxGuestAdditions_5.2.20.iso) = d3c4a0f79a1ff0c35190c530612d83b81a2035eb9f056237888d8b056c07005f
+SIZE (VBoxGuestAdditions_5.2.20.iso) = 58013696
diff --git a/emulators/virtualbox-ose/files/patch-include_iprt_cdefs.h b/emulators/virtualbox-ose/files/patch-include_iprt_cdefs.h
index 4d087eaf36dc..ddef5a0020ba 100644
--- a/emulators/virtualbox-ose/files/patch-include_iprt_cdefs.h
+++ b/emulators/virtualbox-ose/files/patch-include_iprt_cdefs.h
@@ -1,50 +1,6 @@
---- include/iprt/cdefs.h.orig	2018-01-15 14:49:42 UTC
+--- include/iprt/cdefs.h.orig	2018-10-15 14:24:52 UTC
 +++ include/iprt/cdefs.h
-@@ -2214,6 +2214,8 @@
-  */
- #if defined(__cplusplus) && RT_GNUC_PREREQ(4, 4)
- # define RT_OFFSETOF(type, member)              ( (int)(uintptr_t)&( ((type *)(void *)0x1000)->member) - 0x1000 )
-+#elif RT_CLANG_PREREQ(6, 0)
-+# define RT_OFFSETOF(type, member)              ( (int)__builtin_offsetof(type, member) )
- #else
- # define RT_OFFSETOF(type, member)              ( (int)(uintptr_t)&( ((type *)(void *)0)->member) )
- #endif
-@@ -2232,6 +2234,8 @@
-  */
- #if defined(__cplusplus) && RT_GNUC_PREREQ(4, 4)
- # define RT_UOFFSETOF(type, member)             ( (uintptr_t)&( ((type *)(void *)0x1000)->member) - 0x1000 )
-+#elif RT_CLANG_PREREQ(6, 0)
-+# define RT_UOFFSETOF(type, member)             ( (unsigned)__builtin_offsetof(type, member) )
- #else
- # define RT_UOFFSETOF(type, member)             ( (uintptr_t)&( ((type *)(void *)0)->member) )
- #endif
-@@ -2244,7 +2248,11 @@
-  * @param   member  Member.
-  * @param   addend  The addend to add to the offset.
-  */
--#define RT_OFFSETOF_ADD(type, member, addend)   ( (int)RT_UOFFSETOF_ADD(type, member, addend) )
-+#if RT_CLANG_PREREQ(6, 0)
-+# define RT_OFFSETOF_ADD(type, member, addend)  ( (int)(__builtin_offsetof(type, member) + addend) )
-+#else 
-+# define RT_OFFSETOF_ADD(type, member, addend)  ( (int)RT_UOFFSETOF_ADD(type, member, addend) )
-+#endif
- 
- /** @def RT_UOFFSETOF_ADD
-  * RT_UOFFSETOF with an addend.
-@@ -2254,7 +2262,11 @@
-  * @param   member  Member.
-  * @param   addend  The addend to add to the offset.
-  */
--#define RT_UOFFSETOF_ADD(type, member, addend)  ( (uintptr_t)&( ((type *)(void *)(uintptr_t)(addend))->member) )
-+#if RT_CLANG_PREREQ(6, 0)
-+# define RT_UOFFSETOF_ADD(type, member, addend) ( (unsigned)(__builtin_offsetof(type, member) + addend) )
-+#else
-+# define RT_UOFFSETOF_ADD(type, member, addend) ( (uintptr_t)&( ((type *)(void *)(uintptr_t)(addend))->member) )
-+#endif
- 
- /** @def RT_SIZEOFMEMB
-  * Get the size of a structure member.
-@@ -2517,28 +2529,28 @@
+@@ -2611,28 +2611,28 @@
  
  /** @def RT_BYTE1
   * Gets the first byte of something. */