From owner-svn-ports-all@FreeBSD.ORG Fri Aug 30 11:41:31 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D9FCF65F; Fri, 30 Aug 2013 11:41:31 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C81892D36; Fri, 30 Aug 2013 11:41:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7UBfVt3088553; Fri, 30 Aug 2013 11:41:31 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7UBfVKw088552; Fri, 30 Aug 2013 11:41:31 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201308301141.r7UBfVKw088552@svn.freebsd.org> From: Bryan Drewery Date: Fri, 30 Aug 2013 11:41:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325670 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Aug 2013 11:41:31 -0000 Author: bdrewery Date: Fri Aug 30 11:41:31 2013 New Revision: 325670 URL: http://svnweb.freebsd.org/changeset/ports/325670 Log: - Fix WITH_CCACHE_BUILD support on ports that have a *PATH var in their MAKE_ENV. This only intended to ignore PATH. All of these were not supporting WITH_CCACHE_BUILD and a partial exp-run was done on: audio/fdmf biology/biojava devel/ace games/hex graphics/cimg graphics/inventor graphics/peps graphics/wings graphics/wings-devel lang/python26 lang/python27 lang/python31 lang/python32 lang/python33 lang/siod math/py-basemap math/py-basemap-data multimedia/gpodder multimedia/gstreamer-ffmpeg multimedia/gstreamer1-libav multimedia/handbrake print/py-reportlab print/py-reportlab2 science/ncs science/netcdf4 security/nss textproc/adabrowse x11-toolkits/py-kivy With hat: portmgr Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Aug 30 11:03:49 2013 (r325669) +++ head/Mk/bsd.port.mk Fri Aug 30 11:41:31 2013 (r325670) @@ -2157,7 +2157,7 @@ _CCACHE_PATH= ${LOCALBASE}/libexec/ccach # Prepend the ccache dir into the PATH and setup ccache env PATH:= ${_CCACHE_PATH}:${PATH} -.if !${MAKE_ENV:M*PATH=*} && !${CONFIGURE_ENV:M*PATH=*} +.if !${MAKE_ENV:MPATH=*} && !${CONFIGURE_ENV:MPATH=*} MAKE_ENV+= PATH=${PATH} CONFIGURE_ENV+= PATH=${PATH} .endif