diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2021-05-22 15:42:28 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2021-05-22 15:42:28 +0000 |
| commit | 8b0a535c5a3331be21612f3322247998bf87b7e9 (patch) | |
| tree | 57bafe677791e10e9310644372275ae6879af294 | |
| parent | 1465ea5ec3fa5164f1db2ab9dc5d6eb52e5f4d41 (diff) | |
| download | ports-8b0a535c5a3331be21612f3322247998bf87b7e9.tar.gz ports-8b0a535c5a3331be21612f3322247998bf87b7e9.zip | |
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
| -rw-r--r-- | emulators/virtualbox-ose-additions-legacy/Makefile | 2 | ||||
| -rw-r--r-- | emulators/virtualbox-ose-additions/Makefile | 1 |
2 files changed, 2 insertions, 1 deletions
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]* \ |