virtualbox: Make it start building on Linux

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Jul 8 16:36:40 2016 +0200
Changeset:	4b702a26c9bc90dadd17b08d7ccdf072bb8668b3

Modified Files:
	virtualbox/Makefile
	virtualbox/distinfo
	virtualbox/patches/patch-configure

Log Message:
virtualbox: Make it start building on Linux

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4b702a26c9bc90dadd17b08d7ccdf072bb8668b3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 virtualbox/Makefile                |  8 ++++++++
 virtualbox/distinfo                |  2 +-
 virtualbox/patches/patch-configure | 35 ++++++++++++++++++++++++++---------
 3 files changed, 35 insertions(+), 10 deletions(-)

diffs:
diff --git a/virtualbox/Makefile b/virtualbox/Makefile
index 62444a7..8507b0f 100644
--- a/virtualbox/Makefile
+++ b/virtualbox/Makefile
@@ -30,6 +30,11 @@ USE_LANGUAGES+=	c c++
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "Linux"
+# Required by Linux build
+BUILD_DEPENDS+=	makeself-[0-9]*:../../archivers/makeself
+.endif
+
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Adjust paths for pkgsrc
 SUBST_STAGE.paths=	pre-configure
@@ -45,6 +50,9 @@ SUBST_SED.paths+=	-e 's!^LIBZ=.*!LIBZ="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.
 .include "../../sysutils/lvm2/buildlink3.mk"
 SUBST_SED.paths+=	-e 's!^INCDEVMAPPER=.*!INCDEVMAPPER="-I${BUILDLINK_PREFIX.lvm2}/include"!g'
 SUBST_SED.paths+=	-e 's!^LIBDEVMAPPER=.*!LIBDEVMAPPER="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.lvm2}/lib -L${BUILDLINK_PREFIX.lvm2}/lib -ldevmapper"!g'
+.include "../../sysutils/libcap/buildlink3.mk"
+SUBST_SED.paths+=	-e 's!^INCCAP=.*!INCCAP="-I${BUILDLINK_PREFIX.libcap}/include"!g'
+SUBST_SED.paths+=	-e 's!^LIBCAP=.*!LIBCAP="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libcap}/lib -L${BUILDLINK_PREFIX.libcap}/lib -lcap"!g'
 .endif
 SUBST_SED.paths+=	-e 's!^INCCURL=.*!INCCURL="-I${BUILDLINK_PREFIX.curl}/include"!g'
 SUBST_SED.paths+=	-e 's!^LIBCURL=.*!LIBCURL="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.curl}/lib -L${BUILDLINK_PREFIX.curl}/lib -lcurl"!g'
diff --git a/virtualbox/distinfo b/virtualbox/distinfo
index 218f600..bd14db2 100644
--- a/virtualbox/distinfo
+++ b/virtualbox/distinfo
@@ -6,7 +6,7 @@ SHA512 (VirtualBox-5.0.16.tar.bz2) = 3da3a227360fb50d299e99770378f65e8cb99525377
 Size (VirtualBox-5.0.16.tar.bz2) = 111062984 bytes
 SHA1 (patch-Config.kmk) = 136895de8ba926bad725f7f7cf084b25ffbf3152
 SHA1 (patch-Makefile.kmk) = fbb5d999abad202368df11756d91ed7e13c646ae
-SHA1 (patch-configure) = 9f2bbd4e706cfde2a7fb4d74ac4c035ab7241d09
+SHA1 (patch-configure) = b360df61c744ffbb335bf5b8b0dae36abd7206c2
 SHA1 (patch-include_VBox_VBoxGuest.h) = 4f41910ca3abbc502bad31cb9f9b427566025765
 SHA1 (patch-include_VBox_ostypes.h) = fd452f95c79b2e5c98a048af21f6561c80adebc5
 SHA1 (patch-include_VBox_param.h) = 1efcacb3e7890344dc132fee85b945bf9baa9614
diff --git a/virtualbox/patches/patch-configure b/virtualbox/patches/patch-configure
index 388e4c2..4ab5b5e 100644
--- a/virtualbox/patches/patch-configure
+++ b/virtualbox/patches/patch-configure
@@ -11,7 +11,15 @@ $NetBSD$
    sunos)
      OS='solaris'
      ;;
-@@ -134,19 +136,12 @@ LIBVNCSERVER="-lvncserver"
+@@ -116,6 +118,7 @@ MKISOFS="mkisofs"
+ INCCRYPTO=""
+ LIBCRYPTO="-lssl -lcrypto"
+ LIBPTHREAD="-lpthread"
++INCCAP=""
+ LIBCAP="-lcap"
+ GSOAP=""
+ GSOAP_IMPORT=""
+@@ -134,19 +137,12 @@ LIBVNCSERVER="-lvncserver"
  INCDEVMAPPER=""
  LIBDEVMAPPER="-ldevmapper"
  CXX_FLAGS=""
@@ -37,7 +45,7 @@ $NetBSD$
  INCVPX=""
  LIBVPX="-lvpx"
  PKGCONFIG="`which_wrapper pkg-config`"
-@@ -438,7 +433,7 @@ check_gcc()
+@@ -438,7 +434,7 @@ check_gcc()
               -o \( $cc_maj -eq 5 -a $cc_min -gt 3 \) \
               -o $cc_maj -gt 5 ]; then
          log_failure "gcc version $cc_maj.$cc_min found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<10 or gcc 5.3"
@@ -46,7 +54,7 @@ $NetBSD$
        else
          log_success "found version $cc_ver"
        fi
-@@ -529,6 +524,7 @@ check_open_watcom()
+@@ -529,6 +525,7 @@ check_open_watcom()
      "darwin")   wc_bin="binosx";;  # ??
      "dos")      wc_bin="binw";;
      "freebsd")  wc_bin="binfbsd";; # ??
@@ -54,7 +62,7 @@ $NetBSD$
      "linux")    wc_bin="binl";;
      "solaris")  wc_bin="binsol";;  # ??
      "os2")      wc_bin="binp";;
-@@ -914,7 +910,7 @@ EOF
+@@ -914,7 +911,7 @@ EOF
    [ -n "$INCZ" ] && I_INCZ=`prefix_I "$INCZ"`
    if test_compile "$LIBZ $I_INCZ" zlib zlib; then
      if test_execute; then
@@ -63,7 +71,7 @@ $NetBSD$
        cnf_append " SDK_VBOX_ZLIB_LIBS" "`strip_l "$LIBZ"`"
        cnf_append " SDK_VBOX_ZLIB_INCS" "$INCZ"
        echo "endif" >> $CNF
-@@ -1723,9 +1719,9 @@ EOF
+@@ -1723,9 +1720,9 @@ EOF
    echo "compiling the following source file:" >> $LOG
    cat $ODIR.tmp_src.c >> $LOG
    echo "using the following command line:" >> $LOG
@@ -75,7 +83,16 @@ $NetBSD$
        -I$LINUX/include/generated/uapi >> $LOG 2>&1
    if [ $? -ne 0 ]; then
      echo
-@@ -1932,20 +1928,16 @@ extern "C" int main(void)
+@@ -1854,7 +1851,7 @@ extern "C" int main(void)
+   return 0;
+ }
+ EOF
+-  if test_compile $LIBCAP libcap libcap; then
++  if test_compile $INCCAP $LIBCAP libcap libcap; then
+     if test_execute; then
+       log_success "found"
+     fi
+@@ -1932,20 +1929,16 @@ extern "C" int main(void)
  }
  EOF
    found=
@@ -100,7 +117,7 @@ $NetBSD$
          if [ $? -eq 0 ]; then
            found=1
            break
-@@ -2287,7 +2279,7 @@ EOF
+@@ -2287,7 +2280,7 @@ EOF
  [ $OSE          -eq 0 ] && echo "  --disable-extpack        don't build the extpack"
  [ $WITH_DOCS    -eq 1 ] && echo "  --disable-docs           don't build the documentation"
  [ $WITH_LIBVPX  -eq 1 ] && echo "  --disable-libvpx         don't use libvpx for video capturing"
@@ -109,7 +126,7 @@ $NetBSD$
  cat << EOF
    --disable-udptunnel      disable UDP tunnel networking
    --disable-devmapper      disable device mapper library access
-@@ -2744,7 +2736,7 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
+@@ -2744,7 +2737,7 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
    [ $WITH_JAVA   -eq 1 ] && check_java
  
    # PulseAudio
@@ -118,7 +135,7 @@ $NetBSD$
      if [ $WITH_PULSE -eq 1 ]; then
        check_pulse
      elif [ $WITH_PULSE -eq 0 ]; then
-@@ -2803,7 +2795,7 @@ if [ $ONLY_ADDITIONS -eq 0 -a $WITH_UDPT
+@@ -2803,7 +2796,7 @@ if [ $ONLY_ADDITIONS -eq 0 -a $WITH_UDPT
  fi
  
  # VDE