svn commit: r469022 - in head/sysutils/cpu-x: . files

[Alexey Dokuchaev]

Author: danfe
Date: Fri May  4 12:00:26 2018
New Revision: 469022
URL: https://svnweb.freebsd.org/changeset/ports/469022

Log:
  Version 3.2.2 was released for `sysutils/cpu-x', but it does not build on
  FreeBSD as is (was fixed in master later).  The patch which fixes the build
  is actually larger than the functional difference between the two versions,
  which is added support for Zen+ (Pinnacle Ridge) CPUs, so cherry-pick that
  instead and instruct our dear portscout to ignore version 3.2.2 for now.
  
  Reported by:	portscout

Added:
  head/sysutils/cpu-x/files/patch-src_databases.h   (contents, props changed)
Modified:
  head/sysutils/cpu-x/Makefile

Modified: head/sysutils/cpu-x/Makefile
==============================================================================
--- head/sysutils/cpu-x/Makefile	Fri May  4 11:41:28 2018	(r469021)
+++ head/sysutils/cpu-x/Makefile	Fri May  4 12:00:26 2018	(r469022)
@@ -3,6 +3,7 @@
 
 PORTNAME=	cpu-x
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -10,6 +11,8 @@ MAINTAINER=	danfe at FreeBSD.org
 COMMENT=	Gathers information about CPU, motherboard, and more
 
 LICENSE=	GPLv3
+
+PORTSCOUT=	skipv:3.2.2	# useful parts of 3.2.2 were cherry-picked
 
 BUILD_DEPENDS=	nasm:devel/nasm
 LIB_DEPENDS=	libcpuid.so:sysutils/libcpuid \

Added: head/sysutils/cpu-x/files/patch-src_databases.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/cpu-x/files/patch-src_databases.h	Fri May  4 12:00:26 2018	(r469022)
@@ -0,0 +1,19 @@
+--- src/databases.h.orig	2018-03-24 17:05:43 UTC
++++ src/databases.h
+@@ -101,7 +101,7 @@ const Technology_DB technology_amd[] =
+ 	{  1,          -1,          20,          40 }, // Bobcat (Brazos Zacate)
+ 	{  1,           1,          21,          32 }, // Bulldozer
+ 	{  1,          96,          21,          28 }, // Bulldozer (Excavator: Carrizo)
+-	{  1,          -1,          23,          14 }, // Zen (Summit Ridge)
++	{  1,          -1,          23,          14 }, // Zen (Summit Ridge/Raven Ridge)
+ 	{  2,          -1,          16,          65 }, // K10 (Kuma/Agena)
+ 	{  2,          -1,          20,          40 }, // Bobcat (Brazos Desna/Ontario)
+ 	{  2,          -1,          21,          32 }, // Bulldozer (Piledriver: Vishera)
+@@ -115,6 +115,7 @@ const Technology_DB technology_amd[] =
+ 	{  8,          -1,           6,         130 }, // K7 (Thoroughbred/Applebred)
+ 	{  8,          -1,          15,          65 }, // K8 (Tyler)
+ 	{  8,          -1,          21,          28 }, // Bulldozer (Steamroller: Godavari)
++	{  8,          -1,          23,          12 }, // Zen+ (Pinnacle Ridge)
+ 	{  9,          -1,          16,          45 }, // Magny-Cours (Opteron)
+ 	{ 10,          -1,           6,         130 }, // K7 (Barton)
+ 	{ 10,          -1,          16,          45 }, // K10 (Thuban)