From owner-svn-ports-all@freebsd.org Wed Oct 5 20:57:07 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6A65AAF6AD6; Wed, 5 Oct 2016 20:57:07 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3C1A615D8; Wed, 5 Oct 2016 20:57:07 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u95Kv6qA012167; Wed, 5 Oct 2016 20:57:06 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u95Kv602012165; Wed, 5 Oct 2016 20:57:06 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201610052057.u95Kv602012165@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Wed, 5 Oct 2016 20:57:06 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2016 20:57:07 -0000 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 .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 .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]*