Index: branches/2018Q1/sysutils/devcpu-data/Makefile
===================================================================
--- branches/2018Q1/sysutils/devcpu-data/Makefile	(revision 464617)
+++ branches/2018Q1/sysutils/devcpu-data/Makefile	(revision 464618)
@@ -1,41 +1,40 @@
 # Created by: stas
 # $FreeBSD$
 
 PORTNAME=	data
-PORTVERSION=	1.15
-PORTREVISION=	1
+PORTVERSION=	1.16
 CATEGORIES=	sysutils
-MASTER_SITES=	https://downloadmirror.intel.com/27337/eng/:intel \
+MASTER_SITES=	https://downloadmirror.intel.com/27591/eng/:intel \
 		LOCAL/sbruno:amd
 PKGNAMEPREFIX=	devcpu-
-DISTFILES=	microcode-20171117.tgz:intel \
+DISTFILES=	microcode-20180312.tgz:intel \
 		amd64-microcode_3.20171205.1.tar.xz:amd
 
 MAINTAINER=	clarkjc@runbox.com
 COMMENT=	Intel and AMD CPUs microcode updates
 
 LICENSE=	EULA
 LICENSE_NAME=	Intel Software License Agreement
 LICENSE_FILE=	${FILESDIR}/LICENSE
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64 i386
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 
 DATADIR=	${PREFIX}/share/cpucontrol
 
 USE_RC_SUBR=	microcode_update
 
 post-extract:
 	${CP} -p ${FILESDIR}/Makefile ${FILESDIR}/ucode-tool.c ${WRKSRC}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/amd64-microcode-3.20171205.1/microcode_amd.bin ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/amd64-microcode-3.20171205.1/microcode_amd_fam15h.bin ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/amd64-microcode-3.20171205.1/microcode_amd_fam16h.bin ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/amd64-microcode-3.20171205.1/microcode_amd_fam17h.bin ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/mcodes/* ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
Index: branches/2018Q1/sysutils/devcpu-data/distinfo
===================================================================
--- branches/2018Q1/sysutils/devcpu-data/distinfo	(revision 464617)
+++ branches/2018Q1/sysutils/devcpu-data/distinfo	(revision 464618)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1515706070
-SHA256 (microcode-20171117.tgz) = 93bd1da9fa58ece0016702e657f708b7e496e56da637a3fe9a6d21f1d6f524dc
-SIZE (microcode-20171117.tgz) = 3594762
+TIMESTAMP = 1520973336
+SHA256 (microcode-20180312.tgz) = 0b381face2df1b0a829dc4fa8fa93f47f39e11b1c9c22ebd44f8614657c1e779
+SIZE (microcode-20180312.tgz) = 3789662
 SHA256 (amd64-microcode_3.20171205.1.tar.xz) = a38bc072f535a3d3c1bf4e9e545197aa5114e979e94ef7e4a67e615df2f853a7
 SIZE (amd64-microcode_3.20171205.1.tar.xz) = 32584
Index: branches/2018Q1/sysutils/devcpu-data/pkg-plist
===================================================================
--- branches/2018Q1/sysutils/devcpu-data/pkg-plist	(revision 464617)
+++ branches/2018Q1/sysutils/devcpu-data/pkg-plist	(revision 464618)
@@ -1,168 +1,170 @@
 %%DATADIR%%/2f0708.fw
 %%DATADIR%%/M01106C2217.fw
 %%DATADIR%%/M01106CA107.fw
 %%DATADIR%%/M0120661104.fw
 %%DATADIR%%/M0220661105_CV.fw
 %%DATADIR%%/M04106C2218.fw
 %%DATADIR%%/M04106CA107.fw
 %%DATADIR%%/M08106C2219.fw
 %%DATADIR%%/M08106CA107.fw
 %%DATADIR%%/M10106CA107.fw
 %%DATADIR%%/MU163202.fw
 %%DATADIR%%/MU165040.fw
 %%DATADIR%%/MU165041.fw
 %%DATADIR%%/MU165045.fw
 %%DATADIR%%/MU165140.fw
 %%DATADIR%%/MU16522a.fw
 %%DATADIR%%/MU16522c.fw
 %%DATADIR%%/MU16530c.fw
 %%DATADIR%%/MU16530d.fw
 %%DATADIR%%/MU165310.fw
 %%DATADIR%%/MU16600a.fw
 %%DATADIR%%/MU166503.fw
 %%DATADIR%%/MU166a0b.fw
 %%DATADIR%%/MU166a0c.fw
 %%DATADIR%%/MU166a0d.fw
 %%DATADIR%%/MU166d05.fw
 %%DATADIR%%/MU166d06.fw
 %%DATADIR%%/MU166d07.fw
 %%DATADIR%%/MU16810d.fw
 %%DATADIR%%/MU16810e.fw
 %%DATADIR%%/MU16810f.fw
 %%DATADIR%%/MU168111.fw
 %%DATADIR%%/MU168307.fw
 %%DATADIR%%/MU168308.fw
 %%DATADIR%%/MU168607.fw
 %%DATADIR%%/MU168608.fw
 %%DATADIR%%/MU16860a.fw
 %%DATADIR%%/MU16860c.fw
 %%DATADIR%%/MU168a01.fw
 %%DATADIR%%/MU168a04.fw
 %%DATADIR%%/MU168a05.fw
 %%DATADIR%%/MU16b11c.fw
 %%DATADIR%%/MU16b11d.fw
 %%DATADIR%%/MU16b401.fw
 %%DATADIR%%/MU16b402.fw
 %%DATADIR%%/MU26522b.fw
 %%DATADIR%%/MU26530b.fw
 %%DATADIR%%/MU268110.fw
 %%DATADIR%%/MU268602.fw
 %%DATADIR%%/m011066143.fw
 %%DATADIR%%/m011067660F.fw
 %%DATADIR%%/m016fbBA.fw
 %%DATADIR%%/m01f0712.fw
 %%DATADIR%%/m01f0a13.fw
 %%DATADIR%%/m01f2529.fw
 %%DATADIR%%/m01f480c.fw
 %%DATADIR%%/m01f6402.fw
 %%DATADIR%%/m01f6508.fw
 %%DATADIR%%/m021066142.fw
-%%DATADIR%%/m02906eb_00000071_00000072.fw
+%%DATADIR%%/m02906eb_00000083_00000084.fw
 %%DATADIR%%/m02f0a15.fw
 %%DATADIR%%/m02f241f.fw
 %%DATADIR%%/m02f252a.fw
 %%DATADIR%%/m02f2610.fw
 %%DATADIR%%/m02f2738.fw
 %%DATADIR%%/m02f292d.fw
 %%DATADIR%%/m02f4116.fw
 %%DATADIR%%/m02f480e.fw
 %%DATADIR%%/m03106a4_00000012.fw
 %%DATADIR%%/m03106a5_00000019.fw
 %%DATADIR%%/m041067660F.fw
 %%DATADIR%%/m046fbBC.fw
 %%DATADIR%%/m04f0a14.fw
 %%DATADIR%%/m04f122e.fw
 %%DATADIR%%/m04f241e.fw
 %%DATADIR%%/m04f252b.fw
 %%DATADIR%%/m04f2737.fw
 %%DATADIR%%/m04f292e.fw
 %%DATADIR%%/m04f620f.fw
 %%DATADIR%%/m05206f2_00000037.fw
 %%DATADIR%%/m08106d129.fw
 %%DATADIR%%/m086fbBB.fw
 %%DATADIR%%/m08f2739.fw
 %%DATADIR%%/m08f292f.fw
 %%DATADIR%%/m0df320a.fw
 %%DATADIR%%/m0df330c.fw
 %%DATADIR%%/m101067660F.fw
 %%DATADIR%%/m101067770A.fw
-%%DATADIR%%/m1050662_0000000f.fw
-%%DATADIR%%/m1050663_0700000d.fw
-%%DATADIR%%/m1050664_0f00000a.fw
+%%DATADIR%%/m1050662_00000015.fw
+%%DATADIR%%/m1050663_07000012.fw
+%%DATADIR%%/m1050664_0f000011.fw
+%%DATADIR%%/m1050665_0e000009.fw
 %%DATADIR%%/m1069507.fw
 %%DATADIR%%/m106f76a.fw
 %%DATADIR%%/m106fbBA.fw
 %%DATADIR%%/m10f2421.fw
 %%DATADIR%%/m10f252c.fw
 %%DATADIR%%/m111067AA0B.fw
 %%DATADIR%%/m1220652_0000000e.fw
-%%DATADIR%%/m12206a7_00000029.fw
-%%DATADIR%%/m12306a9_0000001c.fw
+%%DATADIR%%/m12206a7_0000002d.fw
+%%DATADIR%%/m12306a9_0000001f.fw
 %%DATADIR%%/m13106e5_00000007.fw
 %%DATADIR%%/m16f25d.fw
 %%DATADIR%%/m16f6d0.fw
 %%DATADIR%%/m16fda4.fw
 %%DATADIR%%/m1df3417.fw
 %%DATADIR%%/m2069507.fw
 %%DATADIR%%/m206d618.fw
 %%DATADIR%%/m206e839.fw
 %%DATADIR%%/m206ec54.fw
 %%DATADIR%%/m206f25c.fw
 %%DATADIR%%/m206f6d1.fw
 %%DATADIR%%/m206fbBA.fw
 %%DATADIR%%/m206fda4.fw
-%%DATADIR%%/m2240671_00000017.fw
-%%DATADIR%%/m22906ea_0000006f_00000070.fw
+%%DATADIR%%/m2240671_0000001d.fw
+%%DATADIR%%/m22906ea_00000084.fw
 %%DATADIR%%/m22f6809.fw
-%%DATADIR%%/m2a906e9_0000005d_0000005e.fw
-%%DATADIR%%/m32306c3_00000022.fw
-%%DATADIR%%/m3240661_00000017.fw
+%%DATADIR%%/m2a906e9_00000083_00000084.fw
+%%DATADIR%%/m32306c3_00000024.fw
+%%DATADIR%%/m3240661_00000019.fw
 %%DATADIR%%/m34f6404.fw
-%%DATADIR%%/m36506e3_000000b9_000000ba.fw
+%%DATADIR%%/m36506e3_000000c1_000000c2.fw
 %%DATADIR%%/m401067660F.fw
 %%DATADIR%%/m406f76b.fw
 %%DATADIR%%/m406fbBC.fw
 %%DATADIR%%/m441067AA0B.fw
 %%DATADIR%%/m46f6d2.fw
 %%DATADIR%%/m5cf4a04.fw
 %%DATADIR%%/m5df4a02.fw
 %%DATADIR%%/m5ff4807.fw
-%%DATADIR%%/m6d206d6_00000619.fw
-%%DATADIR%%/m6d206d7_00000710.fw
-%%DATADIR%%/m6f306f2_0000003a.fw
-%%DATADIR%%/m7240651_00000020.fw
+%%DATADIR%%/m6d206d6_0000061c.fw
+%%DATADIR%%/m6d206d7_00000713.fw
+%%DATADIR%%/m6f306f2_0000003c.fw
+%%DATADIR%%/m7240651_00000023.fw
 %%DATADIR%%/m801066144.fw
 %%DATADIR%%/m801067660F.fw
-%%DATADIR%%/m80306f4_0000000f.fw
+%%DATADIR%%/m80306f4_00000011.fw
 %%DATADIR%%/m8069547.fw
 %%DATADIR%%/m806ec59.fw
 %%DATADIR%%/m806fa95.fw
 %%DATADIR%%/m806fbBA.fw
 %%DATADIR%%/m806fda4.fw
 %%DATADIR%%/m9220655_00000004.fw
+%%DATADIR%%/m9750653_01000140.fw
 %%DATADIR%%/m9df4305.fw
 %%DATADIR%%/m9df4406.fw
 %%DATADIR%%/m9df4703.fw
 %%DATADIR%%/mA01067AA0B.fw
 %%DATADIR%%/m_01_706a1_0000001e.fw
 %%DATADIR%%/m_03_506c9_0000002c.fw
-%%DATADIR%%/mb750654_02000035.fw
+%%DATADIR%%/mb750654_02000043.fw
 %%DATADIR%%/mbdf4117.fw
 %%DATADIR%%/mbdf4903.fw
-%%DATADIR%%/mc0306d4_00000025.fw
-%%DATADIR%%/mc0406e3_000000b9_000000ba.fw
-%%DATADIR%%/mc0806e9_00000061_00000062.fw
-%%DATADIR%%/mc0806ea_0000006f_00000070.fw
-%%DATADIR%%/med306e4_00000428.fw
+%%DATADIR%%/mc0306d4_0000002a.fw
+%%DATADIR%%/mc0406e3_000000c1_000000c2.fw
+%%DATADIR%%/mc0806e9_00000083_00000084.fw
+%%DATADIR%%/mc0806ea_00000083_00000084.fw
+%%DATADIR%%/med306e4_0000042c.fw
 %%DATADIR%%/med306e6_00000600.fw
-%%DATADIR%%/med306e7_0000070d.fw
+%%DATADIR%%/med306e7_00000713.fw
 %%DATADIR%%/mef406f1_0b000021.fw
 %%DATADIR%%/microcode_amd.bin
 %%DATADIR%%/microcode_amd_fam15h.bin
 %%DATADIR%%/microcode_amd_fam16h.bin
 %%DATADIR%%/microcode_amd_fam17h.bin
 %%DATADIR%%/mu267114.fw
 %%DATADIR%%/mu267238.fw
 %%DATADIR%%/mu26732e.fw
 %%DATADIR%%/mu26a003.fw
 %%DATADIR%%/mu26a101.fw
Index: branches/2018Q1
===================================================================
--- branches/2018Q1	(revision 464617)
+++ branches/2018Q1	(revision 464618)

Property changes on: branches/2018Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r464504