Update to 1.5.3.6

With much handholding from upstream (Thanks!), include C sha256 module for
FreeBSD/amd64 and FreeBSD/i386

3 files changed, 103 insertions, 50 deletions

diff --git a/security/gorilla/Makefile b/security/gorilla/Makefile
index 008d1664462d..447f45373a47 100644
--- a/security/gorilla/Makefile
+++ b/security/gorilla/Makefile
@@ -6,38 +6,62 @@
 #
 
 PORTNAME=	gorilla
-PORTVERSION=	1.5.3.4
-DISTVERSIONSUFFIX=	7c3e819
+PORTVERSION=	1.5.3.6
+DISTVERSIONSUFFIX=	a72f9d7
 CATEGORIES=	security
-MASTER_SITES=	LOCAL/crees/gorilla				\
+MASTER_SITES=	LOCAL/crees/gorilla/				\
 		http://www.bayofrum.net/dist/${PORTNAME}/
-DISTNAME=	zdia-${PORTNAME}-v${DISTVERSION}-0-g${DISTVERSIONSUFFIX}
+DISTFILES=	zdia-${PORTNAME}-v${DISTVERSION}-0-g${DISTVERSIONSUFFIX}${EXTRACT_SUFX}
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Password Gorilla is a cross-platform Password Manager
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	itcl>=3.4:${PORTSDIR}/lang/itcl \
 		wish:${PORTSDIR}/x11-toolkits/tk-wrapper
 
-LICENSE=	GPLv2
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == i386
+GORILLAARCH=	FreeBSD-x86
+DISTFILES+=	gorilla-sha256-${DISTVERSION}${EXTRACT_SUFX}
+.elif ${ARCH} == amd64
+GORILLAARCH=	FreeBSD-${ARCH}
+DISTFILES+=	gorilla-sha256-${DISTVERSION}${EXTRACT_SUFX}
+.else
+GORILLAARCH=	bogus
+WITHOUTSO=	"@comment "
+.endif
+
+PLIST_SUB+=	GORILLAARCH=${GORILLAARCH:L} WITHOUTSO=${WITHOUTSO}
 
 WRKSRC=		${WRKDIR}/zdia-${PORTNAME}-${DISTVERSIONSUFFIX}
 USE_TCL_RUN=	85+
 USE_TK=		85+
-NO_BUILD=	yes
 SUB_FILES=	gorilla
 SUB_LIST=	WISH=${WISH}
 PORTDOCS=	*
 
-SRC_DIRS=	blowfish msgs pics pwsafe sha1 sha256c tooltip twofish
+SRC_DIRS=	blowfish modules msgs pics pwsafe tcllib twofish
 
 post-patch:
 # We don't want Linux/Windows/Darwin binaries thank you
-	${FIND} ${WRKSRC} \( \
-		-name "*.so" \
-		-or -name "*.dll" \
-		-or -name "*.dylib" \
-	   \) -delete
+.for irrelevant in linux-ix86 linux-x86_64 macosx-ix86 \
+		   macosx-x86_64 win32-ix86 win32-x86_64
+	${RM} -r ${WRKSRC}/sources/tcllib/sha256c/${irrelevant}
+.endfor
+.for irrelevant in f32-Darwin-x86.dylib f32-Windows-x86.dll \
+		   f32-Linux-x86.so f32-Linux-x86_64.so
+	${RM} ${WRKSRC}/sources/twofish/${irrelevant}
+.endfor
+
+do-build:
+.if !defined(WITHOUTSO)
+	${MV} ${WRKDIR}/${PORTNAME}-sha256/sha256/${GORILLAARCH}/ \
+		${WRKSRC}/sources/tcllib/sha256c/${GORILLAARCH:L}
+.endif
+
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/gorilla
diff --git a/security/gorilla/distinfo b/security/gorilla/distinfo
index a15451633847..4c3148d93355 100644
--- a/security/gorilla/distinfo
+++ b/security/gorilla/distinfo
@@ -1,2 +1,4 @@
-SHA256 (zdia-gorilla-v1.5.3.4-0-g7c3e819.tar.gz) = a97755e0c7005f8ee192905c1fbd9a97f5b235e5f24336f394c84c5aa7a596a0
-SIZE (zdia-gorilla-v1.5.3.4-0-g7c3e819.tar.gz) = 450557
+SHA256 (zdia-gorilla-v1.5.3.6-0-ga72f9d7.tar.gz) = 011826b82c81173aebd50f32b88eb483221998a7114c500868ba4ee98807f2f7
+SIZE (zdia-gorilla-v1.5.3.6-0-ga72f9d7.tar.gz) = 813768
+SHA256 (gorilla-sha256-1.5.3.6.tar.gz) = 96646a34666d2a041eecd3e2fb5ca9a79fadbe47ec48f2f751885322c1af0ce5
+SIZE (gorilla-sha256-1.5.3.6.tar.gz) = 6260
diff --git a/security/gorilla/pkg-plist b/security/gorilla/pkg-plist
index e9ca8860ad84..bf746449e6e0 100644
--- a/security/gorilla/pkg-plist
+++ b/security/gorilla/pkg-plist
@@ -2,7 +2,6 @@
 bin/gorilla
 lib/gorilla/gorilla.tcl
 lib/gorilla/isaac.tcl
-lib/gorilla/non-modal.tcl
 lib/gorilla/viewhelp.tcl
 lib/gorilla/blowfish/LICENSE.txt
 lib/gorilla/blowfish/blowfish.tcl
@@ -27,49 +26,77 @@ lib/gorilla/pwsafe/pwsafe.tcl
 lib/gorilla/pwsafe/pwtest.tcl
 lib/gorilla/pwsafe/pwsafe-v2.tcl
 lib/gorilla/pwsafe/pwsafe-v3.tcl
-lib/gorilla/sha1/ChangeLog
-lib/gorilla/sha1/LICENSE.txt
-lib/gorilla/sha1/pkgIndex.tcl
-lib/gorilla/sha1/sha1.c
-lib/gorilla/sha1/sha1v1.test
-lib/gorilla/sha1/sha1.man
-lib/gorilla/sha1/sha1v1.tcl
-lib/gorilla/sha1/sha256.c
-lib/gorilla/sha1/sha1c.tcl
-lib/gorilla/sha1/sha1.bench
-lib/gorilla/sha1/sha256c.tcl
-lib/gorilla/sha1/sha1.h
-lib/gorilla/sha1/sha1.tcl
-lib/gorilla/sha1/sha1.test
-lib/gorilla/sha1/sha256.bench
-lib/gorilla/sha1/sha256.h
-lib/gorilla/sha1/sha256.man
-lib/gorilla/sha1/sha256.tcl
-lib/gorilla/sha1/sha256.test
-lib/gorilla/sha256c/critcl.tcl
-lib/gorilla/sha256c/pkgIndex.tcl
-lib/gorilla/sha256c/Darwin-x86/critcl.tcl
-lib/gorilla/sha256c/Linux-x86/critcl.tcl
-lib/gorilla/sha256c/Linux-x86_64/critcl.tcl
-lib/gorilla/sha256c/Windows-x86/critcl.tcl
-lib/gorilla/tooltip/pkgIndex.tcl
-lib/gorilla/tooltip/tipstack.tcl
-lib/gorilla/tooltip/tooltip.tcl
+lib/gorilla/modules/PWGprogress-1.0.0.tm
+lib/gorilla/msgs/fr.msg
+lib/gorilla/msgs/help/it.msg
+lib/gorilla/msgs/en.msg
+lib/gorilla/msgs/it.msg
+lib/gorilla/msgs/es.msg
+lib/gorilla/tcllib/sha256c/critcl.tcl
+lib/gorilla/tcllib/sha256c/pkgIndex.tcl
+lib/gorilla/tcllib/uuid/uuid.tcl
+lib/gorilla/tcllib/uuid/ChangeLog
+lib/gorilla/tcllib/uuid/pkgIndex.tcl
+lib/gorilla/tcllib/uuid/uuid.man
+lib/gorilla/tcllib/uuid/uuid.test
+lib/gorilla/tcllib/md5/md5v2.bench
+lib/gorilla/tcllib/md5/md5.h
+lib/gorilla/tcllib/md5/md5.test
+lib/gorilla/tcllib/md5/md5v1.bench
+lib/gorilla/tcllib/md5/md5.tcl
+lib/gorilla/tcllib/md5/ChangeLog
+lib/gorilla/tcllib/md5/md5.man
+lib/gorilla/tcllib/md5/md5.c
+lib/gorilla/tcllib/md5/md5c.tcl
+lib/gorilla/tcllib/md5/md5x.tcl
+lib/gorilla/tcllib/md5/pkgIndex.tcl
+lib/gorilla/tcllib/md5/md5x.test
+lib/gorilla/tcllib/csv/csv.tcl
+lib/gorilla/tcllib/csv/pkgIndex.tcl
+lib/gorilla/tcllib/sha1/sha256.c
+lib/gorilla/tcllib/sha1/sha256.test
+lib/gorilla/tcllib/sha1/sha1.test
+lib/gorilla/tcllib/sha1/sha1.c
+lib/gorilla/tcllib/sha1/sha1.bench
+lib/gorilla/tcllib/sha1/sha1v1.tcl
+lib/gorilla/tcllib/sha1/sha1.man
+lib/gorilla/tcllib/sha1/sha256.tcl
+lib/gorilla/tcllib/sha1/sha256.bench
+lib/gorilla/tcllib/sha1/sha256.man
+lib/gorilla/tcllib/sha1/sha256.h
+lib/gorilla/tcllib/sha1/sha1c.tcl
+lib/gorilla/tcllib/sha1/sha256c.tcl
+lib/gorilla/tcllib/sha1/sha1.tcl
+lib/gorilla/tcllib/sha1/ChangeLog
+lib/gorilla/tcllib/sha1/sha1v1.test
+lib/gorilla/tcllib/sha1/LICENSE.txt
+lib/gorilla/tcllib/sha1/pkgIndex.tcl
+lib/gorilla/tcllib/sha1/sha1.h
+%%WITHOUTSO%%lib/gorilla/tcllib/sha256c/%%GORILLAARCH%%/sha256c.so
+%%WITHOUTSO%%lib/gorilla/tcllib/sha256c/%%GORILLAARCH%%/critcl.tcl
+lib/gorilla/tcllib/tooltip/pkgIndex.tcl
+lib/gorilla/tcllib/tooltip/tipstack.tcl
+lib/gorilla/tcllib/tooltip/tooltip.tcl
+lib/gorilla/tcllib/tcllib.README
+lib/gorilla/tcllib/tcllib.licence.terms
 lib/gorilla/twofish/f32-critcl.tcl
 lib/gorilla/twofish/twofish.tcl
 lib/gorilla/twofish/twotest.tcl
 lib/gorilla/twofish/pkgIndex.tcl
 lib/gorilla/twofish/LICENSE.txt
 @dirrm lib/gorilla/blowfish
+@dirrm lib/gorilla/tcllib/csv
+@dirrm lib/gorilla/tcllib/md5
+@dirrm lib/gorilla/modules
+@dirrm lib/gorilla/msgs/help
 @dirrm lib/gorilla/msgs
 @dirrm lib/gorilla/pics
 @dirrm lib/gorilla/pwsafe
-@dirrm lib/gorilla/sha1
-@dirrm lib/gorilla/sha256c/Darwin-x86
-@dirrm lib/gorilla/sha256c/Linux-x86
-@dirrm lib/gorilla/sha256c/Linux-x86_64
-@dirrm lib/gorilla/sha256c/Windows-x86
-@dirrm lib/gorilla/sha256c
-@dirrm lib/gorilla/tooltip
+@dirrm lib/gorilla/tcllib/sha1
 @dirrm lib/gorilla/twofish
+@dirrm lib/gorilla/tcllib/sha256c/%%GORILLAARCH%%
+@dirrm lib/gorilla/tcllib/sha256c
+@dirrm lib/gorilla/tcllib/tooltip
+@dirrm lib/gorilla/tcllib/uuid
+@dirrm lib/gorilla/tcllib
 @dirrm lib/gorilla