Index: head/devel/ccache/Makefile
===================================================================
--- head/devel/ccache/Makefile	(revision 435559)
+++ head/devel/ccache/Makefile	(revision 435560)
@@ -1,115 +1,116 @@
 # Created by: Dominic Marks <d.marks@student.umist.ac.uk>
 # $FreeBSD$
 
 PORTNAME=	ccache
 PORTVERSION=	3.3.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.samba.org/ftp/ccache/ \
 		LOCAL/bdrewery
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Tool to minimize the compile time of C/C++ programs
 
 LICENSE=	GPLv3
 
 CONFLICTS_INSTALL=	ccache-memcached-[0-9]*
 
 GNU_CONFIGURE=	yes
 
 HOWTO=		ccache-howto-freebsd.txt
 CCLINKDIR=	libexec/ccache
 SUB_FILES=	${HOWTO} world-ccache pkg-message ccache-update-links.sh
 
 PORTDOCS=	ccache-howto-freebsd.txt MANUAL.html MANUAL.txt
 
 OPTIONS_DEFINE=	CLANGLINK LLVMLINK STATIC DOCS TINDERBOX MEMCACHED
 OPTIONS_DEFAULT=CLANGLINK LLVMLINK
 
 CLANGLINK_DESC=	Create clang compiler links if clang is installed
 LLVMLINK_DESC=	Create llvm compiler links if llvm is installed
 TINDERBOX_DESC=	Create tarball for tinderbox usage
 MEMCACHED_DESC=	Build in experimental Memcached support
 
 USES=		compiler
 
 MEMCACHED_EXTRA_PATCHES=	${FILESDIR}/extra-patch-memcached:-p1
 MEMCACHED_CONFIGURE_ENABLE=	memcached
 MEMCACHED_USES=			autoreconf pkgconfig
 MEMCACHED_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
 MEMCACHED_LDFLAGS=		-L${LOCALBASE}/lib
 MEMCACHED_CFLAGS=		-I${LOCALBASE}/include
 
 .if defined(WITH_CCACHE_BUILD) && empty(OPTIONS_SLAVE:MMEMCACHED)
 # Don't allow autoreconf. We want no dependencies on this to keep
 # WITH_CCACHE_BUILD working.
 USES:=		${USES:Nautoreconf}
 
 MEMCACHED_IGNORE=		MEMCACHED cannot be combined with WITH_CCACHE_BUILD.  Use devel/ccache-memcached
 # XXX: This needs more testing with Poudriere before enabling. Also bsd.options.mk support.
 #MEMCACHED_DEPENDS_ARGS+= NO_CCACHE=1
 .endif
 
 OPTIONS_SUB=	yes
 
 STATIC_LDFLAGS=	-static
 
 .include <bsd.port.pre.mk>
 
 .  if ${COMPILER_TYPE} == clang
 CPPFLAGS+=	-DCC_IS_CLANG
 .  elif ${COMPILER_TYPE} == gcc
 CPPFLAGS+=	-DCC_IS_GCC
 .  endif
 
 PLIST_SUB+=	CCLINKDIR="${CCLINKDIR}"
 
 .if ${ARCH}=="i386"
 CCACHE_COMPILERS+=	icc icpc
 .endif
 
 GNU_COMPILERS+=		34 42 43 44 45 46 47 48 49 5 6 7
 CCACHE_COMPILERS+=	cc c++ CC gcc g++ ${GNU_COMPILERS:S|^|gcc|} ${GNU_COMPILERS:S|^|g++|}
 
 .if ${PORT_OPTIONS:MCLANGLINK}
 CLANG_COMPILERS+=	33 34 35 36 37 38 39 40 -devel
 CCACHE_COMPILERS+=	clang clang++ ${CLANG_COMPILERS:S|^|clang|} ${CLANG_COMPILERS:S|^|clang++|}
 .endif
 
 .if ${PORT_OPTIONS:MLLVMLINK}
 CCACHE_COMPILERS+=	llvm-gcc llvm-c++ llvm-g++
 .endif
 
 CCACHE_COMPILERS+=	${EXTRA_COMPILERS}
 SUB_LIST+=	CCACHE_COMPILERS="${CCACHE_COMPILERS}" \
 		CCLINKDIR="${CCLINKDIR}" \
 		ICCPREFIX="${LOCALBASE}/intel_cc_80/bin" \
 		HOWTO="${HOWTO}"
 
 post-build-TINDERBOX-on:
 	@${MKDIR} ${WRKDIR}/tb/opt
 	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${WRKDIR}/tb/opt
 .for l in ${CCACHE_COMPILERS}
 	@${LN} -sf ${PORTNAME} ${WRKDIR}/tb/opt/${l}
 .endfor
 	@${TAR} -C ${WRKDIR}/tb -cpf ${WRKSRC}/${PORTNAME}.tar opt
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ccache ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/ccache.1 ${STAGEDIR}${PREFIX}/man/man1
 	${MKDIR} ${STAGEDIR}${PREFIX}/${CCLINKDIR}/world
 	${INSTALL_SCRIPT} ${WRKDIR}/world-ccache \
 		${STAGEDIR}${PREFIX}/${CCLINKDIR}/world/ccache
 	${INSTALL_SCRIPT} ${WRKDIR}/ccache-update-links.sh \
 		${STAGEDIR}${PREFIX}/bin/ccache-update-links
 
 do-install-TINDERBOX-on:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.tar ${STAGEDIR}${DATADIR}
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/MANUAL.html ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/MANUAL.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${HOWTO} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
Index: head/devel/ccache/files/ccache-update-links.sh.in
===================================================================
--- head/devel/ccache/files/ccache-update-links.sh.in	(revision 435559)
+++ head/devel/ccache/files/ccache-update-links.sh.in	(revision 435560)
@@ -1,56 +1,72 @@
 #!/bin/sh
 #
 # Author: Emanuel Haupt <ehaupt@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 CCACHE_COMPILERS="%%CCACHE_COMPILERS%% ${EXTRA_COMPILERS}"
 CCLINKDIR="%%CCLINKDIR%%"
 PREFIX="%%PREFIX%%"
 
 usage() {
 	cat << "EOUSAGE"
 Usage: ccache-update-links [hv]
 
 ccache-update-links maintains symlinks needed by ccache to work with additional
 compilers.
 
     -h, --help   this help
     -v           verbose
 
 EOUSAGE
 }
 
 case "$1"
 in
 	-h|--help)
 	usage
 	;;
 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
 	if command -v "${comp}" >/dev/null; then
 		if [ ! -L "${PREFIX}/${CCLINKDIR}/${comp}" ]; then
 			[ "$1" = "-v" ] && echo "create symlink for ${comp}"
         		ln -sf ${PREFIX}/bin/ccache ${PREFIX}/${CCLINKDIR}/${comp}
 		fi
 
 		if [ ! -L "${PREFIX}/${CCLINKDIR}/world/${comp}" ]; then
 			[ "$1" = "-v" ] && echo "create symlink for ${comp} (world)"
         		ln -sf ccache ${PREFIX}/${CCLINKDIR}/world/${comp}
 		fi
 	else
 		if [ -L "${PREFIX}/${CCLINKDIR}/${comp}" ]; then
 			[ "$1" = "-v" ] && echo "remove symlink for ${comp}"
 			rm -f ${PREFIX}/${CCLINKDIR}/${comp}
 		fi
 
 		if [ -L "${PREFIX}/${CCLINKDIR}/world/${comp}" ]; then
 			[ "$1" = "-v" ] && echo "remove symlink for ${comp} (world)"
 			rm -f ${PREFIX}/${CCLINKDIR}/world/${comp}
 		fi
 	fi
 done