Wed Oct 28 12:04:02 2020 UTC ()
p5-Sys-CPU: Support the katamari of sysctls for cpufreq NetBSD might expose

Bump PKGREVISION


(nia)
diff -r1.9 -r1.10 pkgsrc/sysutils/p5-Sys-CPU/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/p5-Sys-CPU/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/p5-Sys-CPU/patches/patch-CPU.xs
cvs diff -r1.9 -r1.10 pkgsrc/sysutils/p5-Sys-CPU/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/p5-Sys-CPU/Makefile 2020/08/31 18:11:33 1.9
+++ pkgsrc/sysutils/p5-Sys-CPU/Makefile 2020/10/28 12:04:02 1.10
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.9 2020/08/31 18:11:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.10 2020/10/28 12:04:02 nia Exp $
2 2
3DISTNAME= Sys-CPU-0.61 3DISTNAME= Sys-CPU-0.61
4PKGNAME= p5-${DISTNAME} 4PKGNAME= p5-${DISTNAME}
5PKGREVISION= 6 5PKGREVISION= 7
6CATEGORIES= sysutils perl5 6CATEGORIES= sysutils perl5
7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/M/MZ/MZSANFORD/} 7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/M/MZ/MZSANFORD/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/mzsanford/perl-sys-cpu 10HOMEPAGE= https://github.com/mzsanford/perl-sys-cpu
11COMMENT= Perl 5 module for getting CPU information 11COMMENT= Perl 5 module for getting CPU information
12LICENSE= ${PERL5_LICENSE} 12LICENSE= ${PERL5_LICENSE}
13 13
14USE_LANGUAGES= c 14USE_LANGUAGES= c
15PERL5_PACKLIST= auto/Sys/CPU/.packlist 15PERL5_PACKLIST= auto/Sys/CPU/.packlist
16 16
17.include "../../lang/perl5/module.mk" 17.include "../../lang/perl5/module.mk"
18.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/p5-Sys-CPU/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/p5-Sys-CPU/distinfo 2015/11/04 01:32:25 1.2
+++ pkgsrc/sysutils/p5-Sys-CPU/distinfo 2020/10/28 12:04:02 1.3
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.2 2015/11/04 01:32:25 agc Exp $ 1$NetBSD: distinfo,v 1.3 2020/10/28 12:04:02 nia Exp $
2 2
3SHA1 (Sys-CPU-0.61.tar.gz) = 3bca409742fd47a06768b9ba9d8f14d73171c8c1 3SHA1 (Sys-CPU-0.61.tar.gz) = 3bca409742fd47a06768b9ba9d8f14d73171c8c1
4RMD160 (Sys-CPU-0.61.tar.gz) = 147d6f4d87d76fd15c35cbd6ebc902f416f0bec6 4RMD160 (Sys-CPU-0.61.tar.gz) = 147d6f4d87d76fd15c35cbd6ebc902f416f0bec6
5SHA512 (Sys-CPU-0.61.tar.gz) = 391e113c87d9044cd43c47f9f78a782fab65566a32c028c01f7f3335a5065b6755586ea3143356510c8d28a7d1ad572cc6203ec189eaaa379967bdbd0a0bd7bc 5SHA512 (Sys-CPU-0.61.tar.gz) = 391e113c87d9044cd43c47f9f78a782fab65566a32c028c01f7f3335a5065b6755586ea3143356510c8d28a7d1ad572cc6203ec189eaaa379967bdbd0a0bd7bc
6Size (Sys-CPU-0.61.tar.gz) = 6497 bytes 6Size (Sys-CPU-0.61.tar.gz) = 6497 bytes
7SHA1 (patch-CPU.xs) = b1f1a59ff6eb02b7d9691423b2084fccd21f74cf 7SHA1 (patch-CPU.xs) = 6263b7821d5116ed9291c62dea32760508a243b9
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/p5-Sys-CPU/patches/patch-CPU.xs (expand / switch to unified diff)

--- pkgsrc/sysutils/p5-Sys-CPU/patches/patch-CPU.xs 2014/08/13 20:20:23 1.1
+++ pkgsrc/sysutils/p5-Sys-CPU/patches/patch-CPU.xs 2020/10/28 12:04:02 1.2
@@ -1,46 +1,56 @@ @@ -1,46 +1,56 @@
1$NetBSD: patch-CPU.xs,v 1.1 2014/08/13 20:20:23 wiz Exp $ 1$NetBSD: patch-CPU.xs,v 1.2 2020/10/28 12:04:02 nia Exp $
2 2
3Add NetBSD support. 3Add NetBSD support.
4https://rt.cpan.org/Public/Bug/Display.html?id=98004 4https://rt.cpan.org/Public/Bug/Display.html?id=98004
5 5
6--- CPU.xs.orig 2013-11-27 22:40:07.000000000 +0000 6--- CPU.xs.orig 2013-11-27 22:40:07.000000000 +0000
7+++ CPU.xs 7+++ CPU.xs
8@@ -40,7 +40,7 @@ 8@@ -40,7 +40,7 @@
9 #define _have_cpu_clock 9 #define _have_cpu_clock
10 #define _have_cpu_type 10 #define _have_cpu_type
11 #endif 11 #endif
12-#ifdef __FreeBSD__ 12-#ifdef __FreeBSD__
13+#if defined(__FreeBSD__) || defined(__NetBSD__) 13+#if defined(__FreeBSD__) || defined(__NetBSD__)
14 #include <sys/sysctl.h> 14 #include <sys/sysctl.h>
15 #define _have_cpu_type 15 #define _have_cpu_type
16 #define _have_cpu_clock 16 #define _have_cpu_clock
17@@ -345,6 +345,17 @@ CODE: 17@@ -345,6 +345,27 @@ CODE:
18 size_t len = sizeof(clock); 18 size_t len = sizeof(clock);
19 sysctlbyname("hw.clockrate", &clock, &len, NULL, 0); 19 sysctlbyname("hw.clockrate", &clock, &len, NULL, 0);
20 #endif 20 #endif
21+#ifdef __NetBSD__ 21+#ifdef __NetBSD__
22+ size_t len = sizeof(clock); 22+ size_t len = sizeof(clock);
23+ char const *name; 23+ char const *name;
24+ 24+
25+ if (sysctlbyname("machdep.powernow.frequency.current", NULL, &len, NULL, 0) == 0) 25+ if (sysctlbyname("machdep.powernow.frequency.current", NULL, &len, NULL, 0) == 0)
26+ name = "machdep.powernow.frequency.current"; 26+ name = "machdep.powernow.frequency.current";
27+ else if (sysctlbyname("machdep.est.frequency.current", NULL, &len, NULL, 0) == 0) 27+ else if (sysctlbyname("machdep.est.frequency.current", NULL, &len, NULL, 0) == 0)
28+ name = "machdep.est.frequency.current"; 28+ name = "machdep.est.frequency.current";
 29+ else if (sysctlbyname("machdep.loongson.frequency.current", NULL, &len, NULL, 0) == 0)
 30+ name = "machdep.loongson.frequency.current";
 31+ else if (sysctlbyname("machdep.intrepid.frequency.current", NULL, &len, NULL, 0) == 0)
 32+ name = "machdep.intrepid.frequency.current";
 33+ else if (sysctlbyname("machdep.cpufreq.cpu0.current", NULL, &len, NULL, 0) == 0)
 34+ name = "machdep.cpufreq.cpu0.current";
 35+ else if (sysctlbyname("machdep.cpu.frequency.current", NULL, &len, NULL, 0) == 0)
 36+ name = "machdep.cpu.frequency.current";
 37+ else if (sysctlbyname("machdep.frequency.current", NULL, &len, NULL, 0) == 0)
 38+ name = "machdep.frequency.current";
29+ 39+
30+ sysctlbyname(name, &clock, &len, NULL, 0); 40+ sysctlbyname(name, &clock, &len, NULL, 0);
31+#endif 41+#endif
32 #ifdef WINDOWS 42 #ifdef WINDOWS
33 char *clock_str = malloc(MAX_IDENT_SIZE); 43 char *clock_str = malloc(MAX_IDENT_SIZE);
34 /*!! untested !!*/ 44 /*!! untested !!*/
35@@ -394,6 +405,11 @@ CODE: 45@@ -394,6 +415,11 @@ CODE:
36 size_t len = MAX_IDENT_SIZE; 46 size_t len = MAX_IDENT_SIZE;
37 sysctlbyname("hw.model", value, &len, NULL, 0); 47 sysctlbyname("hw.model", value, &len, NULL, 0);
38 #endif 48 #endif
39+#ifdef __NetBSD__ 49+#ifdef __NetBSD__
40+ value = malloc(MAX_IDENT_SIZE); 50+ value = malloc(MAX_IDENT_SIZE);
41+ size_t len = MAX_IDENT_SIZE; 51+ size_t len = MAX_IDENT_SIZE;
42+ sysctlbyname("hw.model", value, &len, NULL, 0); 52+ sysctlbyname("hw.model", value, &len, NULL, 0);
43+#endif 53+#endif
44 #ifdef __linux__ 54 #ifdef __linux__
45 #if defined __s390__ || defined __s390x__ 55 #if defined __s390__ || defined __s390x__
46 value = processor_machine_field (proc_cpuinfo_field ("processor") ); 56 value = processor_machine_field (proc_cpuinfo_field ("processor") );