From owner-svn-ports-head@FreeBSD.ORG  Tue Dec  9 17:44:31 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 805559ED;
 Tue,  9 Dec 2014 17:44:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 6D337855;
 Tue,  9 Dec 2014 17:44:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB9HiVWd095587;
 Tue, 9 Dec 2014 17:44:31 GMT (envelope-from xmj@FreeBSD.org)
Received: (from xmj@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB9HiVV9095586;
 Tue, 9 Dec 2014 17:44:31 GMT (envelope-from xmj@FreeBSD.org)
Message-Id: <201412091744.sB9HiVV9095586@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org
 using -f
From: Johannes Jost Meixner <xmj@FreeBSD.org>
Date: Tue, 9 Dec 2014 17:44:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r374414 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Dec 2014 17:44:31 -0000

Author: xmj
Date: Tue Dec  9 17:44:30 2014
New Revision: 374414
URL: https://svnweb.freebsd.org/changeset/ports/374414
QAT: https://qat.redports.org/buildarchive/r374414/

Log:
  Force PREFIX to LINUXBASE
  
  Using pkg with linux packages will generate conflicts with non-linux ports if
  PREFIX is set in make.conf. If USE_LINUX_PREFIX is defined, force PREFIX to
  LINUXBASE, which can be overridden separately.
  
  Approved by:    koobs, swills (mentors)
  Approved by:    portmgr (swills)

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Tue Dec  9 17:37:50 2014	(r374413)
+++ head/Mk/bsd.port.mk	Tue Dec  9 17:44:30 2014	(r374414)
@@ -1402,7 +1402,7 @@ SCRIPTDIR?=		${MASTERDIR}/scripts
 PKGDIR?=		${MASTERDIR}
 
 .if defined(USE_LINUX_PREFIX)
-PREFIX?=		${LINUXBASE}
+PREFIX:=		${LINUXBASE}
 NO_MTREE=		yes
 .else
 PREFIX?=		${LOCALBASE}