Upgrade to 7.11.1

3 files changed, 45 insertions, 43 deletions

diff --git a/security/cyberchef/Makefile b/security/cyberchef/Makefile
index 55aafaeefb71..3d42123e9968 100644
--- a/security/cyberchef/Makefile
+++ b/security/cyberchef/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	cyberchef
-PORTVERSION=	0.0.0.20170124
+PORTVERSION=	7.11.1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
 MAINTAINER=	dvl@FreeBSD.org
@@ -14,13 +15,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USE_GITHUB=	yes
 GH_ACCOUNT=	gchq
 GH_PROJECT=	CyberChef
-GH_TAGNAME=	3c3f5d9
 
 NO_BUILD=       yes
 NO_ARCH=        yes
 
 do-install:
-	(cd ${WRKSRC}/build/prod && ${COPYTREE_SHARE} \*       ${STAGEDIR}${WWWDIR}/)
-	(cd ${WRKSRC}/build/prod && ${INSTALL_DATA}  .htaccess ${STAGEDIR}${WWWDIR}/)
+	(cd ${WRKSRC}/src/web/static && ${COPYTREE_SHARE} images       ${STAGEDIR}${WWWDIR}/)
+	${INSTALL} ${WRKSRC}/src/web/html/index.html                   ${STAGEDIR}${WWWDIR}/
+	
 
 .include <bsd.port.mk>
diff --git a/security/cyberchef/distinfo b/security/cyberchef/distinfo
index 6a438ff9fca5..11de696a2247 100644
--- a/security/cyberchef/distinfo
+++ b/security/cyberchef/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485270070
-SHA256 (gchq-CyberChef-0.0.0.20170124-3c3f5d9_GH0.tar.gz) = 68a7d6f7538383514485e6e162545b3d4e4ae40e324c4541e31bae758a01194c
-SIZE (gchq-CyberChef-0.0.0.20170124-3c3f5d9_GH0.tar.gz) = 2003422
+TIMESTAMP = 1532623982
+SHA256 (gchq-CyberChef-v7.11.1_GH0.tar.gz) = cf9a6f2a13879b5c7c3d5903a7103b1517fa1ec7e93c239191f0a8d41b1b9b9b
+SIZE (gchq-CyberChef-v7.11.1_GH0.tar.gz) = 845271
diff --git a/security/cyberchef/pkg-plist b/security/cyberchef/pkg-plist
index ce27a3a14cd5..7f049634e858 100644
--- a/security/cyberchef/pkg-plist
+++ b/security/cyberchef/pkg-plist
@@ -1,46 +1,47 @@
-%%WWWDIR%%/index.html
-%%WWWDIR%%/.htaccess
-%%WWWDIR%%/cyberchef.htm
-%%WWWDIR%%/images/save_as-16x16.png
-%%WWWDIR%%/images/download-24x24.png
-%%WWWDIR%%/images/thumb_down-16x16.png
-%%WWWDIR%%/images/switch-16x16.png
-%%WWWDIR%%/images/layout-16x16.png
-%%WWWDIR%%/images/open_yellow-24x24.png
-%%WWWDIR%%/images/speech-16x16.png
-%%WWWDIR%%/images/disable_selected-16x16.png
-%%WWWDIR%%/images/stats-16x16.png
+%%WWWDIR%%/images/breakpoint-16x16.png
+%%WWWDIR%%/images/bug-16x16.png
 %%WWWDIR%%/images/clean-16x16.png
-%%WWWDIR%%/images/favourite-16x16.png
-%%WWWDIR%%/images/settings-22x22.png
-%%WWWDIR%%/images/mail-16x16.png
-%%WWWDIR%%/images/recycle-16x16.png
+%%WWWDIR%%/images/code-16x16.png
 %%WWWDIR%%/images/cook_female-32x32.png
-%%WWWDIR%%/images/help-16x16.png
-%%WWWDIR%%/images/save-22x22.png
-%%WWWDIR%%/images/restore-16x16.png
-%%WWWDIR%%/images/cyberchef-512x512.png
+%%WWWDIR%%/images/cook_male-32x32.png
+%%WWWDIR%%/images/copy-16x16.png
+%%WWWDIR%%/images/cyberchef-128x128.png
 %%WWWDIR%%/images/cyberchef-16x16.png
-%%WWWDIR%%/images/cyberchef-64x64.png
-%%WWWDIR%%/images/code-16x16.png
-%%WWWDIR%%/images/maximise-16x16.png
 %%WWWDIR%%/images/cyberchef-256x256.png
 %%WWWDIR%%/images/cyberchef-32x32.png
-%%WWWDIR%%/images/breakpoint-16x16.png
-%%WWWDIR%%/images/help-22x22.png
+%%WWWDIR%%/images/cyberchef-512x512.png
+%%WWWDIR%%/images/cyberchef-64x64.png
 %%WWWDIR%%/images/disable_deselected-16x16.png
-%%WWWDIR%%/images/open_yellow-16x16.png
+%%WWWDIR%%/images/disable_selected-16x16.png
+%%WWWDIR%%/images/download-24x24.png
+%%WWWDIR%%/images/erase-16x16.png
+%%WWWDIR%%/images/favicon.ico
+%%WWWDIR%%/images/favourite-16x16.png
 %%WWWDIR%%/images/favourite-24x24.png
-%%WWWDIR%%/images/bug-16x16.png
-%%WWWDIR%%/images/step-16x16.png
+%%WWWDIR%%/images/file-128x128.png
+%%WWWDIR%%/images/file-32x32.png
+%%WWWDIR%%/images/fork_me.png
+%%WWWDIR%%/images/gitter-badge.svg
+%%WWWDIR%%/images/help-16x16.png
+%%WWWDIR%%/images/help-22x22.png
+%%WWWDIR%%/images/info-16x16.png
+%%WWWDIR%%/images/layout-16x16.png
+%%WWWDIR%%/images/mail-16x16.png
+%%WWWDIR%%/images/maximise-16x16.png
+%%WWWDIR%%/images/open_yellow-16x16.png
+%%WWWDIR%%/images/open_yellow-24x24.png
+%%WWWDIR%%/images/recycle-16x16.png
 %%WWWDIR%%/images/remove-16x16.png
-%%WWWDIR%%/images/erase-16x16.png
-%%WWWDIR%%/images/cyberchef-128x128.png
+%%WWWDIR%%/images/restore-16x16.png
 %%WWWDIR%%/images/save-16x16.png
-%%WWWDIR%%/images/undo-16x16.png
-%%WWWDIR%%/images/cook_male-32x32.png
+%%WWWDIR%%/images/save-22x22.png
+%%WWWDIR%%/images/save_as-16x16.png
+%%WWWDIR%%/images/settings-22x22.png
+%%WWWDIR%%/images/speech-16x16.png
+%%WWWDIR%%/images/stats-16x16.png
+%%WWWDIR%%/images/step-16x16.png
+%%WWWDIR%%/images/switch-16x16.png
+%%WWWDIR%%/images/thumb_down-16x16.png
 %%WWWDIR%%/images/thumb_up-16x16.png
-%%WWWDIR%%/images/favicon.ico
-%%WWWDIR%%/images/info-16x16.png
-%%WWWDIR%%/scripts.js
-%%WWWDIR%%/styles.css
+%%WWWDIR%%/images/undo-16x16.png
+%%WWWDIR%%/index.html