Upgrade to mzscheme 205, patches provided by

Jesper Louis Andersen <jlouis@mongers.org> in private email.

No earth-shattering changes, just a long list of bugfixes and minor
twiddles and additions.  For a complete list, see plt/notes/mzscheme/HISTORY

8 files changed, 326 insertions, 53 deletions

diff --git a/lang/mzscheme/Makefile b/lang/mzscheme/Makefile
index e87efbc9cd9..8de5a687b2b 100644
--- a/lang/mzscheme/Makefile
+++ b/lang/mzscheme/Makefile
@@ -1,14 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2003/10/24 20:34:44 kristerw Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/23 23:57:16 pooka Exp $
 
-DISTNAME=		mzscheme.src.unix
-PKGNAME=		mzscheme-200
-WRKSRC=			${WRKDIR}/plt/src/mzscheme
+DISTNAME=		mzscheme-205.src.unix
+PKGNAME=		mzscheme-205
+WRKSRC=			${WRKDIR}/plt/src
 CATEGORIES=		lang
-MASTER_SITES=		http://download.plt-scheme.org/bundles/200/mzscheme/
-DIST_SUBDIR=		${PKGNAME_NOREV}
-PKGREVISION=		1
-
-EXTRACT_USING_PAX=	# defined
+MASTER_SITES=		http://download.plt-scheme.org/bundles/205/mzscheme/
 
 MAINTAINER=		pooka@NetBSD.org
 HOMEPAGE=		http://www.plt-scheme.org/software/mzscheme/
@@ -17,14 +13,17 @@ COMMENT=		R5RS-compliant scheme
 CONFLICTS+=		drscheme*:../drscheme
 
 GNU_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	../configure
+CONFIGURE_SCRIPT=	./configure
+EXTRACT_USING_PAX=      # defined
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 ONLY_FOR_PLATFORM+=	Linux-*-i386
 
 post-patch:
 	@for patchee in ${WRKDIR}/plt/man/man1/mzscheme.1 \
-	${WRKDIR}/plt/collects/slibinit/init.ss ; do \
+			${WRKDIR}/plt/man/man1/help-desk.1 \
+			${WRKDIR}/plt/collects/make/setup-extension.ss \
+			${WRKDIR}/plt/collects/slibinit/init.ss ; do \
 		${MV} -f $$patchee ${WRKSRC}/foo ; \
 		${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g' <${WRKSRC}/foo \
 			> $$patchee ; \
@@ -32,7 +31,7 @@ post-patch:
 	@${RM} -f ${WRKSRC}/foo
 
 do-install:
-	@(cd ${WRKDIR}/plt/src/mzscheme/mzscheme ; ${MAKE} normal-install)
+	@(cd ${WRKDIR}/plt/src/mzscheme ; ${MAKE} normal-install)
 	@${INSTALL_DATA_DIR} ${PREFIX}/include/mzscheme
 	@${INSTALL_DATA} ${WRKDIR}/plt/include/*.h ${PREFIX}/include/mzscheme
 	@${INSTALL_MAN} ${WRKDIR}/plt/man/man1/mzscheme.1 ${PREFIX}/man/man1
diff --git a/lang/mzscheme/PLIST b/lang/mzscheme/PLIST
index af94b13c871..59fc2e8fcb4 100644
--- a/lang/mzscheme/PLIST
+++ b/lang/mzscheme/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2003/09/18 12:52:23 yyamano Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/12/23 23:57:16 pooka Exp $
 bin/mzscheme
 include/mzscheme/escheme.h
 include/mzscheme/scheme.h
 include/mzscheme/schemef.h
+include/mzscheme/schemegc2.h
 include/mzscheme/schemex.h
 include/mzscheme/schemexm.h
 include/mzscheme/schexn.h
@@ -18,6 +19,7 @@ lib/plt/collects/compiler/comp-unit.ss
 lib/plt/collects/compiler/compiler-unit.ss
 lib/plt/collects/compiler/compiler.ss
 lib/plt/collects/compiler/doc.txt
+lib/plt/collects/compiler/embed-sig.ss
 lib/plt/collects/compiler/embed-unit.ss
 lib/plt/collects/compiler/embed.ss
 lib/plt/collects/compiler/info.ss
@@ -46,6 +48,7 @@ lib/plt/collects/compiler/private/vm2c.ss
 lib/plt/collects/compiler/private/vmopt.ss
 lib/plt/collects/compiler/private/vmphase.ss
 lib/plt/collects/compiler/private/vmscheme.ss
+lib/plt/collects/compiler/private/winicon.ss
 lib/plt/collects/compiler/private/zlayer.ss
 lib/plt/collects/compiler/sig.ss
 lib/plt/collects/compiler/src2src.ss
@@ -70,11 +73,31 @@ lib/plt/collects/dynext/private/dirs.ss
 lib/plt/collects/dynext/private/macinc.ss
 lib/plt/collects/dynext/private/stdio.ss
 lib/plt/collects/errortrace/doc.txt
+lib/plt/collects/errortrace/errortrace-breakpoint.ss
+lib/plt/collects/errortrace/errortrace-lib.ss
 lib/plt/collects/errortrace/errortrace.ss
 lib/plt/collects/errortrace/info.ss
 lib/plt/collects/errortrace/stacktrace.ss
 lib/plt/collects/htdp/error.ss
+lib/plt/collects/html/case.ss
+lib/plt/collects/html/doc.txt
+lib/plt/collects/html/dtd-ast.ss
+lib/plt/collects/html/dtd.ss
+lib/plt/collects/html/dtdr.ss
+lib/plt/collects/html/dtds.ss
+lib/plt/collects/html/entity-expander.ss
+lib/plt/collects/html/generate-code.ss
+lib/plt/collects/html/html-sig.ss
+lib/plt/collects/html/html-spec
+lib/plt/collects/html/html-structs.ss
+lib/plt/collects/html/html-unit.ss
+lib/plt/collects/html/html.ss
+lib/plt/collects/html/info.ss
+lib/plt/collects/html/sgml-reader-sig.ss
+lib/plt/collects/html/sgml-reader-unit.ss
+lib/plt/collects/html/sgml.ss
 lib/plt/collects/lang/doc.txt
+lib/plt/collects/lang/error.ss
 lib/plt/collects/lang/htdp-advanced.ss
 lib/plt/collects/lang/htdp-beginner-abbr.ss
 lib/plt/collects/lang/htdp-beginner.ss
@@ -87,6 +110,8 @@ lib/plt/collects/lang/plt-mzscheme.ss
 lib/plt/collects/lang/plt-pretty-big-text.ss
 lib/plt/collects/lang/plt-pretty-big.ss
 lib/plt/collects/lang/posn.ss
+lib/plt/collects/lang/prim.ss
+lib/plt/collects/lang/private/beginner-funs.ss
 lib/plt/collects/lang/private/imageeq.ss
 lib/plt/collects/lang/private/info.ss
 lib/plt/collects/lang/private/teach.ss
@@ -98,6 +123,8 @@ lib/plt/collects/launcher/info.ss
 lib/plt/collects/launcher/launcher-sig.ss
 lib/plt/collects/launcher/launcher-unit.ss
 lib/plt/collects/launcher/launcher.ss
+lib/plt/collects/launcher/mrstart.exe
+lib/plt/collects/launcher/mzstart.exe
 lib/plt/collects/launcher/sh
 lib/plt/collects/launcher/starter-setup.c
 lib/plt/collects/make/collection-sig.ss
@@ -108,18 +135,29 @@ lib/plt/collects/make/info.ss
 lib/plt/collects/make/make-sig.ss
 lib/plt/collects/make/make-unit.ss
 lib/plt/collects/make/make.ss
+lib/plt/collects/make/setup-extension.ss
+lib/plt/collects/make/setup-extension.ss.orig
+lib/plt/collects/mred/doc.txt
+lib/plt/collects/mred/edit-main.ss
+lib/plt/collects/mred/edit.ss
 lib/plt/collects/mred/info.ss
 lib/plt/collects/mred/mred-sig.ss
 lib/plt/collects/mred/mred.ss
 lib/plt/collects/mred/private/info.ss
 lib/plt/collects/mred/private/kernel.ss
+lib/plt/collects/mzlib/async-channel.ss
 lib/plt/collects/mzlib/awk.ss
 lib/plt/collects/mzlib/class-old.ss
 lib/plt/collects/mzlib/class.ss
 lib/plt/collects/mzlib/class100.ss
+lib/plt/collects/mzlib/cm-accomplice.ss
+lib/plt/collects/mzlib/cm.ss
 lib/plt/collects/mzlib/cmdline.ss
+lib/plt/collects/mzlib/cml.ss
 lib/plt/collects/mzlib/compat.ss
 lib/plt/collects/mzlib/compile.ss
+lib/plt/collects/mzlib/contract.ss
+lib/plt/collects/mzlib/contracts.ss
 lib/plt/collects/mzlib/date.ss
 lib/plt/collects/mzlib/deflate.ss
 lib/plt/collects/mzlib/defmacro.ss
@@ -131,17 +169,40 @@ lib/plt/collects/mzlib/info.ss
 lib/plt/collects/mzlib/list.ss
 lib/plt/collects/mzlib/match.ss
 lib/plt/collects/mzlib/math.ss
+lib/plt/collects/mzlib/package.ss
 lib/plt/collects/mzlib/pconvert.ss
+lib/plt/collects/mzlib/plt-match.ss
 lib/plt/collects/mzlib/pregexp.ss
 lib/plt/collects/mzlib/pretty.ss
+lib/plt/collects/mzlib/private/class-sneaky.ss
 lib/plt/collects/mzlib/private/classidmap.ss
+lib/plt/collects/mzlib/private/cm-ctime.ss
+lib/plt/collects/mzlib/private/contract-helpers.scm
 lib/plt/collects/mzlib/private/dmhelp.ss
 lib/plt/collects/mzlib/private/increader.ss
 lib/plt/collects/mzlib/private/info.ss
 lib/plt/collects/mzlib/private/mkmatch.ss
+lib/plt/collects/mzlib/private/package-helper.ss
+lib/plt/collects/mzlib/private/plt-match/coupling-and-binding-new.scm
+lib/plt/collects/mzlib/private/plt-match/coupling-and-binding.scm
+lib/plt/collects/mzlib/private/plt-match/ddk-handlers.scm
+lib/plt/collects/mzlib/private/plt-match/emit-assm.scm
+lib/plt/collects/mzlib/private/plt-match/getter-setter.scm
+lib/plt/collects/mzlib/private/plt-match/match-inc.scm
+lib/plt/collects/mzlib/private/plt-match/match-util.scm
+lib/plt/collects/mzlib/private/plt-match/parse-quasi.scm
+lib/plt/collects/mzlib/private/plt-match/pattern-predicates.scm
+lib/plt/collects/mzlib/private/plt-match/render-test-list.scm
+lib/plt/collects/mzlib/private/plt-match/reorder-tests.scm
+lib/plt/collects/mzlib/private/plt-match/special-generators.scm
+lib/plt/collects/mzlib/private/plt-match/tag-negate-tests.scm
+lib/plt/collects/mzlib/private/plt-match/test-structure.scm
+lib/plt/collects/mzlib/private/plt-match/update-binding-counts.scm
+lib/plt/collects/mzlib/private/plt-match/update-counts.scm
 lib/plt/collects/mzlib/private/shared-body.ss
 lib/plt/collects/mzlib/private/sigmatch.ss
 lib/plt/collects/mzlib/private/sigutil.ss
+lib/plt/collects/mzlib/private/structure-helper.ss
 lib/plt/collects/mzlib/private/stxset.ss
 lib/plt/collects/mzlib/private/unitidmap.ss
 lib/plt/collects/mzlib/process.ss
@@ -150,6 +211,8 @@ lib/plt/collects/mzlib/sendevent.ss
 lib/plt/collects/mzlib/shared.ss
 lib/plt/collects/mzlib/spidey.ss
 lib/plt/collects/mzlib/string.ss
+lib/plt/collects/mzlib/structure.ss
+lib/plt/collects/mzlib/surrogate.ss
 lib/plt/collects/mzlib/thread.ss
 lib/plt/collects/mzlib/trace.ss
 lib/plt/collects/mzlib/traceld.ss
@@ -168,6 +231,7 @@ lib/plt/collects/mzscheme/examples/hello.c
 lib/plt/collects/mzscheme/examples/helloprint.c
 lib/plt/collects/mzscheme/examples/idmodule.c
 lib/plt/collects/mzscheme/examples/makeadder.c
+lib/plt/collects/mzscheme/examples/makeadder3m.c
 lib/plt/collects/mzscheme/examples/msgbox.ss
 lib/plt/collects/mzscheme/examples/tree-finish.ss
 lib/plt/collects/mzscheme/examples/tree.cxx
@@ -179,6 +243,9 @@ lib/plt/collects/net/base64.ss
 lib/plt/collects/net/cgi-sig.ss
 lib/plt/collects/net/cgi-unit.ss
 lib/plt/collects/net/cgi.ss
+lib/plt/collects/net/cookie-sig.ss
+lib/plt/collects/net/cookie-unit.ss
+lib/plt/collects/net/cookie.ss
 lib/plt/collects/net/dns-sig.ss
 lib/plt/collects/net/dns-unit.ss
 lib/plt/collects/net/dns.ss
@@ -214,6 +281,13 @@ lib/plt/collects/net/sendurl.ss
 lib/plt/collects/net/smtp-sig.ss
 lib/plt/collects/net/smtp-unit.ss
 lib/plt/collects/net/smtp.ss
+lib/plt/collects/net/ssl-tcp-unit.ss
+lib/plt/collects/net/tcp-redirect.ss
+lib/plt/collects/net/tcp-sig.ss
+lib/plt/collects/net/tcp-unit.ss
+lib/plt/collects/net/uri-codec-sig.ss
+lib/plt/collects/net/uri-codec-unit.ss
+lib/plt/collects/net/uri-codec.ss
 lib/plt/collects/net/url-sig.ss
 lib/plt/collects/net/url-unit.ss
 lib/plt/collects/net/url.ss
@@ -240,8 +314,10 @@ lib/plt/collects/parser-tools/private-yacc/parser-actions.ss
 lib/plt/collects/parser-tools/private-yacc/parser-builder.ss
 lib/plt/collects/parser-tools/private-yacc/table.ss
 lib/plt/collects/parser-tools/private-yacc/yacc-helper.ss
+lib/plt/collects/parser-tools/yacc-to-scheme.ss
 lib/plt/collects/parser-tools/yacc.ss
 lib/plt/collects/setup/doc.txt
+lib/plt/collects/setup/errors
 lib/plt/collects/setup/getinfo.ss
 lib/plt/collects/setup/info.ss
 lib/plt/collects/setup/infotab.ss
@@ -251,29 +327,135 @@ lib/plt/collects/setup/pack.ss
 lib/plt/collects/setup/plt-installer-sig.ss
 lib/plt/collects/setup/plt-installer-unit.ss
 lib/plt/collects/setup/plt-installer.ss
-lib/plt/collects/setup/plt-installers.ss
+lib/plt/collects/setup/plt-single-installer.ss
 lib/plt/collects/setup/setup-go.ss
 lib/plt/collects/setup/setup-unit.ss
+lib/plt/collects/setup/setup.lch
 lib/plt/collects/setup/setup.ss
 lib/plt/collects/setup/unpack.ss
 lib/plt/collects/setup/winstall.ss
+lib/plt/collects/setup/winvers.ss
 lib/plt/collects/slibinit/doc.txt
 lib/plt/collects/slibinit/init.ss
 lib/plt/collects/slibinit/init.ss.orig
 lib/plt/collects/slibinit/load.ss
+lib/plt/collects/srfi/1.ss
+lib/plt/collects/srfi/1/alist.ss
+lib/plt/collects/srfi/1/cons.ss
+lib/plt/collects/srfi/1/delete.ss
+lib/plt/collects/srfi/1/filter.ss
+lib/plt/collects/srfi/1/fold.ss
+lib/plt/collects/srfi/1/info.ss
+lib/plt/collects/srfi/1/list.ss
+lib/plt/collects/srfi/1/lset.ss
+lib/plt/collects/srfi/1/misc.ss
+lib/plt/collects/srfi/1/predicate.ss
+lib/plt/collects/srfi/1/search.ss
+lib/plt/collects/srfi/1/selector.ss
+lib/plt/collects/srfi/1/util.ss
+lib/plt/collects/srfi/11.ss
+lib/plt/collects/srfi/13.ss
+lib/plt/collects/srfi/13/string.ss
+lib/plt/collects/srfi/14.ss
+lib/plt/collects/srfi/14/char-set.ss
+lib/plt/collects/srfi/16.ss
+lib/plt/collects/srfi/17.ss
+lib/plt/collects/srfi/17/set.ss
+lib/plt/collects/srfi/18.ss
+lib/plt/collects/srfi/19/m.ss
+lib/plt/collects/srfi/19/time.ss
+lib/plt/collects/srfi/2.ss
+lib/plt/collects/srfi/2/and-let.ss
+lib/plt/collects/srfi/23.ss
+lib/plt/collects/srfi/25.ss
+lib/plt/collects/srfi/25/arlib.scm
+lib/plt/collects/srfi/25/array.ss
+lib/plt/collects/srfi/25/ix-ctor.scm
+lib/plt/collects/srfi/25/op-ctor.scm
+lib/plt/collects/srfi/26.ss
+lib/plt/collects/srfi/26/cut.ss
+lib/plt/collects/srfi/27.ss
+lib/plt/collects/srfi/27/random-bits-examples.ss
+lib/plt/collects/srfi/27/random-bits.ss
+lib/plt/collects/srfi/28.ss
+lib/plt/collects/srfi/29.ss
+lib/plt/collects/srfi/29/.cvsignore
+lib/plt/collects/srfi/29/bundles/es/srfi-19
+lib/plt/collects/srfi/29/bundles/srfi-19
+lib/plt/collects/srfi/29/localization.ss
+lib/plt/collects/srfi/30.ss
+lib/plt/collects/srfi/31.ss
+lib/plt/collects/srfi/31/rec.ss
+lib/plt/collects/srfi/4.ss
+lib/plt/collects/srfi/4/.cvsignore
+lib/plt/collects/srfi/4/TODO
+lib/plt/collects/srfi/4/c-generation/homo-all-vector-glue.c
+lib/plt/collects/srfi/4/c-generation/homo-all-vector-prims.h
+lib/plt/collects/srfi/4/c-generation/homo-f32-vector-prims.c
+lib/plt/collects/srfi/4/c-generation/homo-f32-vector-prims.h
+lib/plt/collects/srfi/4/c-generation/homo-f64-vector-prims.c
+lib/plt/collects/srfi/4/c-generation/homo-f64-vector-prims.h
+lib/plt/collects/srfi/4/c-generation/homo-s16-vector-prims.c
+lib/plt/collects/srfi/4/c-generation/homo-s16-vector-prims.h
+lib/plt/collects/srfi/4/c-generation/homo-s32-vector-prims.c
+lib/plt/collects/srfi/4/c-generation/homo-s32-vector-prims.h
+lib/plt/collects/srfi/4/c-generation/homo-s8-vector-prims.c
+lib/plt/collects/srfi/4/c-generation/homo-s8-vector-prims.h
+lib/plt/collects/srfi/4/c-generation/homo-u16-vector-prims.c
+lib/plt/collects/srfi/4/c-generation/homo-u16-vector-prims.h
+lib/plt/collects/srfi/4/c-generation/homo-u32-vector-prims.c
+lib/plt/collects/srfi/4/c-generation/homo-u32-vector-prims.h
+lib/plt/collects/srfi/4/c-generation/homo-u8-vector-prims.c
+lib/plt/collects/srfi/4/c-generation/homo-u8-vector-prims.h
+lib/plt/collects/srfi/4/doc.txt
+lib/plt/collects/srfi/4/homo-vector-glue.c
+lib/plt/collects/srfi/4/homo-vector-prims.c
+lib/plt/collects/srfi/4/homo-vector-prims.h
+lib/plt/collects/srfi/4/homo-vectors.ss
+lib/plt/collects/srfi/4/info.ss
+lib/plt/collects/srfi/4/installer.ss
+lib/plt/collects/srfi/4/run-tests.ss
+lib/plt/collects/srfi/4/test-linking-mechanism.c
+lib/plt/collects/srfi/4/tests.ss
+lib/plt/collects/srfi/42.ss
+lib/plt/collects/srfi/42/.cvsignore
+lib/plt/collects/srfi/42/42-examples.ss
+lib/plt/collects/srfi/42/comprehensions.ss
+lib/plt/collects/srfi/42/examples-42.ss
+lib/plt/collects/srfi/5.ss
+lib/plt/collects/srfi/5/let.ss
+lib/plt/collects/srfi/6.ss
+lib/plt/collects/srfi/7.ss
+lib/plt/collects/srfi/7/program.ss
+lib/plt/collects/srfi/8.ss
+lib/plt/collects/srfi/8/receive.ss
+lib/plt/collects/srfi/9.ss
+lib/plt/collects/srfi/9/record.ss
+lib/plt/collects/srfi/doc.txt
+lib/plt/collects/srfi/features.ss
+lib/plt/collects/srfi/info.ss
+lib/plt/collects/srfi/optional.ss
 lib/plt/collects/string-constants/danish-string-constants.ss
 lib/plt/collects/string-constants/doc.txt
+lib/plt/collects/string-constants/dutch-string-constants.ss
 lib/plt/collects/string-constants/english-string-constants.ss
 lib/plt/collects/string-constants/french-string-constants.ss
 lib/plt/collects/string-constants/german-string-constants.ss
+lib/plt/collects/string-constants/info.ss
+lib/plt/collects/string-constants/italian-string-constants.ss
+lib/plt/collects/string-constants/private/only-once.ss
 lib/plt/collects/string-constants/spanish-string-constants.ss
+lib/plt/collects/string-constants/string-constant-lang.ss
 lib/plt/collects/string-constants/string-constant.ss
+lib/plt/collects/syntax/boundmap.ss
+lib/plt/collects/syntax/context.ss
 lib/plt/collects/syntax/doc.txt
 lib/plt/collects/syntax/docprovide.ss
 lib/plt/collects/syntax/info.ss
 lib/plt/collects/syntax/kerncase.ss
 lib/plt/collects/syntax/moddep.ss
 lib/plt/collects/syntax/name.ss
+lib/plt/collects/syntax/path-spec.ss
 lib/plt/collects/syntax/primitives.ss
 lib/plt/collects/syntax/private/doctable.ss
 lib/plt/collects/syntax/readerr.ss
@@ -283,8 +465,13 @@ lib/plt/collects/syntax/toplevel.ss
 lib/plt/collects/syntax/zodiac-sig.ss
 lib/plt/collects/syntax/zodiac-unit.ss
 lib/plt/collects/syntax/zodiac.ss
+lib/plt/collects/tests/utils/gui.ss
+lib/plt/collects/tests/utils/info.ss
+lib/plt/collects/tests/utils/mz-testing.ss
+lib/plt/collects/tests/utils/sexp-diff.scm
 lib/plt/collects/tex2page/info.ss
 lib/plt/collects/tex2page/start.ss
+lib/plt/collects/tex2page/tex2page-aux.ss
 lib/plt/collects/tex2page/tex2page.ss
 lib/plt/collects/version/check-gui.ss
 lib/plt/collects/version/check-text.ss
@@ -299,7 +486,6 @@ lib/plt/collects/version/private/text-defs.ss
 lib/plt/collects/web-server/channel.ss
 lib/plt/collects/web-server/configuration-structures.ss
 lib/plt/collects/web-server/configuration-table
-lib/plt/collects/web-server/configuration-table-language.ss
 lib/plt/collects/web-server/configuration-table-structs.ss
 lib/plt/collects/web-server/configuration.ss
 lib/plt/collects/web-server/configure.ss
@@ -344,32 +530,51 @@ lib/plt/collects/web-server/default-web-root/htdocs/Defaults/documentation/web-s
 lib/plt/collects/web-server/default-web-root/htdocs/Defaults/index.html
 lib/plt/collects/web-server/default-web-root/htdocs/index.html
 lib/plt/collects/web-server/default-web-root/htdocs/secret/index.html
-lib/plt/collects/web-server/default-web-root/log
 lib/plt/collects/web-server/default-web-root/passwords
 lib/plt/collects/web-server/default-web-root/servlets/configure.ss
+lib/plt/collects/web-server/default-web-root/servlets/examples/README
 lib/plt/collects/web-server/default-web-root/servlets/examples/add.ss
+lib/plt/collects/web-server/default-web-root/servlets/examples/compound/README
+lib/plt/collects/web-server/default-web-root/servlets/examples/compound/add.ss
+lib/plt/collects/web-server/default-web-root/servlets/examples/compound/helper-sig.ss
+lib/plt/collects/web-server/default-web-root/servlets/examples/compound/helper.ss
+lib/plt/collects/web-server/default-web-root/servlets/examples/compound/multiply.ss
 lib/plt/collects/web-server/default-web-root/servlets/examples/count.ss
+lib/plt/collects/web-server/default-web-root/servlets/examples/english-measure-questions.ss
 lib/plt/collects/web-server/default-web-root/servlets/examples/hello.ss
-lib/plt/collects/web-server/default-web-root/servlets/index.ss
+lib/plt/collects/web-server/default-web-root/servlets/examples/quiz.ss
+lib/plt/collects/web-server/default-web-root/servlets/tests/a-module.ss
+lib/plt/collects/web-server/default-web-root/servlets/tests/b-module.ss
+lib/plt/collects/web-server/default-web-root/servlets/tests/bad-require.ss
 lib/plt/collects/web-server/default-web-root/servlets/tests/bad-return.ss
 lib/plt/collects/web-server/default-web-root/servlets/tests/broken.ss
+lib/plt/collects/web-server/default-web-root/servlets/tests/cut-module.ss
+lib/plt/collects/web-server/default-web-root/servlets/tests/incremental.ss
 lib/plt/collects/web-server/default-web-root/servlets/tests/mime.ss
+lib/plt/collects/web-server/default-web-root/servlets/tests/module-suspended-init.ss
 lib/plt/collects/web-server/default-web-root/servlets/tests/non-unit.ss
+lib/plt/collects/web-server/default-web-root/servlets/tests/response.ss
 lib/plt/collects/web-server/default-web-root/servlets/tests/size.ss
+lib/plt/collects/web-server/default-web-root/servlets/tests/suspended-module.ss
 lib/plt/collects/web-server/default-web-root/servlets/tests/test.ss
 lib/plt/collects/web-server/default-web-root/servlets/tests/url.ss
 lib/plt/collects/web-server/doc.txt
+lib/plt/collects/web-server/gui-launch.ss
 lib/plt/collects/web-server/info.ss
+lib/plt/collects/web-server/internal-structs.ss
 lib/plt/collects/web-server/launch.ss
 lib/plt/collects/web-server/monitor-launch.ss
 lib/plt/collects/web-server/monitor-server.ss
 lib/plt/collects/web-server/parse-table.ss
 lib/plt/collects/web-server/servlet-helpers.ss
-lib/plt/collects/web-server/servlet-language.ss
-lib/plt/collects/web-server/servlet-primitives.ss
 lib/plt/collects/web-server/servlet-sig.ss
+lib/plt/collects/web-server/servlet-tables.ss
+lib/plt/collects/web-server/servlet.ss
+lib/plt/collects/web-server/sig.ss
+lib/plt/collects/web-server/text-launch.ss
 lib/plt/collects/web-server/timer.ss
 lib/plt/collects/web-server/util.ss
+lib/plt/collects/web-server/web-server-unit.ss
 lib/plt/collects/web-server/web-server.ss
 lib/plt/collects/xml/XML.jpg
 lib/plt/collects/xml/doc.txt
@@ -380,17 +585,22 @@ lib/plt/collects/xml/private/reader.ss
 lib/plt/collects/xml/private/sig.ss
 lib/plt/collects/xml/private/space.ss
 lib/plt/collects/xml/private/structures.ss
+lib/plt/collects/xml/private/syntax.ss
 lib/plt/collects/xml/private/writer.ss
 lib/plt/collects/xml/private/xexpr.ss
+lib/plt/collects/xml/private/xml-snip-helpers.ss
+lib/plt/collects/xml/scheme-snipclass.ss
 lib/plt/collects/xml/test.ss
 lib/plt/collects/xml/xml-sig.ss
+lib/plt/collects/xml/xml-snipclass.ss
 lib/plt/collects/xml/xml-unit.ss
+lib/plt/collects/xml/xml.png
 lib/plt/collects/xml/xml.ss
 man/man1/mzscheme.1
-@dirrm include/mzscheme
-@dirrm lib/plt/collects/htdp
-@dirrm lib/plt/collects/tex2page
+@dirrm lib/plt/collects/xml/private
+@dirrm lib/plt/collects/xml
 @dirrm lib/plt/collects/web-server/default-web-root/servlets/tests
+@dirrm lib/plt/collects/web-server/default-web-root/servlets/examples/compound
 @dirrm lib/plt/collects/web-server/default-web-root/servlets/examples
 @dirrm lib/plt/collects/web-server/default-web-root/servlets
 @dirrm lib/plt/collects/web-server/default-web-root/htdocs/secret
@@ -404,22 +614,45 @@ man/man1/mzscheme.1
 @dirrm lib/plt/collects/web-server
 @dirrm lib/plt/collects/version/private
 @dirrm lib/plt/collects/version
+@dirrm lib/plt/collects/tex2page
+@dirrm lib/plt/collects/tests/utils
+@dirrm lib/plt/collects/tests
+@dirrm lib/plt/collects/syntax/private
+@dirrm lib/plt/collects/syntax
+@dirrm lib/plt/collects/string-constants/private
+@dirrm lib/plt/collects/string-constants
+@dirrm lib/plt/collects/srfi/9
+@dirrm lib/plt/collects/srfi/8
+@dirrm lib/plt/collects/srfi/7
+@dirrm lib/plt/collects/srfi/5
+@dirrm lib/plt/collects/srfi/42
+@dirrm lib/plt/collects/srfi/4/c-generation
+@dirrm lib/plt/collects/srfi/4
+@dirrm lib/plt/collects/srfi/31
+@dirrm lib/plt/collects/srfi/29/bundles/es
+@dirrm lib/plt/collects/srfi/29/bundles
+@dirrm lib/plt/collects/srfi/29
+@dirrm lib/plt/collects/srfi/27
+@dirrm lib/plt/collects/srfi/26
+@dirrm lib/plt/collects/srfi/25
+@dirrm lib/plt/collects/srfi/2
+@dirrm lib/plt/collects/srfi/19
+@dirrm lib/plt/collects/srfi/17
+@dirrm lib/plt/collects/srfi/14
+@dirrm lib/plt/collects/srfi/13
+@dirrm lib/plt/collects/srfi/1
+@dirrm lib/plt/collects/srfi
 @dirrm lib/plt/collects/slibinit
-@dirrm lib/plt/collects/xml/private
-@dirrm lib/plt/collects/xml
-@dirrm lib/plt/collects/parser-tools/examples
+@dirrm lib/plt/collects/setup
 @dirrm lib/plt/collects/parser-tools/private-yacc
 @dirrm lib/plt/collects/parser-tools/private-lex
+@dirrm lib/plt/collects/parser-tools/examples
 @dirrm lib/plt/collects/parser-tools
-@dirrm lib/plt/collects/syntax/private
-@dirrm lib/plt/collects/syntax
-@dirrm lib/plt/collects/string-constants
-@dirrm lib/plt/collects/compiler/private
-@dirrm lib/plt/collects/compiler
 @dirrm lib/plt/collects/net
 @dirrm lib/plt/collects/mzscheme/lib
 @dirrm lib/plt/collects/mzscheme/examples
 @dirrm lib/plt/collects/mzscheme
+@dirrm lib/plt/collects/mzlib/private/plt-match
 @dirrm lib/plt/collects/mzlib/private
 @dirrm lib/plt/collects/mzlib
 @dirrm lib/plt/collects/mred/private
@@ -428,8 +661,13 @@ man/man1/mzscheme.1
 @dirrm lib/plt/collects/launcher
 @dirrm lib/plt/collects/lang/private
 @dirrm lib/plt/collects/lang
+@dirrm lib/plt/collects/html
+@dirrm lib/plt/collects/htdp
 @dirrm lib/plt/collects/errortrace
 @dirrm lib/plt/collects/dynext/private
 @dirrm lib/plt/collects/dynext
-@dirrm lib/plt/collects/setup
+@dirrm lib/plt/collects/compiler/private
+@dirrm lib/plt/collects/compiler
 @dirrm lib/plt/collects
+@dirrm lib/plt
+@dirrm include/mzscheme
diff --git a/lang/mzscheme/distinfo b/lang/mzscheme/distinfo
index b76290ba55b..2c03d0af00e 100644
--- a/lang/mzscheme/distinfo
+++ b/lang/mzscheme/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2002/08/27 16:42:06 pooka Exp $
+$NetBSD: distinfo,v 1.4 2003/12/23 23:57:16 pooka Exp $
 
-SHA1 (mzscheme-200/mzscheme.src.unix.tar.gz) = f9712988bde29d7fd56c1d38abe0e9ebff44bc8d
-Size (mzscheme-200/mzscheme.src.unix.tar.gz) = 3535250 bytes
-SHA1 (patch-aa) = 96005b595f99487e238d00451e2442824dab7fa8
-SHA1 (patch-ah) = b1e23f33844f233ad4ae03149fda1f29fa0ad96b
-SHA1 (patch-aj) = 192fad84495de0f01d6c6c4d45288a6ba94be7fe
+SHA1 (mzscheme-205.src.unix.tar.gz) = b64d70fe756cd2567d8dcdbccf01c954aa230a26
+Size (mzscheme-205.src.unix.tar.gz) = 3249057 bytes
+SHA1 (patch-aa) = dbd42db2a5db10aff1a1af233004c785c52ddc80
+SHA1 (patch-ab) = 2b32df4c5ee422e03c5fc8717295b9c492e80b58
+SHA1 (patch-ac) = 2a771cc2e44c99e8711540672eca6a83cdd119e7
+SHA1 (patch-ah) = fbc2e897d34d073842da5c73b982613458a8f9b5
+SHA1 (patch-aj) = 5032995196330e3816bc39ef7c424f5c2640be13
diff --git a/lang/mzscheme/patches/patch-aa b/lang/mzscheme/patches/patch-aa
index c709f36178e..50f53a960cf 100644
--- a/lang/mzscheme/patches/patch-aa
+++ b/lang/mzscheme/patches/patch-aa
@@ -1,14 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2002/08/27 16:42:07 pooka Exp $
+$NetBSD: patch-aa,v 1.4 2003/12/23 23:57:16 pooka Exp $
 
---- Makefile.in.orig	Tue Aug 27 18:32:50 2002
-+++ Makefile.in	Tue Aug 27 18:46:10 2002
-@@ -228,9 +228,6 @@
+--- mzscheme/Makefile.in.orig	2003-06-21 04:19:52.000000000 +0300
++++ mzscheme/Makefile.in	2003-12-24 01:41:08.000000000 +0200
+@@ -240,12 +240,6 @@
  	cd ..; cp mzscheme/mzdyn.o $(LIBIDIR)/mzdyn.o
  	cd ..; $(ICP) mzscheme/libmzgc.@LIBSFX@ $(LIBIDIR)/libmzgc.@LIBSFX@
  	cd ..; $(ICP) mzscheme/libmzscheme.@LIBSFX@ $(LIBIDIR)/libmzscheme.@LIBSFX@
 -	cd ..; echo 'CC=@CC@' > $(BUILDINFO)
--	cd ..; echo 'CFLAGS=@CFLAGS@ @OPTIONS@' >> $(BUILDINFO)
+-	cd ..; echo 'CFLAGS=@CFLAGS@ @PREFLAGS@ @COMPFLAGS@' >> $(BUILDINFO)
+-	cd ..; echo 'OPTIONS=@OPTIONS@' >> $(BUILDINFO)
+-	cd ..; echo 'MZOPTIONS=@MZOPTIONS@' >> $(BUILDINFO)
+-	cd ..; echo "LDFLAGS=@LDFLAGS@" >> $(BUILDINFO)
 -	cd ..; echo 'LIBS=@LIBS@' >> $(BUILDINFO)
  
- MZFWDIR = "@FRAMEWORK_INSTALL_DIR@"/PLT_MzScheme.framework
+ MZFWDIR = @FRAMEWORK_INSTALL_DIR@/PLT_MzScheme.framework
  
diff --git a/lang/mzscheme/patches/patch-ab b/lang/mzscheme/patches/patch-ab
new file mode 100644
index 00000000000..03e54442a85
--- /dev/null
+++ b/lang/mzscheme/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.3 2003/12/23 23:57:16 pooka Exp $
+
+--- ../collects/make/setup-extension.ss.orig	2003-12-21 20:57:42.000000000 +0100
++++ ../collects/make/setup-extension.ss
+@@ -76,12 +76,7 @@
+ 	       (path-list-string->path-list v (list default-lib-dir))
+ 	       (list default-lib-dir)))
+ 	 (list "/usr"
+-	       "/usr/local"
+-	       "/usr/local/gnu"
+-	       ;; OS X fink location:
+-	       "/sw"
+-	       ;; Hack for NU PLT's convenience:
+-	       "/arch/gnu/packages/readline-4.2")))
++	       "XXXPREFIXXXX")))
+       
+       (define sys-path
+ 	(ormap (lambda (x)
diff --git a/lang/mzscheme/patches/patch-ac b/lang/mzscheme/patches/patch-ac
new file mode 100644
index 00000000000..6f3267c9bda
--- /dev/null
+++ b/lang/mzscheme/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2003/12/23 23:57:16 pooka Exp $
+
+--- ../man/man1/help-desk.1.orig	2003-12-21 21:03:34.000000000 +0100
++++ ../man/man1/help-desk.1
+@@ -22,7 +22,7 @@ http://www.drscheme.org/
+ looks for its libraries using the environment variables
+ PLTHOME and PLTCOLLECTS.  If this variable is not defined,
+ the installation directory is assumed (usually
+-"/usr/local/lib/plt/"). See the documentation for details.
++"XXXPREFIXXXX/lib/plt/"). See the documentation for details.
+ .PP
+ Please consult your local administrator to determine whether
+ the on-line documentation has been installed locally.
diff --git a/lang/mzscheme/patches/patch-ah b/lang/mzscheme/patches/patch-ah
index 45b3a5a1ff9..bb00761b0b2 100644
--- a/lang/mzscheme/patches/patch-ah
+++ b/lang/mzscheme/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2002/08/27 16:42:23 pooka Exp $
+$NetBSD: patch-ah,v 1.3 2003/12/23 23:57:16 pooka Exp $
 
---- ../../man/man1/mzscheme.1.orig	Sat Feb  2 11:01:39 2002
-+++ ../../man/man1/mzscheme.1	Wed Jul 31 19:07:28 2002
-@@ -304,7 +304,7 @@
+--- ../man/man1/mzscheme.1.orig	2003-12-21 21:04:20.000000000 +0100
++++ ../man/man1/mzscheme.1
+@@ -315,7 +315,7 @@ environment variable containing a file w
  invoked (usually "mzscheme") are checked. Links and parent directories
  are followed as in the first case.
  .IP
diff --git a/lang/mzscheme/patches/patch-aj b/lang/mzscheme/patches/patch-aj
index f0deb3eda2e..bd84ff77d66 100644
--- a/lang/mzscheme/patches/patch-aj
+++ b/lang/mzscheme/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.2 2002/08/27 16:42:25 pooka Exp $
+$NetBSD: patch-aj,v 1.3 2003/12/23 23:57:16 pooka Exp $
 
---- ../../collects/slibinit/init.ss.orig	Thu Apr 22 19:21:19 1999
-+++ ../../collects/slibinit/init.ss	Sun Jan  9 00:00:34 2000
-@@ -53,7 +53,7 @@
+--- ../collects/slibinit/init.ss.orig	2003-12-21 21:02:43.000000000 +0100
++++ ../collects/slibinit/init.ss
+@@ -55,7 +55,7 @@
  			       [(base name dir?) (split-path base)])
  		   (and (string? base) base))))
  	     (case (system-type)
--	       ((unix) "/usr/local/lib/plt")
-+	       ((unix) "XXXPREFIXXXX/lib/plt")
+-	       ((unix macosx) "/usr/local/lib/plt")
++	       ((unix macosx) "XXXPREFIXXXX/lib/plt")
  	       ((windows) "C:\\Program Files\\PLT")
  	       ((macos) "My Disk:plt:")))])
      (lambda () path)))