Update to 3.1.4, inspired by PR 44659 by Marko Schuetz Schmuck:

ccache 3.1.4
Bug fixes

ccache 3.1.3
Bug and portability fixes

ccache 3.1.2
Bug fixes

ccache 3.1.1
Bug fixes

ccache 3.1

New features and improvements
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

    - Added support for hashing the output of a custom command (e.g.
      `%compiler% --version`) to identify the compiler instead of stat-ing or
      hashing the compiler binary. This can improve robustness when the
      compiler (as seen by ccache) actually isn't the real compiler but another
      compiler wrapper.

    - Added support for caching compilations that use precompiled headers. (See
      the manual for important instructions regarding this.)

    - Locking of the files containing statistics counters is now done using
      symlinks instead of POSIX locks. This should make ccache behave a lot
      better on file systems where POSIX locks are slow or broken (e.g. NFS on
      some systems).

    - Manifest files are now updated without the need of taking locks.

    - Updates of statistics counters are now always done in one of the
      sub-level statistics files. This reduces lock contention, which
      especially improves performance on slow NFS mounts.

    - Reading and writing of statistics counters has been made
      forward-compatible (unknown counters are retained).

    - Files are now read without using mmap(). This has two benefits: it's more
      robust against file changes during reading and it improves performance on
      poor systems where mmap() doesn't use the disk cache.

    - Added `.cp` and `.CP` as known C++ suffixes.

    - Improved logging.

    - Added `-install_name` as an option known to take an argument. (This
      improves statistics when using the Darwin linker.)


Bug fixes

ccache 3.0.1
Bug fixes

ccache 3.0

General
~~~~~~~

    - ccache is now licensed under the GNU General Public License (GPL) version
      3 or later.


Upgrade notes
~~~~~~~~~~~~~

    - The way the hashes are calculated has changed, so you won't get cache
      hits for compilation results stored by older ccache versions. Because of
      this, you might as well clear the old cache directory with `ccache
      --clear` if you want, unless you plan to keep using an older ccache
      version.


New features and improvements
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

    - ccache now has a ``direct mode'' where it computes a hash of the source
      code (including all included files) and compiler options without
      running the preprocessor. By not running the preprocessor, CPU usage is
      reduced; the speed is somewhere between 1 and 5 times that of ccache
      running in traditional mode, depending on the circumstances. The speedup
      will be higher when I/O is fast (e.g., when files are in the disk cache).
      The direct mode can be disabled by setting +CCACHE_NODIRECT+.

    - Support has been added for rewriting absolute paths to relative paths
      when hashing, in order to increase cache hit rate when building the same
      source code in different directories even when compiling with `-g` and
      when using absolute include directory paths. This is done by setting the
      `CCACHE_BASEDIR` environment variable to an absolute path that specifies
      which paths to rewrite.

    - Object files are now optionally stored compressed in the cache. The
      runtime cost is negligible, and more files will fit in the ccache
      directory and in the disk cache. Set `CCACHE_COMPRESS` to enable object
      file compression. Note that you can't use compression in combination with
      the hard link feature.

    - A `CCACHE_COMPILERCHECK` option has been added. This option tells ccache
      what compiler-identifying information to hash to ensure that results
      retrieved from the cache are accurate. Possible values are: none (don't
      hash anything), mtime (hash the compiler's mtime and size) and content
      (hash the content of the compiler binary). The default is mtime.

    - It is now possible to specify extra files whose contents should be
      included in the hash sum by setting the `CCACHE_EXTRAFILES` option.

    - Added support for Objective-C and Objective-C\+\+. The statistics counter
      ``not a C/C++ file'' has been renamed to ``unsupported source language''.

    - Added support for the `-x` compiler option.

    - Added support for long command-line options.

    - A `CACHEDIR.TAG` file is now created in the cache directory. See
      <http://www.brynosaurus.com/cachedir/>.

    - Messages printed to the debug log (specified by `CCACHE_LOGFILE`) have
      been improved.

    - You can relax some checks that ccache does in direct mode by setting
      `CCACHE_SLOPPINESS`. See the manual for more information.

    - `CCACHE_TEMPDIR` no longer needs to be on the same filesystem as
      `CCACHE_DIR`.

    - The default value of `CCACHE_TEMPDIR` has been changed to
      `$CCACHE_DIR/tmp` to avoid cluttering the top directory.

    - Temporary files that later will be moved into the cache are now created
      in the cache directory they will end up in. This makes ccache more
      friendly to Linux's directory layout.

    - Improved the test suite and added tests for most of the new
      functionality. It's now also possible to specify a subset of tests to
      run.

    - Standard error output from the compiler is now only stored in the cache
      if it's non-empty.

    - If the compiler produces no object file or an empty object file, but
      gives a zero exit status (could be due to a file system problem, a buggy
      program specified by `CCACHE_PREFIX`, etc.), ccache copes with it
      properly.

    - Added `installcheck` and `distcheck` make targets.

    - Clarified cache size limit options' and cleanup semantics.

    - Improved display of cache max size values.

    - The following options are no longer hashed in the preprocessor mode:
      `-imacros`, `-imultilib`, `-iprefix`, `-iquote`, `-isysroot`,
      `-iwithprefix`, `-iwithprefixbefore`, `-nostdinc`, `-nostdinc++` and
      `-U`.

4 files changed, 7 insertions, 74 deletions

diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile
index 8a1cfdeaddd..60bedf30661 100644
--- a/devel/ccache/Makefile
+++ b/devel/ccache/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.15 2008/05/22 14:20:08 tnn Exp $
+# $NetBSD: Makefile,v 1.16 2011/03/02 06:40:51 wiz Exp $
 
-DISTNAME=	ccache-2.4
+DISTNAME=	ccache-3.1.4
 CATEGORIES=	devel
 MASTER_SITES=	http://samba.org/ftp/ccache/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ccache.samba.org/
 COMMENT=	Cache for C/C++ compilers
+#LICENSE=	gnu-gpl-v3 AND modified-bsd AND public-domain # AND zlib-license
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/devel/ccache/distinfo b/devel/ccache/distinfo
index a665720d788..d9677be99d0 100644
--- a/devel/ccache/distinfo
+++ b/devel/ccache/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 22:24:11 agc Exp $
+$NetBSD: distinfo,v 1.9 2011/03/02 06:40:52 wiz Exp $
 
-SHA1 (ccache-2.4.tar.gz) = 9833ec13de9b90d5409e60d679ac681115ef465e
-RMD160 (ccache-2.4.tar.gz) = 43a0647c7faf659121a53a92ec45d245b8140124
-Size (ccache-2.4.tar.gz) = 86363 bytes
-SHA1 (patch-aa) = f2932ccc9166f94eee56da382f7a51f23088bc69
-SHA1 (patch-ab) = 1c16adfc4d754182dc9c5f682daf01afc4286aaa
+SHA1 (ccache-3.1.4.tar.gz) = caf5b3368419c36b3090b00ad2e03cd3f52f0df7
+RMD160 (ccache-3.1.4.tar.gz) = b2988fb7316419de9326513cc7c64100132bb6bc
+Size (ccache-3.1.4.tar.gz) = 338215 bytes
diff --git a/devel/ccache/patches/patch-aa b/devel/ccache/patches/patch-aa
deleted file mode 100644
index 744729a1284..00000000000
--- a/devel/ccache/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/02/12 07:11:43 jlam Exp $
-
---- ccache.1.orig	Sat Sep 27 21:48:17 2003
-+++ ccache.1
-@@ -208,6 +208,14 @@ to share your cache with other users\&. 
- file permissions set on the object files created from your
- compilations\&.
- .IP 
-+.IP "\fBCCACHE_HASHCC\fP"
-+Normally, ccache adds the compiler size and modification time when
-+calculating the hash that is used to distinguish two compiles\&.  You
-+can use CCACHE_HASHCC to override this default with a unique string\&.
-+This is useful when the compiler is actually a shell script generated
-+on-the-fly that executes the real compiler\&.  A reasonable value for
-+CCACHE_HASHCC for \&'gcc\&' is the output of \&'gcc -v\&'\&.
-+.IP
- .IP "\fBCCACHE_HASHDIR\fP" 
- This tells ccache to hash the current working
- directory when calculating the hash that is used to distinguish two
diff --git a/devel/ccache/patches/patch-ab b/devel/ccache/patches/patch-ab
deleted file mode 100644
index 6c8f6b24d28..00000000000
--- a/devel/ccache/patches/patch-ab
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/10/14 02:39:19 xtraeme Exp $
-
---- ccache.c.orig	2004-09-13 12:38:30.000000000 +0200
-+++ ccache.c	2004-10-14 03:04:59.000000000 +0200
-@@ -255,6 +255,7 @@
- 	int i;
- 	char *path_stdout, *path_stderr;
- 	char *hash_dir;
-+	const char *hash_cc;
- 	char *s;
- 	struct stat st;
- 	int status;
-@@ -317,13 +318,22 @@
- 		hash_string(args->argv[i]);
- 	}
- 
--	/* the compiler driver size and date. This is a simple minded way
--	   to try and detect compiler upgrades. It is not 100% reliable */
-+	/* If CCACHE_HASHCC is defined, then hash that string, otherwise, hash
-+	the compiler driver size and date. This is a simple minded way to
-+	try and detect compiler upgrades. It is not 100% reliable */
-+
-+	hash_cc = getenv("CCACHE_HASHCC");
-+	if (hash_cc) {
-+		hash_string(hash_cc);
-+	} else {
- 	if (stat(args->argv[0], &st) != 0) {
- 		cc_log("Couldn't stat the compiler!? (argv[0]='%s')\n", args->argv[0]);
- 		stats_update(STATS_COMPILER);
- 		failed();
- 	}
-+		hash_int(st.st_size);
-+		hash_int(st.st_mtime);
-+	}
- 
- 	/* also include the hash of the compiler name - as some compilers
- 	   use hard links and behave differently depending on the real name */
-@@ -331,9 +341,6 @@
- 		hash_string(str_basename(args->argv[0]));
- 	}
- 
--	hash_int(st.st_size);
--	hash_int(st.st_mtime);
--
- 	/* possibly hash the current working directory */
- 	if (getenv("CCACHE_HASHDIR")) {
- 		char *cwd = gnu_getcwd();