Upgrade devel/tcllib from 1.6 to 1.7 and www/tclhttpd from 3.4.2 to 3.5.1.

Update dependency lines in amsn and tclxml.

5 files changed, 118 insertions, 46 deletions

diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile
index ec0a63757e12..6bfcf9c99c50 100644
--- a/devel/tcllib/Makefile
+++ b/devel/tcllib/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		tcllib
-PORTVERSION=		1.6
-PORTREVISION=		1
+PORTVERSION=		1.7
 CATEGORIES=		devel tcl83 tcl84
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcllib
@@ -19,30 +18,54 @@ BUILD_DEPENDS=	tclsh:${PORTSDIR}/lang/tcl84
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-ALL_TARGET=	all test
+ALL_TARGET=	all
 MAKE_ENV+=	LANG=C
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-MANN=	base64.n calculus.n changelog.n cksum.n cmdline.n \
-	combinatorics.n comm.n control.n counter.n crc16.n crc32.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 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 \
-	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
+MANN=	asn.n autoproxy.n base64.n bee.n bignum.n calculus.n changelog.n\
+	cksum.n cmdline.n combinatorics.n comm.n constants.n control.n\
+	counter.n crc16.n crc32.n csv.n cvs.n dacceptor.n des.n dexec.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 dtplite.n exif.n expander.n\
+	fa.n faop.n fileutil.n fourier.n ftp.n ftpd.n fuzzy.n geometry.n\
+	graph.n graph1.n html.n htmlparse.n ident.n ini.n interpolate.n\
+	irc.n javascript.n jpeg.n ldap.n log.n logger.n math.n matrix.n\
+	matrix1.n md4.n md5.n md5crypt.n mime.n mpexpand.n multiplexer.n\
+	ncgi.n nntp.n ntp_time.n optimize.n png.n polynomials.n pool.n\
+	pop3.n pop3d.n pop3d_dbox.n pop3d_udb.n prioqueue.n profiler.n\
+	qcomplex.n queue.n rc4.n record.n report.n ripemd128.n ripemd160.n\
+	romberg.n sha1.n skiplist.n smtp.n smtpd.n snit.n snitfaq.n soundex.n\
+	special.n stack.n statistics.n stooop.n struct_list.n struct_set.n\
+	struct_tree.n struct_tree1.n sum.n tar.n tcllib_dns.n tcllib_ip.n\
+	textutil.n tie.n treeql.n uri.n uuencode.n uuid.n yencode.n\
 
 MANCOMPRESSED=	no
 
-post-patch:
-	@${CHMOD} 666 ${WRKSRC}/modules/inifile/test.ini
+test:
+.ifdef DISPLAY
+	#
+	# DISPLAY environment variable appears to be set (${DISPLAY}).
+	# Tcllib may perform some additional Tk-only tests.
+	#
+	-${TEST} -t 1 && sleep 2
+.endif
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} test
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+post-build:	test
+.else
+post-build:
+	# Build is over quickly...
+	#
+	# Several of tcllib's tests are known to hang/fail on non-i386
+	# architectures (not only on ${OPSYS}) so testing on your
+	# (${ARCH}) system is not performed automatically. You are
+	# encouraged to run `make test' manually, however, to check if
+	# the parts, that are important to you, are problem-free.
+	#
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/tcllib/distinfo b/devel/tcllib/distinfo
index 238e63abf312..69e251bd106f 100644
--- a/devel/tcllib/distinfo
+++ b/devel/tcllib/distinfo
@@ -1,2 +1,2 @@
-MD5 (tcllib-1.6.tar.bz2) = 6014528dce625b83cc40a0c6ed5b0761
-SIZE (tcllib-1.6.tar.bz2) = 1175233
+MD5 (tcllib-1.7.tar.bz2) = db8de0205d0a65b88a4a3e235da6ae10
+SIZE (tcllib-1.7.tar.bz2) = 1544908
diff --git a/devel/tcllib/files/patch-koi8 b/devel/tcllib/files/patch-koi8
deleted file mode 100644
index 755532372661..000000000000
--- a/devel/tcllib/files/patch-koi8
+++ /dev/null
@@ -1,8 +0,0 @@
---- modules/mime/mime.tcl	Sun Feb 15 18:15:51 2004
-+++ modules/mime/mime.tcl	Wed Apr 28 16:52:53 2004
-@@ -166,4 +166,5 @@
-             jis0212 "" \
-             koi8-r KOI8-R \
-+            koi8-u KOI8-U \
-             ksc5601 "" \
-             macCentEuro "" \
diff --git a/devel/tcllib/pkg-plist b/devel/tcllib/pkg-plist
index dae0efa85d0e..1bfe3414bf65 100644
--- a/devel/tcllib/pkg-plist
+++ b/devel/tcllib/pkg-plist
@@ -1,10 +1,16 @@
 lib/tcllib%%PORTVERSION%%/pkgIndex.tcl
+lib/tcllib%%PORTVERSION%%/asn/asn.tcl
+lib/tcllib%%PORTVERSION%%/asn/pkgIndex.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/asn
 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
 @dirrm lib/tcllib%%PORTVERSION%%/base64
+lib/tcllib%%PORTVERSION%%/bee/bee.tcl
+lib/tcllib%%PORTVERSION%%/bee/pkgIndex.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/bee
 lib/tcllib%%PORTVERSION%%/cmdline/cmdline.tcl
 lib/tcllib%%PORTVERSION%%/cmdline/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/cmdline/typedCmdline.tcl
@@ -37,8 +43,10 @@ lib/tcllib%%PORTVERSION%%/des/des.tcl
 lib/tcllib%%PORTVERSION%%/des/pkgIndex.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/des
 lib/tcllib%%PORTVERSION%%/dns/dns.tcl
+lib/tcllib%%PORTVERSION%%/dns/ip.tcl
 lib/tcllib%%PORTVERSION%%/dns/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/dns/resolv.tcl
+lib/tcllib%%PORTVERSION%%/dns/spf.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/dns
 lib/tcllib%%PORTVERSION%%/doctools/api.tcl
 lib/tcllib%%PORTVERSION%%/doctools/api_idx.tcl
@@ -98,12 +106,24 @@ lib/tcllib%%PORTVERSION%%/ftp/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/ftpd/ftpd.tcl
 lib/tcllib%%PORTVERSION%%/ftpd/pkgIndex.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/ftpd
+lib/tcllib%%PORTVERSION%%/grammar_fa/dacceptor.tcl
+lib/tcllib%%PORTVERSION%%/grammar_fa/dexec.tcl
+lib/tcllib%%PORTVERSION%%/grammar_fa/fa.tcl
+lib/tcllib%%PORTVERSION%%/grammar_fa/faop.tcl
+lib/tcllib%%PORTVERSION%%/grammar_fa/pkgIndex.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/grammar_fa
 lib/tcllib%%PORTVERSION%%/html/html.tcl
 lib/tcllib%%PORTVERSION%%/html/pkgIndex.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/html
+lib/tcllib%%PORTVERSION%%/http/autoproxy.tcl
+lib/tcllib%%PORTVERSION%%/http/pkgIndex.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/http
 lib/tcllib%%PORTVERSION%%/htmlparse/htmlparse.tcl
 lib/tcllib%%PORTVERSION%%/htmlparse/pkgIndex.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/htmlparse
+lib/tcllib%%PORTVERSION%%/ident/ident.tcl
+lib/tcllib%%PORTVERSION%%/ident/pkgIndex.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/ident
 lib/tcllib%%PORTVERSION%%/inifile/ini.tcl
 lib/tcllib%%PORTVERSION%%/inifile/pkgIndex.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/inifile
@@ -113,14 +133,28 @@ lib/tcllib%%PORTVERSION%%/irc/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/javascript/javascript.tcl
 lib/tcllib%%PORTVERSION%%/javascript/pkgIndex.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/javascript
+lib/tcllib%%PORTVERSION%%/jpeg/jpeg.tcl
+lib/tcllib%%PORTVERSION%%/jpeg/pkgIndex.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/jpeg
+lib/tcllib%%PORTVERSION%%/ldap/ldap.tcl
+lib/tcllib%%PORTVERSION%%/ldap/pkgIndex.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/ldap
 lib/tcllib%%PORTVERSION%%/log/log.tcl
 lib/tcllib%%PORTVERSION%%/log/logger.tcl
 lib/tcllib%%PORTVERSION%%/log/pkgIndex.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/log
+lib/tcllib%%PORTVERSION%%/math/bessel.tcl
+lib/tcllib%%PORTVERSION%%/math/bignum.tcl
 lib/tcllib%%PORTVERSION%%/math/calculus.tcl
+lib/tcllib%%PORTVERSION%%/math/classic_polyns.tcl
 lib/tcllib%%PORTVERSION%%/math/combinatorics.tcl
+lib/tcllib%%PORTVERSION%%/math/constants.tcl
+lib/tcllib%%PORTVERSION%%/math/elliptic.tcl
+lib/tcllib%%PORTVERSION%%/math/exponential.tcl
+lib/tcllib%%PORTVERSION%%/math/fourier.tcl
 lib/tcllib%%PORTVERSION%%/math/fuzzy.tcl
 lib/tcllib%%PORTVERSION%%/math/geometry.tcl
+lib/tcllib%%PORTVERSION%%/math/interpolate.tcl
 lib/tcllib%%PORTVERSION%%/math/liststat.tcl
 lib/tcllib%%PORTVERSION%%/math/math.tcl
 lib/tcllib%%PORTVERSION%%/math/misc.tcl
@@ -128,6 +162,10 @@ lib/tcllib%%PORTVERSION%%/math/optimize.tcl
 lib/tcllib%%PORTVERSION%%/math/pdf_stat.tcl
 lib/tcllib%%PORTVERSION%%/math/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/math/plotstat.tcl
+lib/tcllib%%PORTVERSION%%/math/polynomials.tcl
+lib/tcllib%%PORTVERSION%%/math/qcomplex.tcl
+lib/tcllib%%PORTVERSION%%/math/rational_funcs.tcl
+lib/tcllib%%PORTVERSION%%/math/special.tcl
 lib/tcllib%%PORTVERSION%%/math/statistics.tcl
 lib/tcllib%%PORTVERSION%%/math/tclIndex
 @dirrm lib/tcllib%%PORTVERSION%%/math
@@ -161,6 +199,9 @@ lib/tcllib%%PORTVERSION%%/nntp/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/ntp/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/ntp/time.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/ntp
+lib/tcllib%%PORTVERSION%%/png/pkgIndex.tcl
+lib/tcllib%%PORTVERSION%%/png/png.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/png
 lib/tcllib%%PORTVERSION%%/pop3/clnt.tcl
 lib/tcllib%%PORTVERSION%%/pop3/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/pop3/pop3.tcl
@@ -174,6 +215,14 @@ lib/tcllib%%PORTVERSION%%/pop3d/pop3d_udb.tcl
 lib/tcllib%%PORTVERSION%%/profiler/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/profiler/profiler.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/profiler
+lib/tcllib%%PORTVERSION%%/rc4/pkgIndex.tcl
+lib/tcllib%%PORTVERSION%%/rc4/rc4.tcl
+lib/tcllib%%PORTVERSION%%/rc4/rc4c.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/rc4
+lib/tcllib%%PORTVERSION%%/ripemd/pkgIndex.tcl
+lib/tcllib%%PORTVERSION%%/ripemd/ripemd128.tcl
+lib/tcllib%%PORTVERSION%%/ripemd/ripemd160.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/ripemd
 lib/tcllib%%PORTVERSION%%/report/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/report/report.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/report
@@ -196,8 +245,10 @@ lib/tcllib%%PORTVERSION%%/stooop/switched.tcl
 lib/tcllib%%PORTVERSION%%/stooop/xifo.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/stooop
 lib/tcllib%%PORTVERSION%%/struct/graph.tcl
+lib/tcllib%%PORTVERSION%%/struct/graph1.tcl
 lib/tcllib%%PORTVERSION%%/struct/list.tcl
 lib/tcllib%%PORTVERSION%%/struct/matrix.tcl
+lib/tcllib%%PORTVERSION%%/struct/matrix1.tcl
 lib/tcllib%%PORTVERSION%%/struct/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/struct/pool.tcl
 lib/tcllib%%PORTVERSION%%/struct/pooltest.tcl
@@ -208,22 +259,25 @@ 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/struct1.tcl
 lib/tcllib%%PORTVERSION%%/struct/tree.tcl
+lib/tcllib%%PORTVERSION%%/struct/tree1.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%%/tar/pkgIndex.tcl
+lib/tcllib%%PORTVERSION%%/tar/tar.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/tar
+lib/tcllib%%PORTVERSION%%/tie/pkgIndex.tcl
+lib/tcllib%%PORTVERSION%%/tie/tie.tcl
+lib/tcllib%%PORTVERSION%%/tie/tie_array.tcl
+lib/tcllib%%PORTVERSION%%/tie/tie_dsource.tcl
+lib/tcllib%%PORTVERSION%%/tie/tie_file.tcl
+lib/tcllib%%PORTVERSION%%/tie/tie_log.tcl
+lib/tcllib%%PORTVERSION%%/tie/tie_rarray.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/tie
+lib/tcllib%%PORTVERSION%%/treeql/pkgIndex.tcl
+lib/tcllib%%PORTVERSION%%/treeql/treeql.tcl
+lib/tcllib%%PORTVERSION%%/treeql/treeql84.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/treeql
 lib/tcllib%%PORTVERSION%%/textutil/adjust.tcl
 lib/tcllib%%PORTVERSION%%/textutil/dehypht.tex
 lib/tcllib%%PORTVERSION%%/textutil/eshyph_vo.tex
@@ -239,4 +293,7 @@ lib/tcllib%%PORTVERSION%%/uri/pkgIndex.tcl
 lib/tcllib%%PORTVERSION%%/uri/uri.tcl
 lib/tcllib%%PORTVERSION%%/uri/urn-scheme.tcl
 @dirrm lib/tcllib%%PORTVERSION%%/uri
+lib/tcllib%%PORTVERSION%%/uuid/pkgIndex.tcl
+lib/tcllib%%PORTVERSION%%/uuid/uuid.tcl
+@dirrm lib/tcllib%%PORTVERSION%%/uuid
 @dirrm lib/tcllib%%PORTVERSION%%
diff --git a/devel/tclxml/Makefile b/devel/tclxml/Makefile
index cf713aeebdde..3a8be96319e4 100644
--- a/devel/tclxml/Makefile
+++ b/devel/tclxml/Makefile
@@ -16,7 +16,7 @@ COMMENT=	API for parsing XML documents using Tcl
 
 BUILD_DEPENDS=	tclsh8.4:${PORTSDIR}/lang/tcl84
 RUN_DEPENDS=	tclsh8.4:${PORTSDIR}/lang/tcl84 \
-		${LOCALBASE}/lib/tcllib1.6/uri/uri.tcl:${PORTSDIR}/devel/tcllib
+		${LOCALBASE}/lib/tcllib1.7/uri/uri.tcl:${PORTSDIR}/devel/tcllib
 
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes