kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add newly added slave ports to CONFLICTS_INSTALL.

Browse source
This commit is contained in:
Jung-uk Kim 2016-10-05 20:49:35 +00:00
parent 1c0f31a22f
commit 7eaed1bd50
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=423389
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
emulators/virtualbox-ose-additions/Makefile
View file

@ -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

12
emulators/virtualbox-ose/Makefile
View file

@ -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])