CVS commit: pkgsrc/sysutils/p5-Sys-CPU

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Oct 28 12:04:02 UTC 2020

Modified Files:
        pkgsrc/sysutils/p5-Sys-CPU: Makefile distinfo
        pkgsrc/sysutils/p5-Sys-CPU/patches: patch-CPU.xs

Log Message:
p5-Sys-CPU: Support the katamari of sysctls for cpufreq NetBSD might expose

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/p5-Sys-CPU/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/p5-Sys-CPU/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/p5-Sys-CPU/patches/patch-CPU.xs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/p5-Sys-CPU/Makefile
diff -u pkgsrc/sysutils/p5-Sys-CPU/Makefile:1.9 pkgsrc/sysutils/p5-Sys-CPU/Makefile:1.10
--- pkgsrc/sysutils/p5-Sys-CPU/Makefile:1.9     Mon Aug 31 18:11:33 2020
+++ pkgsrc/sysutils/p5-Sys-CPU/Makefile Wed Oct 28 12:04:02 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2020/08/31 18:11:33 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2020/10/28 12:04:02 nia Exp $
 
 DISTNAME=      Sys-CPU-0.61
 PKGNAME=       p5-${DISTNAME}
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    sysutils perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=../../authors/id/M/MZ/MZSANFORD/}
 

Index: pkgsrc/sysutils/p5-Sys-CPU/distinfo
diff -u pkgsrc/sysutils/p5-Sys-CPU/distinfo:1.2 pkgsrc/sysutils/p5-Sys-CPU/distinfo:1.3
--- pkgsrc/sysutils/p5-Sys-CPU/distinfo:1.2     Wed Nov  4 01:32:25 2015
+++ pkgsrc/sysutils/p5-Sys-CPU/distinfo Wed Oct 28 12:04:02 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:32:25 agc Exp $
+$NetBSD: distinfo,v 1.3 2020/10/28 12:04:02 nia Exp $
 
 SHA1 (Sys-CPU-0.61.tar.gz) = 3bca409742fd47a06768b9ba9d8f14d73171c8c1
 RMD160 (Sys-CPU-0.61.tar.gz) = 147d6f4d87d76fd15c35cbd6ebc902f416f0bec6
 SHA512 (Sys-CPU-0.61.tar.gz) = 391e113c87d9044cd43c47f9f78a782fab65566a32c028c01f7f3335a5065b6755586ea3143356510c8d28a7d1ad572cc6203ec189eaaa379967bdbd0a0bd7bc
 Size (Sys-CPU-0.61.tar.gz) = 6497 bytes
-SHA1 (patch-CPU.xs) = b1f1a59ff6eb02b7d9691423b2084fccd21f74cf
+SHA1 (patch-CPU.xs) = 6263b7821d5116ed9291c62dea32760508a243b9

Index: pkgsrc/sysutils/p5-Sys-CPU/patches/patch-CPU.xs
diff -u pkgsrc/sysutils/p5-Sys-CPU/patches/patch-CPU.xs:1.1 pkgsrc/sysutils/p5-Sys-CPU/patches/patch-CPU.xs:1.2
--- pkgsrc/sysutils/p5-Sys-CPU/patches/patch-CPU.xs:1.1 Wed Aug 13 20:20:23 2014
+++ pkgsrc/sysutils/p5-Sys-CPU/patches/patch-CPU.xs     Wed Oct 28 12:04:02 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-CPU.xs,v 1.1 2014/08/13 20:20:23 wiz Exp $
+$NetBSD: patch-CPU.xs,v 1.2 2020/10/28 12:04:02 nia Exp $
 
 Add NetBSD support.
 https://rt.cpan.org/Public/Bug/Display.html?id=98004
@@ -14,7 +14,7 @@ https://rt.cpan.org/Public/Bug/Display.h
   #include <sys/sysctl.h>
   #define _have_cpu_type
   #define _have_cpu_clock
-@@ -345,6 +345,17 @@ CODE:
+@@ -345,6 +345,27 @@ CODE:
      size_t len = sizeof(clock);
      sysctlbyname("hw.clockrate", &clock, &len, NULL, 0);
  #endif
@@ -26,13 +26,23 @@ https://rt.cpan.org/Public/Bug/Display.h
 +        name = "machdep.powernow.frequency.current";
 +    else if (sysctlbyname("machdep.est.frequency.current", NULL, &len, NULL, 0) == 0)
 +        name = "machdep.est.frequency.current";
++    else if (sysctlbyname("machdep.loongson.frequency.current", NULL, &len, NULL, 0) == 0)
++        name = "machdep.loongson.frequency.current";
++    else if (sysctlbyname("machdep.intrepid.frequency.current", NULL, &len, NULL, 0) == 0)
++        name = "machdep.intrepid.frequency.current";
++    else if (sysctlbyname("machdep.cpufreq.cpu0.current", NULL, &len, NULL, 0) == 0)
++        name = "machdep.cpufreq.cpu0.current";
++    else if (sysctlbyname("machdep.cpu.frequency.current", NULL, &len, NULL, 0) == 0)
++        name = "machdep.cpu.frequency.current";
++    else if (sysctlbyname("machdep.frequency.current", NULL, &len, NULL, 0) == 0)
++        name = "machdep.frequency.current";
 +
 +    sysctlbyname(name, &clock, &len, NULL, 0);
 +#endif
  #ifdef WINDOWS
      char *clock_str = malloc(MAX_IDENT_SIZE);
      /*!! untested !!*/
-@@ -394,6 +405,11 @@ CODE:
+@@ -394,6 +415,11 @@ CODE:
      size_t len = MAX_IDENT_SIZE;
      sysctlbyname("hw.model", value, &len, NULL, 0);
  #endif