diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile
index 4da908163cfd..1abf46c4dfb9 100644
--- a/devel/ccache/Makefile
+++ b/devel/ccache/Makefile
@@ -1,91 +1,90 @@
 # Created by: Dominic Marks <d.marks@student.umist.ac.uk>
 
 PORTNAME=	ccache
-PORTVERSION=	3.7.1
-PORTREVISION=	1
+PORTVERSION=	3.7.12
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/ccache/ccache/releases/download/v${DISTVERSION}/ \
 		LOCAL/bdrewery
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Tool to minimize the compile time of C/C++ programs
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/GPL-3.0.txt
 
 CONFLICTS_INSTALL?=	ccache-static-[0-9]* ccache-memcached-[0-9]* ccache-memcached-static-[0-9]*
 
 GNU_CONFIGURE=	yes
 
 HOWTO=		ccache-howto-freebsd.txt
 SUB_FILES=	${HOWTO} world-ccache pkg-message ccache-update-links.sh
 
 PORTDOCS=	ccache-howto-freebsd.txt MANUAL.html MANUAL.adoc NEWS.adoc \
 		NEWS.html
 
 OPTIONS_DEFINE=	CLANGLINK LLVMLINK STATIC DOCS TINDERBOX
 OPTIONS_DEFAULT=CLANGLINK LLVMLINK
 OPTIONS_SUB=	yes
 
 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
 
 USES=		compiler
 
 STATIC_CONFIGURE_ENABLE=	static
 STATIC_LDFLAGS+=		-static
 
 # Support WITH_CCACHE_BUILD but don't depend on it.
 NO_CCACHE_DEPEND=	yes
 
 .include <bsd.port.pre.mk>
 
 .  if ${COMPILER_TYPE} == clang
 CPPFLAGS+=	-DCC_IS_CLANG
 .  elif ${COMPILER_TYPE} == gcc
 CPPFLAGS+=	-DCC_IS_GCC
 .  endif
 
 .include "${MASTERDIR}/Makefile.compilers"
 
 SUB_LIST+=	HOWTO="${HOWTO}"
 
 post-patch:
 	@${REINPLACE_CMD} \
 	    -e 's,_XOPEN_SOURCE 600,_XOPEN_SOURCE 700,' \
 	    -e 's,_POSIX_C_SOURCE 200112L,_POSIX_C_SOURCE 200809L,' \
 	    ${WRKSRC}/configure
 
 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
 	# Memcached uses the 3.5 dev branch which requires asciidoc to generate
 	# ccache.1.
 	${INSTALL_MAN} ${WRKSRC}/doc/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}/doc/MANUAL.html ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/MANUAL.adoc ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/NEWS.adoc ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/NEWS.html ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${HOWTO} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/devel/ccache/distinfo b/devel/ccache/distinfo
index 75a7222fef87..152f387e9a28 100644
--- a/devel/ccache/distinfo
+++ b/devel/ccache/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558214189
-SHA256 (ccache-3.7.1.tar.gz) = e562fcdbe766406b6fe4bf97ce5c001d2be8a17465f33bcddefc9499bbb057d8
-SIZE (ccache-3.7.1.tar.gz) = 498581
+TIMESTAMP = 1626116189
+SHA256 (ccache-3.7.12.tar.gz) = d2abe88d4c283ce960e233583061127b156ffb027c6da3cf10770fc0c7244194
+SIZE (ccache-3.7.12.tar.gz) = 506948
diff --git a/devel/ccache/files/patch-Makefile.in b/devel/ccache/files/patch-Makefile.in
index 458f388c93ed..995f4173c5ce 100644
--- a/devel/ccache/files/patch-Makefile.in
+++ b/devel/ccache/files/patch-Makefile.in
@@ -1,13 +1,14 @@
---- Makefile.in.orig	2019-05-20 14:04:00 UTC
-+++ Makefile.in
-@@ -126,10 +126,6 @@ install: ccache$(EXEEXT) @disable_man@ccache.1
+--- Makefile.in.orig	2020-10-01 05:21:40.000000000 -0700
++++ Makefile.in	2021-07-12 12:12:03.914717000 -0700
+@@ -125,11 +125,5 @@ install: ccache$(EXEEXT) @disable_man@ccache.1
  clean:
  	rm -rf $(files_to_clean)
  
+-$(non_3pp_objs) $(test_objs): CFLAGS += @more_warnings@
+-
 -src/snprintf.o: CFLAGS += @no_implicit_fallthrough_warning@
 -$(zlib_objs): CPPFLAGS += -include config.h
 -$(zlib_objs): CFLAGS += @no_implicit_fallthrough_warning@
 -
  src/zlib/libz.a: $(zlib_objs)
  	$(if $(quiet),@echo "  AR       $@")
- 	$(Q)$(AR) cr $@ $(zlib_objs)