3 files changed, 52 insertions, 37 deletions

diff --git a/sysutils/intel-nvmupdate/Makefile b/sysutils/intel-nvmupdate/Makefile
index 7d3f3b90cc81..4264cc2a4fd2 100644
--- a/sysutils/intel-nvmupdate/Makefile
+++ b/sysutils/intel-nvmupdate/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nvmupdate
-DISTVERSION=	5_05
-PORTREVISION=	1
+DISTVERSION=	6_01
 CATEGORIES=	sysutils
 MASTER_SITES=	https://downloadmirror.intel.com/${MASTER_SITE_SUBDIR}/ \
 		http://downloadmirror.intel.com/${MASTER_SITE_SUBDIR}/
@@ -25,10 +24,10 @@ LICENSE_NAME_IPL=	Intel Proprietary License
 LICENSE_FILE_IPL=	${WRKSRC}/license.txt
 LICENSE_PERMS_IPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BROKEN=		Does not fetch.
-
 WRKSRC=			${WRKDIR}/XL710/FreeBSDx64
 NO_BUILD=		yes
+NO_ARCH=		yes
+NO_ARCH_IGNORE=		nvmupdate64e
 ONLY_FOR_ARCHS=		amd64
 ONLY_FOR_ARCHS_REASON=	not supported on anything other than amd64
 IGNORE_DragonFly=	FreeBSD binary port
@@ -40,6 +39,12 @@ NVMUPDATE_DIR=	intel-nvmupdate
 
 .include <bsd.port.pre.mk>
 
+# This is the workaround for directory permission issues for 10.x.
+# Remove this after the directory permissions are fixed upstream.
+post-extract:
+	${CHMOD} a+x ${WRKDIR}/XL710
+	${CHMOD} a+x ${WRKSRC}
+
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${NVMUPDATE_DIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${NVMUPDATE_DIR} "! -name 'nvmupdate64e'"
diff --git a/sysutils/intel-nvmupdate/distinfo b/sysutils/intel-nvmupdate/distinfo
index 412aee11b1bf..b2cc9f415bf2 100644
--- a/sysutils/intel-nvmupdate/distinfo
+++ b/sysutils/intel-nvmupdate/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494849154
-SHA256 (XL710_NVMUpdatePackage_v5_05_FreeBSD.tar.gz) = f971ffb11ad0b86be5bc65bbab2809b5c06fac376c9499792aab15e8affa4e09
-SIZE (XL710_NVMUpdatePackage_v5_05_FreeBSD.tar.gz) = 27191403
+TIMESTAMP = 1510575995
+SHA256 (XL710_NVMUpdatePackage_v6_01_FreeBSD.tar.gz) = 71136f8235de02616d31f5fc551be05d0afd33b5e084d09a5fbbc132ae351b5d
+SIZE (XL710_NVMUpdatePackage_v6_01_FreeBSD.tar.gz) = 32774742
diff --git a/sysutils/intel-nvmupdate/pkg-plist b/sysutils/intel-nvmupdate/pkg-plist
index 7677d0f0384c..c85593c6cc8a 100644
--- a/sysutils/intel-nvmupdate/pkg-plist
+++ b/sysutils/intel-nvmupdate/pkg-plist
@@ -1,8 +1,9 @@
+intel-nvmupdate/25G_PHY_MISC_3.txt
 intel-nvmupdate/AXX1P40FRTIOM_4p42_CFGID4p0_80001934.bin
-intel-nvmupdate/AXX1P40FRTIOM_5p05_CFGID4p0.bin
+intel-nvmupdate/AXX1P40FRTIOM_6p01_CFGID4p0.bin
 intel-nvmupdate/AXX1P40FRTIOM_gpio.txt
 intel-nvmupdate/AXX2P40FRTIOM_4p42_CFGID4p5_80001935.bin
-intel-nvmupdate/AXX2P40FRTIOM_5p05_CFGID4p5.bin
+intel-nvmupdate/AXX2P40FRTIOM_6p01_CFGID4p5.bin
 intel-nvmupdate/AXX2P40FRTIOM_gpio.txt
 intel-nvmupdate/BootIMG.FLB
 intel-nvmupdate/Intel_Proprietary_License.pdf
@@ -11,17 +12,22 @@ intel-nvmupdate/PF_Alloc.txt
 intel-nvmupdate/PF_Alloc_1589.txt
 intel-nvmupdate/PF_Alloc_LR4.txt
 intel-nvmupdate/PF_Alloc_WOL_DIS.txt
+intel-nvmupdate/X710DA2OCP_6p01_CFGID7p2_OEMGEN.bin
 intel-nvmupdate/X710DA2_4p42_CFGID7p2_OEMGEN.bin
-intel-nvmupdate/X710DA2_5p05_CFGID7p2_OEMGEN.bin
+intel-nvmupdate/X710DA2_6p01_CFGID7p2_OEMGEN.bin
 intel-nvmupdate/X710DA4FH_4p42_CFGID7p2_OEMGEN.bin
-intel-nvmupdate/X710DA4FH_5p05_CFGID7p2_OEMGEN.bin
+intel-nvmupdate/X710DA4FH_6p01_CFGID7p2_OEMGEN.bin
 intel-nvmupdate/X710DA4_4p42_CFGID7p2_OEMGEN.bin
-intel-nvmupdate/X710DA4_5p05_CFGID7p2_OEMGEN.bin
+intel-nvmupdate/X710DA4_5p05_CFGID7p2_OEMGEN_J382783.bin
+intel-nvmupdate/X710DA4_6p01_CFGID7p2_OEMGEN.bin
+intel-nvmupdate/X710T4_6p01_OEMGEN.bin
+intel-nvmupdate/XL710QDA1OCP_6p01_CFGID4p0_OEMGEN.bin
 intel-nvmupdate/XL710QDA1_4p42_CFGID4p0_OEMGEN.bin
-intel-nvmupdate/XL710QDA1_5p05_CFGID4p0_OEMGEN.bin
+intel-nvmupdate/XL710QDA1_6p01_CFGID4p0_OEMGEN.bin
 intel-nvmupdate/XL710QDA1_gpio.txt
+intel-nvmupdate/XL710QDA2OCP_6p01_CFGID4p5_OEMGEN.bin
 intel-nvmupdate/XL710QDA2_4p42_CFGID4p5_OEMGEN.bin
-intel-nvmupdate/XL710QDA2_5p05_CFGID4p5_OEMGEN.bin
+intel-nvmupdate/XL710QDA2_6p01_CFGID4p5_OEMGEN.bin
 intel-nvmupdate/XL710QDA2_gpio.txt
 intel-nvmupdate/XL710_4p42_KR_KR4_NCSI_CFGID2p0_Single.bin
 intel-nvmupdate/XL710_4p42_KR_KR4_NCSI_CFGID2p4_Dual.bin
@@ -33,34 +39,38 @@ intel-nvmupdate/XL710_4p42_QSFP_NCSI_CFGID4p0_Single.bin
 intel-nvmupdate/XL710_4p42_QSFP_NCSI_CFGID4p5_Dual.bin
 intel-nvmupdate/XL710_4p42_SFI_MCTP_CFGID7p2_Quad.bin
 intel-nvmupdate/XL710_4p42_SFI_NCSI_CFGID7p2_Quad.bin
-intel-nvmupdate/XL710_5p05_BASET_X557_NCSI_CFGID10p01_Quad.bin
-intel-nvmupdate/XL710_5p05_KR_KR4_NCSI_CFGID2p0_Single.bin
-intel-nvmupdate/XL710_5p05_KR_KR4_NCSI_CFGID2p4_Dual.bin
-intel-nvmupdate/XL710_5p05_KR_KX_NCSI_CFGID3p0_Quad.bin
-intel-nvmupdate/XL710_5p05_KR_KX_NCSI_CFGID3p2_Quad.bin
-intel-nvmupdate/XL710_5p05_KR_KX_NCSI_CFGID3p8_Quad.bin
-intel-nvmupdate/XL710_5p05_KX_KX4_NCSI_CFGID1p0_Dual.bin
-intel-nvmupdate/XL710_5p05_QSFP_Breakout_MCTP_CFGID6p0_Quad.bin
-intel-nvmupdate/XL710_5p05_QSFP_Breakout_MCTP_CFGID6p4_Quad.bin
-intel-nvmupdate/XL710_5p05_QSFP_Breakout_NCSI_CFGID6p0_Quad.bin
-intel-nvmupdate/XL710_5p05_QSFP_MCTP_CFGID4p0_Single.bin
-intel-nvmupdate/XL710_5p05_QSFP_MCTP_CFGID4p5_Dual.bin
-intel-nvmupdate/XL710_5p05_QSFP_NCSI_CFGID4p0_Single.bin
-intel-nvmupdate/XL710_5p05_QSFP_NCSI_CFGID4p5_Dual.bin
-intel-nvmupdate/XL710_5p05_SFI_MCTP_CFGID7p2_Quad.bin
-intel-nvmupdate/XL710_5p05_SFI_NCSI_CFGID7p2_Quad.bin
-intel-nvmupdate/XL710_5p05_XLAUI_NCSI_CFGID2p61_Dual.bin
+intel-nvmupdate/XL710_6p01_BASET_X557_NCSI_CFGID10p01_Quad.bin
+intel-nvmupdate/XL710_6p01_KR_KR4_NCSI_CFGID2p0_Single.bin
+intel-nvmupdate/XL710_6p01_KR_KR4_NCSI_CFGID2p4_Dual.bin
+intel-nvmupdate/XL710_6p01_KR_KX_NCSI_CFGID3p0_Quad.bin
+intel-nvmupdate/XL710_6p01_KR_KX_NCSI_CFGID3p2_Quad.bin
+intel-nvmupdate/XL710_6p01_KR_KX_NCSI_CFGID3p8_Quad.bin
+intel-nvmupdate/XL710_6p01_KX_KX4_NCSI_CFGID1p0_Dual.bin
+intel-nvmupdate/XL710_6p01_QSFP_Breakout_MCTP_CFGID6p0_Quad.bin
+intel-nvmupdate/XL710_6p01_QSFP_Breakout_MCTP_CFGID6p4_Quad.bin
+intel-nvmupdate/XL710_6p01_QSFP_Breakout_NCSI_CFGID6p0_Quad.bin
+intel-nvmupdate/XL710_6p01_QSFP_MCTP_CFGID4p0_Single.bin
+intel-nvmupdate/XL710_6p01_QSFP_MCTP_CFGID4p5_Dual.bin
+intel-nvmupdate/XL710_6p01_QSFP_NCSI_CFGID4p0_Single.bin
+intel-nvmupdate/XL710_6p01_QSFP_NCSI_CFGID4p5_Dual.bin
+intel-nvmupdate/XL710_6p01_SFI_MCTP_CFGID7p2_Quad.bin
+intel-nvmupdate/XL710_6p01_SFI_NCSI_CFGID7p2_Quad.bin
+intel-nvmupdate/XL710_6p01_XLAUI_NCSI_CFGID2p61_Dual.bin
 intel-nvmupdate/XL710_X710_4p42_KR_KX_NCSI_CFGID0p5_Dual.bin
 intel-nvmupdate/XL710_X710_4p42_SFI_Backplane_MCTP_CFGID7p2_Dual.bin
 intel-nvmupdate/XL710_X710_4p42_SFI_MCTP_CFGID7p2_Dual.bin
 intel-nvmupdate/XL710_X710_4p42_SFI_NCSI_CFGID7p2_Dual.bin
-intel-nvmupdate/XL710_X710_5p05_KR_KX_NCSI_CFGID0p5_Dual.bin
-intel-nvmupdate/XL710_X710_5p05_SFI_Backplane_MCTP_CFGID7p0_Quad.bin
-intel-nvmupdate/XL710_X710_5p05_SFI_Backplane_MCTP_CFGID7p2_Dual.bin
-intel-nvmupdate/XL710_X710_5p05_SFI_Backplane_MCTP_CFGID7p2_Quad.bin
-intel-nvmupdate/XL710_X710_5p05_SFI_MCTP_CFGID7p2_Dual.bin
-intel-nvmupdate/XL710_X710_5p05_SFI_NCSI_CFGID7p2_Dual.bin
+intel-nvmupdate/XL710_X710_6p01_KR_KX_NCSI_CFGID0p5_Dual.bin
+intel-nvmupdate/XL710_X710_6p01_SFI_Backplane_MCTP_CFGID7p0_Quad.bin
+intel-nvmupdate/XL710_X710_6p01_SFI_Backplane_MCTP_CFGID7p2_Dual.bin
+intel-nvmupdate/XL710_X710_6p01_SFI_Backplane_MCTP_CFGID7p2_Quad.bin
+intel-nvmupdate/XL710_X710_6p01_SFI_MCTP_CFGID7p2_Dual.bin
+intel-nvmupdate/XL710_X710_6p01_SFI_NCSI_CFGID7p2_Dual.bin
+intel-nvmupdate/XXV710DA1_6p01_CFGID13p0_OEMGEN.bin
+intel-nvmupdate/XXV710DA1_OCP_6p01_CFGID13p0_OEMGEN.bin
+intel-nvmupdate/XXV710DA2_6p01_CFGID12p0_OEMGEN.bin
 intel-nvmupdate/file_license.txt
+intel-nvmupdate/iv.txt
 intel-nvmupdate/license.pdf
 intel-nvmupdate/license.txt
 intel-nvmupdate/nvmupdate.cfg