svn commit: r348012 - in head/sysutils/intel-pcm: . files

[Warner Losh]

Author: imp
Date: Wed Mar 12 22:43:12 2014
New Revision: 348012
URL: http://svnweb.freebsd.org/changeset/ports/348012
QAT: https://qat.redports.org/buildarchive/r348012/

Log:
  Move to using a cached copy of Intel's zip file, per their request. Pull
  in the fix from git to make cpucounters.cpp compile.

Added:
  head/sysutils/intel-pcm/files/
  head/sysutils/intel-pcm/files/patch-cpucounters-cpp   (contents, props changed)
Modified:
  head/sysutils/intel-pcm/Makefile
  head/sysutils/intel-pcm/distinfo

Modified: head/sysutils/intel-pcm/Makefile
==============================================================================
--- head/sysutils/intel-pcm/Makefile	Wed Mar 12 21:57:05 2014	(r348011)
+++ head/sysutils/intel-pcm/Makefile	Wed Mar 12 22:43:12 2014	(r348012)
@@ -3,24 +3,22 @@
 
 PORTNAME=	intel-pcm
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	sysutils
+MASTER_SITES=	LOCAL/imp
+DISTNAME=	intelperformancecountermonitorv${PORTVERSION}
 
-MAINTAINER=	adrian at FreeBSD.org
+MAINTAINER=	imp at FreeBSD.org
 COMMENT=	Intel PCM toolkit
 
-LICENSE=	BSD4CLAUSE
+LICENSE=	BSD3CLAUSE
 
-USES=		gmake compiler:c++11-lang
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	erikarn
-GH_COMMIT=	9b302ef
-GH_TAGNAME=	${GH_COMMIT}
+USES=		gmake compiler:c++11-lang zip
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${PORTNAME}-${GH_COMMIT}/src
-MAKE_ARGS=	CC="${CXX}" OPT="${CXXFLAGS}"
+WRKSRC=		${WRKDIR}/IntelPerformanceCounterMonitorV${PORTVERSION}
+MAKE_ARGS=	CC="${CXX}" OPT="${CXXFLAGS}" CXX="${CXX}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/*.x ${STAGEDIR}${PREFIX}/sbin

Modified: head/sysutils/intel-pcm/distinfo
==============================================================================
--- head/sysutils/intel-pcm/distinfo	Wed Mar 12 21:57:05 2014	(r348011)
+++ head/sysutils/intel-pcm/distinfo	Wed Mar 12 22:43:12 2014	(r348012)
@@ -1,2 +1,2 @@
-SHA256 (intel-pcm-2.6.tar.gz) = 8f8b8f55f4d2235a0ac6dfc125f0edb1064473102bef25a21de1b9598fe4f330
-SIZE (intel-pcm-2.6.tar.gz) = 807742
+SHA256 (intelperformancecountermonitorv2.6.zip) = 781dcaa0bfa49593878e16db131c31e8f0a401e6e58f8c2786a6d70b1be67857
+SIZE (intelperformancecountermonitorv2.6.zip) = 907379

Added: head/sysutils/intel-pcm/files/patch-cpucounters-cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/intel-pcm/files/patch-cpucounters-cpp	Wed Mar 12 22:43:12 2014	(r348012)
@@ -0,0 +1,12 @@
+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;