- Update to 1.5.3.4

- Use explicit WISH version in start script
- Update dependencies
- Include PORTDOCS

PR:		ports/157434
Submitted by:	Chris Rees <utisoft@gmail.com> (maintainer)

3 files changed, 71 insertions, 18 deletions

diff --git a/security/gorilla/Makefile b/security/gorilla/Makefile
index 519aee69f102..06d6a65b7664 100644
--- a/security/gorilla/Makefile
+++ b/security/gorilla/Makefile
@@ -6,19 +6,16 @@
 #
 
 PORTNAME=	gorilla
-PORTVERSION=	1.5.3.1
-DISTVERSIONSUFFIX=	c05eb4e
-PORTREVISION=	1
+PORTVERSION=	1.5.3.4
+DISTVERSIONSUFFIX=	7c3e819
 CATEGORIES=	security
-MASTER_SITES=	http://www.bayofrum.net/dist/gorilla/ \
-		http://cerberus.bayofrum.net/dist/gorilla/
+MASTER_SITES=	http://www.bayofrum.net/dist/${PORTNAME}/
 DISTNAME=	zdia-${PORTNAME}-v${DISTVERSION}-0-g${DISTVERSIONSUFFIX}
 
 MAINTAINER=	utisoft@gmail.com
 COMMENT=	Password Gorilla is a cross-platform Password Manager
 
-RUN_DEPENDS=	${LOCALBASE}/lib/bwidget/init.tcl:${PORTSDIR}/x11-toolkits/bwidget \
-		itcl>=3.4:${PORTSDIR}/lang/itcl \
+RUN_DEPENDS=	itcl>=3.4:${PORTSDIR}/lang/itcl \
 		wish:${PORTSDIR}/x11-toolkits/tk-wrapper
 
 LICENSE=	GPLv2
@@ -28,20 +25,40 @@ USE_TCL_RUN=	85+
 USE_TK=		85+
 NO_BUILD=	yes
 SUB_FILES=	gorilla
-SUB_LIST=	WISH=wish
+SUB_LIST=	WISH=${WISH}
+PORTDOCS=	*
+
+SRC_DIRS=	blowfish msgs pics pwsafe sha1 sha256c tooltip twofish
+
+post-patch:
+# We don't want Linux/Windows/Darwin binaries thank you
+	${FIND} ${WRKSRC} \( \
+		-name "*.so" \
+		-or -name "*.dll" \
+		-or -name "*.dylib" \
+	   \) -delete
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/gorilla
 	@${INSTALL_SCRIPT} ${WRKSRC}/sources/*.tcl ${PREFIX}/lib/gorilla
-	${TAR} -C ${WRKSRC}/sources -cf - blowfish pics pwsafe twofish sha1 | \
-		${TAR} -C ${PREFIX}/lib/gorilla --unlink -xf -
+.for dir in ${SRC_DIRS}
+	@${MKDIR} ${PREFIX}/lib/${PORTNAME}/${dir}
+	@cd ${WRKSRC}/sources/${dir} \
+		&& ${COPYTREE_SHARE} \* \
+		${PREFIX}/lib/${PORTNAME}/${dir}
+.endfor
 	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
 
 post-install:
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gorilla
-	@${CHMOD} ugo+rx ${PREFIX}/lib/gorilla/blowfish/*.tcl
-	@${CHMOD} ugo+rx ${PREFIX}/lib/gorilla/pwsafe/*.tcl
-	@${CHMOD} ugo+rx ${PREFIX}/lib/gorilla/twofish/*.tcl
-	@${CHMOD} ugo+rx ${PREFIX}/lib/gorilla/sha1/*.tcl
+	@${FIND} ${PREFIX}/lib/${PORTNAME}/ -name "*.tcl" \
+		| ${XARGS} ${CHMOD} ${BINMODE}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README			\
+		${WRKSRC}/sources/README.install-from-source	\
+		${WRKSRC}/sources/CHANGES.txt			\
+	   ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/security/gorilla/distinfo b/security/gorilla/distinfo
index cba1db75b80d..a15451633847 100644
--- a/security/gorilla/distinfo
+++ b/security/gorilla/distinfo
@@ -1,3 +1,2 @@
-MD5 (zdia-gorilla-v1.5.3.1-0-gc05eb4e.tar.gz) = 8b96ae606e0808e7e89b32dc84e67c3f
-SHA256 (zdia-gorilla-v1.5.3.1-0-gc05eb4e.tar.gz) = 7762d4a238b7917d496237c800f340be69ef0d3712173731f224f7c4e718c750
-SIZE (zdia-gorilla-v1.5.3.1-0-gc05eb4e.tar.gz) = 353151
+SHA256 (zdia-gorilla-v1.5.3.4-0-g7c3e819.tar.gz) = a97755e0c7005f8ee192905c1fbd9a97f5b235e5f24336f394c84c5aa7a596a0
+SIZE (zdia-gorilla-v1.5.3.4-0-g7c3e819.tar.gz) = 450557
diff --git a/security/gorilla/pkg-plist b/security/gorilla/pkg-plist
index 4a6ddfc245d8..e9ca8860ad84 100644
--- a/security/gorilla/pkg-plist
+++ b/security/gorilla/pkg-plist
@@ -2,10 +2,14 @@
 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
 lib/gorilla/blowfish/blowtest.tcl
 lib/gorilla/blowfish/pkgIndex.tcl
+lib/gorilla/msgs/de.msg
+lib/gorilla/msgs/ru.msg
 lib/gorilla/pics/browse.gif
 lib/gorilla/pics/gorilla-16x16.gif
 lib/gorilla/pics/gorilla-32x32.gif
@@ -23,16 +27,49 @@ 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/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/msgs
 @dirrm lib/gorilla/pics
-@dirrm lib/gorilla/twofish
 @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/twofish
 @dirrm lib/gorilla