From owner-svn-ports-all@freebsd.org  Wed Oct  5 20:13:08 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
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 50B5DAF78C9;
 Wed,  5 Oct 2016 20:13:08 +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 200FD644;
 Wed,  5 Oct 2016 20:13:08 +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 u95KD7dI093170;
 Wed, 5 Oct 2016 20:13:07 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u95KD7oR093169;
 Wed, 5 Oct 2016 20:13:07 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201610052013.u95KD7oR093169@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jkim set sender to
 jkim@FreeBSD.org using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 5 Oct 2016 20:13:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r423384 - head/emulators/virtualbox-ose
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Oct 2016 20:13:08 -0000

Author: jkim
Date: Wed Oct  5 20:13:07 2016
New Revision: 423384
URL: https://svnweb.freebsd.org/changeset/ports/423384

Log:
  Add the newly added emulators/virtualbox-ose-nox11 to CONFLICTS_INSTALL.

Modified:
  head/emulators/virtualbox-ose/Makefile

Modified: head/emulators/virtualbox-ose/Makefile
==============================================================================
--- head/emulators/virtualbox-ose/Makefile	Wed Oct  5 19:57:02 2016	(r423383)
+++ head/emulators/virtualbox-ose/Makefile	Wed Oct  5 20:13:07 2016	(r423384)
@@ -114,8 +114,8 @@ USE_RC_SUBR=	vboxheadless vboxwatchdog
 .include <bsd.port.options.mk>
 
 .if ${SLAVE_PORT} == no
+CONFLICTS_INSTALL+=	${PORTNAME}-lite-[4,5]* ${PORTNAME}-nox11-5*
 OPTIONS_DEFAULT+=	PYTHON
-CONFLICTS_INSTALL+=	${PORTNAME}-lite-[4,5]*
 .else
 CONFLICTS_INSTALL+=	${PORTNAME}-[4,5]*
 .endif