Date: Wed, 5 Oct 2016 20:57:06 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423390 - in head/emulators: virtualbox-ose virtualbox-ose-additions Message-ID: <201610052057.u95Kv602012165@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Oct 5 20:57:06 2016 New Revision: 423390 URL: https://svnweb.freebsd.org/changeset/ports/423390 Log: Fix the previous commit. It was incomplete. Pointy hat: jkim 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:49:35 2016 (r423389) +++ head/emulators/virtualbox-ose-additions/Makefile Wed Oct 5 20:57:06 2016 (r423390) @@ -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 Modified: head/emulators/virtualbox-ose/Makefile ============================================================================== --- head/emulators/virtualbox-ose/Makefile Wed Oct 5 20:49:35 2016 (r423389) +++ head/emulators/virtualbox-ose/Makefile Wed Oct 5 20:57:06 2016 (r423390) @@ -39,9 +39,9 @@ CONFIGURE_ARGS= --disable-java --passive 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]*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610052057.u95Kv602012165>