Update to 5.1.6.

12 files changed, 32 insertions, 101 deletions

diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 7bb6da422b23..f71d1aa0988d 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-PORTVERSION=	5.1.4
+PORTVERSION=	5.1.6
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX=	-additions
@@ -76,9 +76,6 @@ MAKE_ARGS+=	DEBUG_FLAGS="-O1 -g"
 .endif
 
 .if ${PORT_OPTIONS:MOPENGL}
-PKGPOSTINSTALL=		${WRKDIR}/pkg-post-install
-PKGPREDEINSTALL=	${WRKDIR}/pkg-pre-deinstall
-SUB_FILES=	pkg-post-install pkg-pre-deinstall
 USE_XORG=	xcomposite xdamage xfixes
 USE_GL=		gl
 VBOX_LIBS=	VBoxEGL.so \
@@ -208,6 +205,8 @@ do-install:
 .endif
 
 .if ${PORT_OPTIONS:MOPENGL}
+	${INSTALL_DATA} ${FILESDIR}/vboxvideo.conf \
+	    ${STAGEDIR}${PREFIX}/etc/libmap.d/
 	${INSTALL_DATA} ${VBOX_LIBS:S|^|${VBOX_BIN}/|} \
 	    ${STAGEDIR}${PREFIX}/lib/
 .endif
diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo
index 9cd349782987..7c54f28d795b 100644
--- a/emulators/virtualbox-ose-additions/distinfo
+++ b/emulators/virtualbox-ose-additions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472243715
-SHA256 (VirtualBox-5.1.4.tar.bz2) = b9a14a7771059c55c44b97f8d4eef9bea84544f3e215e0caa563bc35e2f16aaf
-SIZE (VirtualBox-5.1.4.tar.bz2) = 114642581
+TIMESTAMP = 1473714391
+SHA256 (VirtualBox-5.1.6.tar.bz2) = 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911
+SIZE (VirtualBox-5.1.6.tar.bz2) = 114669517
diff --git a/emulators/virtualbox-ose-additions/files/pkg-post-install.in b/emulators/virtualbox-ose-additions/files/pkg-post-install.in
deleted file mode 100644
index 568bf738097b..000000000000
--- a/emulators/virtualbox-ose-additions/files/pkg-post-install.in
+++ /dev/null
@@ -1,6 +0,0 @@
-/bin/rm -f %%PREFIX%%/lib/libEGL.so*
-/bin/ln -f %%PREFIX%%/lib/VBoxEGL.so %%PREFIX%%/lib/libEGL.so
-/bin/ln -f %%PREFIX%%/lib/VBoxEGL.so %%PREFIX%%/lib/libEGL.so.1
-/bin/rm -f %%PREFIX%%/lib/libGL.so*
-/bin/ln -f %%PREFIX%%/lib/VBoxOGL.so %%PREFIX%%/lib/libGL.so
-/bin/ln -f %%PREFIX%%/lib/VBoxOGL.so %%PREFIX%%/lib/libGL.so.1
diff --git a/emulators/virtualbox-ose-additions/files/pkg-pre-deinstall.in b/emulators/virtualbox-ose-additions/files/pkg-pre-deinstall.in
deleted file mode 100644
index 2fe0b996779f..000000000000
--- a/emulators/virtualbox-ose-additions/files/pkg-pre-deinstall.in
+++ /dev/null
@@ -1,18 +0,0 @@
-/bin/rm -f %%PREFIX%%/lib/libEGL.so*
-if [ -f %%PREFIX%%/lib/.nvidia/libEGL.so.1 ]; then
-	/bin/ln -f %%PREFIX%%/lib/.nvidia/libEGL.so.1 %%PREFIX%%/lib/libEGL.so
-	/bin/ln -f %%PREFIX%%/lib/.nvidia/libEGL.so.1 %%PREFIX%%/lib/libEGL.so.1
-elif [ -f %%PREFIX%%/lib/.mesa/libEGL.so.1.0.0 ]; then
-	/bin/ln -f %%PREFIX%%/lib/.mesa/libEGL.so.1.0.0 %%PREFIX%%/lib/libEGL.so
-	/bin/ln -f %%PREFIX%%/lib/.mesa/libEGL.so.1.0.0 %%PREFIX%%/lib/libEGL.so.1
-	/bin/ln -f %%PREFIX%%/lib/.mesa/libEGL.so.1.0.0 %%PREFIX%%/lib/libEGL.so.1.0.0
-fi
-/bin/rm -f %%PREFIX%%/lib/libGL.so*
-if [ -f %%PREFIX%%/lib/.nvidia/libGL.so.1 ]; then
-	/bin/ln -f %%PREFIX%%/lib/.nvidia/libGL.so.1 %%PREFIX%%/lib/libGL.so
-	/bin/ln -f %%PREFIX%%/lib/.nvidia/libGL.so.1 %%PREFIX%%/lib/libGL.so.1
-elif [ -f %%PREFIX%%/lib/.mesa/libGL.so.1.2.0 ]; then
-	/bin/ln -f %%PREFIX%%/lib/.mesa/libGL.so.1.2.0 %%PREFIX%%/lib/libGL.so
-	/bin/ln -f %%PREFIX%%/lib/.mesa/libGL.so.1.2.0 %%PREFIX%%/lib/libGL.so.1
-	/bin/ln -f %%PREFIX%%/lib/.mesa/libGL.so.1.2.0 %%PREFIX%%/lib/libGL.so.1.2.0
-fi
diff --git a/emulators/virtualbox-ose-additions/files/vboxvideo.conf b/emulators/virtualbox-ose-additions/files/vboxvideo.conf
new file mode 100644
index 000000000000..97f7c85b6398
--- /dev/null
+++ b/emulators/virtualbox-ose-additions/files/vboxvideo.conf
@@ -0,0 +1,2 @@
+libEGL.so.1	VBoxEGL.so
+libGL.so.1	VBoxOGL.so
diff --git a/emulators/virtualbox-ose-additions/pkg-plist b/emulators/virtualbox-ose-additions/pkg-plist
index 9fdd824c62bc..0f6bcedb7e91 100644
--- a/emulators/virtualbox-ose-additions/pkg-plist
+++ b/emulators/virtualbox-ose-additions/pkg-plist
@@ -1,5 +1,6 @@
 %%X11%%bin/VBoxClient
 %%X11%%bin/VBoxClient-all
+%%OPENGL%%etc/libmap.d/vboxvideo.conf
 %%X11%%etc/xdg/autostart/vboxclient.desktop
 %%OPENGL%%lib/VBoxEGL.so
 %%OPENGL%%lib/VBoxOGL.so
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index b19b9b373ea7..3da01d395b77 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-PORTVERSION=	5.1.4
+PORTVERSION=	5.1.6
 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 9cd349782987..7c54f28d795b 100644
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472243715
-SHA256 (VirtualBox-5.1.4.tar.bz2) = b9a14a7771059c55c44b97f8d4eef9bea84544f3e215e0caa563bc35e2f16aaf
-SIZE (VirtualBox-5.1.4.tar.bz2) = 114642581
+TIMESTAMP = 1473714391
+SHA256 (VirtualBox-5.1.6.tar.bz2) = 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911
+SIZE (VirtualBox-5.1.6.tar.bz2) = 114669517
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 965c09c12b45..8f5a34f39d17 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-PORTVERSION=	5.1.4
+PORTVERSION=	5.1.6
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
 DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
@@ -280,12 +280,6 @@ post-patch:
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_VALIDATIONKIT =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
-.if empty(PORT_OPTIONS:MALSA)
-	@${ECHO} 'VBOX_WITH_AUDIO_ALSA =' >> ${WRKSRC}/LocalConfig.kmk
-.endif
-.if empty(PORT_OPTIONS:MPULSEAUDIO)
-	@${ECHO} 'VBOX_WITH_AUDIO_PULSE =' >> ${WRKSRC}/LocalConfig.kmk
-.endif
 .if ${PORT_OPTIONS:MQT4}
 	@${ECHO} 'TOOL_QT4_BIN_SUFF = -qt4' >> ${WRKSRC}/LocalConfig.kmk
 .endif
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index 26883ddcd6fa..95a07bfad3c0 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1472243715
-SHA256 (VirtualBox-5.1.4.tar.bz2) = b9a14a7771059c55c44b97f8d4eef9bea84544f3e215e0caa563bc35e2f16aaf
-SIZE (VirtualBox-5.1.4.tar.bz2) = 114642581
-SHA256 (VBoxGuestAdditions_5.1.4.iso) = e385b698338003595f6cdeee7b631ec6713058ba1227d1f2a1da342bdf741982
-SIZE (VBoxGuestAdditions_5.1.4.iso) = 59262976
+TIMESTAMP = 1473714391
+SHA256 (VirtualBox-5.1.6.tar.bz2) = 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911
+SIZE (VirtualBox-5.1.6.tar.bz2) = 114669517
+SHA256 (VBoxGuestAdditions_5.1.6.iso) = cbcf9b9b1000e09911b3d20e1efe529aef8a945cf130f6abffc14a39522cc1ed
+SIZE (VBoxGuestAdditions_5.1.6.iso) = 59258880
diff --git a/emulators/virtualbox-ose/files/patch-configure b/emulators/virtualbox-ose/files/patch-configure
index bfdf2a2ae812..82994e000506 100644
--- a/emulators/virtualbox-ose/files/patch-configure
+++ b/emulators/virtualbox-ose/files/patch-configure
@@ -1,4 +1,4 @@
---- configure.orig	2016-08-16 19:55:20 UTC
+--- configure.orig	2016-09-12 16:11:24 UTC
 +++ configure
 @@ -140,10 +140,14 @@ CXX_FLAGS=""
  if [ "$OS" = "freebsd" ]; then
@@ -54,7 +54,7 @@
        ;;
      --with-ow-dir=*)
        WATCOM=`echo $option | cut -d'=' -f2`
-@@ -2942,8 +2949,15 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
+@@ -2944,13 +2951,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
    [ $WITH_PYTHON -eq 1 ] && check_python
    [ $WITH_JAVA   -eq 1 ] && check_java
  
@@ -63,22 +63,27 @@
 +    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" ""
++      cnf_append "VBOX_WITH_AUDIO_ALSA" ""
 +    fi
      if [ $WITH_PULSE -eq 1 ]; then
        check_pulse
      elif [ $WITH_PULSE -eq 0 ]; then
-@@ -2965,14 +2979,6 @@ if [ "$OS" = "linux" ]; then
+       cnf_append "VBOX_WITH_AUDIO_PULSE" ""
+     fi
++    if [ $WITH_DBUS -eq 0 ]; then
++      cnf_append "VBOX_WITH_DBUS" ""
++    fi
+  fi
+ fi
+ 
+@@ -2967,14 +2981,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" ""
+-      cnf_append "VBOX_WITH_AUDIO_ALSA" ""
 -    fi
 -    if [ $WITH_DBUS -eq 0 ]; then
 -      cnf_append "VBOX_WITH_DBUS" ""
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp
deleted file mode 100644
index ccaaea1fb88c..000000000000
--- a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/VBox/Devices/Audio/DrvHostOSSAudio.cpp.orig	2016-08-16 19:57:22 UTC
-+++ src/VBox/Devices/Audio/DrvHostOSSAudio.cpp
-@@ -254,14 +254,14 @@ static int ossStreamClose(int *phFile)
- }
- 
- 
--static int ossStreamOpen(const char *pszDev, int fOpen, POSSAUDIOSTREAMCFG pReq, POSSAUDIOSTREAMCFG pObt, int *phFile)
-+static int ossStreamOpen(const char *pszDev, bool fIn, POSSAUDIOSTREAMCFG pReq, POSSAUDIOSTREAMCFG pObt, int *phFile)
- {
-     int rc;
- 
-     int hFile = -1;
-     do
-     {
--        hFile = open(pszDev, fOpen);
-+        hFile = open(pszDev, (fIn ? O_RDONLY : O_WRONLY) | O_NONBLOCK);
-         if (hFile == -1)
-         {
-             LogRel(("OSS: Failed to open %s: %s (%d)\n", pszDev, strerror(errno), errno));
-@@ -312,7 +312,7 @@ static int ossStreamOpen(const char *psz
-         }
- 
-         audio_buf_info abinfo;
--        if (ioctl(hFile, (fOpen & O_RDONLY) ? SNDCTL_DSP_GETISPACE : SNDCTL_DSP_GETOSPACE, &abinfo))
-+        if (ioctl(hFile, fIn ? SNDCTL_DSP_GETISPACE : SNDCTL_DSP_GETOSPACE, &abinfo))
-         {
-             LogRel(("OSS: Failed to retrieve buffer length: %s (%d)\n", strerror(errno), errno));
-             rc = RTErrConvertFromErrno(errno);
-@@ -670,7 +670,7 @@ static int ossCreateStreamIn(PPDMAUDIOST
-         reqStream.cFragments     = s_OSSConf.nfrags;
-         reqStream.cbFragmentSize = s_OSSConf.fragsize;
- 
--        rc = ossStreamOpen(s_OSSConf.devpath_in, O_RDONLY | O_NONBLOCK, &reqStream, &obtStream, &hFile);
-+        rc = ossStreamOpen(s_OSSConf.devpath_in, true /* fIn */, &reqStream, &obtStream, &hFile);
-         if (RT_SUCCESS(rc))
-         {
-             pCfgAcq->enmFormat     = obtStream.enmFormat;
-@@ -742,7 +742,7 @@ static int ossCreateStreamOut(PPDMAUDIOS
-         reqStream.cFragments     = s_OSSConf.nfrags;
-         reqStream.cbFragmentSize = s_OSSConf.fragsize;
- 
--        rc = ossStreamOpen(s_OSSConf.devpath_out, O_WRONLY | O_NONBLOCK, &reqStream, &obtStream, &hFile);
-+        rc = ossStreamOpen(s_OSSConf.devpath_out, false /* fIn */, &reqStream, &obtStream, &hFile);
-         if (RT_SUCCESS(rc))
-         {
-             pCfgAcq->enmFormat     = obtStream.enmFormat;