diff options
| author | jkim <jkim@FreeBSD.org> | 2016-10-06 04:57:06 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2016-10-06 04:57:06 +0800 |
| commit | 24287adfedac9d6dc8320e71c394b39bf5ce5b3d (patch) | |
| tree | 667b5d229fe04936539cf9ae79e4dd3386ccea2c /emulators | |
| parent | a468acdfbd0e5530be1cbc81b27567f09c23ac6a (diff) | |
| download | freebsd-ports-gnome-24287adfedac9d6dc8320e71c394b39bf5ce5b3d.tar.gz freebsd-ports-gnome-24287adfedac9d6dc8320e71c394b39bf5ce5b3d.tar.zst freebsd-ports-gnome-24287adfedac9d6dc8320e71c394b39bf5ce5b3d.zip | |
Fix the previous commit. It was incomplete.
Pointy hat: jkim
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/virtualbox-ose-additions/Makefile | 2 | ||||
| -rw-r--r-- | emulators/virtualbox-ose/Makefile | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index de9975f40932..5c603b207a68 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -56,7 +56,7 @@ OPENGL_CONFIGURE_OFF= --disable-opengl .include <bsd.port.options.mk> .if ${SLAVE_PORT} == no -CONFLICTS_INSTALL+= virtualbox-ose-additions-nox11-* +CONFLICTS_INSTALL+= virtualbox-ose-additions-nox11-[0-9]* .else CONFLICTS_INSTALL+= virtualbox-ose-additions-[0-9]* .endif diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 57c0cae99f6d..c70e82067caf 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -39,9 +39,9 @@ CONFIGURE_ARGS= --disable-java --passive-mesa CONFIGURE_ARGS+= --with-gcc="${CC}" --with-g++="${CXX}" CONFLICTS_INSTALL= virtualbox-ose-additions-* \ - virtualbox-ose-devel-* \ - virtualbox-ose-legacy-* \ - virtualbox-ose-lite-* + virtualbox-ose-devel-[0-9]* \ + virtualbox-ose-legacy-[0-9]* \ + virtualbox-ose-lite-[0-9]* VBOXUSER?= vboxusers VBOXWSUSER?= vboxusers @@ -114,7 +114,7 @@ USE_RC_SUBR= vboxheadless vboxwatchdog .include <bsd.port.options.mk> .if ${SLAVE_PORT} == no -CONFLICTS_INSTALL+= virtualbox-ose-nox11-* +CONFLICTS_INSTALL+= virtualbox-ose-nox11-[0-9]* OPTIONS_DEFAULT+= PYTHON .else CONFLICTS_INSTALL+= virtualbox-ose-[0-9]* |