git: 26369b2563ea - main - benchmarks/libcpucycles: update to 20251226

The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=26369b2563ea2beb9003156eedafc9b850ad0fc3

commit 26369b2563ea2beb9003156eedafc9b850ad0fc3
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2025-12-26 19:20:03 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2025-12-28 15:12:08 +0000

    benchmarks/libcpucycles: update to 20251226
    
    Changelog: https://cpucycles.cr.yp.to/download.html
    
    Event:          39C3
---
 benchmarks/libcpucycles/Makefile                       | 18 +++++-------------
 benchmarks/libcpucycles/distinfo                       |  6 +++---
 .../libcpucycles/files/patch-cpucycles_wrapper.c       | 17 ++++-------------
 benchmarks/libcpucycles/pkg-plist                      |  2 ++
 4 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/benchmarks/libcpucycles/Makefile b/benchmarks/libcpucycles/Makefile
index 77f506393ed5..c10e707747bf 100644
--- a/benchmarks/libcpucycles/Makefile
+++ b/benchmarks/libcpucycles/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libcpucycles
-DISTVERSION=	20250925
+DISTVERSION=	20251226
 CATEGORIES=	benchmarks devel
 MASTER_SITES=	https://cpucycles.cr.yp.to/
 
@@ -17,21 +17,13 @@ CONFIGURE_ARGS=	--host=${ARCH}
 ALL_TARGET=	default
 CFLAGS+=	-fPIC -fwrapv -fvisibility=hidden
 
-_STAGE=	${WRKSRC}/build/0/package
-
 pre-configure:
 	${ECHO} ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} >${WRKSRC}/compilers/default
 
-# no staging support for some reason
-do-install:
-	${INSTALL_MAN} ${_STAGE}/man/man1/cpucycles-info.1 ${STAGEDIR}${PREFIX}/share/man/man1/
-	${INSTALL_MAN} ${_STAGE}/man/man3/cpucycles.3 ${STAGEDIR}${PREFIX}/share/man/man3/
-	${INSTALL_DATA} ${_STAGE}/include/cpucycles.h ${STAGEDIR}${PREFIX}/include/
-	for lib in ${_STAGE}/lib/libcpucycles* ; \
-	do \
-		${INSTALL_LIB} $$lib ${STAGEDIR}${PREFIX}/lib/ ; \
-	done
-	${INSTALL_PROGRAM} ${_STAGE}/bin/cpucycles-info ${STAGEDIR}${PREFIX}/bin/
+post-install:
+	${MV} ${STAGEDIR}${PREFIX}/man/man1/* ${STAGEDIR}${PREFIX}/share/man/man1/
+	${MV} ${STAGEDIR}${PREFIX}/man/man3/* ${STAGEDIR}${PREFIX}/share/man/man3/
+	${RMDIR} ${STAGEDIR}${PREFIX}/man/man? ${STAGEDIR}${PREFIX}/man
 
 do-test:
 	${SETENVI} LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib ${STAGEDIR}${PREFIX}/bin/cpucycles-info
diff --git a/benchmarks/libcpucycles/distinfo b/benchmarks/libcpucycles/distinfo
index 2f5c126dde9d..4b7cb6a5ef40 100644
--- a/benchmarks/libcpucycles/distinfo
+++ b/benchmarks/libcpucycles/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1758883194
-SHA256 (libcpucycles-20250925.tar.gz) = 62313d42ad5a3cbd8d41a9fb7088edc328ef499d426e1f191612331d0fcbe301
-SIZE (libcpucycles-20250925.tar.gz) = 48447
+TIMESTAMP = 1766776193
+SHA256 (libcpucycles-20251226.tar.gz) = 5dc17b801b9b27f3861aab0e1754285b1703bffe9b8f469dc666de6d9be2f93f
+SIZE (libcpucycles-20251226.tar.gz) = 55008
diff --git a/benchmarks/libcpucycles/files/patch-cpucycles_wrapper.c b/benchmarks/libcpucycles/files/patch-cpucycles_wrapper.c
index 703b4a0763c3..2a786d59da21 100644
--- a/benchmarks/libcpucycles/files/patch-cpucycles_wrapper.c
+++ b/benchmarks/libcpucycles/files/patch-cpucycles_wrapper.c
@@ -1,6 +1,6 @@
---- cpucycles/wrapper.c.orig	2024-03-18 00:15:33 UTC
+--- cpucycles/wrapper.c.orig	2025-12-26 09:44:50 UTC
 +++ cpucycles/wrapper.c
-@@ -16,6 +16,12 @@
+@@ -18,6 +18,12 @@
  #include <inttypes.h>
  #include <signal.h>
  #include <setjmp.h>
@@ -13,16 +13,7 @@
  #include "cpucycles.h"
  #include "cpucycles_internal.h"
  
-@@ -26,7 +32,7 @@ void cpucycles_tracesetup(void)
-   tracesetup = 1;
- }
- 
--static jmp_buf crash_jmp;
-+static sigjmp_buf crash_jmp;
- 
- static void crash(int s)
- {
-@@ -81,6 +87,21 @@ static double osfreq(void)
+@@ -83,6 +89,21 @@ static double osfreq(void)
      if (s > 0) return result;
    }
  
@@ -44,7 +35,7 @@
    f = fopen("/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed", "r");
    if (f) {
      s = fscanf(f,"%lf",&result);
-@@ -163,6 +184,7 @@ static double osfreq(void)
+@@ -165,6 +186,7 @@ static double osfreq(void)
      pclose(f);
      if (result) return 1000000.0 * result;
    }
diff --git a/benchmarks/libcpucycles/pkg-plist b/benchmarks/libcpucycles/pkg-plist
index 8c9c0b661f23..7a5fc83cb36d 100644
--- a/benchmarks/libcpucycles/pkg-plist
+++ b/benchmarks/libcpucycles/pkg-plist
@@ -1,7 +1,9 @@
 bin/cpucycles-info
+bin/cpucycles-open
 include/cpucycles.h
 lib/libcpucycles.a
 lib/libcpucycles.so
 lib/libcpucycles.so.1
 share/man/man1/cpucycles-info.1.gz
+share/man/man1/cpucycles-open.1.gz
 share/man/man3/cpucycles.3.gz