From nobody Thu May 18 19:48:54 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QMgX72hSDz4BxTD; Thu, 18 May 2023 19:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QMgX7265Hz3pqk; Thu, 18 May 2023 19:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684439335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZO49P6Q9fMVFr6WDof77AapSu7BELWGsmZYP7v5KX6A=; b=QoBYulHeLV/S9Vi/8ZlsEAlAWhN+Ei565gNk/zTFPo1J58gdtAlECn10OIWAme2Hxq1neq xdrMbM7lUSsbqEkCuj48qY23lq0HWpPPJU3daYQ/kuySgQMQcuxd/qKAUPEUdr3jRBOXmw eW5An4qIQ+aPc3MnaJI6GryZqPBOCkPmLSJo6QpFCNoFmlcKJ7YAQKoGeyfRtu9gBPgnmM PrUnN7Q5NoC3T8HcYqjR41DcEbYKbu1cq05hQ+7Zpd26Tlmqtjt58uUSn7AjW0nZgFZj7C Roldw+ta/0M7GfYE+rRMUEd2QPydJmg2Q8umXss1jE+nVSlvJfZKLJJULI1Tig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684439335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZO49P6Q9fMVFr6WDof77AapSu7BELWGsmZYP7v5KX6A=; b=ZPeUugcERXmrJA/iCwWorui3ZvJYwyAe3JJTip3e+GrVvJDHlEkM+sg/GXyC5OZ51jA0Y1 D0zoDtq7vLSlD9+cGcbVr7GVRy9EN3kHwfyVH6C5d4tHegZp54NBssSgJs3cyjAGSGYM6c LDRe74/Wev2JKqcOv+sgeQTBPjOnigdCtZkjp7YaryMFsQbC+uQJ+46xw3VmoS9ZyZ3+JH 1jiGv5GgByMUHHN2kVcf9cgrwkRIsal5huzu74W0sK0fXOiiwrqjWUy6wcDGcmJupBfYNh 7t7u3m32Kc1qhtCRxAQLCOYS2Buri60R6twFk867dU4EvkdKIl+oj+63xLKxLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684439335; a=rsa-sha256; cv=none; b=IgPjgFLliS/ZU0VEtTXdEb3qGLEXx5tvnLc1pENzbA2qTZkrjlrhtC1dwJaRFh7+TjAIdJ z56mIQAowNwAYv8p38oyRr84ZRUxk86t24Ior2QqpO2wOORixHeYHrYxd0MLoLpMak48pc FdAkHHfKwFtLj2qVEX52i+gwzuzAyyYTjvtQwU25HDozAzHu9634ojWTUgxOTgyEixPlKB maOw48RELSsQ40YZriVGfPFmJ3N/iThOq1fYYTRRMuwNmOOECnhEx2WyqXA0xW6FSZaqxD eXb1eMrqo/U0HinqYH9tv4iDVjlcYAlRaQeR8A64ZfIPEOitVR8DVNkvmNrDuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QMgX70jphzyvh; Thu, 18 May 2023 19:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34IJmsx3083155; Thu, 18 May 2023 19:48:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34IJmseP083154; Thu, 18 May 2023 19:48:54 GMT (envelope-from git) Date: Thu, 18 May 2023 19:48:54 GMT Message-Id: <202305181948.34IJmseP083154@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 8b9f42573ed3 - main - emulators/virtualbox-ose[-legacy]: VM VirtualBox Manager: Help menu: unable to open external browser List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b9f42573ed3ebcd6a84f7ccd1ba2ef000357332 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b9f42573ed3ebcd6a84f7ccd1ba2ef000357332 commit 8b9f42573ed3ebcd6a84f7ccd1ba2ef000357332 Author: Vladimir Druzenko AuthorDate: 2023-05-18 19:41:30 +0000 Commit: Vladimir Druzenko CommitDate: 2023-05-18 19:48:47 +0000 emulators/virtualbox-ose[-legacy]: VM VirtualBox Manager: Help menu: unable to open external browser While here sort out LOCALBASE, PREFIX, VBOX_DIR, VBOX_ETC PR: 266778 Approved by: arrowd (mentor) Differential Revision: https://reviews.freebsd.org/D40119 --- emulators/virtualbox-ose-legacy/Makefile | 6 ++++-- .../files/patch-src-VBox-Installer-freebsd-VBox.sh | 10 +++++----- emulators/virtualbox-ose/Makefile | 10 ++++++---- .../files/patch-src-VBox-Installer-freebsd-VBox.sh | 12 ++++++------ .../patch-src_VBox_HostDrivers_adpctl_VBoxNetAdpCtl.cpp | 2 +- emulators/virtualbox-ose/files/pkg-message.in | 6 +++--- 6 files changed, 25 insertions(+), 21 deletions(-) diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile index 1c22e2fed732..fe7e00fe1be7 100644 --- a/emulators/virtualbox-ose-legacy/Makefile +++ b/emulators/virtualbox-ose-legacy/Makefile @@ -52,6 +52,7 @@ USERS= ${VBOXUSER} GROUPS= ${VBOXGROUP} VBOX_DIR= ${PREFIX}/${VBOX_DIR_REL} VBOX_DIR_REL= lib/virtualbox +VBOX_ETC= ${PREFIX}/etc/vbox VBOX_LINKS= VBoxVRDP VBOX_PROGS= VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxHeadless \ VBoxManage @@ -323,8 +324,9 @@ post-patch: ${WRKSRC}/src/VBox/Runtime/Makefile.kmk @${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk .endif - @${REINPLACE_CMD} -e 's|/usr/local/lib/virtualbox|${VBOX_DIR}|' \ - -e 's|/usr/local|${PREFIX}|' \ + @${REINPLACE_CMD} -e 's|%%VBOX_DIR%%|${VBOX_DIR}|g' \ + -e 's|%%VBOX_ETC%%|${VBOX_ETC}|g' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh @${REINPLACE_CMD} \ -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \ diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Installer-freebsd-VBox.sh b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Installer-freebsd-VBox.sh index cebabd64d010..08b833613af2 100644 --- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Installer-freebsd-VBox.sh +++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Installer-freebsd-VBox.sh @@ -16,15 +16,15 @@ +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# + -+PATH="/usr/bin:/bin:/usr/sbin:/sbin" -+CONFIG="/usr/local/etc/vbox/vbox.cfg" ++PATH="/sbin:/bin:/usr/sbin:/usr/bin:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin" ++CONFIG="%%VBOX_ETC%%/vbox.cfg" + +test -r "${CONFIG}" && + . "${CONFIG}" +test -z "${INSTALL_DIR}" && -+ if test -d /usr/local/lib/virtualbox && -+ test -f /usr/local/lib/virtualbox/VBoxRT.so; then -+ INSTALL_DIR=/usr/local/lib/virtualbox ++ if test -d %%VBOX_DIR%% && ++ test -f %%VBOX_DIR%%/VBoxRT.so; then ++ INSTALL_DIR=%%VBOX_DIR%% + else + echo "Could not find VirtualBox installation. Please reinstall." + exit 1 diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 541d4c63ae38..fd0219c7b2e7 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -45,6 +45,7 @@ USERS= ${VBOXUSER} GROUPS= ${VBOXGROUP} VBOX_DIR= ${PREFIX}/${VBOX_DIR_REL} VBOX_DIR_REL= lib/virtualbox +VBOX_ETC= ${PREFIX}/etc/vbox VBOX_LINKS= VBoxVRDP VBOX_PROGS= VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxHeadless \ VBoxManage @@ -314,7 +315,6 @@ post-patch: ${WRKSRC}/Config.kmk ${WRKSRC}/configure \ ${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \ ${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \ - ${WRKSRC}/src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp \ ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py @${REINPLACE_CMD} \ -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \ @@ -325,10 +325,12 @@ post-patch: ${WRKSRC}/src/VBox/Runtime/Makefile.kmk @${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk .endif - # Causes a "reinplace" QA warning with default PREFIX/VBOX_DIR - @${REINPLACE_CMD} -e 's|/usr/local/lib/virtualbox|${VBOX_DIR}|' \ - -e 's|/usr/local|${PREFIX}|' \ + @${REINPLACE_CMD} -e 's|%%VBOX_DIR%%|${VBOX_DIR}|g' \ + -e 's|%%VBOX_ETC%%|${VBOX_ETC}|g' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh + @${REINPLACE_CMD} -e 's|%%VBOX_ETC%%|${VBOX_ETC}|g' \ + ${WRKSRC}/src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp @${REINPLACE_CMD} \ -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \ ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh b/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh index 6511a665a219..b4c177a54d1c 100644 --- a/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh +++ b/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh @@ -16,15 +16,15 @@ +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# + -+PATH="/usr/bin:/bin:/usr/sbin:/sbin" -+CONFIG="/usr/local/etc/vbox/vbox.cfg" ++PATH="/sbin:/bin:/usr/sbin:/usr/bin:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin" ++CONFIG="%%VBOX_ETC%%/vbox.cfg" + +test -r "${CONFIG}" && + . "${CONFIG}" +test -z "${INSTALL_DIR}" && -+ if test -d /usr/local/lib/virtualbox && -+ test -f /usr/local/lib/virtualbox/VBoxRT.so; then -+ INSTALL_DIR=/usr/local/lib/virtualbox ++ if test -d %%VBOX_DIR%% && ++ test -f %%VBOX_DIR%%/VBoxRT.so; then ++ INSTALL_DIR=%%VBOX_DIR%% + else + >&2 echo "Could not find VirtualBox installation. Please reinstall." + exit 1 @@ -33,7 +33,7 @@ +if [ -d /etc/vbox ]; then + >&2 cat <<-EOH + WARNING: Directory /etc/vbox found, but ignored. VirtualBox -+ configuration files are stored in /usr/local/etc/vbox/. ++ configuration files are stored in %%VBOX_ETC%%/. + EOH +fi + diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_adpctl_VBoxNetAdpCtl.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_adpctl_VBoxNetAdpCtl.cpp index dfd9105f8390..67573dc080a4 100644 --- a/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_adpctl_VBoxNetAdpCtl.cpp +++ b/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_adpctl_VBoxNetAdpCtl.cpp @@ -5,7 +5,7 @@ *********************************************************************************************************************************/ -#define VBOX_GLOBAL_NETWORK_CONFIG_PATH "/etc/vbox/networks.conf" -+#define VBOX_GLOBAL_NETWORK_CONFIG_PATH "/usr/local/etc/vbox/networks.conf" ++#define VBOX_GLOBAL_NETWORK_CONFIG_PATH "%%VBOX_ETC%%/networks.conf" #define VBOXNET_DEFAULT_IPV4MASK "255.255.255.0" class NetworkAddress diff --git a/emulators/virtualbox-ose/files/pkg-message.in b/emulators/virtualbox-ose/files/pkg-message.in index 8df5a0a47ffd..8fd6062977da 100644 --- a/emulators/virtualbox-ose/files/pkg-message.in +++ b/emulators/virtualbox-ose/files/pkg-message.in @@ -62,7 +62,7 @@ To check if AIO is used use: kldstat -v | grep aio When assigning IP addresses in host-only mode from ranges outside of VirtualBox's defaults, the respective ranges need to be listed -in %%LOCALBASE%%/etc/vbox/networks.conf (PR#259399). +in %%VBOX_ETC%%/networks.conf (PR#259399). Check wiki page for known issues and troubleshooting: http://wiki.freebsd.org/VirtualBox @@ -87,10 +87,10 @@ EOM maximum_version: 6.1.32_1 message: <