Index: head/emulators/virtualbox-ose/files/patch-configure
===================================================================
--- head/emulators/virtualbox-ose/files/patch-configure	(revision 418982)
+++ head/emulators/virtualbox-ose/files/patch-configure	(revision 418983)
@@ -1,69 +1,78 @@
---- configure.orig	2015-06-01 13:50:10.000000000 -0400
-+++ configure	2015-06-10 19:40:14.170742000 -0400
-@@ -137,10 +137,14 @@
+--- configure.orig	2016-07-18 11:50:32 UTC
++++ configure
+@@ -137,10 +137,14 @@ CXX_FLAGS=""
  if [ "$OS" = "freebsd" ]; then
    INCCURL="-I/usr/local/include"
    LIBCURL="-L/usr/local/lib -lcurl"
 +  INCALSA="-I/usr/local/include"
 +  LIBALSA="-L/usr/local/lib"
    INCPULSE="-I/usr/local/include"
    LIBPULSE="-L/usr/local/lib"
    INCPNG="-I/usr/local/include"
    LIBPNG="-L/usr/local/lib -lpng"
 +  INCVNCSERVER="-I/usr/local/include"
 +  LIBVNCSERVER="-L/usr/local/lib"
  else
    INCCURL=""
    LIBCURL="-lcurl"
-@@ -1200,7 +1204,7 @@
+@@ -1213,7 +1217,7 @@ extern "C" int main(void)
  #endif
  }
  EOF
 -  if test_compile "-lasound" asound asound; then
 +  if test_compile "$INCALSA $LIBALSA -lasound" asound asound; then
      test_execute
    fi
  }
-@@ -1949,8 +1953,8 @@
+@@ -1945,8 +1949,8 @@ EOF
          echo "compiling the following source file:" >> $LOG
          cat $ODIR.tmp_src.cc >> $LOG
          echo "using the following command line:" >> $LOG
 -        echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so" >> $LOG
 -        $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so >> $LOG 2>&1
 +        echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so -pthread" >> $LOG
 +        $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so -pthread >> $LOG 2>&1
          if [ $? -eq 0 ]; then
            found=1
            break
-@@ -2733,8 +2737,15 @@
+@@ -2415,7 +2419,7 @@ for option in "$@"; do
+     --with-openssl-dir=*)
+       OPENSSLDIR=`echo $option | cut -d'=' -f2`
+       INCCRYPTO="-I${OPENSSLDIR}/include"
+-      LIBCRYPTO="${OPENSSLDIR}/lib/libcrypto.a ${OPENSSLDIR}/lib/libssl.a"
++      LIBCRYPTO="-L${OPENSSLDIR}/lib -lssl -lcrypto"
+       ;;
+     --with-ow-dir=*)
+       WATCOM=`echo $option | cut -d'=' -f2`
+@@ -2744,8 +2748,15 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
    [ $WITH_PYTHON -eq 1 ] && check_python
    [ $WITH_JAVA   -eq 1 ] && check_java
  
 -  # PulseAudio
    if [ "$OS" = "linux" -o "$OS" = "freebsd" ]; then
 +    if [ $WITH_DBUS -eq 0 ]; then
 +      cnf_append "VBOX_WITH_DBUS" ""
 +    fi
 +    if [ $WITH_ALSA -eq 1 ]; then
 +      check_alsa
 +    else
 +      cnf_append "VBOX_WITH_ALSA" ""
 +    fi
      if [ $WITH_PULSE -eq 1 ]; then
        check_pulse
      elif [ $WITH_PULSE -eq 0 ]; then
-@@ -2756,14 +2767,6 @@
+@@ -2767,14 +2778,6 @@ if [ "$OS" = "linux" ]; then
      cnf_append "VBOX_WITH_ADDITION_DRIVERS" ""
    fi
    if [ $ONLY_ADDITIONS -eq 0 ]; then
 -    if [ $WITH_ALSA -eq 1 ]; then
 -      check_alsa
 -    else
 -      cnf_append "VBOX_WITH_ALSA" ""
 -    fi
 -    if [ $WITH_DBUS -eq 0 ]; then
 -      cnf_append "VBOX_WITH_DBUS" ""
 -    fi
      if [ $WITH_DEVMAPPER -eq 1 ]; then
        check_libdevmapper
      else