1 files changed, 63 insertions, 36 deletions

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