From owner-svn-ports-all@FreeBSD.ORG  Thu May 30 01:14:43 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6DCED778;
 Thu, 30 May 2013 01:14:43 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6084A997;
 Thu, 30 May 2013 01:14:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4U1EgGa038047;
 Thu, 30 May 2013 01:14:42 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4U1Egfv038046;
 Thu, 30 May 2013 01:14:42 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201305300114.r4U1Egfv038046@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 30 May 2013 01:14:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319400 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 May 2013 01:14:43 -0000

Author: bdrewery
Date: Thu May 30 01:14:42 2013
New Revision: 319400
URL: http://svnweb.freebsd.org/changeset/ports/319400

Log:
  Fix build with WITH_CCACHE_BUILD with ports that override PATH via
  MAKE_ENV or CONFIGURE_ENV. I.e., don't set PATH in MAKE_ENV twice as
  env(1) only takes one, in which case some ports fail to build. One
  example is any USES=ada port (such as textproc/xmlada). Instead,
  add the ccache path into PATH via := and let it fall into there
  via the sourcing port's MAKE_ENV=PATH=...:${PATH} line.
  
  A more comprehensive solution to this could be to add a MACRO/feature
  to modify the PATH for all ports without using MAKE_ENV via
  something like ADDPATH=...
  
  With hat:	portmgr
  Tested by:	several exp-runs

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu May 30 01:06:51 2013	(r319399)
+++ head/Mk/bsd.port.mk	Thu May 30 01:14:42 2013	(r319400)
@@ -2193,9 +2193,15 @@ MAKE_JOBS_NUMBER=	1
 BUILD_DEPENDS+=		${LOCALBASE}/bin/ccache:${PORTSDIR}/devel/ccache
 .	endif
 
+_CCACHE_PATH=	${LOCALBASE}/libexec/ccache
+
 # Prepend the ccache dir into the PATH and setup ccache env
-MAKE_ENV+=		PATH=${LOCALBASE}/libexec/ccache:${PATH}
-CONFIGURE_ENV+=	PATH=${LOCALBASE}/libexec/ccache:${PATH}
+PATH:=	${_CCACHE_PATH}:${PATH}
+.if !${MAKE_ENV:M*PATH=*} && !${CONFIGURE_ENV:M*PATH=*}
+MAKE_ENV+=			PATH=${PATH}
+CONFIGURE_ENV+=		PATH=${PATH}
+.endif
+
 .	if defined(CCACHE_DIR)
 MAKE_ENV+=		CCACHE_DIR="${CCACHE_DIR}"
 CONFIGURE_ENV+=	CCACHE_DIR="${CCACHE_DIR}"