Date: Sat, 22 May 2021 15:43:30 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8b0a535c5a33 - main - emulators/virtualbox-ose-additions(-legacy): fix conflicts Message-ID: <202105221543.14MFhUd2091088@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b0a535c5a3331be21612f3322247998bf87b7e9 commit 8b0a535c5a3331be21612f3322247998bf87b7e9 Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2021-05-22 15:42:28 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2021-05-22 15:42:28 +0000 emulators/virtualbox-ose-additions(-legacy): fix conflicts - Add missing conflicts lines to emulators/virtualbox-ose-additions ports - Remove duplicate entry in emulators/virtualbox-ose-additions-legacy CONFLICTS_INSTALL PR: 256048 --- emulators/virtualbox-ose-additions-legacy/Makefile | 2 +- emulators/virtualbox-ose-additions/Makefile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/emulators/virtualbox-ose-additions-legacy/Makefile b/emulators/virtualbox-ose-additions-legacy/Makefile index 308913203811..ee6830eeb373 100644 --- a/emulators/virtualbox-ose-additions-legacy/Makefile +++ b/emulators/virtualbox-ose-additions-legacy/Makefile @@ -41,9 +41,9 @@ CONFIGURE_ARGS+= --disable-alsa \ CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}" CONFLICTS_INSTALL= virtualbox-ose-[0-9]* \ + virtualbox-ose-additions-[0-9]* \ virtualbox-ose-additions-devel-[0-9]* \ virtualbox-ose-devel-[0-9]* \ - virtualbox-ose-[0-9]* \ virtualbox-ose-lite-[0-9]* \ virtualbox-ose-nox11-[0-9]* diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index 1a55a7eacdf7..5d5e6dd75c50 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -41,6 +41,7 @@ CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}" CONFLICTS_INSTALL= virtualbox-ose-[0-9]* \ virtualbox-ose-additions-devel-[0-9]* \ + virtualbox-ose-additions-legacy-[0-9]* \ virtualbox-ose-devel-[0-9]* \ virtualbox-ose-legacy-[0-9]* \ virtualbox-ose-lite-[0-9]* \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105221543.14MFhUd2091088>