Index: sysutils/storcli/Makefile
===================================================================
--- sysutils/storcli/Makefile
+++ sysutils/storcli/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	storcli
-PORTVERSION=	1.23.02
+DISTVERSION=	7.504
 CATEGORIES=	sysutils
-MASTER_SITES=	https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/
-DISTNAME=	${PORTVERSION}_StorCLI
+MASTER_SITES=	https://docs.broadcom.com/docs-and-downloads/docs-and-downloads/raid-controllers/
+DISTNAME=	${DISTVERSION}_Unified_StorCLI
 
 MAINTAINER=	takefu@airport.fm
 COMMENT=	SAS MegaRAID FreeBSD StorCLI
@@ -16,26 +16,36 @@
 		See https://www.broadcom.com/cs/Satellite?pagename=AVG2/Utilities/EulaMsg
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
 
-USES=		zip
+ONLY_FOR_ARCHS=	amd64 i386
 
-ONLY_FOR_ARCHS=	i386 amd64
+USES=		zip
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	sbin/storcli
 PKGMESSAGE=	${WRKDIR}/pkg-message
-BINSRC=		${WRKSRC}/storcli_All_OS/FreeBSD
+BINSRC=		${WRKSRC}/Unified_storcli_all_os/FreeBSD
+
+.include <bsd.port.pre.mk>
+
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+DOWNLOAD_URL=https://docs.broadcom.com/docs/007.0504.0000.0000_Unified_StorCLI.zip
+
+IGNORE?=You must manually fetch the distribution file\
+	(${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL},\
+	place it in ${DISTDIR} and then run make again
+.endif
 
 post-extract:
-	@${TAR} xf ${WRKSRC}/storcli_All_OS.zip -C${WRKSRC}
+	@${TAR} xf ${WRKSRC}/Unified_storcli_all_os.zip -C${WRKSRC}
 	@${TAR} xf ${BINSRC}/storcli${ARCH:S/i386//:S/amd64/64/}.tar -C${WRKSRC}
 	@${REINPLACE_CMD} 's#\(StorCli\).*StorCli64#\1#'\
 		${BINSRC}/FreeBSD_readme.txt
-	@${FMT} 75 79 ${BINSRC}/FreeBSD_readme.txt > ${WRKSRC}/pkg-message
+	@${FMT} 75 79 ${BINSRC}/FreeBSD_readme.txt > ${WRKDIR}/pkg-message
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/storcli${ARCH:S/i386//:S/amd64/64/}\
 		${STAGEDIR}${PREFIX}/sbin/storcli
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: sysutils/storcli/distinfo
===================================================================
--- sysutils/storcli/distinfo
+++ sysutils/storcli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504079269
-SHA256 (1.23.02_StorCLI.zip) = d7cd07b7af93cbeb5735f5d4754fb5cb0fa92af3965017c6642e5273e10eb8ff
-SIZE (1.23.02_StorCLI.zip) = 48778476
+TIMESTAMP = 1528263675
+SHA256 (007.0504.0000.0000_Unified_StorCLI.zip) = 3915dcb69afa1925e2c5ee3e5aea9637e8a49adc5cb0d4d213486440ce4d7cfd
+SIZE (007.0504.0000.0000_Unified_StorCLI.zip) = 40558670