svn commit: r423389 - in head/emulators: virtualbox-ose virtualbox-ose-additions
Jung-uk Kim
jkim at FreeBSD.org
Wed Oct 5 20:49:36 UTC 2016
Author: jkim
Date: Wed Oct 5 20:49:35 2016
New Revision: 423389
URL: https://svnweb.freebsd.org/changeset/ports/423389
Log:
Add newly added slave ports to CONFLICTS_INSTALL.
Modified:
head/emulators/virtualbox-ose-additions/Makefile
head/emulators/virtualbox-ose/Makefile
Modified: head/emulators/virtualbox-ose-additions/Makefile
==============================================================================
--- head/emulators/virtualbox-ose-additions/Makefile Wed Oct 5 20:17:39 2016 (r423388)
+++ head/emulators/virtualbox-ose-additions/Makefile Wed Oct 5 20:49:35 2016 (r423389)
@@ -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
Modified: head/emulators/virtualbox-ose/Makefile
==============================================================================
--- head/emulators/virtualbox-ose/Makefile Wed Oct 5 20:17:39 2016 (r423388)
+++ head/emulators/virtualbox-ose/Makefile Wed Oct 5 20:49:35 2016 (r423389)
@@ -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])
More information about the svn-ports-all
mailing list