diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2016-10-06 04:49:35 +0800 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2016-10-06 04:49:35 +0800 |
| commit | 7eaed1bd50bd0dc44225e2e2bfd0bc976f2af6fe (patch) | |
| tree | c170e33afafd56c653e5fce44aa4b10408583382 /emulators/virtualbox-ose/Makefile | |
| parent | 1c0f31a22f510a5d5bc2ffa1d08db2fa1145ef0d (diff) | |
| download | freebsd-ports-gnome-7eaed1bd50bd0dc44225e2e2bfd0bc976f2af6fe.tar.gz freebsd-ports-gnome-7eaed1bd50bd0dc44225e2e2bfd0bc976f2af6fe.tar.zst freebsd-ports-gnome-7eaed1bd50bd0dc44225e2e2bfd0bc976f2af6fe.zip | |
Add newly added slave ports to CONFLICTS_INSTALL.
Diffstat (limited to 'emulators/virtualbox-ose/Makefile')
| -rw-r--r-- | emulators/virtualbox-ose/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index a7b1c6b92107..57c0cae99f6d 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -38,10 +38,10 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= --disable-java --passive-mesa CONFIGURE_ARGS+= --with-gcc="${CC}" --with-g++="${CXX}" -CONFLICTS_INSTALL= virtualbox-ose-additions-[4,5]* \ - virtualbox-ose-additions-devel-4* \ - virtualbox-ose-devel-4* \ - virtualbox-ose-legacy-4* +CONFLICTS_INSTALL= virtualbox-ose-additions-* \ + virtualbox-ose-devel-* \ + virtualbox-ose-legacy-* \ + virtualbox-ose-lite-* VBOXUSER?= vboxusers VBOXWSUSER?= vboxusers @@ -114,10 +114,10 @@ USE_RC_SUBR= vboxheadless vboxwatchdog .include <bsd.port.options.mk> .if ${SLAVE_PORT} == no -CONFLICTS_INSTALL+= ${PORTNAME}-lite-[4,5]* ${PORTNAME}-nox11-5* +CONFLICTS_INSTALL+= virtualbox-ose-nox11-* OPTIONS_DEFAULT+= PYTHON .else -CONFLICTS_INSTALL+= ${PORTNAME}-[4,5]* +CONFLICTS_INSTALL+= virtualbox-ose-[0-9]* .endif .if ${PORT_OPTIONS:MNLS} && empty(PORT_OPTIONS:MQT[45]) |