7 files changed, 42 insertions, 33 deletions

diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 4d647430f1ef..ea4422373b1e 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-PORTVERSION=	5.2.14
+PORTVERSION=	5.2.16
 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 c1fff0290d53..b258300fd020 100644
--- a/emulators/virtualbox-ose-additions/distinfo
+++ b/emulators/virtualbox-ose-additions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530565190
-SHA256 (VirtualBox-5.2.14.tar.bz2) = ee3af129a581ec4c1a3e777e98247f8943e976ce6edd24962bcaa5c53ed1f644
-SIZE (VirtualBox-5.2.14.tar.bz2) = 118597539
+TIMESTAMP = 1531839980
+SHA256 (VirtualBox-5.2.16.tar.bz2) = c30383ad9c86b8a2d1fee03e576f0c0b6ec5354cbfba5f795bf3c5cd339bf650
+SIZE (VirtualBox-5.2.16.tar.bz2) = 118678441
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index 413903c39f03..e84167e93f37 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-PORTVERSION=	5.2.14
+PORTVERSION=	5.2.16
 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 c1fff0290d53..b258300fd020 100644
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530565190
-SHA256 (VirtualBox-5.2.14.tar.bz2) = ee3af129a581ec4c1a3e777e98247f8943e976ce6edd24962bcaa5c53ed1f644
-SIZE (VirtualBox-5.2.14.tar.bz2) = 118597539
+TIMESTAMP = 1531839980
+SHA256 (VirtualBox-5.2.16.tar.bz2) = c30383ad9c86b8a2d1fee03e576f0c0b6ec5354cbfba5f795bf3c5cd339bf650
+SIZE (VirtualBox-5.2.16.tar.bz2) = 118678441
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 1be76c1ae721..7296918cd3b8 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-PORTVERSION=	5.2.14
+PORTVERSION=	5.2.16
 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 f3bbc11fe343..93be364557a7 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1530565190
-SHA256 (VirtualBox-5.2.14.tar.bz2) = ee3af129a581ec4c1a3e777e98247f8943e976ce6edd24962bcaa5c53ed1f644
-SIZE (VirtualBox-5.2.14.tar.bz2) = 118597539
-SHA256 (VBoxGuestAdditions_5.2.14.iso) = e149ff0876242204fe924763f9272f691242d6a6ad4538a128fb7dba770781de
-SIZE (VBoxGuestAdditions_5.2.14.iso) = 57978880
+TIMESTAMP = 1531839980
+SHA256 (VirtualBox-5.2.16.tar.bz2) = c30383ad9c86b8a2d1fee03e576f0c0b6ec5354cbfba5f795bf3c5cd339bf650
+SIZE (VirtualBox-5.2.16.tar.bz2) = 118678441
+SHA256 (VBoxGuestAdditions_5.2.16.iso) = 68ddc870c9b9faf61850a69155388e5f3de0189f2d19ad4131e3c71aff2d26b0
+SIZE (VBoxGuestAdditions_5.2.16.iso) = 57976832
diff --git a/emulators/virtualbox-ose/files/patch-configure b/emulators/virtualbox-ose/files/patch-configure
index fbbd36a9cf95..aa942ff3c2f9 100644
--- a/emulators/virtualbox-ose/files/patch-configure
+++ b/emulators/virtualbox-ose/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2017-10-18 07:06:30 UTC
+--- configure.orig	2018-07-16 14:56:48 UTC
 +++ configure
-@@ -139,10 +139,14 @@ CXX_FLAGS=""
+@@ -138,10 +138,14 @@ CXX_FLAGS=""
  if [ "$OS" = "freebsd" ]; then
    INCCURL="-I/usr/local/include"
    LIBCURL="-L/usr/local/lib -lcurl"
@@ -15,7 +15,7 @@
  else
    INCCURL=""
    LIBCURL="-lcurl"
-@@ -437,6 +441,9 @@ check_gcc()
+@@ -436,6 +440,9 @@ check_gcc()
        elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "$OS" = "darwin" ]; then
          log_success "found version $cc_ver"
        # gcc-4.0 is allowed for Darwin only
@@ -25,7 +25,7 @@
        elif [ $cc_maj -lt 4 \
               -o \( $cc_maj -eq 4 -a $cc_min -lt 4 -a "$OS" != "darwin" \) \
               -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS"  = "darwin" \) \
-@@ -1233,7 +1240,7 @@ extern "C" int main(void)
+@@ -1204,7 +1211,7 @@ extern "C" int main(void)
  #endif
  }
  EOF
@@ -34,7 +34,7 @@
      test_execute
    fi
  }
-@@ -1533,8 +1540,7 @@ EOF
+@@ -1504,8 +1511,7 @@ EOF
          if [ $? -eq 0 ]; then
            echo "(Qt5 from pkg-config)" >> $LOG
            FLGQT5=`pkg-config Qt5Core --cflags`
@@ -44,7 +44,16 @@
            INCQT5=`strip_I "$FLGQT5"`
            LIBDIR5=`pkg-config Qt5Core --variable=libdir`
            LIBQT5=`pkg-config Qt5Core --libs`
-@@ -1994,8 +2000,8 @@ EOF
+@@ -1644,7 +1650,7 @@ check_libopus()
+       fi
+       cat > $ODIR.tmp_src.cc << EOF
+ #include <cstdio>
+-#include <opus/opus.h>
++#include <opus.h>
+ extern "C" int main(void)
+ {
+   OpusEncoder *test;
+@@ -1976,8 +1982,8 @@ EOF
          echo "compiling the following source file:" >> $LOG
          cat $ODIR.tmp_src.cc >> $LOG
          echo "using the following command line:" >> $LOG
@@ -55,7 +64,7 @@
          if [ $? -eq 0 ]; then
            found=1
            break
-@@ -2468,7 +2474,7 @@ for option in "$@"; do
+@@ -2449,7 +2455,7 @@ for option in "$@"; do
      --with-openssl-dir=*)
        OPENSSLDIR=`echo $option | cut -d'=' -f2`
        INCCRYPTO="-I${OPENSSLDIR}/include"
@@ -64,16 +73,16 @@
        ;;
      --with-ow-dir=*)
        WATCOM=`echo $option | cut -d'=' -f2`
-@@ -2748,7 +2754,7 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
-   # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs
-   # [ "$OS" != "darwin" ] && check_yasm
-   [ "$OS" != "darwin"  ] && check_xsltproc
--  [ "$OS" != "darwin"  ] && check_mkisofs
-+  [ "$OS" != "darwin" -a "$OS" != "freebsd" ] && check_mkisofs
- fi
- 
- # the libraries
-@@ -2803,13 +2809,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
+@@ -2763,7 +2769,7 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
+   check_ssl
+   check_curl
+   [ $WITH_LIBVPX -eq 1 ] && check_vpx
+-  check_libopus
++  [ $OSE -eq 0 -a "$OS" != "win" ] && check_libopus
+  [ "$OS" != "darwin"  ] && check_z
+   [ "$OS" != "darwin"  ] && check_png
+   [ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
+@@ -2784,13 +2790,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
    [ $WITH_PYTHON -eq 1 ] && check_python
    [ $WITH_JAVA   -eq 1 ] && check_java
  
@@ -95,8 +104,8 @@
   fi
  fi
  
-@@ -2826,14 +2839,6 @@ if [ "$OS" = "linux" ]; then
-     cnf_append "VBOX_WITH_ADDITION_DRIVERS" ""
+@@ -2806,14 +2819,6 @@ if [ "$OS" = "linux" ]; then
+     cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"
    fi
    if [ $ONLY_ADDITIONS -eq 0 ]; then
 -    if [ $WITH_ALSA -eq 1 ]; then