sysutils/cpupdate: - correct ONLY_FOR_ARCHS_REASON message;

- be more specific in the COMMENT and pkg-descr: mention x86-centricity;

- in addition to CPM option, add INTEL convinience option to ease
downloading and extraction of recently updated Intel's pack of microcode updates
https://downloadmirror.intel.com/27591/eng/:intel/microcode-20180312.tgz
allowed for end users but not for redistribution, so it does not get
installed nor added to pkg-plist.

Still no real changes of the package, so no PORTREVISION bump yet.

4 files changed, 25 insertions, 13 deletions

diff --git a/sysutils/cpupdate/Makefile b/sysutils/cpupdate/Makefile
index 9889f9a6fd02..f1bdb1649c8f 100644
--- a/sysutils/cpupdate/Makefile
+++ b/sysutils/cpupdate/Makefile
@@ -6,13 +6,16 @@ DISTVERSION=	g20180302
 CATEGORIES=	sysutils
 
 MAINTAINER=	eugen@FreeBSD.org
-COMMENT=	CPU microcode update utility
+COMMENT=	CPU microcode update utility for x86
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=		amd64 i386
-ONLY_FOR_ARCHS_REASON=	contains microcode specific to certain x86 processors
+ONLY_FOR_ARCHS_REASON=	specific to x86 processors
+
+SUB_FILES=	pkg-message
+SUB_LIST=	CPM_DIR=${CPM_DIR} INTEL_DIR=${INTEL_DIR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kernschmelze
@@ -25,13 +28,19 @@ CPM_ACCOUNT=	platomav
 CPM_PROJECT=	CPUMicrocodes
 CPM_TAGNAME=	2ece631
 
-OPTIONS_DEFINE=	CPM
+OPTIONS_DEFINE=	CPM INTEL
 CPM_DESC=	Download platomav/CPUMicrocodes collection
 CPM_GH_ACCOUNT=	${CPM_ACCOUNT}:cpm
 CPM_GH_PROJECT=	${CPM_PROJECT}:cpm
 CPM_GH_TAGNAME=	${CPM_TAGNAME}:cpm
-CPM_SUB_FILES=	pkg-message
-CPM_SUB_LIST=	DIR=${WRKDIR}/${CPM_PROJECT}-${CPM_TAGNAME}
+CPM_DIR=${WRKDIR}/${CPM_PROJECT}-${CPM_TAGNAME}
+
+INTEL_PACK=		microcode-20180312.tgz
+INTEL_DESC=		Download Intel microcode pack ${INTEL_PACK}
+INTEL_MASTER_SITES=	https://downloadmirror.intel.com/27591/eng/:intel
+INTEL_DISTFILES=	${INTEL_PACK}:intel
+
+INTEL_DIR=		${WRKDIR}/intel-ucode
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/sysutils/cpupdate/distinfo b/sysutils/cpupdate/distinfo
index a3e24d983f98..c36d20a1b2f4 100644
--- a/sysutils/cpupdate/distinfo
+++ b/sysutils/cpupdate/distinfo
@@ -1,4 +1,6 @@
-TIMESTAMP = 1521043890
+TIMESTAMP = 1521367334
+SHA256 (microcode-20180312.tgz) = 0b381face2df1b0a829dc4fa8fa93f47f39e11b1c9c22ebd44f8614657c1e779
+SIZE (microcode-20180312.tgz) = 3789662
 SHA256 (kernschmelze-cpupdate-g20180302-58bc0ca_GH0.tar.gz) = a44ff576290051b68241cb8e5af8874db8dbdb1d728a349d9ba1a174a5fc2483
 SIZE (kernschmelze-cpupdate-g20180302-58bc0ca_GH0.tar.gz) = 12574
 SHA256 (platomav-CPUMicrocodes-2ece631_GH0.tar.gz) = bc45bad50b1c2bf86e0a4810d98d8e84328e84dd506d45774079bc87cfb01e15
diff --git a/sysutils/cpupdate/files/pkg-message.in b/sysutils/cpupdate/files/pkg-message.in
index b194ad098437..b7ce45b967ed 100644
--- a/sysutils/cpupdate/files/pkg-message.in
+++ b/sysutils/cpupdate/files/pkg-message.in
@@ -1,8 +1,9 @@
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-NOTE: The following directory
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+NOTE: The following directories
 
-%%DIR%%
+%%CPM_DIR%%
+%%INTEL_DIR%%
 
-contains platomav/CPUMicrocodes collection
-if you have just built the port with CPM option enabled.
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+contain Intel and/or platomav/CPUMicrocodes collections respectively
+if you have just built the port with corresponging CPM/INTEL option(s) enabled
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/sysutils/cpupdate/pkg-descr b/sysutils/cpupdate/pkg-descr
index 6418f2a7178a..f2f869c035e5 100644
--- a/sysutils/cpupdate/pkg-descr
+++ b/sysutils/cpupdate/pkg-descr
@@ -1,4 +1,4 @@
-CPU microcode utility for BSD.
+x86 CPU microcode utility for BSD.
 
 As of March 2018, it is still work in progress
 but should do its job for most cases already.