Date: Tue, 15 Dec 2009 06:50:12 GMT From: "Philip M. Gollucci" <pgollucci@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: terry@sucked-in.com Subject: ports/141573: [PATCH] devel/p5-Sys-CPU: update to 0.51 Message-ID: <200912150650.nBF6oCiE073603@frieza.p6m7g8.net> Resent-Message-ID: <200912150700.nBF70DTP060615@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 141573 >Category: ports >Synopsis: [PATCH] devel/p5-Sys-CPU: update to 0.51 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Dec 15 07:00:12 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Philip M. Gollucci >Release: FreeBSD 9.0-CURRENT amd64 >Organization: RideCharge Inc. >Environment: System: FreeBSD frieza.p6m7g8.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Tue Dec 8 02:25:55 UTC >Description: - Update to 0.51 Port maintainer (terry@sucked-in.com) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- p5-Sys-CPU-0.51.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/p5-Sys-Cpu/Makefile,v retrieving revision 1.1 diff -u -u -r1.1 Makefile --- Makefile 25 Jul 2008 08:12:22 -0000 1.1 +++ Makefile 14 Dec 2009 06:46:03 -0000 @@ -6,7 +6,7 @@ # PORTNAME= Sys-CPU -PORTVERSION= 0.40 +PORTVERSION= 0.51 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- Index: distinfo =================================================================== RCS file: /home/ncvs/ports/devel/p5-Sys-Cpu/distinfo,v retrieving revision 1.1 diff -u -u -r1.1 distinfo --- distinfo 25 Jul 2008 08:12:22 -0000 1.1 +++ distinfo 14 Dec 2009 06:46:05 -0000 @@ -1,3 +1,3 @@ -MD5 (Sys-CPU-0.40.tar.gz) = c2731716e5c1eaa4e88860ccc09791e2 -SHA256 (Sys-CPU-0.40.tar.gz) = 48efce686727f6529a555c3a6f7c57f91285e364675370007bb462174e773558 -SIZE (Sys-CPU-0.40.tar.gz) = 4696 +MD5 (Sys-CPU-0.51.tar.gz) = 714b8ee88cfea4cc5f01a897c1de2f7a +SHA256 (Sys-CPU-0.51.tar.gz) = 5fade386d41bf2e21da9604dfbb523cab2ca74ba65296e568e1fd963f49ba625 +SIZE (Sys-CPU-0.51.tar.gz) = 5626 Index: files/patch-CPU.xs =================================================================== RCS file: /home/ncvs/ports/devel/p5-Sys-Cpu/files/patch-CPU.xs,v retrieving revision 1.1 diff -u -u -r1.1 patch-CPU.xs --- files/patch-CPU.xs 25 Jul 2008 08:12:22 -0000 1.1 +++ files/patch-CPU.xs 15 Dec 2009 05:11:39 -0000 @@ -1,57 +1,50 @@ ---- CPU.xs.orig 2008-07-25 09:06:35.000000000 +0200 -+++ CPU.xs 2008-07-25 09:24:13.000000000 +0200 -@@ -35,6 +35,9 @@ - #define _have_cpu_clock - #define _have_cpu_type - #endif -+#ifdef __FreeBSD__ -+ #include <sys/sysctl.h> -+#endif - - #ifdef WINDOWS - /* Registry Functions */ -@@ -237,6 +240,10 @@ - { - int clock = 0; - int retcode = 0; -+#ifdef __FreeBSD__ -+ size_t len = sizeof(clock); -+ sysctlbyname("hw.clockrate", &clock, &len, NULL, 0); -+#else - #ifdef __linux__ - int value = proc_cpuinfo_clock(); - if (value) clock = value; -@@ -263,12 +270,13 @@ - } - } - #endif -+#endif - if (clock) { - ST(0) = sv_newmortal(); - sv_setiv (ST(0), clock); - } else { - ST(0) = &PL_sv_undef; -- } -+ } - } - - SV * -@@ -277,6 +285,10 @@ - { - char *value = malloc(MAX_IDENT_SIZE); - int retcode = 0; -+#ifdef __FreeBSD__ -+ size_t len = MAX_IDENT_SIZE; -+ sysctlbyname("hw.model", value, &len, NULL, 0); -+#else - #ifdef __linux__ - value = proc_cpuinfo_field ("model name"); - if (!value) value = proc_cpuinfo_field ("machine"); -@@ -296,6 +308,7 @@ - value = infop->pi_processor_type; - } - #endif -+#endif - if (value) { - ST(0) = sv_newmortal(); - sv_setpv (ST(0), value); +--- ./CPU.xs.orig 2009-12-15 05:09:42.345521784 +0000 ++++ ./CPU.xs 2009-12-15 05:11:33.058328554 +0000 +@@ -40,6 +40,9 @@ + #define _have_cpu_clock + #define _have_cpu_type + #endif ++#ifdef __FreeBSD__ ++ #include <sys/sysctl.h> ++#endif + #ifdef WINDOWS + /* Registry Functions */ + +@@ -313,6 +316,10 @@ + { + int clock = 0; + int retcode = 0; ++#ifdef __FreeBSD__ ++ size_t len = sizeof(clock); ++ sysctlbyname("hw.clockrate", &clock, &len, NULL, 0); ++#else + #ifdef __linux__ + int value = proc_cpuinfo_clock(); + if (value) clock = value; +@@ -342,6 +349,7 @@ + } + } + #endif ++#endif + if (clock) { + ST(0) = sv_newmortal(); + sv_setiv (ST(0), clock); +@@ -356,6 +364,10 @@ + { + char *value = malloc(MAX_IDENT_SIZE); + int retcode = 0; ++#ifdef __FreeBSD__ ++ size_t len = MAX_IDENT_SIZE; ++ sysctlbyname("hw.model", value, &len, NULL, 0); ++#else + #ifdef __linux__ + value = proc_cpuinfo_field ("model name"); + if (!value) value = proc_cpuinfo_field ("machine"); +@@ -378,6 +390,7 @@ + value = infop->pi_processor_type; + } + #endif ++#endif + if (value) { + ST(0) = sv_newmortal(); + sv_setpv (ST(0), value); --- p5-Sys-CPU-0.51.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912150650.nBF6oCiE073603>