Attachment #251072 for bug #279257

Lines 46-51 CONFLICTS_INSTALL= virtualbox-ose \ Link Here

(-)b/emulators/virtualbox-ose-additions-legacy/Makefile (+5 lines)
46	virtualbox-ose-lite \	46	virtualbox-ose-lite \
47	virtualbox-ose-nox11	47	virtualbox-ose-nox11
48		48
		49	EXTRACT_AFTER_ARGS= --exclude tools/.x86 --exclude tools/.amd64 --exclude Firmware
49	PORTSCOUT= limit:^5\.	50	PORTSCOUT= limit:^5\.
50		51
51	OPTIONS_DEFINE= DBUS DEBUG X11	52	OPTIONS_DEFINE= DBUS DEBUG X11
Lines 131-136 post-patch: Link Here
131	${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk	132	${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
132	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk	133	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
133	.endif	134	.endif
		135	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400093
		136	@${REINPLACE_CMD} -e 's\|enum vtype\|enum enum_vtype_uint8\|g' \
		137	${WRKSRC}/src/VBox/Additions/freebsd/vboxvfs/vboxvfs*.[ch]
		138	.endif
134		139
135	post-patch-X11-on:	140	post-patch-X11-on:
136	@${ECHO_CMD} 'VBOX_USE_SYSTEM_XORG_HEADERS = 1' >> \	141	@${ECHO_CMD} 'VBOX_USE_SYSTEM_XORG_HEADERS = 1' >> \




PORTNAME=	virtualbox-ose
PORTVERSION=	5.2.44
PORTREVISION?=	19
CATEGORIES=	emulators
MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/:src \
		LOCAL/bofh/emulators/virtualbox-ose-legacy:docs

X11_USE=		SDL=sdl XORG=x11,xcursor,xext,xinerama,xmu,xorgproto,xt
X11_CONFIGURE_OFF=	--build-headless

ENV=
.export ENV

PLIST_SUB=	GUEST_VER=${PORTVERSION} \
		PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \
		VBOXGROUP=${VBOXGROUP}

.include <bsd.port.pre.mk>

.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && \
    (${OSVERSION} < 1302505 || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079))
# llvm before 15 included in old versions of the FreeBSD 13 and 14 fails to compile
# this legacy version of virtualbox-ose, force llvm 15 on those versions of the
# FreeBSD: PR#265539, 279257.
# and several versions of 14 where the llvm 15 is included: PR#265539.
# Keep possibility to define different llvm via VBOX_LLVM_VER in make.conf.
BUILD_DEPENDS+=	clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
CC=		clang${VBOX_LLVM_VER}

	    ${WRKSRC}/LocalConfig.kmk
	@${ECHO_CMD} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> \
	    ${WRKSRC}/LocalConfig.kmk
	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long \
		-Wno-dynamic-exception-spec -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION' >> \
	    ${WRKSRC}/LocalConfig.kmk
	@${REINPLACE_CMD} -E -e '/soap_socket_errno\(/s/(soap_socket_errno)(\([^)]+\))/\1/' \
		${WRKSRC}/src/VBox/Main/webservice/vboxweb.cpp
.else
	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wno-dynamic-exception-spec \
		-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION' >> \
	    ${WRKSRC}/LocalConfig.kmk
.endif
	@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
	    -e 's| -mpreferred-stack-boundary=2||' \

	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk \
	    ${WRKSRC}/src/VBox/Runtime/Makefile.kmk
	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
.endif
.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${ARCH} == i386
	@${ECHO_CMD} 'VBOX_FREEBSD = -fPIC' >> ${WRKSRC}/LocalConfig.kmk
.endif
	@${REINPLACE_CMD} -e 's|%%VBOX_DIR%%|${VBOX_DIR}|g' \
	    -e 's|%%VBOX_ETC%%|${VBOX_ETC}|g' \

	@${REINPLACE_CMD} \
	    -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \
	    ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400093
	@${REINPLACE_CMD} -e 's|enum vtype|enum enum_vtype_uint8|g' \
	    ${WRKSRC}/src/VBox/Additions/freebsd/vboxvfs/vboxvfs*.[ch]
.endif

do-build:
	cd ${WRKSRC} && ${SH} -c '. ${WRKSRC}/env.sh && \




--- src/VBox/Runtime/common/log/logcom.cpp
+++ src/VBox/Runtime/common/log/logcom.cpp
@@ -121,6 +121,6 @@ 
     for (pu8 = (const uint8_t *)pach; cb-- > 0; pu8++)
     {
-        register unsigned cMaxWait;
-        register uint8_t  u8;
+        unsigned cMaxWait;
+        uint8_t  u8;
 
         /* expand \n -> \r\n */
--- src/VBox/Runtime/common/table/avl_Range.cpp.h
+++ src/VBox/Runtime/common/table/avl_Range.cpp.h
@@ -36,7 +36,7 @@ 
  * @param     Key     The Key to find matching range for.
  */
-KAVL_DECL(PKAVLNODECORE) KAVL_FN(RangeGet)(PPKAVLNODECORE ppTree, register KAVLKEY Key)
+KAVL_DECL(PKAVLNODECORE) KAVL_FN(RangeGet)(PPKAVLNODECORE ppTree, KAVLKEY Key)
 {
-    register PKAVLNODECORE  pNode = KAVL_GET_POINTER_NULL(ppTree);
+    PKAVLNODECORE  pNode = KAVL_GET_POINTER_NULL(ppTree);
     if (pNode)
     {
--- src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h
+++ src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h
@@ -44,5 +44,5 @@ 
 KAVL_DECL(PKAVLNODECORE) KAVL_FN(GetBestFit)(PPKAVLNODECORE ppTree, KAVLKEY Key, bool fAbove)
 {
-    register PKAVLNODECORE  pNode = KAVL_GET_POINTER_NULL(ppTree);
+    PKAVLNODECORE  pNode = KAVL_GET_POINTER_NULL(ppTree);
     if (pNode)
     {
--- src/VBox/Runtime/common/table/avl_Get.cpp.h
+++ src/VBox/Runtime/common/table/avl_Get.cpp.h
@@ -38,5 +38,5 @@ 
 KAVL_DECL(PKAVLNODECORE) KAVL_FN(Get)(PPKAVLNODECORE ppTree, KAVLKEY Key)
 {
-    register PKAVLNODECORE  pNode = KAVL_GET_POINTER_NULL(ppTree);
+    PKAVLNODECORE  pNode = KAVL_GET_POINTER_NULL(ppTree);
 
     if (pNode)
--- src/VBox/Runtime/common/table/avl_Base.cpp.h
+++ src/VBox/Runtime/common/table/avl_Base.cpp.h
@@ -267,5 +267,5 @@ 
         else
         {
-            register unsigned char uchHeight = (unsigned char)(KMAX(uchLeftHeight, uchRightHeight) + 1);
+            unsigned char uchHeight = (unsigned char)(KMAX(uchLeftHeight, uchRightHeight) + 1);
             if (uchHeight == pNode->uchHeight)
                 break;
@@ -301,8 +301,8 @@ 
     KAVLSTACK               AVLStack;
     PPKAVLNODECORE          ppCurNode = ppTree;
-    register PKAVLNODECORE  pCurNode;
-    register KAVLKEY        Key = pNode->Key; NOREF(Key);
+    PKAVLNODECORE  pCurNode;
+    KAVLKEY        Key = pNode->Key; NOREF(Key);
 #ifdef KAVL_RANGE
-    register KAVLKEY        KeyLast = pNode->KeyLast; NOREF(KeyLast);
+    KAVLKEY        KeyLast = pNode->KeyLast; NOREF(KeyLast);
 #endif
 
@@ -401,5 +401,5 @@ 
     KAVLSTACK                AVLStack;
     PPKAVLNODECORE           ppDeleteNode = ppTree;
-    register PKAVLNODECORE   pDeleteNode;
+    PKAVLNODECORE   pDeleteNode;
 
     AVLStack.cEntries = 0;
@@ -428,5 +428,5 @@ 
         const unsigned          iStackEntry = AVLStack.cEntries;
         PPKAVLNODECORE          ppLeftLeast = &pDeleteNode->pLeft;
-        register PKAVLNODECORE  pLeftLeast = KAVL_GET_POINTER(ppLeftLeast);
+        PKAVLNODECORE  pLeftLeast = KAVL_GET_POINTER(ppLeftLeast);
 
         while (pLeftLeast->pRight != KAVL_NULL)
--- src/VBox/Runtime/common/string/utf-16.cpp
+++ src/VBox/Runtime/common/string/utf-16.cpp
@@ -195,5 +195,5 @@ 
 
 
-RTDECL(int) RTUtf16Cmp(register PCRTUTF16 pwsz1, register PCRTUTF16 pwsz2)
+RTDECL(int) RTUtf16Cmp(PCRTUTF16 pwsz1, PCRTUTF16 pwsz2)
 {
     if (pwsz1 == pwsz2)
@@ -206,6 +206,6 @@ 
     for (;;)
     {
-        register RTUTF16  wcs = *pwsz1;
-        register int     iDiff = wcs - *pwsz2;
+        RTUTF16  wcs = *pwsz1;
+        int     iDiff = wcs - *pwsz2;
         if (iDiff || !wcs)
             return iDiff;
--- src/VBox/Runtime/common/string/utf-16-case.cpp
+++ src/VBox/Runtime/common/string/utf-16-case.cpp
@@ -40,5 +40,5 @@ 
 
 
-RTDECL(int) RTUtf16ICmp(register PCRTUTF16 pwsz1, register PCRTUTF16 pwsz2)
+RTDECL(int) RTUtf16ICmp(PCRTUTF16 pwsz1, PCRTUTF16 pwsz2)
 {
     if (pwsz1 == pwsz2)
@@ -52,7 +52,7 @@ 
     for (;;)
     {
-        register RTUTF16  wc1 = *pwsz1;
-        register RTUTF16  wc2 = *pwsz2;
-        register int     iDiff = wc1 - wc2;
+        RTUTF16  wc1 = *pwsz1;
+        RTUTF16  wc2 = *pwsz2;
+        int     iDiff = wc1 - wc2;
         if (iDiff)
         {
@@ -107,5 +107,5 @@ 
 
 
-RTDECL(int) RTUtf16BigICmp(register PCRTUTF16 pwsz1, register PCRTUTF16 pwsz2)
+RTDECL(int) RTUtf16BigICmp(PCRTUTF16 pwsz1, PCRTUTF16 pwsz2)
 {
     if (pwsz1 == pwsz2)
@@ -119,7 +119,7 @@ 
     for (;;)
     {
-        register RTUTF16  wc1 = *pwsz1;
-        register RTUTF16  wc2 = *pwsz2;
-        register int     iDiff = wc1 - wc2;
+        RTUTF16  wc1 = *pwsz1;
+        RTUTF16  wc2 = *pwsz2;
+        int     iDiff = wc1 - wc2;
         if (iDiff)
         {
@@ -217,5 +217,5 @@ 
 
 
-RTDECL(int) RTUtf16NICmp(register PCRTUTF16 pwsz1, register PCRTUTF16 pwsz2, size_t cwcMax)
+RTDECL(int) RTUtf16NICmp(PCRTUTF16 pwsz1, PCRTUTF16 pwsz2, size_t cwcMax)
 {
     if (pwsz1 == pwsz2)
@@ -229,7 +229,7 @@ 
     while (cwcMax-- > 0)
     {
-        register RTUTF16  wc1 = *pwsz1;
-        register RTUTF16  wc2 = *pwsz2;
-        register int     iDiff = wc1 - wc2;
+        RTUTF16  wc1 = *pwsz1;
+        RTUTF16  wc2 = *pwsz2;
+        int     iDiff = wc1 - wc2;
         if (iDiff)
         {
@@ -290,5 +290,5 @@ 
 
 
-RTDECL(int) RTUtf16BigNICmp(register PCRTUTF16 pwsz1, register PCRTUTF16 pwsz2, size_t cwcMax)
+RTDECL(int) RTUtf16BigNICmp(PCRTUTF16 pwsz1, PCRTUTF16 pwsz2, size_t cwcMax)
 {
     if (pwsz1 == pwsz2)
@@ -302,7 +302,7 @@ 
     while (cwcMax-- > 0)
     {
-        register RTUTF16  wc1 = *pwsz1;
-        register RTUTF16  wc2 = *pwsz2;
-        register int     iDiff = wc1 - wc2;
+        RTUTF16  wc1 = *pwsz1;
+        RTUTF16  wc2 = *pwsz2;
+        int     iDiff = wc1 - wc2;
         if (iDiff)
         {
--- src/VBox/HostDrivers/VBoxUSB/USBLib.cpp.orig
+++ src/VBox/HostDrivers/VBoxUSB/USBLib.cpp
@@ -45,11 +45,11 @@ USBLIB_DECL(uint64_t) USBLibHashSerial(const char *psz
     if (!pszSerial)
         pszSerial = "";
 
-    register const uint8_t *pu8 = (const uint8_t *)pszSerial;
-    register uint64_t u64 = UINT64_C(14695981039346656037);
+    const uint8_t *pu8 = (const uint8_t *)pszSerial;
+    uint64_t u64 = UINT64_C(14695981039346656037);
     for (;;)
     {
-        register uint8_t u8 = *pu8;
+        uint8_t u8 = *pu8;
         if (!u8)
             break;
         u64 = (u64 * UINT64_C(1099511628211)) ^ u8;
--- src/VBox/Runtime/common/checksum/crc32-zlib.cpp.orig
+++ src/VBox/Runtime/common/checksum/crc32-zlib.cpp
@@ -51,7 +51,7 @@ static uint32_t rtCrc32ProcessTooBig(uint32_t uCRC32, 
     return uCRC32;
 }
 
-RTDECL(uint32_t) RTCrc32(const void *pv, register size_t cb)
+RTDECL(uint32_t) RTCrc32(const void *pv, size_t cb)
 {
     uint32_t uCrc = crc32(0, NULL, 0);
     if (RT_UNLIKELY((uInt)cb == cb))
--- src/VBox/Devices/Network/DevPCNet.cpp.orig
+++ src/VBox/Devices/Network/DevPCNet.cpp
@@ -1242,8 +1242,8 @@ static void pcnetSoftReset(PPCNETSTATE pThis)
  */
 static void pcnetUpdateIrq(PPCNETSTATE pThis)
 {
-    register int      iISR = 0;
-    register uint16_t csr0 = pThis->aCSR[0];
+    int      iISR = 0;
+    uint16_t csr0 = pThis->aCSR[0];
 
     csr0 &= ~0x0080; /* clear INTR */
 
--- src/VBox/VMM/VMMAll/PGMAllGst.h.orig
+++ src/VBox/VMM/VMMAll/PGMAllGst.h
@@ -92,7 +92,7 @@ DECLINLINE(int) PGM_GST_NAME(Walk)(PVMCPU pVCpu, RTGCP
         return PGM_GST_NAME(WalkReturnNotPresent)(pVCpu, pWalk, 8);
 # endif
 
-    uint32_t register fEffective = X86_PTE_RW | X86_PTE_US | X86_PTE_PWT | X86_PTE_PCD | X86_PTE_A | 1;
+    uint32_t fEffective = X86_PTE_RW | X86_PTE_US | X86_PTE_PWT | X86_PTE_PCD | X86_PTE_A | 1;
     {
 # if PGM_GST_TYPE == PGM_TYPE_AMD64
         /*
@@ -102,9 +102,9 @@ DECLINLINE(int) PGM_GST_NAME(Walk)(PVMCPU pVCpu, RTGCP
         if (RT_SUCCESS(rc)) { /* probable */ }
         else return PGM_GST_NAME(WalkReturnBadPhysAddr)(pVCpu, pWalk, 4, rc);
 
-        PX86PML4E register  pPml4e;
+        PX86PML4E pPml4e;
         pWalk->pPml4e  = pPml4e  = &pWalk->pPml4->a[(GCPtr >> X86_PML4_SHIFT) & X86_PML4_MASK];
-        X86PML4E  register  Pml4e;
+        X86PML4E  Pml4e;
         pWalk->Pml4e.u = Pml4e.u = pPml4e->u;
 
         if (Pml4e.n.u1Present) { /* probable */ }
@@ -131,9 +131,9 @@ DECLINLINE(int) PGM_GST_NAME(Walk)(PVMCPU pVCpu, RTGCP
     }
     {
 # if PGM_GST_TYPE == PGM_TYPE_AMD64 || PGM_GST_TYPE == PGM_TYPE_PAE
-        PX86PDPE register   pPdpe;
+        PX86PDPE pPdpe;
         pWalk->pPdpe  = pPdpe  = &pWalk->pPdpt->a[(GCPtr >> GST_PDPT_SHIFT) & GST_PDPT_MASK];
-        X86PDPE  register   Pdpe;
+        X86PDPE  Pdpe;
         pWalk->Pdpe.u = Pdpe.u = pPdpe->u;
 
         if (Pdpe.n.u1Present) { /* probable */ }
@@ -164,7 +164,7 @@ DECLINLINE(int) PGM_GST_NAME(Walk)(PVMCPU pVCpu, RTGCP
 # endif
     }
     {
-        PGSTPDE register    pPde;
+        PGSTPDE pPde;
         pWalk->pPde  = pPde  = &pWalk->pPd->a[(GCPtr >> GST_PD_SHIFT) & GST_PD_MASK];
         GSTPDE              Pde;
         pWalk->Pde.u = Pde.u = pPde->u;
@@ -221,9 +221,9 @@ DECLINLINE(int) PGM_GST_NAME(Walk)(PVMCPU pVCpu, RTGCP
         else return PGM_GST_NAME(WalkReturnBadPhysAddr)(pVCpu, pWalk, 1, rc);
     }
     {
-        PGSTPTE register    pPte;
+        PGSTPTE pPte;
         pWalk->pPte  = pPte  = &pWalk->pPt->a[(GCPtr >> GST_PT_SHIFT) & GST_PT_MASK];
-        GSTPTE  register    Pte;
+        GSTPTE  Pte;
         pWalk->Pte.u = Pte.u = pPte->u;
 
         if (Pte.n.u1Present) { /* probable */ }
--- include/VBox/HostServices/Service.h.orig
+++ include/VBox/HostServices/Service.h
@@ -358,11 +358,11 @@ class AbstractService: public RTCNonCopyable (public)
             else
             {
                 RT_GCC_NO_WARN_DEPRECATED_BEGIN
-                std::auto_ptr<AbstractService> apService;
+                std::unique_ptr<AbstractService> apService;
                 /* No exceptions may propagate outside. */
                 try
                 {
-                    apService = std::auto_ptr<AbstractService>(new T(pTable->pHelpers));
+                    apService = std::unique_ptr<AbstractService>(new T(pTable->pHelpers));
                 } catch (int rcThrown)
                 {
                     rc = rcThrown;
--- src/VBox/Main/src-server/PerformanceImpl.cpp.orig
+++ src/VBox/Main/src-server/PerformanceImpl.cpp
@@ -699,7 +699,7 @@ void PerformanceCollector::samplerCallback(uint64_t iT
      * Those should be destroyed now.
      */
     Log7Func(("{%p}: before remove_if: toBeCollected.size()=%d\n", this, toBeCollected.size()));
-    toBeCollected.remove_if(std::mem_fun(&pm::BaseMetric::isUnregistered));
+    toBeCollected.remove_if(std::mem_fn(&pm::BaseMetric::isUnregistered));
     Log7Func(("{%p}: after remove_if: toBeCollected.size()=%d\n", this, toBeCollected.size()));
     Log7Func(("{%p}: before remove_if: m.baseMetrics.size()=%d\n", this, m.baseMetrics.size()));
     for (it = m.baseMetrics.begin(); it != m.baseMetrics.end();)
@@ -720,7 +720,7 @@ void PerformanceCollector::samplerCallback(uint64_t iT
 
     /* Finally, collect the data */
     std::for_each(toBeCollected.begin(), toBeCollected.end(),
-                  std::mem_fun(&pm::BaseMetric::collect));
+                  std::mem_fn(&pm::BaseMetric::collect));
     Log4Func(("{%p}: LEAVE\n", this));
 }
 




 else
  # This is kind of bad, the returned string needs to be re-evaluated before use.
  # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
@@ -3068,6 +3069,9 @@ ifeq ($(KBUILD_TARGET_ARCH),x86)
   # (The '<=' operator is for prepending (kmk specific).)
   VBOX_GCC_OPT <= -march=i586
  endif
+ ifeq ($(KBUILD_TARGET),freebsd)
+  VBOX_GCC_OPT <= $(VBOX_FREEBSD)
+ endif
 endif
 
 
@@ -4218,6 +4219,7 @@ ifdef VBOX_WITH_RAW_MODE
  TEMPLATE_VBoxRc_TOOL                = $(VBOX_GCC32_TOOL)
  TEMPLATE_VBoxRc_CXXFLAGS            = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)

Lines 1-4 Link Here

(-)b/emulators/virtualbox-ose-nox11-legacy/Makefile (-1 / +1 lines)
1	PORTREVISION= 16	1	PORTREVISION= 17
2	PKGNAMESUFFIX= -nox11-legacy	2	PKGNAMESUFFIX= -nox11-legacy
3		3
4	OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS PULSEAUDIO	4	OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS PULSEAUDIO

Return to bug 279257

Lines 1-6 Link Here

(-)b/emulators/virtualbox-ose-legacy/Makefile (-10 / +18 lines)
1	PORTNAME= virtualbox-ose	1	PORTNAME= virtualbox-ose
2	PORTVERSION= 5.2.44	2	PORTVERSION= 5.2.44
3	PORTREVISION?= 18	3	PORTREVISION?= 19
4	CATEGORIES= emulators	4	CATEGORIES= emulators
5	MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/:src \	5	MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/:src \
6	LOCAL/bofh/emulators/virtualbox-ose-legacy:docs	6	LOCAL/bofh/emulators/virtualbox-ose-legacy:docs
Lines 110-118 X11_USES= sdl xorg Link Here
110	X11_USE= SDL=sdl XORG=x11,xcursor,xext,xinerama,xmu,xorgproto,xt	110	X11_USE= SDL=sdl XORG=x11,xcursor,xext,xinerama,xmu,xorgproto,xt
111	X11_CONFIGURE_OFF= --build-headless	111	X11_CONFIGURE_OFF= --build-headless
112		112
113	ENV=
114	.export ENV
115
116	PLIST_SUB= GUEST_VER=${PORTVERSION} \	113	PLIST_SUB= GUEST_VER=${PORTVERSION} \
117	PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \	114	PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \
118	VBOXGROUP=${VBOXGROUP}	115	VBOXGROUP=${VBOXGROUP}
Lines 194-204 KMK_FLAGS+= -j${MAKE_JOBS_NUMBER} Link Here
194	.include <bsd.port.pre.mk>	191	.include <bsd.port.pre.mk>
195		192
196	.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && \	193	.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && \
197	(${OSVERSION} < 1302505 \|\| (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079) \|\| \	194	(${OSVERSION} < 1302505 \|\| (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079))
198	${OSVERSION} >= 1400091)	195	# llvm before 15 included in old versions of the FreeBSD 13 and 14 fails to compile
199	# llvm 13, 14 and 16 included in FreeBSD fails to compile this legacy version of	196	# this legacy version of virtualbox-ose, force llvm 15 on those versions of the
200	# virtualbox-ose, force llvm 15 on all versions of the FreeBSD except lastest 13	197	# FreeBSD: PR#265539, 279257.
201	# and several versions of 14 where the llvm 15 is included: PR#265539.
202	# Keep possibility to define different llvm via VBOX_LLVM_VER in make.conf.	198	# Keep possibility to define different llvm via VBOX_LLVM_VER in make.conf.
203	BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}	199	BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
204	CC= clang${VBOX_LLVM_VER}	200	CC= clang${VBOX_LLVM_VER}
Lines 276-285 post-patch: Link Here
276	${WRKSRC}/LocalConfig.kmk	272	${WRKSRC}/LocalConfig.kmk
277	@${ECHO_CMD} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> \	273	@${ECHO_CMD} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> \
278	${WRKSRC}/LocalConfig.kmk	274	${WRKSRC}/LocalConfig.kmk
279	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \	275	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long \
		276	-Wno-dynamic-exception-spec -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION' >> \
280	${WRKSRC}/LocalConfig.kmk	277	${WRKSRC}/LocalConfig.kmk
281	@${REINPLACE_CMD} -E -e '/soap_socket_errno\(/s/(soap_socket_errno)(\([^)]+\))/\1/' \	278	@${REINPLACE_CMD} -E -e '/soap_socket_errno\(/s/(soap_socket_errno)(\([^)]+\))/\1/' \
282	${WRKSRC}/src/VBox/Main/webservice/vboxweb.cpp	279	${WRKSRC}/src/VBox/Main/webservice/vboxweb.cpp
		280	.else
		281	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wno-dynamic-exception-spec \
		282	-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION' >> \
		283	${WRKSRC}/LocalConfig.kmk
283	.endif	284	.endif
284	@${REINPLACE_CMD} -e 's\| -finline-limit=8000\|\|' \	285	@${REINPLACE_CMD} -e 's\| -finline-limit=8000\|\|' \
285	-e 's\| -mpreferred-stack-boundary=2\|\|' \	286	-e 's\| -mpreferred-stack-boundary=2\|\|' \
Lines 304-309 post-patch: Link Here
304	@${REINPLACE_CMD} -e 's\|iconv\|\|' ${WRKSRC}/Config.kmk \	305	@${REINPLACE_CMD} -e 's\|iconv\|\|' ${WRKSRC}/Config.kmk \
305	${WRKSRC}/src/VBox/Runtime/Makefile.kmk	306	${WRKSRC}/src/VBox/Runtime/Makefile.kmk
306	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk	307	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
		308	.endif
		309	.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${ARCH} == i386
		310	@${ECHO_CMD} 'VBOX_FREEBSD = -fPIC' >> ${WRKSRC}/LocalConfig.kmk
307	.endif	311	.endif
308	@${REINPLACE_CMD} -e 's\|%%VBOX_DIR%%\|${VBOX_DIR}\|g' \	312	@${REINPLACE_CMD} -e 's\|%%VBOX_DIR%%\|${VBOX_DIR}\|g' \
309	-e 's\|%%VBOX_ETC%%\|${VBOX_ETC}\|g' \	313	-e 's\|%%VBOX_ETC%%\|${VBOX_ETC}\|g' \
Lines 312-317 post-patch: Link Here
312	@${REINPLACE_CMD} \	316	@${REINPLACE_CMD} \
313	-e 's\|^versions =.*\|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]\|' \	317	-e 's\|^versions =.*\|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]\|' \
314	${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py	318	${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
		319	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400093
		320	@${REINPLACE_CMD} -e 's\|enum vtype\|enum enum_vtype_uint8\|g' \
		321	${WRKSRC}/src/VBox/Additions/freebsd/vboxvfs/vboxvfs*.[ch]
		322	.endif
315		323
316	do-build:	324	do-build:
317	cd ${WRKSRC} && ${SH} -c '. ${WRKSRC}/env.sh && \	325	cd ${WRKSRC} && ${SH} -c '. ${WRKSRC}/env.sh && \

Added Link Here

(-)b/emulators/virtualbox-ose-legacy/files/patch-C++17 (+301 lines)
1	--- src/VBox/Runtime/common/log/logcom.cpp
2	+++ src/VBox/Runtime/common/log/logcom.cpp
3	@@ -121,6 +121,6 @@
4	for (pu8 = (const uint8_t *)pach; cb-- > 0; pu8++)
5	{
6	- register unsigned cMaxWait;
7	- register uint8_t u8;
8	+ unsigned cMaxWait;
9	+ uint8_t u8;
10
11	/* expand \n -> \r\n */
12	--- src/VBox/Runtime/common/table/avl_Range.cpp.h
13	+++ src/VBox/Runtime/common/table/avl_Range.cpp.h
14	@@ -36,7 +36,7 @@
15	* @param Key The Key to find matching range for.
16	*/
17	-KAVL_DECL(PKAVLNODECORE) KAVL_FN(RangeGet)(PPKAVLNODECORE ppTree, register KAVLKEY Key)
18	+KAVL_DECL(PKAVLNODECORE) KAVL_FN(RangeGet)(PPKAVLNODECORE ppTree, KAVLKEY Key)
19	{
20	- register PKAVLNODECORE pNode = KAVL_GET_POINTER_NULL(ppTree);
21	+ PKAVLNODECORE pNode = KAVL_GET_POINTER_NULL(ppTree);
22	if (pNode)
23	{
24	--- src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h
25	+++ src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h
26	@@ -44,5 +44,5 @@
27	KAVL_DECL(PKAVLNODECORE) KAVL_FN(GetBestFit)(PPKAVLNODECORE ppTree, KAVLKEY Key, bool fAbove)
28	{
29	- register PKAVLNODECORE pNode = KAVL_GET_POINTER_NULL(ppTree);
30	+ PKAVLNODECORE pNode = KAVL_GET_POINTER_NULL(ppTree);
31	if (pNode)
32	{
33	--- src/VBox/Runtime/common/table/avl_Get.cpp.h
34	+++ src/VBox/Runtime/common/table/avl_Get.cpp.h
35	@@ -38,5 +38,5 @@
36	KAVL_DECL(PKAVLNODECORE) KAVL_FN(Get)(PPKAVLNODECORE ppTree, KAVLKEY Key)
37	{
38	- register PKAVLNODECORE pNode = KAVL_GET_POINTER_NULL(ppTree);
39	+ PKAVLNODECORE pNode = KAVL_GET_POINTER_NULL(ppTree);
40
41	if (pNode)
42	--- src/VBox/Runtime/common/table/avl_Base.cpp.h
43	+++ src/VBox/Runtime/common/table/avl_Base.cpp.h
44	@@ -267,5 +267,5 @@
45	else
46	{
47	- register unsigned char uchHeight = (unsigned char)(KMAX(uchLeftHeight, uchRightHeight) + 1);
48	+ unsigned char uchHeight = (unsigned char)(KMAX(uchLeftHeight, uchRightHeight) + 1);
49	if (uchHeight == pNode->uchHeight)
50	break;
51	@@ -301,8 +301,8 @@
52	KAVLSTACK AVLStack;
53	PPKAVLNODECORE ppCurNode = ppTree;
54	- register PKAVLNODECORE pCurNode;
55	- register KAVLKEY Key = pNode->Key; NOREF(Key);
56	+ PKAVLNODECORE pCurNode;
57	+ KAVLKEY Key = pNode->Key; NOREF(Key);
58	#ifdef KAVL_RANGE
59	- register KAVLKEY KeyLast = pNode->KeyLast; NOREF(KeyLast);
60	+ KAVLKEY KeyLast = pNode->KeyLast; NOREF(KeyLast);
61	#endif
62
63	@@ -401,5 +401,5 @@
64	KAVLSTACK AVLStack;
65	PPKAVLNODECORE ppDeleteNode = ppTree;
66	- register PKAVLNODECORE pDeleteNode;
67	+ PKAVLNODECORE pDeleteNode;
68
69	AVLStack.cEntries = 0;
70	@@ -428,5 +428,5 @@
71	const unsigned iStackEntry = AVLStack.cEntries;
72	PPKAVLNODECORE ppLeftLeast = &pDeleteNode->pLeft;
73	- register PKAVLNODECORE pLeftLeast = KAVL_GET_POINTER(ppLeftLeast);
74	+ PKAVLNODECORE pLeftLeast = KAVL_GET_POINTER(ppLeftLeast);
75
76	while (pLeftLeast->pRight != KAVL_NULL)
77	--- src/VBox/Runtime/common/string/utf-16.cpp
78	+++ src/VBox/Runtime/common/string/utf-16.cpp
79	@@ -195,5 +195,5 @@
80
81
82	-RTDECL(int) RTUtf16Cmp(register PCRTUTF16 pwsz1, register PCRTUTF16 pwsz2)
83	+RTDECL(int) RTUtf16Cmp(PCRTUTF16 pwsz1, PCRTUTF16 pwsz2)
84	{
85	if (pwsz1 == pwsz2)
86	@@ -206,6 +206,6 @@
87	for (;;)
88	{
89	- register RTUTF16 wcs = *pwsz1;
90	- register int iDiff = wcs - *pwsz2;
91	+ RTUTF16 wcs = *pwsz1;
92	+ int iDiff = wcs - *pwsz2;
93	if (iDiff \|\| !wcs)
94	return iDiff;
95	--- src/VBox/Runtime/common/string/utf-16-case.cpp
96	+++ src/VBox/Runtime/common/string/utf-16-case.cpp
97	@@ -40,5 +40,5 @@
98
99
100	-RTDECL(int) RTUtf16ICmp(register PCRTUTF16 pwsz1, register PCRTUTF16 pwsz2)
101	+RTDECL(int) RTUtf16ICmp(PCRTUTF16 pwsz1, PCRTUTF16 pwsz2)
102	{
103	if (pwsz1 == pwsz2)
104	@@ -52,7 +52,7 @@
105	for (;;)
106	{
107	- register RTUTF16 wc1 = *pwsz1;
108	- register RTUTF16 wc2 = *pwsz2;
109	- register int iDiff = wc1 - wc2;
110	+ RTUTF16 wc1 = *pwsz1;
111	+ RTUTF16 wc2 = *pwsz2;
112	+ int iDiff = wc1 - wc2;
113	if (iDiff)
114	{
115	@@ -107,5 +107,5 @@
116
117
118	-RTDECL(int) RTUtf16BigICmp(register PCRTUTF16 pwsz1, register PCRTUTF16 pwsz2)
119	+RTDECL(int) RTUtf16BigICmp(PCRTUTF16 pwsz1, PCRTUTF16 pwsz2)
120	{
121	if (pwsz1 == pwsz2)
122	@@ -119,7 +119,7 @@
123	for (;;)
124	{
125	- register RTUTF16 wc1 = *pwsz1;
126	- register RTUTF16 wc2 = *pwsz2;
127	- register int iDiff = wc1 - wc2;
128	+ RTUTF16 wc1 = *pwsz1;
129	+ RTUTF16 wc2 = *pwsz2;
130	+ int iDiff = wc1 - wc2;
131	if (iDiff)
132	{
133	@@ -217,5 +217,5 @@
134
135
136	-RTDECL(int) RTUtf16NICmp(register PCRTUTF16 pwsz1, register PCRTUTF16 pwsz2, size_t cwcMax)
137	+RTDECL(int) RTUtf16NICmp(PCRTUTF16 pwsz1, PCRTUTF16 pwsz2, size_t cwcMax)
138	{
139	if (pwsz1 == pwsz2)
140	@@ -229,7 +229,7 @@
141	while (cwcMax-- > 0)
142	{
143	- register RTUTF16 wc1 = *pwsz1;
144	- register RTUTF16 wc2 = *pwsz2;
145	- register int iDiff = wc1 - wc2;
146	+ RTUTF16 wc1 = *pwsz1;
147	+ RTUTF16 wc2 = *pwsz2;
148	+ int iDiff = wc1 - wc2;
149	if (iDiff)
150	{
151	@@ -290,5 +290,5 @@
152
153
154	-RTDECL(int) RTUtf16BigNICmp(register PCRTUTF16 pwsz1, register PCRTUTF16 pwsz2, size_t cwcMax)
155	+RTDECL(int) RTUtf16BigNICmp(PCRTUTF16 pwsz1, PCRTUTF16 pwsz2, size_t cwcMax)
156	{
157	if (pwsz1 == pwsz2)
158	@@ -302,7 +302,7 @@
159	while (cwcMax-- > 0)
160	{
161	- register RTUTF16 wc1 = *pwsz1;
162	- register RTUTF16 wc2 = *pwsz2;
163	- register int iDiff = wc1 - wc2;
164	+ RTUTF16 wc1 = *pwsz1;
165	+ RTUTF16 wc2 = *pwsz2;
166	+ int iDiff = wc1 - wc2;
167	if (iDiff)
168	{
169	--- src/VBox/HostDrivers/VBoxUSB/USBLib.cpp.orig
170	+++ src/VBox/HostDrivers/VBoxUSB/USBLib.cpp
171	@@ -45,11 +45,11 @@ USBLIB_DECL(uint64_t) USBLibHashSerial(const char *psz
172	if (!pszSerial)
173	pszSerial = "";
174
175	- register const uint8_t pu8 = (const uint8_t )pszSerial;
176	- register uint64_t u64 = UINT64_C(14695981039346656037);
177	+ const uint8_t pu8 = (const uint8_t )pszSerial;
178	+ uint64_t u64 = UINT64_C(14695981039346656037);
179	for (;;)
180	{
181	- register uint8_t u8 = *pu8;
182	+ uint8_t u8 = *pu8;
183	if (!u8)
184	break;
185	u64 = (u64 * UINT64_C(1099511628211)) ^ u8;
186	--- src/VBox/Runtime/common/checksum/crc32-zlib.cpp.orig
187	+++ src/VBox/Runtime/common/checksum/crc32-zlib.cpp
188	@@ -51,7 +51,7 @@ static uint32_t rtCrc32ProcessTooBig(uint32_t uCRC32,
189	return uCRC32;
190	}
191
192	-RTDECL(uint32_t) RTCrc32(const void *pv, register size_t cb)
193	+RTDECL(uint32_t) RTCrc32(const void *pv, size_t cb)
194	{
195	uint32_t uCrc = crc32(0, NULL, 0);
196	if (RT_UNLIKELY((uInt)cb == cb))
197	--- src/VBox/Devices/Network/DevPCNet.cpp.orig
198	+++ src/VBox/Devices/Network/DevPCNet.cpp
199	@@ -1242,8 +1242,8 @@ static void pcnetSoftReset(PPCNETSTATE pThis)
200	*/
201	static void pcnetUpdateIrq(PPCNETSTATE pThis)
202	{
203	- register int iISR = 0;
204	- register uint16_t csr0 = pThis->aCSR[0];
205	+ int iISR = 0;
206	+ uint16_t csr0 = pThis->aCSR[0];
207
208	csr0 &= ~0x0080; /* clear INTR */
209
210	--- src/VBox/VMM/VMMAll/PGMAllGst.h.orig
211	+++ src/VBox/VMM/VMMAll/PGMAllGst.h
212	@@ -92,7 +92,7 @@ DECLINLINE(int) PGM_GST_NAME(Walk)(PVMCPU pVCpu, RTGCP
213	return PGM_GST_NAME(WalkReturnNotPresent)(pVCpu, pWalk, 8);
214	# endif
215
216	- uint32_t register fEffective = X86_PTE_RW \| X86_PTE_US \| X86_PTE_PWT \| X86_PTE_PCD \| X86_PTE_A \| 1;
217	+ uint32_t fEffective = X86_PTE_RW \| X86_PTE_US \| X86_PTE_PWT \| X86_PTE_PCD \| X86_PTE_A \| 1;
218	{
219	# if PGM_GST_TYPE == PGM_TYPE_AMD64
220	/*
221	@@ -102,9 +102,9 @@ DECLINLINE(int) PGM_GST_NAME(Walk)(PVMCPU pVCpu, RTGCP
222	if (RT_SUCCESS(rc)) { /* probable */ }
223	else return PGM_GST_NAME(WalkReturnBadPhysAddr)(pVCpu, pWalk, 4, rc);
224
225	- PX86PML4E register pPml4e;
226	+ PX86PML4E pPml4e;
227	pWalk->pPml4e = pPml4e = &pWalk->pPml4->a[(GCPtr >> X86_PML4_SHIFT) & X86_PML4_MASK];
228	- X86PML4E register Pml4e;
229	+ X86PML4E Pml4e;
230	pWalk->Pml4e.u = Pml4e.u = pPml4e->u;
231
232	if (Pml4e.n.u1Present) { /* probable */ }
233	@@ -131,9 +131,9 @@ DECLINLINE(int) PGM_GST_NAME(Walk)(PVMCPU pVCpu, RTGCP
234	}
235	{
236	# if PGM_GST_TYPE == PGM_TYPE_AMD64 \|\| PGM_GST_TYPE == PGM_TYPE_PAE
237	- PX86PDPE register pPdpe;
238	+ PX86PDPE pPdpe;
239	pWalk->pPdpe = pPdpe = &pWalk->pPdpt->a[(GCPtr >> GST_PDPT_SHIFT) & GST_PDPT_MASK];
240	- X86PDPE register Pdpe;
241	+ X86PDPE Pdpe;
242	pWalk->Pdpe.u = Pdpe.u = pPdpe->u;
243
244	if (Pdpe.n.u1Present) { /* probable */ }
245	@@ -164,7 +164,7 @@ DECLINLINE(int) PGM_GST_NAME(Walk)(PVMCPU pVCpu, RTGCP
246	# endif
247	}
248	{
249	- PGSTPDE register pPde;
250	+ PGSTPDE pPde;
251	pWalk->pPde = pPde = &pWalk->pPd->a[(GCPtr >> GST_PD_SHIFT) & GST_PD_MASK];
252	GSTPDE Pde;
253	pWalk->Pde.u = Pde.u = pPde->u;
254	@@ -221,9 +221,9 @@ DECLINLINE(int) PGM_GST_NAME(Walk)(PVMCPU pVCpu, RTGCP
255	else return PGM_GST_NAME(WalkReturnBadPhysAddr)(pVCpu, pWalk, 1, rc);
256	}
257	{
258	- PGSTPTE register pPte;
259	+ PGSTPTE pPte;
260	pWalk->pPte = pPte = &pWalk->pPt->a[(GCPtr >> GST_PT_SHIFT) & GST_PT_MASK];
261	- GSTPTE register Pte;
262	+ GSTPTE Pte;
263	pWalk->Pte.u = Pte.u = pPte->u;
264
265	if (Pte.n.u1Present) { /* probable */ }
266	--- include/VBox/HostServices/Service.h.orig
267	+++ include/VBox/HostServices/Service.h
268	@@ -358,11 +358,11 @@ class AbstractService: public RTCNonCopyable (public)
269	else
270	{
271	RT_GCC_NO_WARN_DEPRECATED_BEGIN
272	- std::auto_ptr<AbstractService> apService;
273	+ std::unique_ptr<AbstractService> apService;
274	/* No exceptions may propagate outside. */
275	try
276	{
277	- apService = std::auto_ptr<AbstractService>(new T(pTable->pHelpers));
278	+ apService = std::unique_ptr<AbstractService>(new T(pTable->pHelpers));
279	} catch (int rcThrown)
280	{
281	rc = rcThrown;
282	--- src/VBox/Main/src-server/PerformanceImpl.cpp.orig
283	+++ src/VBox/Main/src-server/PerformanceImpl.cpp
284	@@ -699,7 +699,7 @@ void PerformanceCollector::samplerCallback(uint64_t iT
285	* Those should be destroyed now.
286	*/
287	Log7Func(("{%p}: before remove_if: toBeCollected.size()=%d\n", this, toBeCollected.size()));
288	- toBeCollected.remove_if(std::mem_fun(&pm::BaseMetric::isUnregistered));
289	+ toBeCollected.remove_if(std::mem_fn(&pm::BaseMetric::isUnregistered));
290	Log7Func(("{%p}: after remove_if: toBeCollected.size()=%d\n", this, toBeCollected.size()));
291	Log7Func(("{%p}: before remove_if: m.baseMetrics.size()=%d\n", this, m.baseMetrics.size()));
292	for (it = m.baseMetrics.begin(); it != m.baseMetrics.end();)
293	@@ -720,7 +720,7 @@ void PerformanceCollector::samplerCallback(uint64_t iT
294
295	/* Finally, collect the data */
296	std::for_each(toBeCollected.begin(), toBeCollected.end(),
297	- std::mem_fun(&pm::BaseMetric::collect));
298	+ std::mem_fn(&pm::BaseMetric::collect));
299	Log4Func(("{%p}: LEAVE\n", this));
300	}
301