diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2016-10-05 20:49:35 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2016-10-05 20:49:35 +0000 |
| commit | 7eaed1bd50bd0dc44225e2e2bfd0bc976f2af6fe (patch) | |
| tree | c170e33afafd56c653e5fce44aa4b10408583382 /emulators/virtualbox-ose-additions | |
| parent | 1c0f31a22f510a5d5bc2ffa1d08db2fa1145ef0d (diff) | |
Add newly added slave ports to CONFLICTS_INSTALL.
Notes
Notes:
svn path=/head/; revision=423389
Diffstat (limited to 'emulators/virtualbox-ose-additions')
| -rw-r--r-- | emulators/virtualbox-ose-additions/Makefile | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index 221dc688370d..de9975f40932 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -38,10 +38,12 @@ CONFIGURE_ARGS+= --disable-alsa \ --disable-xpcom CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}" -CONFLICTS_INSTALL= virtualbox-ose-[3-5]* \ - virtualbox-ose-additions-devel-[3,4]* \ - virtualbox-ose-devel-[3,4]* \ - virtualbox-ose-legacy-[3,4]* +CONFLICTS_INSTALL= virtualbox-ose-[0-9]* \ + virtualbox-ose-additions-devel-[0-9]* \ + virtualbox-ose-devel-[0-9]* \ + virtualbox-ose-legacy-[0-9]* \ + virtualbox-ose-lite-[0-9]* \ + virtualbox-ose-nox11-[0-9]* OPTIONS_DEFINE= DBUS DEBUG OPENGL X11 OPTIONS_DEFAULT= DBUS X11 @@ -53,6 +55,12 @@ OPENGL_CONFIGURE_OFF= --disable-opengl .include <bsd.port.options.mk> +.if ${SLAVE_PORT} == no +CONFLICTS_INSTALL+= virtualbox-ose-additions-nox11-* +.else +CONFLICTS_INSTALL+= virtualbox-ose-additions-[0-9]* +.endif + .if ${PORT_OPTIONS:MOPENGL} && empty(PORT_OPTIONS:MX11) BROKEN= OPENGL requires X11 support. Run 'make config' again! .endif |