From owner-svn-ports-all@freebsd.org  Thu Oct 10 20:04:12 2019
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1AA7613071E;
 Thu, 10 Oct 2019 20:04:12 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46q29771Dxz4WQ7;
 Thu, 10 Oct 2019 20:04:11 +0000 (UTC)
 (envelope-from bdrewery@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D43A57163;
 Thu, 10 Oct 2019 20:04:11 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9AK4Bhb054506;
 Thu, 10 Oct 2019 20:04:11 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9AK4Bxq054505;
 Thu, 10 Oct 2019 20:04:11 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201910102004.x9AK4Bxq054505@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 10 Oct 2019 20:04:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r514245 - head/graphics/rawtherapee
X-SVN-Group: ports-head
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: head/graphics/rawtherapee
X-SVN-Commit-Revision: 514245
X-SVN-Commit-Repository: ports
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.29
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: Thu, 10 Oct 2019 20:04:12 -0000

Author: bdrewery
Date: Thu Oct 10 20:04:11 2019
New Revision: 514245
URL: https://svnweb.freebsd.org/changeset/ports/514245

Log:
  - Respect NOCCACHE
  - Use proper path to CCACHE. It cannot be assumed to be in LOCALBASE
    as CCACHE_WRAPPER_PATH is used to override it.

Modified:
  head/graphics/rawtherapee/Makefile

Modified: head/graphics/rawtherapee/Makefile
==============================================================================
--- head/graphics/rawtherapee/Makefile	Thu Oct 10 19:51:10 2019	(r514244)
+++ head/graphics/rawtherapee/Makefile	Thu Oct 10 20:04:11 2019	(r514245)
@@ -73,9 +73,9 @@ INSTALLS_ICONS=	yes
 CMAKE_ARGS+=	-DPROC_TARGET_NUMBER="1"
 .endif
 
-.if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE) 
-CMAKE_ARGS+=	-DCMAKE_C_COMPILER_LAUNCHER=${LOCALBASE}/bin/ccache \
-		-DCMAKE_CXX_COMPILER_LAUNCHER=${LOCALBASE}/bin/ccache
+.if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE) && !defined(NOCCACHE)
+CMAKE_ARGS+=	-DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_WRAPPER_PATH:C,/libexec/ccache$,,}/bin/ccache \
+		-DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE_WRAPPER_PATH:C,/libexec/ccache$,,}/bin/ccache
 .endif
 
 RTDIR=		${PREFIX}/libdata/${PORTNAME}