upgrade to 1.33. too many updates to mention here.

see http://www.call-with-current-continuation.org/ChangeLog.txt for complete
changelog.

6 files changed, 125 insertions, 148 deletions

diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index 4c7910d8f4e..d6f5fdc48e3 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:43 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/15 08:02:23 itojun Exp $
 #
 
-DISTNAME=	chicken-1.17
+DISTNAME=	chicken-1.33
 CATEGORIES=	lang
 MASTER_SITES=	http://www.call-with-current-continuation.org/
 
diff --git a/lang/chicken/PLIST b/lang/chicken/PLIST
index b9f2e9d17bf..5790b6ff45d 100644
--- a/lang/chicken/PLIST
+++ b/lang/chicken/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2003/09/12 10:01:12 itojun Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/02/15 08:02:23 itojun Exp $
 bin/chicken
 bin/chicken-config
+bin/chicken-setup
 bin/chicken-static
 bin/csc
 bin/csi
@@ -13,8 +14,27 @@ bin/scheme-r5rs
 bin/scheme-srfi-0
 bin/scheme-srfi-7
 include/c_defaults.h
+include/chicken-config.h
 include/chicken.h
-lib/chicken
+lib/chicken/REGISTRY
+lib/chicken/extras
+lib/chicken/format
+lib/chicken/lolevel
+lib/chicken/match-support
+lib/chicken/posix
+lib/chicken/profiler
+lib/chicken/regex
+lib/chicken/script-utils
+lib/chicken/srfi-1
+lib/chicken/srfi-13
+lib/chicken/srfi-14
+lib/chicken/srfi-18
+lib/chicken/srfi-25
+lib/chicken/srfi-37
+lib/chicken/srfi-4
+lib/chicken/syntax-case
+lib/chicken/tcp
+lib/chicken/tinyclos
 lib/libchicken.a
 lib/libchicken.la
 lib/libchicken.so
@@ -49,56 +69,11 @@ man/man1/chicken-config.1
 man/man1/chicken.1
 man/man1/csc.1
 man/man1/csi.1
+share/chicken/banner.scm
+share/chicken/default-entry-points.scm
 share/chicken/highlevel-macros.scm
 share/chicken/match.scm
 share/chicken/moremacros.scm
-share/chicken/src/batch-driver.scm
-share/chicken/src/build.scm
-share/chicken/src/c-backend.scm
-share/chicken/src/c-platform.scm
-share/chicken/src/chicken-setup.scm
-share/chicken/src/chicken.scm
-share/chicken/src/compiler.scm
-share/chicken/src/csi.scm
-share/chicken/src/eval.scm
-share/chicken/src/extras.scm
-share/chicken/src/format.scm
-share/chicken/src/highlevel-macros.scm
-share/chicken/src/library.scm
-share/chicken/src/lolevel.scm
-share/chicken/src/match-support.scm
-share/chicken/src/match.scm
-share/chicken/src/moremacros.scm
-share/chicken/src/nsample.scm
-share/chicken/src/optimizer.scm
-share/chicken/src/parameters.scm
-share/chicken/src/posix.scm
-share/chicken/src/profiler.scm
-share/chicken/src/psyntax-bootstrap.scm
-share/chicken/src/psyntax.scm
-share/chicken/src/regex.scm
-share/chicken/src/regex2.scm
-share/chicken/src/runtime.c
-share/chicken/src/scheduler.scm
-share/chicken/src/script-utils.scm
-share/chicken/src/srfi-1.scm
-share/chicken/src/srfi-13-syntax.scm
-share/chicken/src/srfi-13.scm
-share/chicken/src/srfi-14.scm
-share/chicken/src/srfi-18.scm
-share/chicken/src/srfi-25.scm
-share/chicken/src/srfi-37.scm
-share/chicken/src/srfi-4.scm
-share/chicken/src/support.scm
-share/chicken/src/syntax-case.scm
-share/chicken/src/tcp.scm
-share/chicken/src/test-infrastructure-hygienic-local.scm
-share/chicken/src/test-infrastructure-hygienic.scm
-share/chicken/src/test-infrastructure-lowlevel-local.scm
-share/chicken/src/test-infrastructure-lowlevel.scm
-share/chicken/src/test-infrastructure.scm
-share/chicken/src/tinyclos.scm
-share/chicken/src/tweaks.scm
 share/chicken/srfi-13-syntax.scm
 share/chicken/test-infrastructure-hygienic-local.scm
 share/chicken/test-infrastructure-hygienic.scm
@@ -118,65 +93,81 @@ share/doc/chicken/css.t2p
 share/doc/chicken/format.txt
 share/doc/chicken/manual.t2p
 share/doc/chicken/manual.tex
+share/doc/chicken/manual/manual--h.aux
+share/doc/chicken/manual/manual--h.idx
+share/doc/chicken/manual/manual--h.ilg
+share/doc/chicken/manual/manual--h.ind
+share/doc/chicken/manual/manual-Z-A.scm
+share/doc/chicken/manual/manual-Z-G-1.png
+share/doc/chicken/manual/manual-Z-G-1.ps
+share/doc/chicken/manual/manual-Z-G-1.tex
+share/doc/chicken/manual/manual-Z-H-1.html
+share/doc/chicken/manual/manual-Z-H-10.html
+share/doc/chicken/manual/manual-Z-H-11.html
+share/doc/chicken/manual/manual-Z-H-12.html
+share/doc/chicken/manual/manual-Z-H-13.html
+share/doc/chicken/manual/manual-Z-H-14.html
+share/doc/chicken/manual/manual-Z-H-15.html
+share/doc/chicken/manual/manual-Z-H-16.html
+share/doc/chicken/manual/manual-Z-H-17.html
+share/doc/chicken/manual/manual-Z-H-18.html
+share/doc/chicken/manual/manual-Z-H-19.html
+share/doc/chicken/manual/manual-Z-H-2.html
+share/doc/chicken/manual/manual-Z-H-20.html
+share/doc/chicken/manual/manual-Z-H-21.html
+share/doc/chicken/manual/manual-Z-H-22.html
+share/doc/chicken/manual/manual-Z-H-23.html
+share/doc/chicken/manual/manual-Z-H-24.html
+share/doc/chicken/manual/manual-Z-H-25.html
+share/doc/chicken/manual/manual-Z-H-26.html
+share/doc/chicken/manual/manual-Z-H-27.html
+share/doc/chicken/manual/manual-Z-H-28.html
+share/doc/chicken/manual/manual-Z-H-29.html
+share/doc/chicken/manual/manual-Z-H-3.html
+share/doc/chicken/manual/manual-Z-H-30.html
+share/doc/chicken/manual/manual-Z-H-31.html
+share/doc/chicken/manual/manual-Z-H-32.html
+share/doc/chicken/manual/manual-Z-H-33.html
+share/doc/chicken/manual/manual-Z-H-34.html
+share/doc/chicken/manual/manual-Z-H-35.html
+share/doc/chicken/manual/manual-Z-H-36.html
+share/doc/chicken/manual/manual-Z-H-37.html
+share/doc/chicken/manual/manual-Z-H-38.html
+share/doc/chicken/manual/manual-Z-H-39.html
+share/doc/chicken/manual/manual-Z-H-4.html
+share/doc/chicken/manual/manual-Z-H-40.html
+share/doc/chicken/manual/manual-Z-H-41.html
+share/doc/chicken/manual/manual-Z-H-42.html
+share/doc/chicken/manual/manual-Z-H-43.html
+share/doc/chicken/manual/manual-Z-H-44.html
+share/doc/chicken/manual/manual-Z-H-45.html
+share/doc/chicken/manual/manual-Z-H-46.html
+share/doc/chicken/manual/manual-Z-H-47.html
+share/doc/chicken/manual/manual-Z-H-48.html
+share/doc/chicken/manual/manual-Z-H-49.html
+share/doc/chicken/manual/manual-Z-H-5.html
+share/doc/chicken/manual/manual-Z-H-50.html
+share/doc/chicken/manual/manual-Z-H-51.html
+share/doc/chicken/manual/manual-Z-H-52.html
+share/doc/chicken/manual/manual-Z-H-53.html
+share/doc/chicken/manual/manual-Z-H-54.html
+share/doc/chicken/manual/manual-Z-H-55.html
+share/doc/chicken/manual/manual-Z-H-56.html
+share/doc/chicken/manual/manual-Z-H-57.html
+share/doc/chicken/manual/manual-Z-H-58.html
+share/doc/chicken/manual/manual-Z-H-59.html
+share/doc/chicken/manual/manual-Z-H-6.html
+share/doc/chicken/manual/manual-Z-H-60.html
+share/doc/chicken/manual/manual-Z-H-7.html
+share/doc/chicken/manual/manual-Z-H-8.html
+share/doc/chicken/manual/manual-Z-H-9.html
+share/doc/chicken/manual/manual-Z-L.scm
+share/doc/chicken/manual/manual-Z-S.css
+share/doc/chicken/manual/manual.hlog
+share/doc/chicken/manual/manual.html
 share/doc/chicken/tex2page
-share/doc/html/chicken/manual-Z-G-1.png
-share/doc/html/chicken/manual-Z-H-1.html
-share/doc/html/chicken/manual-Z-H-10.html
-share/doc/html/chicken/manual-Z-H-11.html
-share/doc/html/chicken/manual-Z-H-12.html
-share/doc/html/chicken/manual-Z-H-13.html
-share/doc/html/chicken/manual-Z-H-14.html
-share/doc/html/chicken/manual-Z-H-15.html
-share/doc/html/chicken/manual-Z-H-16.html
-share/doc/html/chicken/manual-Z-H-17.html
-share/doc/html/chicken/manual-Z-H-18.html
-share/doc/html/chicken/manual-Z-H-19.html
-share/doc/html/chicken/manual-Z-H-2.html
-share/doc/html/chicken/manual-Z-H-20.html
-share/doc/html/chicken/manual-Z-H-21.html
-share/doc/html/chicken/manual-Z-H-22.html
-share/doc/html/chicken/manual-Z-H-23.html
-share/doc/html/chicken/manual-Z-H-24.html
-share/doc/html/chicken/manual-Z-H-25.html
-share/doc/html/chicken/manual-Z-H-26.html
-share/doc/html/chicken/manual-Z-H-27.html
-share/doc/html/chicken/manual-Z-H-28.html
-share/doc/html/chicken/manual-Z-H-29.html
-share/doc/html/chicken/manual-Z-H-3.html
-share/doc/html/chicken/manual-Z-H-30.html
-share/doc/html/chicken/manual-Z-H-31.html
-share/doc/html/chicken/manual-Z-H-32.html
-share/doc/html/chicken/manual-Z-H-33.html
-share/doc/html/chicken/manual-Z-H-34.html
-share/doc/html/chicken/manual-Z-H-35.html
-share/doc/html/chicken/manual-Z-H-36.html
-share/doc/html/chicken/manual-Z-H-37.html
-share/doc/html/chicken/manual-Z-H-38.html
-share/doc/html/chicken/manual-Z-H-39.html
-share/doc/html/chicken/manual-Z-H-4.html
-share/doc/html/chicken/manual-Z-H-40.html
-share/doc/html/chicken/manual-Z-H-41.html
-share/doc/html/chicken/manual-Z-H-42.html
-share/doc/html/chicken/manual-Z-H-43.html
-share/doc/html/chicken/manual-Z-H-44.html
-share/doc/html/chicken/manual-Z-H-45.html
-share/doc/html/chicken/manual-Z-H-46.html
-share/doc/html/chicken/manual-Z-H-47.html
-share/doc/html/chicken/manual-Z-H-48.html
-share/doc/html/chicken/manual-Z-H-49.html
-share/doc/html/chicken/manual-Z-H-5.html
-share/doc/html/chicken/manual-Z-H-50.html
-share/doc/html/chicken/manual-Z-H-51.html
-share/doc/html/chicken/manual-Z-H-52.html
-share/doc/html/chicken/manual-Z-H-6.html
-share/doc/html/chicken/manual-Z-H-7.html
-share/doc/html/chicken/manual-Z-H-8.html
-share/doc/html/chicken/manual-Z-H-9.html
-share/doc/html/chicken/manual-Z-S.css
-share/doc/html/chicken/manual.html
-@dirrm share/doc/html/chicken
+@dirrm share/doc/chicken/manual
 @dirrm share/doc/chicken
-@dirrm share/chicken/src
 @dirrm share/chicken
 @exec ${MKDIR} %D/lib/chicken
 @dirrm lib/chicken
diff --git a/lang/chicken/distinfo b/lang/chicken/distinfo
index a6a9951c7e1..89afcc714ca 100644
--- a/lang/chicken/distinfo
+++ b/lang/chicken/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.7 2003/09/12 10:01:12 itojun Exp $
+$NetBSD: distinfo,v 1.8 2004/02/15 08:02:23 itojun Exp $
 
-SHA1 (chicken-1.17.tar.gz) = 18a32f53afab1c90e33e19155829eb207b05ace6
-Size (chicken-1.17.tar.gz) = 2729914 bytes
-SHA1 (patch-aa) = 0d4fbc773a33f3a910f25eefd66bf4a7e4bfd68e
-SHA1 (patch-ab) = 65937026074731a8a2f0d63b0d9b72cccbe2327b
+SHA1 (chicken-1.33.tar.gz) = 4e92325bfabaeb66c3263ab774017cd5dc9b2087
+Size (chicken-1.33.tar.gz) = 2929016 bytes
+SHA1 (patch-aa) = bbc94975f659c2a4cf1869221ef278243539db34
+SHA1 (patch-ab) = 51bf4a05fff3e15690a94a01187505c435015721
 SHA1 (patch-ac) = f666a50c992af1fbcff4da107a69c0a598cf8b58
 SHA1 (patch-ad) = fb80d8782aa6310f9fa31b219ad65adf9034debb
-SHA1 (patch-ae) = 206f08421e5facd5438205143773c7e3d4259f0d
diff --git a/lang/chicken/patches/patch-aa b/lang/chicken/patches/patch-aa
index a4328e96f21..61f23bf1b1e 100644
--- a/lang/chicken/patches/patch-aa
+++ b/lang/chicken/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2003/08/27 08:52:59 itojun Exp $
+$NetBSD: patch-aa,v 1.5 2004/02/15 08:02:23 itojun Exp $
 
---- Makefile.am.orig	2003-06-14 02:35:08.000000000 +0900
-+++ Makefile.am	2003-08-27 17:39:30.000000000 +0900
-@@ -249,10 +249,10 @@
+--- Makefile.am.orig	2004-01-26 02:37:09.000000000 +0900
++++ Makefile.am	2004-02-15 16:38:20.000000000 +0900
+@@ -263,10 +263,10 @@
  
  # Install docs and sources.
  install-data-local : doc-html
@@ -11,13 +11,13 @@ $NetBSD: patch-aa,v 1.4 2003/08/27 08:52:59 itojun Exp $
 -	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc/manual
 -	-cp $(srcdir)/doc/manual/* $(DESTDIR)$(pkgdatadir)/doc/manual
 +	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken
-+	-for file in $(DOCFILES); do $(INSTALL_DATA) $(srcdir)/doc/$$file $(DESTDIR)$(prefix)/share/doc/chicken; done
-+	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/html/chicken
-+	-for file in $(srcdir)/doc/manual/*.html $(srcdir)/doc/manual/*.png $(srcdir)/doc/manual/*.css ; do $(INSTALL_DATA) $$file $(DESTDIR)$(prefix)/share/doc/html/chicken; done
- 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/src
- 	-cp $(srcdir)/*.scm $(srcdir)/runtime.c $(DESTDIR)$(pkgdatadir)/src
++	-for file in $(DOCFILES); do cp $(srcdir)/doc/chicken/$$file $(DESTDIR)$(prefix)/share/doc; done
++	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken/manual
++	-cp $(srcdir)/doc/manual/* $(DESTDIR)$(prefix)/share/doc/chicken/manual
  	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-@@ -479,4 +479,4 @@
+ 	./chicken-setup
+ 
+@@ -493,4 +493,4 @@
  .PHONY : test
  
  test :
diff --git a/lang/chicken/patches/patch-ab b/lang/chicken/patches/patch-ab
index 51746328dca..64a65a9aee0 100644
--- a/lang/chicken/patches/patch-ab
+++ b/lang/chicken/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/08/27 08:52:59 itojun Exp $
+$NetBSD: patch-ab,v 1.3 2004/02/15 08:02:23 itojun Exp $
 
---- Makefile.in.orig	2003-04-24 04:30:07.000000000 +0900
-+++ Makefile.in	2003-08-27 17:40:34.000000000 +0900
-@@ -461,7 +461,7 @@
+--- Makefile.in.orig	2004-01-30 08:33:49.000000000 +0900
++++ Makefile.in	2004-02-15 16:40:20.000000000 +0900
+@@ -473,7 +473,7 @@
   configure.lineno
  $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
  	cd $(top_srcdir) && \
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2003/08/27 08:52:59 itojun Exp $
  Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
  	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
  
-@@ -1233,10 +1233,10 @@
+@@ -1256,10 +1256,10 @@
  
  # Install docs and sources.
  install-data-local : doc-html
@@ -20,13 +20,13 @@ $NetBSD: patch-ab,v 1.2 2003/08/27 08:52:59 itojun Exp $
 -	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc/manual
 -	-cp $(srcdir)/doc/manual/* $(DESTDIR)$(pkgdatadir)/doc/manual
 +	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken
-+	-for file in $(DOCFILES); do $(INSTALL_DATA) $(srcdir)/doc/$$file $(DESTDIR)$(prefix)/share/doc/chicken; done
-+	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/html/chicken
-+	-for file in $(srcdir)/doc/manual/*.html $(srcdir)/doc/manual/*.png $(srcdir)/doc/manual/*.css ; do $(INSTALL_DATA) $$file $(DESTDIR)$(prefix)/share/doc/html/chicken; done
- 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/src
- 	-cp $(srcdir)/*.scm $(srcdir)/runtime.c $(DESTDIR)$(pkgdatadir)/src
++	-for file in $(DOCFILES); do cp $(srcdir)/doc/$$file $(DESTDIR)$(prefix)/share/doc/chicken; done
++	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken/manual
++	-cp $(srcdir)/doc/manual/* $(DESTDIR)$(prefix)/share/doc/chicken/manual
  	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-@@ -1432,7 +1432,7 @@
+ 	./chicken-setup
+ clean-local:
+@@ -1455,7 +1455,7 @@
  .PHONY : test
  
  test :
diff --git a/lang/chicken/patches/patch-ae b/lang/chicken/patches/patch-ae
deleted file mode 100644
index 8f2baa48816..00000000000
--- a/lang/chicken/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/09/09 01:38:26 itojun Exp $
-
---- csc.in	2003-09-09 10:24:21.000000000 +0900
-+++ csc.in-	2003-09-09 10:24:00.000000000 +0900
-@@ -145,7 +145,7 @@
- 
- (if win
-     (define link-options '())
--    (define link-options '("-L%libdir%")) )
-+    (define link-options '("-Wl,-R%libdir% -L%libdir%")) )
- 
- (define target-filename #f)
- (define verbose #f)