- Update to 4.3.20.

- Fix MANUAL option. [1]

PR:		195272 [1]

9 files changed, 119 insertions, 85 deletions

diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index a415eddaa125..63d6f11e0f27 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.3.18
+DISTVERSION=	4.3.20
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo
index 49fa09753395..0e0b4ac66e32 100644
--- a/emulators/virtualbox-ose-additions/distinfo
+++ b/emulators/virtualbox-ose-additions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.3.18.tar.bz2) = 9798acbc78b2645f2a02446ef6be181ede1a377792007af2a3280c962edc24cb
-SIZE (VirtualBox-4.3.18.tar.bz2) = 98022191
+SHA256 (VirtualBox-4.3.20.tar.bz2) = 1484f8e9993ec4fe3892c5165db84d238713d2506e147ed8236541ece642e965
+SIZE (VirtualBox-4.3.20.tar.bz2) = 100184338
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index ebc3c3ad1fb5..4be1ecaa63e2 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.3.18
+DISTVERSION=	4.3.20
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
diff --git a/emulators/virtualbox-ose-kmod/distinfo b/emulators/virtualbox-ose-kmod/distinfo
index 49fa09753395..0e0b4ac66e32 100644
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.3.18.tar.bz2) = 9798acbc78b2645f2a02446ef6be181ede1a377792007af2a3280c962edc24cb
-SIZE (VirtualBox-4.3.18.tar.bz2) = 98022191
+SHA256 (VirtualBox-4.3.20.tar.bz2) = 1484f8e9993ec4fe3892c5165db84d238713d2506e147ed8236541ece642e965
+SIZE (VirtualBox-4.3.20.tar.bz2) = 100184338
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 5ce640d47bf4..1ba2d9bff2fb 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.3.18
+DISTVERSION=	4.3.20
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@@ -128,7 +128,7 @@ RESTRICTED_FILES=	${GUESTADDITIONS}
 .endif
 
 .if ${PORT_OPTIONS:MMANUAL}
-USE_TEX=	dvipsk:build formats:build texlive
+USE_TEX=	dvipsk:build formats:build
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index a803e3d7ca0f..7dbda79bc860 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,4 +1,4 @@
-SHA256 (VirtualBox-4.3.18.tar.bz2) = 9798acbc78b2645f2a02446ef6be181ede1a377792007af2a3280c962edc24cb
-SIZE (VirtualBox-4.3.18.tar.bz2) = 98022191
-SHA256 (VBoxGuestAdditions_4.3.18.iso) = e5b425ec4f6a62523855c3cbd3975d17f962f27df093d403eab27c0e7f71464a
-SIZE (VBoxGuestAdditions_4.3.18.iso) = 58298368
+SHA256 (VirtualBox-4.3.20.tar.bz2) = 1484f8e9993ec4fe3892c5165db84d238713d2506e147ed8236541ece642e965
+SIZE (VirtualBox-4.3.20.tar.bz2) = 100184338
+SHA256 (VBoxGuestAdditions_4.3.20.iso) = 9ab48f44ac26a6deb374cb5fe6bad103bbf4fdf5186140e2d40ebe48bd01f3ea
+SIZE (VBoxGuestAdditions_4.3.20.iso) = 58343424
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
index 3ca631699f11..4f5ea776a0a7 100644
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
@@ -1,5 +1,5 @@
---- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig	2014-09-14 16:52:56.396443385 +0400
-+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2014-09-14 16:57:44.198422874 +0400
+--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig	2014-11-24 19:16:07.000000000 -0500
++++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2014-11-24 19:22:38.000000000 -0500
 @@ -36,7 +36,7 @@
  vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13
  vboxvideo_15_DEFS := \
@@ -78,15 +78,7 @@
  vboxvideo_drv_19_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0
-@@ -287,11 +303,19 @@
- vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
-+if1of ($(KBUILD_TARGET), freebsd)
-+ vboxvideo_drv_19_DEFS += \
-+ 	VBOX_DRI_OLD
-+endif
- vboxvideo_drv_110_INCS = \
+@@ -291,7 +307,11 @@
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0
  vboxvideo_drv_110_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
@@ -99,15 +91,7 @@
  
  
  #
-@@ -301,11 +325,15 @@
- vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
-+if1of ($(KBUILD_TARGET), freebsd)
-+ vboxvideo_drv_111_DEFS += \
-+ 	VBOX_DRI_OLD
-+endif
- vboxvideo_drv_111_INCS = \
+@@ -305,7 +325,7 @@
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0
  vboxvideo_drv_111_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
@@ -116,15 +100,7 @@
  
  
  #
-@@ -315,11 +343,15 @@
- vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
-+if1of ($(KBUILD_TARGET), freebsd)
-+ vboxvideo_drv_112_DEFS += \
-+ 	VBOX_DRI_OLD
-+endif
- vboxvideo_drv_112_INCS = \
+@@ -319,7 +339,7 @@
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0
  vboxvideo_drv_112_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
@@ -133,15 +109,7 @@
  
  
  #
-@@ -329,11 +361,15 @@
- vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101300000
-+if1of ($(KBUILD_TARGET), freebsd)
-+ vboxvideo_drv_113_DEFS += \
-+ 	VBOX_DRI_OLD
-+endif
- vboxvideo_drv_113_INCS = \
+@@ -333,7 +353,7 @@
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.13.0
  vboxvideo_drv_113_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
@@ -150,15 +118,7 @@
  
  
  #
-@@ -343,11 +379,15 @@
- vboxvideo_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_114_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101400000
-+if1of ($(KBUILD_TARGET), freebsd)
-+ vboxvideo_drv_114_DEFS += \
-+ 	VBOX_DRI_OLD
-+endif
- vboxvideo_drv_114_INCS = \
+@@ -347,7 +367,7 @@
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.14.0
  vboxvideo_drv_114_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
@@ -167,15 +127,7 @@
  
  
  #
-@@ -357,11 +397,15 @@
- vboxvideo_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_115_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101500000
-+if1of ($(KBUILD_TARGET), freebsd)
-+ vboxvideo_drv_115_DEFS += \
-+ 	VBOX_DRI_OLD
-+endif
- vboxvideo_drv_115_INCS = \
+@@ -361,7 +381,7 @@
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.15.0
  vboxvideo_drv_115_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
@@ -184,14 +136,12 @@
  
  
  #
-@@ -371,6 +415,10 @@
- vboxvideo_drv_116_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_116_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_116_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101600000
-+if1of ($(KBUILD_TARGET), freebsd)
-+ vboxvideo_drv_116_DEFS += \
-+ 	VBOX_DRI_OLD
-+endif
- vboxvideo_drv_116_INCS = \
+@@ -375,7 +395,7 @@
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.16.0
+ vboxvideo_drv_116_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
+-vboxvideo_drv_116_SOURCES := $(vboxvideo_drv_17_SOURCES)
++vboxvideo_drv_116_SOURCES := $(vboxvideo_drv_110_SOURCES)
+ 
+ 
+ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp
index 1616ee2f52a2..98547e544c6d 100644
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp
@@ -1,5 +1,5 @@
---- src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp.orig	2014-09-09 23:54:12.000000000 +0400
-+++ src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp	2014-09-11 00:40:37.313435496 +0400
+--- src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp.orig	2014-10-11 08:06:56.000000000 -0400
++++ src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp	2014-11-18 15:10:55.000000000 -0500
 @@ -52,6 +52,7 @@
  #include <iprt/asm.h>
  #include <iprt/string.h>
@@ -18,16 +18,44 @@
      bool                   fCancelling;
      /** Flag whether initialised or not */
      bool                   fInit;
-+    /** Pipe handle for waiking up - writing end. */
++    /** Pipe handle for waking up - writing end. */
 +    RTPIPE                 hPipeWakeupW;
-+    /** Pipe handle for waiking up - reading end. */
++    /** Pipe handle for waking up - reading end. */
 +    RTPIPE                 hPipeWakeupR;
 +    /** Software endpoint structures */
 +    USBENDPOINTFBSD        aSwEndpoint[USBFBSD_MAXENDPOINTS];
      /** Kernel endpoint structures */
      struct usb_fs_endpoint aHwEndpoint[USBFBSD_MAXENDPOINTS];
  } USBPROXYDEVFBSD, *PUSBPROXYDEVFBSD;
-@@ -453,7 +458,6 @@
+@@ -383,10 +388,17 @@
+         rc = usbProxyFreeBSDFsInit(pProxyDev);
+         if (RT_SUCCESS(rc))
+         {
+-            LogFlow(("usbProxyFreeBSDOpen(%p, %s): returns successfully hFile=%RTfile iActiveCfg=%d\n",
+-                     pProxyDev, pszAddress, pDevFBSD->hFile, pProxyDev->iActiveCfg));
++            /*
++             * Create wakeup pipe.
++             */
++            rc = RTPipeCreate(&pDevFBSD->hPipeWakeupR, &pDevFBSD->hPipeWakeupW, 0);
++            if (RT_SUCCESS(rc))
++            {
++                LogFlow(("usbProxyFreeBSDOpen(%p, %s): returns successfully hFile=%RTfile iActiveCfg=%d\n",
++                         pProxyDev, pszAddress, pDevFBSD->hFile, pProxyDev->iActiveCfg));
+ 
+-            return VINF_SUCCESS;
++                return VINF_SUCCESS;
++            }
+         }
+ 
+         RTFileClose(hFile);
+@@ -449,11 +461,13 @@
+ 
+     usbProxyFreeBSDFsUnInit(pProxyDev);
+ 
++    RTPipeClose(pDevFBSD->hPipeWakeupR);
++    RTPipeClose(pDevFBSD->hPipeWakeupW);
++
+     RTFileClose(pDevFBSD->hFile);
      pDevFBSD->hFile = NIL_RTFILE;
  
      RTMemFree(pDevFBSD);
@@ -35,7 +63,64 @@
  
      LogFlow(("usbProxyFreeBSDClose: returns\n"));
  }
-@@ -984,6 +988,16 @@
+@@ -822,7 +836,7 @@
+     PUSBENDPOINTFBSD pEndpointFBSD;
+     PVUSBURB pUrb;
+     struct usb_fs_complete UsbFsComplete;
+-    struct pollfd PollFd;
++    struct pollfd pfd[2];
+     int rc;
+ 
+     LogFlow(("usbProxyFreeBSDUrbReap: pProxyDev=%p, cMillies=%u\n",
+@@ -948,21 +962,34 @@
+     }
+     else if (cMillies && rc == VERR_RESOURCE_BUSY)
+     {
+-        /* Poll for finished transfers */
+-        PollFd.fd = RTFileToNative(pDevFBSD->hFile);
+-        PollFd.events = POLLIN | POLLRDNORM;
+-        PollFd.revents = 0;
+-
+-        rc = poll(&PollFd, 1, (cMillies == RT_INDEFINITE_WAIT) ? INFTIM : cMillies);
+-        if (rc >= 1)
+-        {
+-            goto repeat;
+-        }
+-        else
++        for (;;)
+         {
+-            LogFlow(("usbProxyFreeBSDUrbReap: "
+-                     "poll returned rc=%d\n", rc));
++            pfd[0].fd = RTFileToNative(pDevFBSD->hFile);
++            pfd[0].events = POLLIN | POLLRDNORM;
++            pfd[0].revents = 0;
++
++            pfd[1].fd = RTPipeToNative(pDevFBSD->hPipeWakeupR);
++            pfd[1].events = POLLIN | POLLRDNORM;
++            pfd[1].revents = 0;
++
++            rc = poll(pfd, 2, (cMillies == RT_INDEFINITE_WAIT) ? INFTIM : cMillies);
++            if (rc > 0)
++            {
++                if (pfd[1].revents & POLLIN)
++                {
++                    /* Got woken up, drain pipe. */
++                    uint8_t bRead;
++                    size_t cbIgnored = 0;
++                    RTPipeRead(pDevFBSD->hPipeWakeupR, &bRead, 1, &cbIgnored);
++                }
++                break;
++            }
++            if (rc == 0)
++                return NULL;
++            if (errno != EAGAIN)
++                return NULL;
+         }
++        goto repeat;
+     }
+     return pUrb;
+ }
+@@ -984,6 +1011,16 @@
      return usbProxyFreeBSDEndpointClose(pProxyDev, index);
  }
  
@@ -52,7 +137,7 @@
  /**
   * The FreeBSD USB Proxy Backend.
   */
-@@ -1005,6 +1019,7 @@
+@@ -1005,6 +1042,7 @@
      usbProxyFreeBSDUrbQueue,
      usbProxyFreeBSDUrbCancel,
      usbProxyFreeBSDUrbReap,
diff --git a/emulators/virtualbox-ose/pkg-plist b/emulators/virtualbox-ose/pkg-plist
index 04f40ea83c55..fd2ad6c21bc1 100644
--- a/emulators/virtualbox-ose/pkg-plist
+++ b/emulators/virtualbox-ose/pkg-plist
@@ -452,7 +452,6 @@ lib/virtualbox/components/VBoxXPCOMIPCC.so
 lib/virtualbox/components/VirtualBox_XPCOM.xpt
 %%QT4%%share/applications/virtualbox.desktop
 %%MANUAL%%%%DOCSDIR%%/UserManual.pdf
-%%MANUAL%%%%DOCSDIR%%/UserManual_fr_FR.pdf
 %%QT4%%share/pixmaps/VBox.png
 %%DATADIR%%/idl/VirtualBox_XPCOM.idl
 %%DATADIR%%/idl/ipcIClientObserver.idl