- Update VirtualBox OSE to 6.1.18

- Old VirtualBox OSE 5.2.44 preserved as "-legacy" versions of the
  ports (repocopied)
- Add back extra patch removed in r528258, actually required to
  build DEBUG kmod
- Correctly define WITH_DEBUG when enabling the DEBUG option, so
  binaries are not stripped

Please note that this new version supports only amd64 CPUs. If you need
to use older hardware please install the legacy ports.

Note that moving VM snapshots across major updates is unsupported, it's
strongly suggested to properly shutdown VMs before upgrading, please
check UPDATING for further details.

This update is the result of work from many people, and thanks to all
who gave feedback and tested things.

Patch based on work from: Mario Lobo <lobo@bsd.com.br> and jkim.

PR:			234878
Submitted by:		kunda <chitty_cloud@me.com>
Approved by:		vbox (implicit)
Reviewed by:		decke
Tested by:		jwb,
			martin ilavsky <ilavsky.martin@gmail.com>,
			Mario Lobo <lobo@bsd.com.br>
Relnotes:		https://www.virtualbox.org/wiki/Changelog-6.1
Differential Revision:	https://reviews.freebsd.org/D28871

1 files changed, 29 insertions, 37 deletions

diff --git a/emulators/virtualbox-ose/files/patch-configure b/emulators/virtualbox-ose/files/patch-configure
index 31d4bd082fe3..1312d17cacc2 100644
--- a/emulators/virtualbox-ose/files/patch-configure
+++ b/emulators/virtualbox-ose/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2020-05-13 19:36:41 UTC
+--- configure.orig	2021-01-07 15:31:21 UTC
 +++ configure
-@@ -138,10 +138,14 @@ CXX_FLAGS=""
+@@ -140,10 +140,14 @@ CXX_FLAGS=""
  if [ "$OS" = "freebsd" ]; then
    INCCURL="-I/usr/local/include"
    LIBCURL="-L/usr/local/lib -lcurl"
@@ -15,17 +15,7 @@
  else
    INCCURL=""
    LIBCURL="-lcurl"
-@@ -441,6 +445,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
-+      elif [ $cc_maj -eq 4 -a $cc_min -eq 2 -a "$OS" = "freebsd" ]; then
-+        log_success "found version $cc_ver"
-+      # gcc-4.2 is allowed for FreeBSD only
-       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" \) ]; then
-@@ -1208,7 +1215,7 @@ extern "C" int main(void)
+@@ -1258,7 +1262,7 @@ extern "C" int main(void)
  #endif
  }
  EOF
@@ -34,17 +24,18 @@
      test_execute
    fi
  }
-@@ -1508,8 +1515,7 @@ EOF
+@@ -1563,9 +1567,7 @@ EOF
          if [ $? -eq 0 ]; then
            echo "(Qt5 from pkg-config)" >> $LOG
            FLGQT5=`pkg-config Qt5Core --cflags`
 -          # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk)
 -          [ $cc_maj -eq 4 -a $cc_min -eq 8 ] && FLGQT5="$FLGQT5 -std=c++11"
-+          FLGQT5="$FLGQT5 -std=c++11"
-           INCQT5=`strip_I "$FLGQT5"`
+-          INCQT5=`strip_I "$FLGQT5"`
++          FLGQT5="$FLGQT5 -std=c++11"          INCQT5=`strip_I "$FLGQT5"`
            LIBDIR5=`pkg-config Qt5Core --variable=libdir`
            LIBQT5=`pkg-config Qt5Core --libs`
-@@ -1648,7 +1654,7 @@ check_libopus()
+           LIBQT5="-L$LIBDIR5 $LIBQT5"
+@@ -1703,7 +1705,7 @@ check_libopus()
        fi
        cat > $ODIR.tmp_src.cc << EOF
  #include <cstdio>
@@ -53,7 +44,7 @@
  extern "C" int main(void)
  {
    OpusEncoder *test;
-@@ -1980,8 +1986,8 @@ EOF
+@@ -2035,8 +2037,8 @@ EOF
          echo "compiling the following source file:" >> $LOG
          cat $ODIR.tmp_src.cc >> $LOG
          echo "using the following command line:" >> $LOG
@@ -64,7 +55,7 @@
          if [ $? -eq 0 ]; then
            found=1
            break
-@@ -2453,7 +2459,7 @@ for option in "$@"; do
+@@ -2512,7 +2514,7 @@ for option in "$@"; do
      --with-openssl-dir=*)
        OPENSSLDIR=`echo $option | cut -d'=' -f2`
        INCCRYPTO="-I${OPENSSLDIR}/include"
@@ -73,38 +64,39 @@
        ;;
      --with-ow-dir=*)
        WATCOM=`echo $option | cut -d'=' -f2`
-@@ -2767,7 +2773,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
-@@ -2788,13 +2794,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
+@@ -2856,14 +2858,23 @@ 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" -o "$OS" = "netbsd" ]; then
+-  if [ $WITH_PULSE -eq 1 ]; then
+-    check_pulse
+-  elif [ $WITH_PULSE -eq 0 ]; then # Force disabling PulseAudio.
+-    cnf_append "VBOX_WITH_AUDIO_PULSE" ""
+-  elif [ $WITH_PULSE -eq 2 ]; then # --enable-pulse was passed, force PulseAudio.
+-    cnf_append "VBOX_WITH_AUDIO_PULSE" "1"
+-  fi
++  if [ "$OS" = "linux" -o "$OS" = "freebsd" -o "$OS" = "netbsd" ]; then
 +    if [ $WITH_ALSA -eq 1 ]; then
 +      check_alsa
 +    else
 +      cnf_append "VBOX_WITH_AUDIO_ALSA" ""
 +    fi
-     if [ $WITH_PULSE -eq 1 ]; then
-       check_pulse
-     elif [ $WITH_PULSE -eq 0 ]; then
-       cnf_append "VBOX_WITH_AUDIO_PULSE" ""
-     fi
++    if [ $WITH_PULSE -eq 1 ]; then
++      check_pulse
++    elif [ $WITH_PULSE -eq 0 ]; then # Force disabling PulseAudio.
++      cnf_append "VBOX_WITH_AUDIO_PULSE" ""
++    elif [ $WITH_PULSE -eq 2 ]; then # --enable-pulse was passed, force PulseAudio.
++      cnf_append "VBOX_WITH_AUDIO_PULSE" "1"
++    fi
 +    if [ $WITH_DBUS -eq 0 ]; then
 +      cnf_append "VBOX_WITH_DBUS" ""
 +    fi
-  fi
++  fi  
  fi
  
-@@ -2810,14 +2823,6 @@ if [ "$OS" = "linux" ]; then
+ # Linux-specific
+@@ -2878,14 +2889,6 @@ if [ "$OS" = "linux" ]; then
      cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"
    fi
    if [ $ONLY_ADDITIONS -eq 0 ]; then