Date: Tue, 05 May 2026 21:01:18 +0000
From: Vladimir Druzenko <vvd@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: 55cdeefc9ba6 - main - emulators/virtualbox-ose{,-70,-71,-72,-legacy}: Fix PKGNAMESUFFIX
Message-ID: <69fa5a9e.18444.7e00d0a1@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=55cdeefc9ba6088271dfb0702ef98c662db680ba commit 55cdeefc9ba6088271dfb0702ef98c662db680ba Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2026-05-05 20:57:50 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-05-05 21:01:13 +0000 emulators/virtualbox-ose{,-70,-71,-72,-legacy}: Fix PKGNAMESUFFIX While here parametrize version for unification. Sponsored by: UNIS Labs --- emulators/virtualbox-ose-70/Makefile | 6 +++--- emulators/virtualbox-ose-71/Makefile | 6 +++--- emulators/virtualbox-ose-72/Makefile | 6 +++--- emulators/virtualbox-ose-legacy/Makefile | 8 ++++---- emulators/virtualbox-ose/Makefile | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/emulators/virtualbox-ose-70/Makefile b/emulators/virtualbox-ose-70/Makefile index 02bc5f178f1d..33f241ff5cf1 100644 --- a/emulators/virtualbox-ose-70/Makefile +++ b/emulators/virtualbox-ose-70/Makefile @@ -28,12 +28,12 @@ BUILD_DEPENDS= gtar:archivers/gtar \ xsltproc:textproc/libxslt LIB_DEPENDS= libpng.so:graphics/png \ libcurl.so:ftp/curl -RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod-70 +RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod${_VER} FLAVORS= x11 nox11 FLAVOR?= ${FLAVORS:[1]} -_VER= ${DISTVERSION:R:S|.||} -${FLAVOR}_PKGNAMESUFFIX= -${${FLAVOR:N${FLAVORS:[1]}} ${_VER}:L:ts-} +_VER= -${DISTVERSION:R:S|.||} +${FLAVOR}_PKGNAMESUFFIX= ${FLAVOR:N${FLAVORS:[1]}:C|(.+)|-\1|}${_VER} USES= compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2 CPE_VENDOR= oracle diff --git a/emulators/virtualbox-ose-71/Makefile b/emulators/virtualbox-ose-71/Makefile index 1a5533cbe366..4b57b18b0530 100644 --- a/emulators/virtualbox-ose-71/Makefile +++ b/emulators/virtualbox-ose-71/Makefile @@ -31,12 +31,12 @@ LIB_DEPENDS= libpng.so:graphics/png \ libvorbis.so:audio/libvorbis \ libvorbisenc.so:audio/libvorbis \ libvpx.so:multimedia/libvpx -RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod-71 +RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod${_VER} FLAVORS= x11 nox11 FLAVOR?= ${FLAVORS:[1]} -_VER= ${DISTVERSION:R:S|.||} -${FLAVOR}_PKGNAMESUFFIX= -${${FLAVOR:N${FLAVORS:[1]}} ${_VER}:L:ts-} +_VER= -${DISTVERSION:R:S|.||} +${FLAVOR}_PKGNAMESUFFIX= ${FLAVOR:N${FLAVORS:[1]}:C|(.+)|-\1|}${_VER} USES= compiler:c++17-lang cpe gnome iconv pkgconfig ssl tar:bzip2 CPE_VENDOR= oracle diff --git a/emulators/virtualbox-ose-72/Makefile b/emulators/virtualbox-ose-72/Makefile index 2ef7eed613eb..dc419e694e64 100644 --- a/emulators/virtualbox-ose-72/Makefile +++ b/emulators/virtualbox-ose-72/Makefile @@ -29,12 +29,12 @@ LIB_DEPENDS= libpng.so:graphics/png \ libvorbis.so:audio/libvorbis \ libvorbisenc.so:audio/libvorbis \ libvpx.so:multimedia/libvpx -RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod-72 +RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod${_VER} FLAVORS= x11 nox11 FLAVOR?= ${FLAVORS:[1]} -_VER= ${DISTVERSION:R:S|.||} -${FLAVOR}_PKGNAMESUFFIX= -${${FLAVOR:N${FLAVORS:[1]}} ${_VER}:L:ts-} +_VER= -${DISTVERSION:R:S|.||} +${FLAVOR}_PKGNAMESUFFIX= ${FLAVOR:N${FLAVORS:[1]}:C|(.+)|-\1|}${_VER} USES= compiler:c++17-lang cpe gnome iconv pkgconfig ssl tar:bzip2 CPE_VENDOR= oracle diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile index b57b623d8c56..da0528e8eede 100644 --- a/emulators/virtualbox-ose-legacy/Makefile +++ b/emulators/virtualbox-ose-legacy/Makefile @@ -3,7 +3,7 @@ DISTVERSION= 5.2.44 PORTREVISION= 36 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/:src \ - LOCAL/bofh/emulators/virtualbox-ose-legacy:docs \ + LOCAL/bofh/emulators/virtualbox-ose${_VER}:docs \ LOCAL/vvd:docs DISTFILES= VirtualBox-${DISTVERSION}${EXTRACT_SUFX}:src \ VirtualBox-docs-${DISTVERSION}${EXTRACT_SUFX}:docs @@ -27,12 +27,12 @@ BUILD_DEPENDS= gtar:archivers/gtar \ xsltproc:textproc/libxslt LIB_DEPENDS= libpng.so:graphics/png \ libcurl.so:ftp/curl -RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod-legacy +RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod${_VER} FLAVORS= x11 nox11 FLAVOR?= ${FLAVORS:[1]} -_VER= legacy -${FLAVOR}_PKGNAMESUFFIX= -${${FLAVOR:N${FLAVORS:[1]}} ${_VER}:L:ts-} +_VER= -legacy +${FLAVOR}_PKGNAMESUFFIX= ${FLAVOR:N${FLAVORS:[1]}:C|(.+)|-\1|}${_VER} USES= compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2 CPE_VENDOR= oracle diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index ade317d4de59..c08db16cc21d 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -1,9 +1,9 @@ PORTNAME= virtualbox-ose DISTVERSION= 6.1.50 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/:src \ - LOCAL/bofh/emulators/virtualbox-ose:docs \ + LOCAL/bofh/emulators/virtualbox-ose${_VER}:docs \ LOCAL/vvd:docs DISTFILES= VirtualBox-${DISTVERSION}${EXTRACT_SUFX}:src \ VirtualBox-docs-${DISTVERSION}${EXTRACT_SUFX}:docs @@ -29,12 +29,12 @@ BUILD_DEPENDS= gtar:archivers/gtar \ xsltproc:textproc/libxslt LIB_DEPENDS= libpng.so:graphics/png \ libcurl.so:ftp/curl -RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod +RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod${_VER} FLAVORS= x11 nox11 FLAVOR?= ${FLAVORS:[1]} _VER= # -${FLAVOR}_PKGNAMESUFFIX= -${${FLAVOR:N${FLAVORS:[1]}} ${_VER}:L:ts-} +${FLAVOR}_PKGNAMESUFFIX= ${FLAVOR:N${FLAVORS:[1]}:C|(.+)|-\1|}${_VER} USES= compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2 CPE_VENDOR= oraclehome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69fa5a9e.18444.7e00d0a1>