Index: head/sysutils/intel-pcm/files/patch-cpucounters-cpp =================================================================== --- head/sysutils/intel-pcm/files/patch-cpucounters-cpp (revision 377571) +++ head/sysutils/intel-pcm/files/patch-cpucounters-cpp (nonexistent) @@ -1,12 +0,0 @@ -diff -ru cpucounters.cpp cpucounters.cpp ---- cpucounters.cpp 2013-11-04 05:43:31.000000000 -0700 -+++ cpucounters.cpp 2014-03-07 05:47:24.000000000 -0700 -@@ -681,7 +681,7 @@ - else - apic_ids_per_core = 1; - -- for (i = 0; i < num_cores; i++) -+ for (int i = 0; i < num_cores; i++) - { - char cpuctl_name[64]; - int apic_id; Property changes on: head/sysutils/intel-pcm/files/patch-cpucounters-cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/intel-pcm/files/patch-cpuctl_check =================================================================== --- head/sysutils/intel-pcm/files/patch-cpuctl_check (revision 377571) +++ head/sysutils/intel-pcm/files/patch-cpuctl_check (nonexistent) @@ -1,60 +0,0 @@ -commit f87e1f30a39055cdb3b10964a805a9b5e41e6a77 -Author: Jim Harris -Date: Mon Apr 14 22:59:44 2014 -0700 - - FreeBSD: ensure cpuctl(4) driver is loaded. - - Also do a couple of sanity checks on some of the apic cpuid parsing. - This just ensures we get a sensible error messages rather than an - FPE if some logic bug is found in the apic parsing code. - -diff --git cpucounters.cpp cpucounters.cpp -index df8a802..0a9fc26 100644 ---- cpucounters.cpp -+++ cpucounters.cpp -@@ -63,6 +63,8 @@ int convertUnknownToInt(size_t size, char* value); - #endif - - #if defined (__FreeBSD__) -+#include -+#include - #include - #include - #include -@@ -735,11 +737,23 @@ PCM::PCM() : - std::cerr << "Unable to get kern.smp.cpus from sysctl." << std::endl; - return; - } -+ -+ if (modfind("cpuctl") == -1) -+ { -+ std::cout << "cpuctl(4) not loaded." << std::endl; -+ return; -+ } - - do_cpuid(1, cpuid_args.data); - - apic_ids_per_package = (cpuid_args.data[1] & 0x00FF0000) >> 16; - -+ if (apic_ids_per_package == 0) -+ { -+ std::cout << "apic_ids_per_package == 0" << std::endl; -+ return; -+ } -+ - cpuid_count(0xb, 0x0, cpuid_args.data); - - if ((cpuid_args.data[2] & 0xFF00) == 0x100) -@@ -747,6 +761,12 @@ PCM::PCM() : - else - apic_ids_per_core = 1; - -+ if (apic_ids_per_core == 0) -+ { -+ std::cout << "apic_ids_per_core == 0" << std::endl; -+ return; -+ } -+ - for (int i = 0; i < num_cores; i++) - { - char cpuctl_name[64]; Property changes on: head/sysutils/intel-pcm/files/patch-cpuctl_check ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -t \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/intel-pcm/Makefile =================================================================== --- head/sysutils/intel-pcm/Makefile (revision 377571) +++ head/sysutils/intel-pcm/Makefile (revision 377572) @@ -1,26 +1,25 @@ # Created by: Adrian Chadd # $FreeBSD$ PORTNAME= intel-pcm -PORTVERSION= 2.6 -PORTREVISION= 2 +PORTVERSION= 2.8 CATEGORIES= sysutils MASTER_SITES= LOCAL/imp DISTNAME= intelperformancecountermonitorv${PORTVERSION} MAINTAINER= imp@FreeBSD.org COMMENT= Intel PCM toolkit LICENSE= BSD3CLAUSE USES= gmake compiler:c++11-lang zip ONLY_FOR_ARCHS= i386 amd64 WRKSRC= ${WRKDIR}/IntelPerformanceCounterMonitorV${PORTVERSION} MAKE_ARGS= CC="${CXX}" OPT="${CXXFLAGS}" CXX="${CXX}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/*.x ${STAGEDIR}${PREFIX}/sbin .include Index: head/sysutils/intel-pcm/distinfo =================================================================== --- head/sysutils/intel-pcm/distinfo (revision 377571) +++ head/sysutils/intel-pcm/distinfo (revision 377572) @@ -1,2 +1,2 @@ -SHA256 (intelperformancecountermonitorv2.6.zip) = 781dcaa0bfa49593878e16db131c31e8f0a401e6e58f8c2786a6d70b1be67857 -SIZE (intelperformancecountermonitorv2.6.zip) = 907379 +SHA256 (intelperformancecountermonitorv2.8.zip) = 3c51b2fc7b772f16f746ea6fda0471d280c0f27bfd52fa51dd78433ca5a6ca6a +SIZE (intelperformancecountermonitorv2.8.zip) = 931374