Update to tcl-cgi-1.3, and adapt to tcl-8.3.2.

Changes since tcl-cgi-0.8 include:

5/19/00 1.3.0	Changed many cgi_puts to cgi_put in hopes of addressing more
		of Zygo's 5/9/00 complaint (i.e., same problem in tables).

5/9/00	1.2.2	Zygo Blaxell <zblaxell@feedme.hungrycats.org> provided signif.
		cgi_input regexp speedup for long x=y-style values.  He also
		noted that some browsers are sensitive to leading/following
		\n's in textarea and provided a patch to avoid adding them in
		the first place.

		James Ward <jew@rincon.com> noted absence of pkgIndex.tcl
		(presumably due to really old Tcl) broke installation.  Fixed
		pkgcreate to create stub file to allow Make to complete.

		Robin Lauren <robin.lauren@novostore.com> contributed the doc
		in HTML form.  Really need to automate this now, sigh.

		Jan.Vlcek@sasprg.cz observed that converting %XX to \u00XX
		and then using subst is only good for us-ascii and corrupts
		iso8859-1, iso8859-2, etc.  He provided a patch for
		cgi_unquote_input.

		Ross Mohn <rpmohn@waxandwane.com> corrected syntax error in
		cgi_span and made <hr> handle width= better.

		Tore Morkemo provided a patch to his prior patch for cgi_eval.

		Asari Hirotsugu <asari@math.uiuc.edu> provided additional
		installation advice for Mac.

12/27/99 1.2.1	Tore Morkemo noted expires=never value of 9999 inappropriate
		as Netscape ignores anything beyond mid-January 2038.

		Tore also provided patch for cgi_eval when running inside of
		a proc.

12/20/99 1.2.0	Keith Lea <keith@cs.oswego.edu> noted 2-digit years as per
		RFC2109.  Despite RFC, Netscape now accepts 4-digit years.
		Some browsers won't like this but it hardly matters anyway
		since they'll do the wrong thing on old 2-digit years come
		Y2K anyway.

		Petrus Vloet noted example/nistguest missing from distrib.

12/18/99 1.1.0	Tomas Soucek" <tomas.soucek@sasprg.cz> noted cgi_input was
		adding eol characters to uploaded files if they didn't
		contain them.  Fixed this and also enhanced file upload
		example so that it could do both cat/od and also warn when
		Tcl couldn't do binary upload.

		Added braces around unprotected expressions.

		Added check to unimail example for HTTP_REFERER.

		Petrus Vloet requested Makefile install example data files.

		Added img.cgi example and modified frame example so it accepts
		"example=whatever" so that I can post URLs that go right to a
		particular example and have it framed.

9/12/99 1.0.0	Bumped version to 1 to pacify management.

		Jeffrey Hobbs rewrote cgi_unquote_input to take advantage of
		8.2 features.  300% speed improvement!

7/16/99 0.8.1	Douglas Ridgway provided mod to make cgi_image_button handle
		optional args.

		Made code use straight cgi_input_multipart if on Tcl 8.1.

		Jeffrey Hobbs provided cgi_unquote_input that works better for
		8.1.

		Petrus Vloet <petrus.vloet@siemens.at> requested sample data
		files for examples that need them; ability to change example
		install destination.

6 files changed, 102 insertions, 64 deletions

diff --git a/www/tcl-cgi/Makefile b/www/tcl-cgi/Makefile
index 7170ae5d9de..e0079e20e86 100644
--- a/www/tcl-cgi/Makefile
+++ b/www/tcl-cgi/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.2 1999/07/07 16:10:42 bouyer Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/30 15:42:58 jwise Exp $
 #
 
 DISTNAME=	cgi.tcl
-PKGNAME=	tcl-cgi-0.8
-WRKSRC=		${WRKDIR}/cgi.tcl-0.8
+PKGNAME=	tcl-cgi-1.3.0
+WRKSRC=		${WRKDIR}/cgi.tcl-1.3
 CATEGORIES=	www
 MASTER_SITES=	http://expect.nist.gov/cgi.tcl/
 
 MAINTAINER=	bouyer@netbsd.org
 HOMEPAGE=	http://expect.nist.gov/cgi.tcl/
 
-DEPENDS+=	tcl-8.0.5:../../lang/tcl80
+DEPENDS+=	tcl-8.3.2:../../lang/tcl
 
 GNU_CONFIGURE=	yes
 
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/cgi-tcl
-	${MKDIR} ${PREFIX}/share/examples/cgi-tcl
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/cgi-tcl
-	${INSTALL_DATA} ${WRKSRC}/example/* ${PREFIX}/share/examples/cgi-tcl
+	${MKDIR} ${PREFIX}/share/doc/tcl/cgi-tcl
+	${MKDIR} ${PREFIX}/share/examples/tcl/cgi-tcl
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/tcl/cgi-tcl
+	${INSTALL_DATA} ${WRKSRC}/example/* ${PREFIX}/share/examples/tcl/cgi-tcl
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/tcl-cgi/files/md5 b/www/tcl-cgi/files/md5
index 064ebccd918..eb7abf29d63 100644
--- a/www/tcl-cgi/files/md5
+++ b/www/tcl-cgi/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/07/07 15:15:12 bouyer Exp $
+$NetBSD: md5,v 1.2 2000/08/30 15:42:58 jwise Exp $
 
-MD5 (cgi.tcl.tar.gz) = c476fa60a291a1b1ba237572902ad843
+MD5 (cgi.tcl.tar.gz) = e440636d3c5a52242dd600a695c04d9a
diff --git a/www/tcl-cgi/files/patch-sum b/www/tcl-cgi/files/patch-sum
index 36da0e06934..3bda7acaebe 100644
--- a/www/tcl-cgi/files/patch-sum
+++ b/www/tcl-cgi/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:18 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/30 15:42:58 jwise Exp $
 
-MD5 (patch-aa) = eafd229210c3ab6e3f908641fdcd62ef
+MD5 (patch-aa) = b19c9e2ed49189b8f111f557db882957
+MD5 (patch-ab) = a07da53370d065007ecc7b78b0925f80
diff --git a/www/tcl-cgi/patches/patch-aa b/www/tcl-cgi/patches/patch-aa
index da9d7984416..0520cb3c5c2 100644
--- a/www/tcl-cgi/patches/patch-aa
+++ b/www/tcl-cgi/patches/patch-aa
@@ -1,19 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/07/07 15:15:12 bouyer Exp $
-
---- cgi.tcl.in.orig	Tue Jul  6 17:58:42 1999
-+++ cgi.tcl.in	Tue Jul  6 18:00:17 1999
-@@ -2006,8 +2006,8 @@
+--- cgi.tcl.in.orig	Wed Aug 30 11:07:29 2000
++++ cgi.tcl.in	Wed Aug 30 11:08:26 2000
+@@ -2040,7 +2040,7 @@
  
      flush $_cgi(mailfid)
  
 -    if {[file executable /usr/lib/sendmail]} {
--	exec /usr/lib/sendmail -t -odb < $_cgi(mailfile)
 +    if {[file executable /usr/sbin/sendmail]} {
-+	exec /usr/sbin/sendmail -t -odb < $_cgi(mailfile)
+ 	exec /usr/lib/sendmail -t -odb < $_cgi(mailfile)
  	# Explanation:
  	# -t   means: pick up recipient from body
- 	# -odb means: deliver in background
-@@ -2022,6 +2022,9 @@
+@@ -2056,6 +2056,9 @@
  	set s [socket $_cgi(mail_relay) 25]
  	gets $s answer
  	if {[lindex $answer 0] != 220} {error $answer} 
diff --git a/www/tcl-cgi/patches/patch-ab b/www/tcl-cgi/patches/patch-ab
new file mode 100644
index 00000000000..a2763ffa1c8
--- /dev/null
+++ b/www/tcl-cgi/patches/patch-ab
@@ -0,0 +1,37 @@
+--- Makefile.in.orig	Thu Apr 20 11:21:24 2000
++++ Makefile.in	Wed Aug 30 11:18:05 2000
+@@ -58,13 +58,13 @@
+ 
+ mandir 	= $(prefix)/man
+ man1dir = $(mandir)/man1
+-man3dir = $(mandir)/man3
++man3dir = $(mandir)/mann
+ docdir = $(datadir)/doc
+ 
+ # utility script directories - arch-independent and arch-non-
+ # independent.
+-SCRIPTDIR	= $(datadir)/cgi$(SHORT_VERSION)
+-EXECSCRIPTDIR	= $(execdatadir)/cgi$(SHORT_VERSION)
++SCRIPTDIR	= $(datadir)/tcl/cgi$(SHORT_VERSION)
++EXECSCRIPTDIR	= $(execdatadir)/tcl/cgi$(SHORT_VERSION)
+ 
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -93,7 +93,7 @@
+ # (but not the noninstalled files such as `make all' creates)
+ uninstall:
+ 	-rm -f $(SCRIPTDIR)/cgi.tcl
+-	-rm -f $(man3dir)/cgi.tcl.3
++	-rm -f $(man3dir)/cgi.tcl.n
+ 	-rm -f $(SCRIPTDIR)/pkgIndex.tcl
+ 
+ .PHONY: install-info install info
+@@ -104,7 +104,7 @@
+ # install scripts
+ 	$(INSTALL_DATA) cgi.tcl $(SCRIPTDIR)
+ # install library man page
+-	$(INSTALL_DATA) cgi.tcl.man $(man3dir)/cgi.tcl.3
++	$(INSTALL_DATA) cgi.tcl.man $(man3dir)/cgi.tcl.n
+ 	$(INSTALL_DATA) pkgIndex.tcl $(SCRIPTDIR)
+ 
+ examples:
diff --git a/www/tcl-cgi/pkg/PLIST b/www/tcl-cgi/pkg/PLIST
index dc8a6a871ab..f6ffd6856f8 100644
--- a/www/tcl-cgi/pkg/PLIST
+++ b/www/tcl-cgi/pkg/PLIST
@@ -1,43 +1,47 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/07/07 15:15:12 bouyer Exp $
-lib/cgi0.8/cgi.tcl
-lib/cgi0.8/pkgIndex.tcl
-man/man3/cgi.tcl.3
-share/doc/cgi-tcl/ref.txt
-share/examples/cgi-tcl/README
-share/examples/cgi-tcl/cookie.cgi
-share/examples/cgi-tcl/creditcard.cgi
-share/examples/cgi-tcl/display-in-frame.cgi
-share/examples/cgi-tcl/display.cgi
-share/examples/cgi-tcl/download.cgi
-share/examples/cgi-tcl/error.cgi
-share/examples/cgi-tcl/evaljs.cgi
-share/examples/cgi-tcl/example.tcl
-share/examples/cgi-tcl/examples.cgi
-share/examples/cgi-tcl/form-tour-result.cgi
-share/examples/cgi-tcl/form-tour.cgi
-share/examples/cgi-tcl/format-tour.cgi
-share/examples/cgi-tcl/frame.cgi
-share/examples/cgi-tcl/image.cgi
-share/examples/cgi-tcl/kill.cgi
-share/examples/cgi-tcl/nistguest.cgi
-share/examples/cgi-tcl/oratcl.cgi
-share/examples/cgi-tcl/parray.cgi
-share/examples/cgi-tcl/passwd-form.cgi
-share/examples/cgi-tcl/passwd.cgi
-share/examples/cgi-tcl/passwd.tcl
-share/examples/cgi-tcl/push.cgi
-share/examples/cgi-tcl/rm.cgi
-share/examples/cgi-tcl/stopwatch.cgi
-share/examples/cgi-tcl/unimail.cgi
-share/examples/cgi-tcl/upload.cgi
-share/examples/cgi-tcl/uploadbin.cgi
-share/examples/cgi-tcl/validate.cgi
-share/examples/cgi-tcl/vclock-src-frame.cgi
-share/examples/cgi-tcl/vclock.cgi
-share/examples/cgi-tcl/vclock.pl
-share/examples/cgi-tcl/visitor.cgi
-share/examples/cgi-tcl/visitor.cnt
-share/examples/cgi-tcl/vote.cgi
-@dirrm lib/cgi0.8
-@dirrm share/doc/cgi-tcl
-@dirrm share/examples/cgi-tcl
+@comment $NetBSD: PLIST,v 1.2 2000/08/30 15:42:59 jwise Exp $
+lib/tcl/cgi1.3/cgi.tcl
+lib/tcl/cgi1.3/pkgIndex.tcl
+man/mann/cgi.tcl.n
+share/doc/tcl/cgi-tcl/ref.txt
+share/doc/tcl/cgi-tcl/ref.html
+share/examples/tcl/cgi-tcl/README
+share/examples/tcl/cgi-tcl/cookie.cgi
+share/examples/tcl/cgi-tcl/creditcard.cgi
+share/examples/tcl/cgi-tcl/display-in-frame.cgi
+share/examples/tcl/cgi-tcl/display.cgi
+share/examples/tcl/cgi-tcl/download.cgi
+share/examples/tcl/cgi-tcl/error.cgi
+share/examples/tcl/cgi-tcl/evaljs.cgi
+share/examples/tcl/cgi-tcl/example.tcl
+share/examples/tcl/cgi-tcl/examples.cgi
+share/examples/tcl/cgi-tcl/form-tour-result.cgi
+share/examples/tcl/cgi-tcl/form-tour.cgi
+share/examples/tcl/cgi-tcl/format-tour.cgi
+share/examples/tcl/cgi-tcl/frame.cgi
+share/examples/tcl/cgi-tcl/image.cgi
+share/examples/tcl/cgi-tcl/img.cgi
+share/examples/tcl/cgi-tcl/kill.cgi
+share/examples/tcl/cgi-tcl/nistguest.cgi
+share/examples/tcl/cgi-tcl/nistguest
+share/examples/tcl/cgi-tcl/oratcl.cgi
+share/examples/tcl/cgi-tcl/parray.cgi
+share/examples/tcl/cgi-tcl/passwd-form.cgi
+share/examples/tcl/cgi-tcl/passwd.cgi
+share/examples/tcl/cgi-tcl/passwd.tcl
+share/examples/tcl/cgi-tcl/push.cgi
+share/examples/tcl/cgi-tcl/rm.cgi
+share/examples/tcl/cgi-tcl/stopwatch.cgi
+share/examples/tcl/cgi-tcl/unimail.cgi
+share/examples/tcl/cgi-tcl/upload.cgi
+share/examples/tcl/cgi-tcl/uploadbin.cgi
+share/examples/tcl/cgi-tcl/validate.cgi
+share/examples/tcl/cgi-tcl/vclock-src-frame.cgi
+share/examples/tcl/cgi-tcl/vclock.cgi
+share/examples/tcl/cgi-tcl/vclock.pl
+share/examples/tcl/cgi-tcl/visitor.cgi
+share/examples/tcl/cgi-tcl/visitor.cnt
+share/examples/tcl/cgi-tcl/vote.cgi
+share/examples/tcl/cgi-tcl/vote.cnt
+@dirrm lib/tcl/cgi1.3
+@dirrm share/doc/tcl/cgi-tcl
+@dirrm share/examples/tcl/cgi-tcl