ccache: update to 4.7

3 files changed, 442 insertions, 181 deletions

diff --git a/ccache/.signature b/ccache/.signature
index 0465ac2e1..0ed81d9d8 100644
--- a/ccache/.signature
+++ b/ccache/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/dKkmeHf7kJ97tqIdB86dP9xG3FKBPc1wXBe/F+Ymqko8CMsBbIDcl4575Jt21wuHHrlfXdoF8Tb9Ba3mIxePAE=
-SHA256 (Pkgfile) = e96b4fa359a9d56b34bb2e20193a1ab640d4b08ecb585e0a9a5f68dabf783726
+RWSE3ohX2g5d/VsBODWK16hlY81eMKmggQsFiGbAKu7HLLbhH5n4WEUmEMQp/Dh9WppG4/xVN1zrCMTqgRIqMW4kjHKbAjqOnQk=
+SHA256 (Pkgfile) = ffe09c9d0164b09fba0ef1c6826e7adc68c24966f4520a9c7727e586a33f522f
 SHA256 (.footprint) = aa85bfc686cf873efffd292c55eae8016e161bd8074d4f3490539f6089eead23
-SHA256 (ccache-4.6.3.tar.xz) = 1e3a251bb112632553b8255a78661fe526c3a16598496d51128c32b218fd8b22
-SHA256 (ccache.1) = 1e66a00419827c387f69e0138375d2d64d3510d1b1b37365fa62da39d92cb3b2
+SHA256 (ccache-4.7.tar.xz) = d9283bbe22085268f52d309b91adb81a77a7abe10867eb6852057910ffac736a
+SHA256 (ccache.1) = 5ea5fcc0a54fafe7404c1a9a4edd668fecd6649b64b7202dbe346e61086fc8c3
diff --git a/ccache/Pkgfile b/ccache/Pkgfile
index 99e542d11..229b38e60 100644
--- a/ccache/Pkgfile
+++ b/ccache/Pkgfile
@@ -1,16 +1,19 @@
 # Description: A fast compiler cache.
 # URL: https://ccache.dev/
 # Maintainer: Danny Rawlins, crux at romster dot me
+# Depends on: cmake
 # Optional: asciidoctor clang-ccache-bindings
 
 name=ccache
-version=4.6.3
+version=4.7
 release=1
 source=(https://github.com/$name/$name/releases/download/v$version/$name-$version.tar.xz
 	ccache.1)
 
 build() {
-	cmake -S $name-$version -B build -G Ninja \
+	prt-get isinst ninja && PKGMK_CCACHE+=' -G Ninja'
+
+	cmake -S $name-$version -B build $PKGMK_CCACHE \
 		-D CMAKE_INSTALL_PREFIX=/usr \
 		-D CMAKE_INSTALL_LIBDIR=lib \
 		-D CMAKE_BUILD_TYPE=Release \
diff --git a/ccache/ccache.1 b/ccache/ccache.1
index f30cc6fda..0596fe1b3 100644
--- a/ccache/ccache.1
+++ b/ccache/ccache.1
@@ -2,12 +2,12 @@
 .\"     Title: ccache
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.17
-.\"      Date: 2022-08-27
+.\"      Date: 2022-10-17
 .\"    Manual: \ \&
-.\"    Source: Ccache 4.6.3
+.\"    Source: Ccache 4.7
 .\"  Language: English
 .\"
-.TH "CCACHE" "1" "2022-08-27" "Ccache 4.6.3" "\ \&"
+.TH "CCACHE" "1" "2022-10-17" "Ccache 4.7" "\ \&"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -34,7 +34,7 @@ ccache \- a fast C/C++ compiler cache
 .nf
 \fBccache\fP [\fIoptions\fP]
 \fBccache\fP \fIcompiler\fP [\fIcompiler options\fP]
-\fIcompiler\fP [\fIcompiler options\fP]                   (via symbolic link)
+\fIcompiler\fP [\fIcompiler options\fP]            (ccache masquerading as the compiler)
 .fi
 .br
 .SH "DESCRIPTION"
@@ -50,16 +50,41 @@ goal are listed under \fICAVEATS\fP. If you discover an undocumented case where
 ccache changes the output of your compiler, please let us know.
 .SH "RUN MODES"
 .sp
-There are two ways to use ccache. You can either prefix your compilation
-commands with \fBccache\fP or you can let ccache masquerade as the compiler by
-creating a symbolic link (named as the compiler) to ccache. The first method is
-most convenient if you just want to try out ccache or wish to use it for some
-specific projects. The second method is most useful for when you wish to use
-ccache for all your compilations.
+There are two different ways to use ccache to cache a compilation:
 .sp
-To use the first method, just make sure that \fBccache\fP is in your \fBPATH\fP.
+.RS 4
+.ie n \{\
+\h'-04' 1.\h'+01'\c
+.\}
+.el \{\
+.  sp -1
+.  IP " 1." 4.2
+.\}
+Prefix your compilation command with \fBccache\fP. This method is most convenient
+if you just want to try out ccache or wish to use it for some specific
+projects. Example:
+.sp
+.if n .RS 4
+.nf
+.fam C
+ccache gcc \-c example.c
+.fam
+.fi
+.if n .RE
+.RE
 .sp
-To use the symlinks method, do something like this:
+.RS 4
+.ie n \{\
+\h'-04' 2.\h'+01'\c
+.\}
+.el \{\
+.  sp -1
+.  IP " 2." 4.2
+.\}
+Let ccache masquerade as the compiler. This method is most useful when you
+wish to use ccache for all your compilations. To do this, create a symbolic
+link to ccache named as the compiler. For example, here is set up ccache to
+masquerade as \fBgcc\fP and \fBg++\fP:
 .sp
 .if n .RS 4
 .nf
@@ -67,16 +92,25 @@ To use the symlinks method, do something like this:
 cp ccache /usr/local/bin/
 ln \-s ccache /usr/local/bin/gcc
 ln \-s ccache /usr/local/bin/g++
-ln \-s ccache /usr/local/bin/cc
-ln \-s ccache /usr/local/bin/c++
 .fam
 .fi
 .if n .RE
 .sp
-And so forth. This will work as long as the directory with symlinks comes
-before the path to the compiler (which is usually in \fB/usr/bin\fP). After
-installing you may wish to run \(lqwhich gcc\(rq to make sure that the correct link
-is being used.
+On platforms that don\(cqt support symbolic links you can simply copy ccache to the
+compiler name instead for a similar effect:
+.sp
+.if n .RS 4
+.nf
+.fam C
+cp ccache /usr/local/bin/gcc
+cp ccache /usr/local/bin/g++
+.fam
+.fi
+.if n .RE
+.sp
+And so forth. This will work as long as the directory with symbolic links or
+ccache copies comes before the directory with the compiler (typically
+\fB/usr/bin\fP) in \fBPATH\fP.
 .if n .sp
 .RS 4
 .it 1 an-trap
@@ -93,26 +127,13 @@ but currently doesn\(cqt interact well with other tools that do the same thing.
 \fIUSING CCACHE WITH OTHER COMPILER WRAPPERS\fP.
 .sp .5v
 .RE
-.if n .sp
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-.B Warning
-.ps -1
-.br
-.sp
-Use a symbolic links for masquerading, not hard links.
-.sp .5v
 .RE
 .SH "COMMAND LINE OPTIONS"
 .sp
-These command line options only apply when you invoke ccache as \(lqccache\(rq.
-When invoked as a compiler (via a symlink as described in the previous
-section), the normal compiler options apply and you should refer to the
-compiler\(cqs documentation.
+These command line options only apply when you invoke ccache as \(lqccache\(rq. When
+ccache masquerades as a compiler (as described in the previous section), the
+normal compiler options apply and you should refer to the compiler\(cqs
+documentation.
 .SS "Common options"
 .sp
 \fB\-c\fP, \fB\-\-cleanup\fP
@@ -241,7 +262,7 @@ Print version and copyright information.
 .RS 4
 Zero the cache statistics (but not the configuration options).
 .RE
-.SS "Options for secondary storage"
+.SS "Options for remote file\-based storage"
 .sp
 \fB\-\-trim\-dir\fP \fIPATH\fP
 .RS 4
@@ -258,8 +279,8 @@ by \fB\-\-trim\-max\-size\fP.
 .ps -1
 .br
 .sp
-Don\(cqt use this option to trim the primary cache. To trim the primary
-cache directory to a certain size, use \fBCCACHE_MAXSIZE=\fISIZE\fP ccache \-c\fP.
+Don\(cqt use this option to trim the local cache. To trim the local cache
+directory to a certain size, use \fBCCACHE_MAXSIZE=\fISIZE\fP ccache \-c\fP.
 .sp .5v
 .RE
 .RE
@@ -391,7 +412,7 @@ Environment variables.
 .  sp -1
 .  IP " 2." 4.2
 .\}
-The primary (cache\-specific) configuration file (see below).
+The cache\-specific configuration file (see below).
 .RE
 .sp
 .RS 4
@@ -402,9 +423,8 @@ The primary (cache\-specific) configuration file (see below).
 .  sp -1
 .  IP " 3." 4.2
 .\}
-The secondary (system\-wide read\-only) configuration file
-\fB<sysconfdir>/ccache.conf\fP (typically \fB/etc/ccache.conf\fP or
-\fB/usr/local/etc/ccache.conf\fP).
+The system (read\-only) configuration file \fB<sysconfdir>/ccache.conf\fP
+(typically \fB/etc/ccache.conf\fP or \fB/usr/local/etc/ccache.conf\fP).
 .RE
 .sp
 .RS 4
@@ -418,13 +438,13 @@ The secondary (system\-wide read\-only) configuration file
 Compile\-time defaults.
 .RE
 .sp
-As a special case, if the the environment variable \fBCCACHE_CONFIGPATH\fP is set
-it specifies the primary configuration file and the secondary (system\-wide)
-configuration file won\(cqt be read.
-.SS "Location of the primary configuration file"
+As a special case, if the environment variable \fBCCACHE_CONFIGPATH\fP is set it
+specifies the configuration file, and the system configuration file won\(cqt be
+read.
+.SS "Location of the configuration file"
 .sp
-The location of the primary (cache\-specific) configuration is determined like
-this:
+The location of the cache\-specific configuration file is determined like this on
+non\-Windows systems:
 .sp
 .RS 4
 .ie n \{\
@@ -457,8 +477,8 @@ Otherwise, if the environment variable \fBCCACHE_DIR\fP is set then use
 .  sp -1
 .  IP " 3." 4.2
 .\}
-Otherwise, if \fBcache_dir\fP is set in the secondary
-(system\-wide) configuration file then use \fB<cache_dir>/ccache.conf\fP.
+Otherwise, if \fBcache_dir\fP is set in the system
+configuration file then use \fB<cache_dir>/ccache.conf\fP.
 .RE
 .sp
 .RS 4
@@ -493,10 +513,87 @@ Otherwise, if \fBXDG_CONFIG_HOME\fP is set then use
 .  sp -1
 .  IP " 6." 4.2
 .\}
-Otherwise, use \fB%APPDATA%/ccache/ccache.conf\fP (Windows),
+Otherwise, use
 \fB$HOME/Library/Preferences/ccache/ccache.conf\fP (macOS) or
 \fB$HOME/.config/ccache/ccache.conf\fP (other systems).
 .RE
+.sp
+On Windows, this is the method used to find the configuration file:
+.sp
+.RS 4
+.ie n \{\
+\h'-04' 1.\h'+01'\c
+.\}
+.el \{\
+.  sp -1
+.  IP " 1." 4.2
+.\}
+If \fBCCACHE_CONFIGPATH\fP is set, use that path.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04' 2.\h'+01'\c
+.\}
+.el \{\
+.  sp -1
+.  IP " 2." 4.2
+.\}
+Otherwise, if the environment variable \fBCCACHE_DIR\fP is set then use
+\fB%CCACHE_DIR%/ccache.conf\fP.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04' 3.\h'+01'\c
+.\}
+.el \{\
+.  sp -1
+.  IP " 3." 4.2
+.\}
+Otherwise, if \fBcache_dir\fP is set in the system
+configuration file then use \fB<cache_dir>\(rsccache.conf\fP. The
+system\-wide configuration on Windows is
+\fB%ALLUSERSPROFILE%\(rsccache\(rsccache.conf\fP by default. The \fBALLUSERSPROFILE\fP
+environment variable is usually \fBC:\(rsProgramData\fP.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04' 4.\h'+01'\c
+.\}
+.el \{\
+.  sp -1
+.  IP " 4." 4.2
+.\}
+Otherwise, if there is a legacy \fB%USERPROFILE%\(rs.ccache\fP directory then use
+\fB%USERPROFILE%\(rs.ccache\(rsccache.conf\fP.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04' 5.\h'+01'\c
+.\}
+.el \{\
+.  sp -1
+.  IP " 5." 4.2
+.\}
+Otherwise, use \fB%LOCALAPPDATA%\(rsccache\(rsccache.conf\fP if it exists.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04' 6.\h'+01'\c
+.\}
+.el \{\
+.  sp -1
+.  IP " 6." 4.2
+.\}
+Otherwise, use \fB%APPDATA%\(rsccache\(rsccache.conf\fP.
+.RE
+.sp
+See also the \fBcache_dir\fP configuration option for how the
+cache directory location is determined.
 .SS "Configuration file syntax"
 .sp
 Configuration files are in a simple \(lqkey = value\(rq format, one option per
@@ -659,15 +756,33 @@ relative paths in the first place instead instead of using \fBbase_dir\fP.
 \fBcache_dir\fP (\fBCCACHE_DIR\fP)
 .RS 4
 This option specifies where ccache will keep its cached compiler outputs.
-The default is \fB$XDG_CACHE_HOME/ccache\fP if \fBXDG_CACHE_HOME\fP is set,
-otherwise \fB%APPDATA%/ccache\fP (Windows), \fB$HOME/Library/Caches/ccache\fP
-(macOS) or \fB$HOME/.config/ccache\fP (other systems). Exception: If the legacy
-directory \fB$HOME/.ccache\fP exists then that directory is the default.
 .sp
-See also \fILocation of the primary configuration file\fP.
+On non\-Windows systems, the default is \fB$HOME/.ccache\fP if such a directory
+exists, otherwise \fB$XDG_CACHE_HOME/ccache\fP if \fBXDG_CACHE_HOME\fP is set, otherwise
+\fB$HOME/Library/Caches/ccache\fP (macOS) or \fB$HOME/.config/ccache\fP (other systems).
+.sp
+On Windows, the default is \fB%USERPROFILE%\(rs.ccache\fP if such a directory exists,
+otherwise \fB%LOCALAPPDATA%\(rsccache\fP.
+.if n .sp
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+.B Warning
+.ps -1
+.br
 .sp
-If you want to use another \fBCCACHE_DIR\fP value temporarily for one ccache
-invocation you can use the \fB\-d\fP/\fB\-\-dir\fP command line option instead.
+Previous ccache versions defaulted to storing the cache in
+\fB%APPDATA%\(rsccache\fP on Windows. This can result in large network file transfers
+of the cache in domain environments and similar problems. Please check this
+directory for cache directories and either delete them or the whole directory,
+or move them to the \fB%LOCALAPPDATA%\(rsccache\fP directory.
+.sp .5v
+.RE
+.sp
+See also \fILocation of the configuration file\fP.
 .RE
 .sp
 \fBcompiler\fP (\fBCCACHE_COMPILER\fP or (deprecated) \fBCCACHE_CC\fP)
@@ -783,6 +898,11 @@ clang\-cl.
 GCC\-based compiler.
 .RE
 .sp
+\fBicl\fP
+.RS 4
+Intel compiler on Windows.
+.RE
+.sp
 \fBmsvc\fP
 .RS 4
 Microsoft Visual C++ (MSVC).
@@ -1051,14 +1171,25 @@ example, \fB\-fmessage\-length=*\fP will match both \fB\-fmessage\-length=20\fP
 .sp
 \fBinode_cache\fP (\fBCCACHE_INODECACHE\fP or \fBCCACHE_NOINODECACHE\fP, see \fIBoolean values\fP above)
 .RS 4
-If true, enables caching of source file hashes based on device, inode and
-timestamps. This will reduce the time spent on hashing included files as
-the result can be resused between compilations.
-.sp
-The feature is still experimental and thus off by default. It is currently not
-available on Windows.
+If true, ccache will cache source file hashes based on device, inode and
+timestamps. This reduces the time spent on hashing include files since the
+result can be resused between compilations. The default is true. The feature
+requires \fBtemporary_dir\fP to be located on a local
+filesystem of a supported type.
+.if n .sp
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+.B Note
+.ps -1
+.br
 .sp
-The feature requires \fBtemporary_dir\fP to be located on a local filesystem.
+The inode cache feature is currently not available on Windows.
+.sp .5v
+.RE
 .RE
 .sp
 \fBkeep_comments_cpp\fP (\fBCCACHE_COMMENTS\fP or \fBCCACHE_NOCOMMENTS\fP, see \fIBoolean values\fP above)
@@ -1109,16 +1240,23 @@ Gi, Ti (binary). The default suffix is G. See also
 \fICACHE SIZE MANAGEMENT\fP.
 .RE
 .sp
+\fBmsvc_dep_prefix\fP (\fBCCACHE_MSVC_DEP_PREFIX\fP)
+.RS 4
+This option specifies the prefix of included files output for MSVC compiler.
+The default prefix is \(lqNote: including file:\(rq. If you use a localized
+compiler, this should be set accordingly.
+.RE
+.sp
 \fBnamespace\fP (\fBCCACHE_NAMESPACE\fP)
 .RS 4
 If set, the namespace string will be added to the hashed data for each
 compilation. This will make the associated cache entries logically separate
 from cache entries with other namespaces, but they will still share the same
-storage space. Cache entries can also be selectively removed from the
-primary cache with the command line option \fB\-\-evict\-namespace\fP, potentially
-in combination with \fB\-\-evict\-older\-than\fP.
+storage space. Cache entries can also be selectively removed from the local
+cache with the command line option \fB\-\-evict\-namespace\fP, potentially in
+combination with \fB\-\-evict\-older\-than\fP.
 .sp
-For instance, if you use the same primary cache for several disparate projects,
+For instance, if you use the same local cache for several disparate projects,
 you can use a unique namespace string for each one. This allows you to remove
 cache entries that belong to a certain project if you stop working with that
 project.
@@ -1182,43 +1320,20 @@ If true, ccache will not use any previously stored result. New results will
 still be cached, possibly overwriting any pre\-existing results.
 .RE
 .sp
-\fBreshare\fP (\fBCCACHE_RESHARE\fP or \fBCCACHE_NORESHARE\fP, see \fIBoolean values\fP above)
+\fBremote_only\fP (\fBCCACHE_REMOTE_ONLY\fP or \fBCCACHE_NOREMOTE_ONLY\fP, see \fIBoolean values\fP above)
 .RS 4
-If true, ccache will write results to secondary storage even for primary
-storage cache hits. The default is false.
+If true, ccache will only use remote storage. The
+default is false. Note that cache statistics counters will still be kept in
+the local cache directory unless \fBstats\fP is false. See also
+\fIStorage interaction\fP.
 .RE
 .sp
-\fBrun_second_cpp\fP (\fBCCACHE_CPP2\fP or \fBCCACHE_NOCPP2\fP, see \fIBoolean values\fP above)
-.RS 4
-If true, ccache will first run the preprocessor to preprocess the source
-code (see \fIThe preprocessor mode\fP) and then on a cache miss run the
-compiler on the source code to get hold of the object file. This is the
-default.
-.sp
-If false, ccache will first run preprocessor to preprocess the source code and
-then on a cache miss run the compiler on the \fIpreprocessed source code\fP instead
-of the original source code. This makes cache misses slightly faster since the
-source code only has to be preprocessed once. The downside is that some
-compilers won\(cqt produce the same result (for instance diagnostics warnings)
-when compiling preprocessed source code.
-.sp
-A solution to the above mentioned downside is to set \fBrun_second_cpp\fP to false
-and pass \fB\-fdirectives\-only\fP (for GCC) or \fB\-frewrite\-includes\fP (for Clang) to
-the compiler. This will cause the compiler to leave the macros and other
-preprocessor information, and only process the \fB#include\fP directives. When run
-in this way, the preprocessor arguments will be passed to the compiler since it
-still has to do \fIsome\fP preprocessing (like macros).
-.sp
-This option is ignored with MSVC, as there is no way to make it compile without
-preprocessing first.
-.RE
-.sp
-\fBsecondary_storage\fP (\fBCCACHE_SECONDARY_STORAGE\fP)
+\fBremote_storage\fP (\fBCCACHE_REMOTE_STORAGE\fP)
 .RS 4
 This option specifies one or several storage backends (separated by space)
-to query after the primary cache storage. See
-\fISECONDARY STORAGE BACKENDS\fP for documentation of syntax and available
-backends.
+to query after checking the local cache (unless
+\fBremote_only\fP is true). See \fI[Remote storage
+backends]\fP for documentation of syntax and available backends.
 .sp
 Examples:
 .sp
@@ -1264,8 +1379,54 @@ Examples:
 .  IP \(bu 2.3
 .\}
 \fBredis://example.com\fP
+.if n .sp
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+.B Note
+.ps -1
+.br
+.sp
+In previous ccache versions this option was called \fBsecondary_storage\fP
+(\fBCCACHE_SECONDARY_STORAGE\fP), which can still be used as an alias.
+.sp .5v
 .RE
 .RE
+.RE
+.sp
+\fBreshare\fP (\fBCCACHE_RESHARE\fP or \fBCCACHE_NORESHARE\fP, see \fIBoolean values\fP above)
+.RS 4
+If true, ccache will write results to remote storage even for local storage
+cache hits. The default is false.
+.RE
+.sp
+\fBrun_second_cpp\fP (\fBCCACHE_CPP2\fP or \fBCCACHE_NOCPP2\fP, see \fIBoolean values\fP above)
+.RS 4
+If true, ccache will first run the preprocessor to preprocess the source
+code (see \fIThe preprocessor mode\fP) and then on a cache miss run the
+compiler on the source code to get hold of the object file. This is the
+default.
+.sp
+If false, ccache will first run preprocessor to preprocess the source code and
+then on a cache miss run the compiler on the \fIpreprocessed source code\fP instead
+of the original source code. This makes cache misses slightly faster since the
+source code only has to be preprocessed once. The downside is that some
+compilers won\(cqt produce the same result (for instance diagnostics warnings)
+when compiling preprocessed source code.
+.sp
+A solution to the above mentioned downside is to set \fBrun_second_cpp\fP to false
+and pass \fB\-fdirectives\-only\fP (for GCC) or \fB\-frewrite\-includes\fP (for Clang) to
+the compiler. This will cause the compiler to leave the macros and other
+preprocessor information, and only process the \fB#include\fP directives. When run
+in this way, the preprocessor arguments will be passed to the compiler since it
+still has to do \fIsome\fP preprocessing (like macros).
+.sp
+This option is ignored with MSVC, as there is no way to make it compile without
+preprocessing first.
+.RE
 .sp
 \fBsloppiness\fP (\fBCCACHE_SLOPPINESS\fP)
 .RS 4
@@ -1306,21 +1467,22 @@ when producing a \fB.gcno\fP file (when compiling with \fB\-ftest\-coverage\fP o
 in the \fB.gcno\fP file. The \fBgcno_cwd\fP sloppiness makes ccache not hash the
 current working directory so that you can get cache hits when compiling in
 different directories, with the tradeoff of potentially getting an incorrect
-directory in the \fB.gcno\fP file.
+directory in the \fB.gcno\fP file. \fBgcno_cwd\fP also disables hashing of the
+current working directory if \fB\-fprofile\-abs\-path\fP is used.
 .RE
 .sp
 \fBinclude_file_ctime\fP
 .RS 4
-By default, ccache will not cache a file if it includes a header whose ctime
-is too new. This sloppiness disables that check. See also
-\fIHANDLING OF NEWLY CREATED HEADER FILES\fP.
+By default, ccache will disable the direct mode if an include file has too
+new ctime. This sloppiness disables that check. See also \fI[Handling of
+newly created header files]\fP.
 .RE
 .sp
 \fBinclude_file_mtime\fP
 .RS 4
-By default, ccache will not cache a file if it includes a header whose mtime
-is too new. This sloppiness disables that check. See also
-\fIHANDLING OF NEWLY CREATED HEADER FILES\fP.
+By default, ccache will disable the direct mode if an include file has too
+new mtime. This sloppiness disables that check. See also \fI[Handling of
+newly created header files]\fP.
 .RE
 .sp
 \fBivfsoverlay\fP
@@ -1338,18 +1500,25 @@ compiler warning messages. Set this sloppiness to tell ccache not to do
 that.
 .RE
 .sp
+\fBmodules\fP
+.RS 4
+By default, ccache will not cache compilations if \fB\-fmodules\fP is used since
+it cannot hash the state of compiler\(cqs internal representation of relevant
+modules. This sloppiness allows caching in such a case. See
+\fIC++ MODULES\fP for more information.
+.RE
+.sp
 \fBpch_defines\fP
 .RS 4
 Be sloppy about \fB#define\fP directives when precompiling a header file. See
 \fIPRECOMPILED HEADERS\fP for more information.
 .RE
 .sp
-\fBmodules\fP
+\fBrandom_seed\fP
 .RS 4
-By default, ccache will not cache compilations if \fB\-fmodules\fP is used since
-it cannot hash the state of compiler\(cqs internal representation of relevant
-modules. This sloppiness allows caching in such a case. See
-\fIC++ MODULES\fP for more information.
+Ignore the \fB\-frandom\-seed\fP option and its arguments when computing the input
+hash. This is useful if your build system generates different seeds between
+builds and you are OK with reusing cached results.
 .RE
 .sp
 \fBsystem_headers\fP
@@ -1423,23 +1592,25 @@ This option (an octal integer) specifies the umask for files and directories
 in the cache directory. This is mostly useful when you wish to share your
 cache with other users.
 .RE
-.SH "SECONDARY STORAGE BACKENDS"
+.SH "REMOTE STORAGE BACKENDS"
 .sp
-The \fBsecondary_storage\fP option lets you configure
-ccache to use one or several other storage backends in addition to the primary
-cache storage located in \fBcache_dir\fP. Note that cache
-statistics counters will still be kept in the primary cache directory \(em secondary storage backends only store cache results and manifests.
+The \fBremote_storage\fP option lets you configure ccache
+to use one or several remote storage backends. By default, the local cache
+directory located in \fBcache_dir\fP will be queried first and
+remote storage second, but \fBremote_only\fP can be set to
+true to disable local storage. Note that cache statistics counters will still be
+kept in the local cache directory \(em remote storage backends only store
+compilation results and manifests.
 .sp
-A secondary storage backend is specified with a URL, optionally followed by a
-pipe (\fB|\fP) and a pipe\-separated list of attributes. An attribute is
-\fIkey\fP=\fIvalue\fP or just \fIkey\fP as a short form of \fIkey\fP=\fBtrue\fP. Attribute values
-must be \c
+A remote storage backend is specified with a URL, optionally followed by a pipe
+(\fB|\fP) and a pipe\-separated list of attributes. An attribute is \fIkey\fP=\fIvalue\fP or
+just \fIkey\fP as a short form of \fIkey\fP=\fBtrue\fP. Attribute values must be
 .URL "https://en.wikipedia.org/wiki/Percent\-encoding" "percent\-encoded" ""
-if they
-contain percent, pipe or space characters.
+if they contain
+percent, pipe or space characters.
 .SS "Attributes for all backends"
 .sp
-These optional attributes are available for all secondary storage backends:
+These optional attributes are available for all remote storage backends:
 .sp
 .RS 4
 .ie n \{\
@@ -1501,31 +1672,20 @@ of the cache on \fBredis://cache\-a.example.com\fP, 18% (1/5.5) on
 \fBhttp://example.com/alpha\fP and 50% on \fBhttp://example.com/beta\fP.
 .RE
 .RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.  sp -1
-.  IP \(bu 2.3
-.\}
-\fBshare\-hits\fP: If \fBtrue\fP, write hits for this backend to primary storage. The
-default is \fBtrue\fP.
-.RE
 .SS "Storage interaction"
 .sp
-The table below describes the interaction between primary and secondary storage
-on cache hits and misses:
+The table below describes the interaction between local and remote storage on
+cache hits and misses if \fBremote_only\fP is false (which is
+the default):
 .TS
 allbox tab(:);
 lt lt lt.
 T{
 .sp
-\fBPrimary storage\fP
+\fBLocal storage\fP
 T}:T{
 .sp
-\fBSecondary storage\fP
+\fBRemote storage\fP
 T}:T{
 .sp
 \fBWhat happens\fP
@@ -1538,7 +1698,7 @@ T}:T{
 miss
 T}:T{
 .sp
-Compile, write to primary, write to secondary[1]
+Compile, write to local, write to remote[1]
 T}
 T{
 .sp
@@ -1548,7 +1708,7 @@ T}:T{
 hit
 T}:T{
 .sp
-Read from secondary, write to primary[2]
+Read from remote, write to local
 T}
 T{
 .sp
@@ -1558,25 +1718,62 @@ T}:T{
 \-
 T}:T{
 .sp
-Read from primary, don\(cqt write to secondary[3]
+Read from local, don\(cqt write to remote[2]
 T}
 .TE
 .sp
 .sp
-[1] Unless secondary storage has attribute \fBread\-only=true\fP.
+[1] Unless remote storage has attribute \fBread\-only=true\fP.
 .br
-[2] Unless secondary storage has attribute \fBshare\-hits=false\fP.
-.br
-[3] Unless primary storage is set to share its cache hits with the
+[2] Unless local storage is set to share its cache hits with the
 \fBreshare\fP option.
+.sp
+If \fBremote_only\fP is true:
+.TS
+allbox tab(:);
+lt lt lt.
+T{
+.sp
+\fBLocal storage\fP
+T}:T{
+.sp
+\fBRemote storage\fP
+T}:T{
+.sp
+\fBWhat happens\fP
+T}
+T{
+.sp
+\-
+T}:T{
+.sp
+miss
+T}:T{
+.sp
+Compile, write to remote, don\(cqt write to local
+T}
+T{
+.sp
+\-
+T}:T{
+.sp
+hit
+T}:T{
+.sp
+Read from remote, don\(cqt write to local
+T}
+.TE
+.sp
 .SS "File storage backend"
 .sp
-URL format: \fBfile:DIRECTORY\fP or \fBfile://DIRECTORY\fP
+URL format: \fBfile:DIRECTORY\fP or \fBfile://[HOST]DIRECTORY\fP
 .sp
 This backend stores data as separate files in a directory structure below
-\fBDIRECTORY\fP (an absolute path), similar (but not identical) to the primary cache
-storage. A typical use case for this backend would be sharing a cache on an NFS
-directory.
+\fBDIRECTORY\fP, similar (but not identical) to the local cache storage. A typical
+use case for this backend would be sharing a cache on an NFS directory.
+\fBDIRECTORY\fP must start with a slash. \fBHOST\fP can be the empty string or
+localhost. On Windows, \fBHOST\fP can also be the name of a server hosting a shared
+folder.
 .if n .sp
 .RS 4
 .it 1 an-trap
@@ -1617,6 +1814,17 @@ Examples:
 \fBfile:///shared/nfs/directory|umask=002|update\-mtime=true\fP
 .RE
 .sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.  sp -1
+.  IP \(bu 2.3
+.\}
+\fBfile://example.com/shared/folder\fP
+.RE
+.sp
 Optional attributes:
 .sp
 .RS 4
@@ -1879,7 +2087,13 @@ The default is \fBsubdirs\fP.
 .RE
 .SS "Redis storage backend"
 .sp
-URL format: \fBredis://[[USERNAME:]PASSWORD@]HOST[:PORT][/DBNUMBER]\fP
+URL formats:
+.sp
+\fBredis://[[USERNAME:]PASSWORD@]HOST[:PORT][/DBNUMBER]\fP
+.br
+\fBredis+unix:SOCKET_PATH[?db=DBNUMBER]\fP
+.br
+\fBredis+unix://[[USERNAME:]PASSWORD@localhost]SOCKET_PATH[?db=DBNUMBER]\fP
 .sp
 This backend stores data in a \c
 .URL "https://redis.io" "Redis" ""
@@ -1929,7 +2143,7 @@ storage"  for hints on setting up a Redis server for use with ccache.
 .br
 .sp
 You can set up a cluster of Redis servers using the \fBshards\fP attribute
-described in \fISECONDARY STORAGE BACKENDS\fP.
+described in \fIREMOTE STORAGE BACKENDS\fP.
 .sp .5v
 .RE
 .sp
@@ -1957,6 +2171,39 @@ Examples:
 \fBredis://p4ssw0rd@cache.example.com:6379/0|connect\-timeout=50\fP
 .RE
 .sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.  sp -1
+.  IP \(bu 2.3
+.\}
+\fBredis+unix:/run/redis.sock\fP
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.  sp -1
+.  IP \(bu 2.3
+.\}
+\fBredis+unix:///run/redis.sock\fP
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.  sp -1
+.  IP \(bu 2.3
+.\}
+\fBredis+unix://p4ssw0rd@localhost/run/redis.sock?db=0\fP
+.RE
+.sp
 Optional attributes:
 .sp
 .RS 4
@@ -2151,7 +2398,7 @@ recompressed.
 cleanups (number of performed cleanups, either implicitly due to a cache size
 limit being reached or due to explicit \fBccache \-c\fP calls), overall hit rate, hit
 rate for direct/preprocessed modes
-and hit rate for primary and secondary storage.
+and hit rate for local and remote storage.
 .sp
 The summary also includes counters called \(lqErrors\(rq and \(lqUncacheable\(rq, which
 are sums of more detailed counters. To see those detailed counters, use the
@@ -2652,7 +2899,8 @@ the string \fB__TIME__\fP is present in the source code
 If the depend mode is enabled, ccache will not use the preprocessor at all. The
 hash used to identify results in the cache will be based on the direct mode
 hash described above plus information about include files read from the
-dependency file generated by the compiler with \fB\-MD\fP or \fB\-MMD\fP.
+dependency list generated by MSVC with \fB/showIncludes\fP, or the dependency file
+generated by other compilers with \fB\-MD\fP or \fB\-MMD\fP.
 .sp
 Advantages:
 .sp
@@ -2705,8 +2953,8 @@ to some types of changes of compiler options and source code changes.
 .  IP \(bu 2.3
 .\}
 If \-MD is used, the manifest entries will include system header files as
-well, thus slowing down cache hits slightly, just as using \-MD slows down
-make.
+well, thus slowing down cache hits slightly, just as using \fB\-MD\fP slows down
+make. This is also the case for MSVC with \fB/showIncludes\fP.
 .RE
 .sp
 .RS 4
@@ -2717,7 +2965,7 @@ make.
 .  sp -1
 .  IP \(bu 2.3
 .\}
-If \-MMD is used, the manifest entries will not include system header files,
+If \fB\-MMD\fP is used, the manifest entries will not include system header files,
 which means ccache will ignore changes in them.
 .RE
 .sp
@@ -2753,7 +3001,8 @@ The depend mode will be disabled if any of the following holds:
 .  sp -1
 .  IP \(bu 2.3
 .\}
-The compiler is not generating dependencies using \fB\-MD\fP or \fB\-MMD\fP.
+The compiler is not generating dependencies using \fB\-MD\fP or \fB\-MMD\fP (for MSVC,
+\fB/showIncludes\fP is added automatically if not specified by the user).
 .RE
 .SH "HANDLING OF NEWLY CREATED HEADER FILES"
 .sp
@@ -2869,35 +3118,35 @@ T}:T{
 T}
 T{
 .sp
-\fB<objectfile>.ccache\-input\-c\fP
+\fB<objectfile>.<timestamp>.ccache\-input\-c\fP
 T}:T{
 .sp
 Binary input hashed by both the direct mode and the preprocessor mode.
 T}
 T{
 .sp
-\fB<objectfile>.ccache\-input\-d\fP
+\fB<objectfile>.<timestamp>.ccache\-input\-d\fP
 T}:T{
 .sp
 Binary input only hashed by the direct mode.
 T}
 T{
 .sp
-\fB<objectfile>.ccache\-input\-p\fP
+\fB<objectfile>.<timestamp>.ccache\-input\-p\fP
 T}:T{
 .sp
 Binary input only hashed by the preprocessor mode.
 T}
 T{
 .sp
-\fB<objectfile>.ccache\-input\-text\fP
+\fB<objectfile>.<timestamp>.ccache\-input\-text\fP
 T}:T{
 .sp
 Human\-readable combined diffable text version of the three files above.
 T}
 T{
 .sp
-\fB<objectfile>.ccache\-log\fP
+\fB<objectfile>.<timestamp>.ccache\-log\fP
 T}:T{
 .sp
 Log for this object file.
@@ -2905,6 +3154,15 @@ T}
 .TE
 .sp
 .sp
+.if n .RS 4
+.nf
+.fam C
+ The timestamp format is
+`<year><month><day>_<hour><minute><second>_<microsecond>`.
+.fam
+.fi
+.if n .RE
+.sp
 If \fBdebug_dir\fP (environment variable \fBCCACHE_DEBUGDIR\fP) is
 set, the files above will be written to that directory with full absolute paths
 instead of next to the object file.
@@ -2930,7 +3188,7 @@ something like this:
 .  sp -1
 .  IP " 1." 4.2
 .\}
-Build with debug mode enabled.
+Enable \fBdebug\fP (\fBCCACHE_DEBUG\fP).
 .RE
 .sp
 .RS 4
@@ -2941,7 +3199,7 @@ Build with debug mode enabled.
 .  sp -1
 .  IP " 2." 4.2
 .\}
-Save the \fB<objectfile>.ccache\-*\fP files.
+Build.
 .RE
 .sp
 .RS 4
@@ -2952,7 +3210,7 @@ Save the \fB<objectfile>.ccache\-*\fP files.
 .  sp -1
 .  IP " 3." 4.2
 .\}
-Build again with debug mode enabled.
+Clean and build again.
 .RE
 .sp
 .RS 4
@@ -2963,9 +3221,9 @@ Build again with debug mode enabled.
 .  sp -1
 .  IP " 4." 4.2
 .\}
-Compare \fB<objectfile>.ccache\-input\-text\fP for the two builds. This together
-with the \fB<objectfile>.ccache\-log\fP files should give you some clues about
-what is happening.
+Compare the \fB<objectfile>.<timestamp>.ccache\-input\-text\fP files for the two
+builds. This together with the \fB<objectfile>.<timestamp>.ccache\-log\fP files
+should give you some clues about what is happening.
 .RE
 .SH "COMPILING IN DIFFERENT DIRECTORIES"
 .sp
@@ -3166,10 +3424,10 @@ You must use both \fBdirect mode\fP and
 \fBdepend mode\fP. When using
 the preprocessor mode Clang does not provide enough
 information to allow hashing of \fBmodule.modulemap\fP files.
-.SH "SHARING A CACHE"
+.SH "SHARING A LOCAL CACHE"
 .sp
-A group of developers can increase the cache hit rate by sharing a cache
-directory. To share a cache without unpleasant side effects, the following
+A group of developers can increase the cache hit rate by sharing a local cache
+directory. To share a local cache without unpleasant side effects, the following
 conditions should to be met:
 .sp
 .RS 4
@@ -3299,7 +3557,7 @@ systems. One way of improving cache hit rate in that case is to set
 headers.
 .sp
 An alternative to putting the main cache directory on NFS is to set up a
-secondary storage file cache.
+remote storage file cache.
 .SH "USING CCACHE WITH OTHER COMPILER WRAPPERS"
 .sp
 The recommended way of combining ccache with another compiler wrapper (such as