5 files changed, 37 insertions, 18 deletions

diff --git a/devel/ccache/files/ccache-howto-freebsd.txt.in b/devel/ccache/files/ccache-howto-freebsd.txt.in
index ed0316e6f2a6..eef830d2e7fd 100644
--- a/devel/ccache/files/ccache-howto-freebsd.txt.in
+++ b/devel/ccache/files/ccache-howto-freebsd.txt.in
@@ -4,25 +4,17 @@
 
 To use ccache add the following to /etc/make.conf
 
-.if !defined(NOCCACHE)
-.if ${.CURDIR:M/usr/src*} && exists(%%LOCALBASE%%/libexec/ccache/cc)
-CC=%%LOCALBASE%%/libexec/ccache/cc
-CXX=%%LOCALBASE%%/libexec/ccache/c++
-.else
-CC=cc
-CXX=c++
-.endif
-.else
-CC=/usr/bin/cc
-CXX=/usr/bin/c++
+.if (!empty(.CURDIR:M/usr/src*) || !empty(.CURDIR:M/usr/obj*)) && !defined(NOCCACHE)
+CC=%%PREFIX%%/%%CCLINKDIR%%/world-cc
+CXX=%%PREFIX%%/%%CCLINKDIR%%/world-c++
 .endif
 
 For Korn/Bourne shells Add the following to /etc/profile:
- export PATH=%%PREFIX%%/libexec/ccache/:$PATH
+ export PATH=%%PREFIX%%/%%CCLINKDIR%%:$PATH
  export CCACHE_PATH=/usr/bin:%%LOCALBASE%%/bin
 
 For csh/tcsh Add the following to /etc/csh.cshrc:
- setenv PATH %%PREFIX%%/libexec/ccache/:$PATH
+ setenv PATH %%PREFIX%%/%%CCLINKDIR%%:$PATH
  setenv CCACHE_PATH /usr/bin:%%LOCALBASE%%/bin
 
 For icc users:
@@ -42,9 +34,12 @@ For csh/tcsh Add the following to /etc/csh.cshrc:
 
 --
 
-If you have a problem building a port
+If you have a problem building world
 define NOCCACHE and try again.
 
+If you have a problem building a port
+reset PATH=$CCACHE_PATH and try again.
+
 --
 
 Ccache has installed links for the following compilers
diff --git a/devel/ccache/files/patch-ccache.c b/devel/ccache/files/patch-ccache.c
index 7ee069ace02b..caba042f50c0 100644
--- a/devel/ccache/files/patch-ccache.c
+++ b/devel/ccache/files/patch-ccache.c
@@ -1,12 +1,14 @@
---- ccache.c.orig	Mon Sep 13 06:38:30 2004
-+++ ccache.c	Tue Nov 15 14:59:46 2005
-@@ -331,8 +331,10 @@
+--- ccache.c.orig	2004/09/13 10:19:06	1.96
++++ ccache.c	2005/11/24 21:54:09	1.98
+@@ -331,8 +331,12 @@
  		hash_string(str_basename(args->argv[0]));
  	}
  
 -	hash_int(st.st_size);
 -	hash_int(st.st_mtime);
-+	if (!getenv("CCACHE_NOHASH_SIZE_MTIME")) {
++	if (getenv("CCACHE_HASH_COMPILER")) {
++		hash_file(args->argv[0]);
++	} else if (!getenv("CCACHE_NOHASH_SIZE_MTIME")) {
 +		hash_int(st.st_size);
 +		hash_int(st.st_mtime);
 +	}
diff --git a/devel/ccache/files/patch-ccache.yo b/devel/ccache/files/patch-ccache.yo
new file mode 100644
index 000000000000..626f75610499
--- /dev/null
+++ b/devel/ccache/files/patch-ccache.yo
@@ -0,0 +1,14 @@
+--- ccache.yo.orig	2004/09/10 05:05:14	1.26
++++ ccache.yo	2005/11/24 21:54:09	1.27
+@@ -203,6 +203,11 @@
+ strike problems with gdb not using the correct directory then enable
+ this option.
+ 
++dit(bf(CCACHE_HASH_COMPILER)) This tells ccache to hash binary of the
++compiler instead of hashing just its size and mtime. This is very
++slightly slower, but makes copes better with compiler upgrades during
++a build bootstrapping process.
++
+ dit(bf(CCACHE_UNIFY)) If you set the environment variable CCACHE_UNIFY
+ then ccache will use the C/C++ unifier when hashing the pre-processor
+ output if -g is not used in the compile. The unifier is slower than a
diff --git a/devel/ccache/files/world-c++.in b/devel/ccache/files/world-c++.in
new file mode 100644
index 000000000000..d6933ff5c33b
--- /dev/null
+++ b/devel/ccache/files/world-c++.in
@@ -0,0 +1,4 @@
+#!/bin/sh
+unset CCACHE_PATH
+export CCACHE_HASH_COMPILER
+exec %%PREFIX%%/%%CCLINKDIR%%/c++ "$@"
diff --git a/devel/ccache/files/world-cc.in b/devel/ccache/files/world-cc.in
new file mode 100644
index 000000000000..bb2f8162ac8c
--- /dev/null
+++ b/devel/ccache/files/world-cc.in
@@ -0,0 +1,4 @@
+#!/bin/sh
+unset CCACHE_PATH
+export CCACHE_HASH_COMPILER
+exec %%PREFIX%%/%%CCLINKDIR%%/cc "$@"