3 files changed, 45 insertions, 12 deletions

diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile
index f28c0272d766..8193566a59db 100644
--- a/devel/tcllib/Makefile
+++ b/devel/tcllib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		tcllib
-PORTVERSION=		1.4
+PORTVERSION=		1.6
 CATEGORIES=		devel tcl83 tcl84
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcllib
@@ -28,20 +28,20 @@ MANN=	base64.n calculus.n changelog.n cksum.n cmdline.n \
 	csv.n cvs.n des.n docidx.n docidx_api.n docidx_fmt.n \
 	doctoc.n doctoc_api.n doctoc_fmt.n doctools.n doctools_api.n \
 	doctools_fmt.n exif.n expander.n fileutil.n ftp.n ftpd.n \
-	fuzzy.n graph.n html.n htmlparse.n irc.n javascript.n log.n \
+	fuzzy.n graph.n html.n htmlparse.n ini.n irc.n javascript.n log.n \
 	logger.n math.n matrix.n md4.n md5.n mime.n mpexpand.n \
+	multiplexer.n \
 	ncgi.n nntp.n ntp_time.n optimize.n pool.n pop3.n pop3d.n \
 	pop3d_dbox.n pop3d_udb.n prioqueue.n profiler.n queue.n \
-	record.n report.n sha1.n skiplist.n smtp.n smtpd.n soundex.n \
-	stack.n statistics.n stooop.n struct_list.n struct_tree.n \
+	record.n report.n sha1.n skiplist.n smtp.n smtpd.n \
+	snit.n snitfaq.n soundex.n \
+	stack.n statistics.n stooop.n struct_list.n struct_set.n \
+	struct_tree.n \
 	sum.n tcllib_dns.n textutil.n uri.n uuencode.n yencode.n
 
 MANCOMPRESSED=	no
 
-.include <bsd.port.pre.mk>
+post-patch:
+	@${CHMOD} 666 ${WRKSRC}/modules/inifile/test.ini
 
-.if ${ARCH} == "alpha"
-IGNORE=		"Hangs during build on alpha"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/tcllib/distinfo b/devel/tcllib/distinfo
index 059491114b33..238e63abf312 100644
--- a/devel/tcllib/distinfo
+++ b/devel/tcllib/distinfo
@@ -1,2 +1,2 @@
-MD5 (tcllib-1.4.tar.bz2) = 0a53fcfa3c7dcff9d38efdf34531996a
-SIZE (tcllib-1.4.tar.bz2) = 916891
+MD5 (tcllib-1.6.tar.bz2) = 6014528dce625b83cc40a0c6ed5b0761
+SIZE (tcllib-1.6.tar.bz2) = 1175233
diff --git a/devel/tcllib/pkg-plist b/devel/tcllib/pkg-plist
index 3222423ac4a6..dae0efa85d0e 100644
--- a/devel/tcllib/pkg-plist
+++ b/devel/tcllib/pkg-plist
@@ -1,5 +1,6 @@
 lib/tcllib%%PORTVERSION%%/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/base64/base64.tcl
+lib/tcllib%%PORTVERSION%%/base64/base64c.tcl
 lib/tcllib%%PORTVERSION%%/base64/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/base64/uuencode.tcl
 lib/tcllib%%PORTVERSION%%/base64/yencode.tcl
@@ -25,6 +26,7 @@ lib/tcllib%%PORTVERSION%%/counter/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/crc/cksum.tcl
 lib/tcllib%%PORTVERSION%%/crc/crc16.tcl
 lib/tcllib%%PORTVERSION%%/crc/crc32.tcl
+lib/tcllib%%PORTVERSION%%/crc/crcc.tcl
 lib/tcllib%%PORTVERSION%%/crc/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/crc/sum.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/crc
@@ -68,6 +70,7 @@ lib/tcllib%%PORTVERSION%%/doctools/mpformats/fmt.null
 lib/tcllib%%PORTVERSION%%/doctools/mpformats/fmt.text
 lib/tcllib%%PORTVERSION%%/doctools/mpformats/fmt.tmml
 lib/tcllib%%PORTVERSION%%/doctools/mpformats/fmt.wiki
+lib/tcllib%%PORTVERSION%%/doctools/mpformats/fr.msg
 lib/tcllib%%PORTVERSION%%/doctools/mpformats/idx.html
 lib/tcllib%%PORTVERSION%%/doctools/mpformats/idx.nroff
 lib/tcllib%%PORTVERSION%%/doctools/mpformats/idx.null
@@ -101,6 +104,9 @@ lib/tcllib%%PORTVERSION%%/html/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/htmlparse/htmlparse.tcl
 lib/tcllib%%PORTVERSION%%/htmlparse/pkgIndex.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/htmlparse
+lib/tcllib%%PORTVERSION%%/inifile/ini.tcl
+lib/tcllib%%PORTVERSION%%/inifile/pkgIndex.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/inifile
 lib/tcllib%%PORTVERSION%%/irc/irc.tcl
 lib/tcllib%%PORTVERSION%%/irc/pkgIndex.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/irc
@@ -130,13 +136,22 @@ lib/tcllib%%PORTVERSION%%/md4/md4c.tcl
 lib/tcllib%%PORTVERSION%%/md4/pkgIndex.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/md4
 lib/tcllib%%PORTVERSION%%/md5/md5.tcl
+lib/tcllib%%PORTVERSION%%/md5/md5c.tcl
+lib/tcllib%%PORTVERSION%%/md5/md5x.tcl
 lib/tcllib%%PORTVERSION%%/md5/pkgIndex.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/md5
+lib/tcllib%%PORTVERSION%%/md5crypt/md5crypt.tcl
+lib/tcllib%%PORTVERSION%%/md5crypt/md5cryptc.tcl
+lib/tcllib%%PORTVERSION%%/md5crypt/pkgIndex.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/md5crypt
 lib/tcllib%%PORTVERSION%%/mime/mime.tcl
 lib/tcllib%%PORTVERSION%%/mime/performance.tcl
 lib/tcllib%%PORTVERSION%%/mime/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/mime/smtp.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/mime
+lib/tcllib%%PORTVERSION%%/multiplexer/multiplexer.tcl
+lib/tcllib%%PORTVERSION%%/multiplexer/pkgIndex.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/multiplexer
 lib/tcllib%%PORTVERSION%%/ncgi/ncgi.tcl
 lib/tcllib%%PORTVERSION%%/ncgi/pkgIndex.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/ncgi
@@ -168,6 +183,9 @@ lib/tcllib%%PORTVERSION%%/sha1/sha1.tcl
 lib/tcllib%%PORTVERSION%%/smtpd/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/smtpd/smtpd.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/smtpd
+lib/tcllib%%PORTVERSION%%/snit/pkgIndex.tcl
+lib/tcllib%%PORTVERSION%%/snit/snit.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/snit
 lib/tcllib%%PORTVERSION%%/soundex/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/soundex/soundex.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/soundex
@@ -186,11 +204,26 @@ lib/tcllib%%PORTVERSION%%/struct/pooltest.tcl
 lib/tcllib%%PORTVERSION%%/struct/prioqueue.tcl
 lib/tcllib%%PORTVERSION%%/struct/queue.tcl
 lib/tcllib%%PORTVERSION%%/struct/record.tcl
+lib/tcllib%%PORTVERSION%%/struct/sets.tcl
 lib/tcllib%%PORTVERSION%%/struct/skiplist.tcl
 lib/tcllib%%PORTVERSION%%/struct/stack.tcl
 lib/tcllib%%PORTVERSION%%/struct/struct.tcl
 lib/tcllib%%PORTVERSION%%/struct/tree.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/struct
+lib/tcllib%%PORTVERSION%%/struct1/graph.tcl
+lib/tcllib%%PORTVERSION%%/struct1/list.tcl
+lib/tcllib%%PORTVERSION%%/struct1/matrix.tcl
+lib/tcllib%%PORTVERSION%%/struct1/pkgIndex.tcl
+lib/tcllib%%PORTVERSION%%/struct1/pool.tcl
+lib/tcllib%%PORTVERSION%%/struct1/pooltest.tcl
+lib/tcllib%%PORTVERSION%%/struct1/prioqueue.tcl
+lib/tcllib%%PORTVERSION%%/struct1/queue.tcl
+lib/tcllib%%PORTVERSION%%/struct1/record.tcl
+lib/tcllib%%PORTVERSION%%/struct1/skiplist.tcl
+lib/tcllib%%PORTVERSION%%/struct1/stack.tcl
+lib/tcllib%%PORTVERSION%%/struct1/struct.tcl
+lib/tcllib%%PORTVERSION%%/struct1/tree.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/struct1
 lib/tcllib%%PORTVERSION%%/textutil/adjust.tcl
 lib/tcllib%%PORTVERSION%%/textutil/dehypht.tex
 lib/tcllib%%PORTVERSION%%/textutil/eshyph_vo.tex