git: 9f3e54599328 - main - devel/ccache4: Update 4.9 → 4.10.2

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9f3e54599328a5ca357f46863a17ccb669fd03cf

commit 9f3e54599328a5ca357f46863a17ccb669fd03cf
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-01-29 16:18:49 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-01-29 16:32:04 +0000

    devel/ccache4: Update 4.9 → 4.10.2
    
    Based on patches from Oleg Sidorkin and Älven.
    
    Improve port:
    - update required compiler version from 11 to 17;
    - update CONFLICTS_INSTALL;
    - update GNU_COMPILERS and CLANG_COMPILERS;
    - update dependencies;
    - improve STATIC and TEST options;
    - fix warnings from portclippy - sort options and etc.
    
    Changelogs:
    https://ccache.dev/releasenotes.html#_ccache_4_10_2
    
    PR:             276854 283910
    Approved by:    bdrewery (maintainer, timeout 1 year)
    Tested by:      Oleg Sidorkin (osidorkin@gmail.com), Älven (alster@vinterdalen.se)
---
 devel/ccache4/Makefile | 59 ++++++++++++++++++++++++++++----------------------
 devel/ccache4/distinfo |  6 ++---
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/devel/ccache4/Makefile b/devel/ccache4/Makefile
index 3242b81260b4..3167605b554a 100644
--- a/devel/ccache4/Makefile
+++ b/devel/ccache4/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ccache
-DISTVERSION=	4.9
 DISTVERSIONPREFIX=	v
+DISTVERSION=	4.10.2
 CATEGORIES=	devel
 PKGNAMESUFFIX=	4
 
@@ -11,48 +11,55 @@ WWW=		https://ccache.dev/
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/GPL-3.0.txt
 
-USES=		cmake:noninja pathfix shebangfix compiler:c++11-lang
-CONFLICTS_INSTALL?=	ccache ccache-static \
-		ccache-memcached ccache-memcached-static
-
-PORTDOCS=	AUTHORS.adoc AUTHORS.html MANUAL.html MANUAL.adoc \
-		NEWS.adoc NEWS.html
-
+USES=		cmake:noninja compiler:c++17-lang pathfix shebangfix
 USE_GITHUB=	yes
-SUB_FILES=	world-ccache ccache-update-links.sh ccache_clean
-# Prevent infinite recursion.
-NO_CCACHE_DEPEND=	yes
-
-LIB_DEPENDS+=	libzstd.so:archivers/zstd
 
 # /bin/bash -> /bin/sh to reduce tests dep.
 SHEBANG_FILES=	test/*
 SHEBANG_GLOB=	*.sh *.bash
 bash_CMD=	/bin/sh
 
+CMAKE_ARGS+=	-D DEPS=LOCAL
 CMAKE_OFF=	WARNINGS_AS_ERRORS \
 		ENABLE_IPO \
-		ZSTD_FROM_INTERNET \
 		ENABLE_TRACING \
 		REDIS_STORAGE_BACKEND
 
-OPTIONS_DEFINE=	DOCS CLANGLINK LLVMLINK STATIC TEST
-OPTIONS_DEFAULT=CLANGLINK LLVMLINK
-OPTIONS_SUB=	yes
+CONFLICTS_INSTALL?=	ccache ccache-static
+
+# Prevent infinite recursion.
+NO_CCACHE_DEPEND=	yes
+SUB_FILES=	ccache_clean ccache-update-links.sh world-ccache
+
+PORTDOCS=	AUTHORS.adoc AUTHORS.html MANUAL.adoc MANUAL.html \
+		NEWS.adoc NEWS.html
+
+OPTIONS_DEFINE=		CLANGLINK DOCS LLVMLINK STATIC TEST
+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
 
 DOCS_BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor
-DOCS_ALL_TARGET=	all doc
 DOCS_USES=		perl5
 DOCS_CMAKE_BOOL=	ENABLE_DOCUMENTATION
+DOCS_ALL_TARGET=	all doc
 
-CLANGLINK_DESC=	Create clang compiler links if clang is installed
-LLVMLINK_DESC=	Create llvm compiler links if llvm is installed
-
-STATIC_LDFLAGS=	-static
+STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libzstd.a:archivers/zstd \
+			${LOCALBASE}/lib/libxxhash.a:devel/xxhash
+STATIC_LIB_DEPENDS_OFF=	libzstd.so:archivers/zstd \
+			libfmt.so:devel/libfmt \
+			libxxhash.so:devel/xxhash
 STATIC_CMAKE_BOOL=	STATIC_LINK
+STATIC_CMAKE_ON=	-D DEP_BLAKE3=BUNDLED -D DEP_CPPHTTPLIB=BUNDLED \
+			-D DEP_FMT=BUNDLED -D DEP_NONSTDSPAN=BUNDLED \
+			-D DEP_TLEXPECTED=BUNDLED
+STATIC_LDFLAGS=		-static
 
-TEST_CMAKE_BOOL=ENABLE_TESTING
-TEST_TARGET=	check
+TEST_BUILD_DEPENDS=	doctest>=2.4.6:devel/doctest
+TEST_CMAKE_BOOL=	ENABLE_TESTING
+TEST_TARGET=		check
 
 .include <bsd.port.pre.mk>
 
@@ -63,13 +70,13 @@ PLIST_SUB+=		CCLINKDIR="${CCLINKDIR}"
 CCACHE_COMPILERS+=	icc icpc
 .endif
 
-GNU_COMPILERS+=		48 8 9 10 11 12 13
+GNU_COMPILERS+=		11 12 13 14 15
 CCACHE_COMPILERS+=	cc c++ CC gcc g++ ${GNU_COMPILERS:S|^|gcc|} \
 			${GNU_COMPILERS:S|^|g++|} \
 			${GNU_COMPILERS:S|^|cpp|}
 
 .if ${PORT_OPTIONS:MCLANGLINK}
-CLANG_COMPILERS+=	10 11 12 13 14 15 16 17 -devel
+CLANG_COMPILERS+=	11 12 13 14 15 16 17 18 19 -devel
 CCACHE_COMPILERS+=	clang clang++ ${CLANG_COMPILERS:S|^|clang|} \
 			${CLANG_COMPILERS:S|^|clang++|} \
 			${CLANG_COMPILERS:S|^|cpp|}
diff --git a/devel/ccache4/distinfo b/devel/ccache4/distinfo
index dd75d9fb10ee..30a84bda2657 100644
--- a/devel/ccache4/distinfo
+++ b/devel/ccache4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707011016
-SHA256 (ccache-ccache-v4.9_GH0.tar.gz) = 7333833c95d181b54ee66bd884c2c1b28f4aa683d9d0925e5126ba4b2f3beead
-SIZE (ccache-ccache-v4.9_GH0.tar.gz) = 803357
+TIMESTAMP = 1721663686
+SHA256 (ccache-ccache-v4.10.2_GH0.tar.gz) = d22a4e59b58cdb3af5dd2a5a8fa3c40179bf35c985d17bc9bdeed2cffa3265be
+SIZE (ccache-ccache-v4.10.2_GH0.tar.gz) = 675413