git: 5d54155d9f44 - 2021Q2 - emulators/virtualbox-ose: Fix build with ports provided SSL library on 11.x

[Guido Falsi]

The branch 2021Q2 has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5d54155d9f447a031acb89ee5ba038bf8520d368

commit 5d54155d9f447a031acb89ee5ba038bf8520d368
Author:     Guido Falsi <madpilot at FreeBSD.org>
AuthorDate: 2021-04-11 14:55:35 +0000
Commit:     Guido Falsi <madpilot at FreeBSD.org>
CommitDate: 2021-04-11 15:08:10 +0000

    emulators/virtualbox-ose: Fix build with ports provided SSL library on 11.x
    
    Due to a compiler/linker command line ordering issue, VirtualBox 6
    fails to compile on 11.x when a ports provided SSL library is
    used.
    
    Fix the order of -L options passed to the linker where the ssl
    library is used.
    
    Thanks to  Chad Jacob Milios <milios at ccsys.com> for suggesting the
    correct fix.
    
    PR:             254295
    Submitted by:   russo at bogodyn.org
    MFH:            2021Q2
    
    (cherry picked from commit 423f3dfd755f7c98bf2d28083aac19783cf4e9a6)
---
 .../files/patch-src_VBox_RDP_client-1.8.4_Makefile.kmk      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_RDP_client-1.8.4_Makefile.kmk b/emulators/virtualbox-ose/files/patch-src_VBox_RDP_client-1.8.4_Makefile.kmk
new file mode 100644
index 000000000000..c23a6e6fbb16
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src_VBox_RDP_client-1.8.4_Makefile.kmk
@@ -0,0 +1,13 @@
+--- src/VBox/RDP/client-1.8.4/Makefile.kmk.orig	2021-01-07 15:41:47 UTC
++++ src/VBox/RDP/client-1.8.4/Makefile.kmk
+@@ -117,8 +117,8 @@ rdesktop-vrdp_SOURCES.solaris = \
+ rdesktop-vrdp_SOURCES.freebsd = \
+ 	rdpsnd_oss.c
+ rdesktop-vrdp_LIBPATH = \
+-	/usr/lib \
+-	$(VBOX_LIBPATH_X11)
++	$(VBOX_LIBPATH_X11)/lib \
++	/usr/lib
+ rdesktop-vrdp_LIBS = \
+ 	X11 \
+ 	$(LIB_RUNTIME)