From owner-svn-ports-head@freebsd.org  Mon Mar  6 17:50:16 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 1A586CFAB28;
 Mon,  6 Mar 2017 17:50:16 +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 mx1.freebsd.org (Postfix) with ESMTPS id DD6D81973;
 Mon,  6 Mar 2017 17:50:15 +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 v26HoFgF077977;
 Mon, 6 Mar 2017 17:50:15 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v26HoEfW077975;
 Mon, 6 Mar 2017 17:50:14 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201703061750.v26HoEfW077975@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: Mon, 6 Mar 2017 17:50:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r435560 - in head/devel/ccache: . files
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Mar 2017 17:50:16 -0000

Author: bdrewery
Date: Mon Mar  6 17:50:14 2017
New Revision: 435560
URL: https://svnweb.freebsd.org/changeset/ports/435560

Log:
  ccache-update-links.sh: Fix removing links to missing compilers.
  
  PR:		217570
  Reported by:	rwmaillists@googlemail.com
  Tested by:	rwmaillists@googlemail.com

Modified:
  head/devel/ccache/Makefile
  head/devel/ccache/files/ccache-update-links.sh.in

Modified: head/devel/ccache/Makefile
==============================================================================
--- head/devel/ccache/Makefile	Mon Mar  6 17:48:26 2017	(r435559)
+++ head/devel/ccache/Makefile	Mon Mar  6 17:50:14 2017	(r435560)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ccache
 PORTVERSION=	3.3.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.samba.org/ftp/ccache/ \
 		LOCAL/bdrewery

Modified: head/devel/ccache/files/ccache-update-links.sh.in
==============================================================================
--- head/devel/ccache/files/ccache-update-links.sh.in	Mon Mar  6 17:48:26 2017	(r435559)
+++ head/devel/ccache/files/ccache-update-links.sh.in	Mon Mar  6 17:50:14 2017	(r435560)
@@ -29,6 +29,22 @@ in
 	;;
 esac
 
+strip_path() {
+	local IFS=":"
+	local path
+	set -- ${PATH}
+	while [ $# -gt 0 ]; do
+		if ! [ "${1}" = "${PREFIX}/libexec/ccache" ]; then
+			path="${path}${path:+:}${1}"
+		fi
+		shift
+	done
+	echo "${path}"
+}
+
+# Remove ccache wrappers from PATH
+PATH=$(strip_path)
+
 # create compiler links
 for comp in ${CCACHE_COMPILERS}
 do