Update chicken to 2.41, based on PR 34504 by Peter Bex.

Mark directories used by chiken's own package `egg' as OWN_DIRS
so that keep eggs when updating this package.

11 files changed, 36 insertions, 193 deletions

diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index cb0e3ce89a5..2935684f51b 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2006/05/23 10:25:47 tonio Exp $
+# $NetBSD: Makefile,v 1.26 2006/10/10 15:04:38 obache Exp $
 #
 
-DISTNAME=	chicken-2.3
+DISTNAME=	chicken-2.41
 CATEGORIES=	lang
 MASTER_SITES=	http://www.call-with-current-continuation.org/
 
@@ -13,10 +13,13 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
 
-INFO_FILES=	# PLIST
+INFO_FILES=	yes
 MAKE_FLAGS+=	MAKEINFO=${TRUE:Q}
 
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=	F77=${FALSE:Q}
 
+OWN_DIRS+=	${PREFIX}/lib/chicken
+OWN_DIRS+=	${PREFIX}/lib/chicken/1
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/chicken/PLIST b/lang/chicken/PLIST
index 6bf982cd52d..8d988775640 100644
--- a/lang/chicken/PLIST
+++ b/lang/chicken/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/05/23 10:25:47 tonio Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/10/10 15:04:38 obache Exp $
 bin/chicken
 bin/chicken-profile
 bin/chicken-setup
@@ -19,13 +19,25 @@ man/man1/csc.1
 man/man1/csi.1
 share/chicken/banner.scm
 share/chicken/chicken-ffi-macros.scm
-share/chicken/chicken-match-macros.scm
 share/chicken/chicken-more-macros.scm
+share/chicken/eval.exports
+share/chicken/extras.exports
+share/chicken/library.exports
+share/chicken/lolevel.exports
+share/chicken/posix.exports
+share/chicken/regex.exports
+share/chicken/scheduler.exports
+share/chicken/srfi-1.exports
+share/chicken/srfi-13.exports
+share/chicken/srfi-14.exports
+share/chicken/srfi-18.exports
+share/chicken/srfi-4.exports
+share/chicken/tcp.exports
+share/chicken/tinyclos.exports
+share/chicken/utils.exports
 share/doc/chicken/ChangeLog
 share/doc/chicken/LICENSE
 share/doc/chicken/README
 share/doc/chicken/chicken.html
 @dirrm share/doc/chicken
 @dirrm share/chicken
-@exec ${MKDIR} %D/lib/chicken
-@dirrm lib/chicken
diff --git a/lang/chicken/distinfo b/lang/chicken/distinfo
index b1452e89c37..78137494b72 100644
--- a/lang/chicken/distinfo
+++ b/lang/chicken/distinfo
@@ -1,13 +1,7 @@
-$NetBSD: distinfo,v 1.16 2006/05/23 10:25:47 tonio Exp $
+$NetBSD: distinfo,v 1.17 2006/10/10 15:04:38 obache Exp $
 
-SHA1 (chicken-2.3.tar.gz) = 0ceb0cdea495f753f091cd06ac196b48eadc0b11
-RMD160 (chicken-2.3.tar.gz) = cca291aacef699b06c9fb197bea735cd28892d38
-Size (chicken-2.3.tar.gz) = 3906266 bytes
-SHA1 (patch-aa) = 6caf2b3f93527498a5bc8b0847339a037db915d5
-SHA1 (patch-ab) = 23ecb37a510d2a9b14411b5c7484661e6ae24a2d
-SHA1 (patch-ad) = 926244a681a9c561c649a6e7d7f413aee93c88d7
-SHA1 (patch-ae) = 879adca4cdf2a411559af510f4074bfe8880ec13
-SHA1 (patch-af) = 70aacbe9a01ebd941b41556db6e37068a123c4b8
-SHA1 (patch-ag) = 4532f03b2d888253f0dfad10541dca2de1ae75a5
-SHA1 (patch-ah) = 65e7846c195e11c750f0793e18e69f0b75df93b2
-SHA1 (patch-ai) = 66e74d1253e5709faaafbef4ad42b7885b5e6585
+SHA1 (chicken-2.41.tar.gz) = cfc202f16d021d530b7e9d73a75db097e1946d34
+RMD160 (chicken-2.41.tar.gz) = ba08c178c9260fa9f5dc0d57f5e46bb779ce51aa
+Size (chicken-2.41.tar.gz) = 3950398 bytes
+SHA1 (patch-aa) = 34ac9e2bb18de718a7e2c7fe9a7e042950648636
+SHA1 (patch-ab) = ce95ea724f3129335dcc4b3dc8fe827f526a8d1a
diff --git a/lang/chicken/patches/patch-aa b/lang/chicken/patches/patch-aa
index d320363d6c2..d2b223909d8 100644
--- a/lang/chicken/patches/patch-aa
+++ b/lang/chicken/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2005/11/16 22:36:40 rillig Exp $
+$NetBSD: patch-aa,v 1.10 2006/10/10 15:04:38 obache Exp $
 
---- Makefile.am.orig	2005-07-12 15:56:39.000000000 +0200
+--- Makefile.am.orig	Mon Jul 17 19:18:42 2006
 +++ Makefile.am
-@@ -254,8 +254,8 @@ pkgdata_DATA = chicken-match-macros.scm 
+@@ -254,8 +254,8 @@ regex.exports: $(regexexports)
  
  # Install docs and sources.
  install-data-local : chicken.html
@@ -10,6 +10,6 @@ $NetBSD: patch-aa,v 1.9 2005/11/16 22:36:40 rillig Exp $
 -	-for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/doc; done
 +	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken
 +	-for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(prefix)/share/doc/chicken; done
- 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+ 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)/$(BINARY_VERSION)
  
  chicken.html: chicken.texi
diff --git a/lang/chicken/patches/patch-ab b/lang/chicken/patches/patch-ab
index a116887810e..4105545a5ad 100644
--- a/lang/chicken/patches/patch-ab
+++ b/lang/chicken/patches/patch-ab
@@ -1,17 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2005/11/16 22:36:40 rillig Exp $
+$NetBSD: patch-ab,v 1.8 2006/10/10 15:04:38 obache Exp $
 
---- Makefile.in.orig	2005-07-13 18:18:22.000000000 +0200
+--- Makefile.in.orig	Mon Jul 17 19:18:42 2006
 +++ Makefile.in
-@@ -465,7 +465,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
-  configure.lineno
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --foreign  Makefile
-+	  $(AUTOMAKE) --foreign  --ignore-deps Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
- 
-@@ -1596,8 +1596,8 @@ csc.scm: csc.scm.in
+@@ -1651,8 +1651,8 @@ regex.exports: $(regexexports)
  
  # Install docs and sources.
  install-data-local : chicken.html
@@ -19,6 +10,6 @@ $NetBSD: patch-ab,v 1.7 2005/11/16 22:36:40 rillig Exp $
 -	-for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/doc; done
 +	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken
 +	-for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(prefix)/share/doc/chicken; done
- 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+ 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)/$(BINARY_VERSION)
  
  chicken.html: chicken.texi
diff --git a/lang/chicken/patches/patch-ad b/lang/chicken/patches/patch-ad
deleted file mode 100644
index d6d67c910d2..00000000000
--- a/lang/chicken/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2005/12/31 00:39:01 joerg Exp $
-
---- scheduler.c.orig	2005-12-30 23:46:23.000000000 +0000
-+++ scheduler.c
-@@ -9,7 +9,6 @@
- 
- #ifdef HAVE_ERRNO_H
- # include <errno.h>
--extern int errno;
- # define C_signal_interrupted_p     C_mk_bool(errno == EINTR)
- #else
- # define C_signal_interrupted_p     C_SCHEME_FALSE
diff --git a/lang/chicken/patches/patch-ae b/lang/chicken/patches/patch-ae
deleted file mode 100644
index 6bb1f1b2ee6..00000000000
--- a/lang/chicken/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2005/12/31 00:39:01 joerg Exp $
-
---- posix.c.orig	2005-12-30 23:52:04.000000000 +0000
-+++ posix.c
-@@ -209,7 +209,7 @@ static void C_fcall C_free_exec_env() {
- #define C_execvp(f)         C_fix(execvp(C_data_pointer(f), C_exec_args))
- #define C_execve(f)         C_fix(execve(C_data_pointer(f), C_exec_args, C_exec_env))
- 
--#if defined(__FreeBSD__) || defined(C_MACOSX) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sgi__) || defined(sgi)
-+#if defined(__FreeBSD__) || defined(C_MACOSX) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sgi__) || defined(sgi) || defined(__DragonFly__)
- static C_TLS int C_uw;
- # define C_WIFEXITED(n)      (C_uw = C_unfix(n), C_mk_bool(WIFEXITED(C_uw)))
- # define C_WIFSIGNALED(n)    (C_uw = C_unfix(n), C_mk_bool(WIFSIGNALED(C_uw)))
diff --git a/lang/chicken/patches/patch-af b/lang/chicken/patches/patch-af
deleted file mode 100644
index 99a57f5d4f0..00000000000
--- a/lang/chicken/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/12/31 00:39:01 joerg Exp $
-
---- runtime.c.orig	2005-12-30 23:52:36.000000000 +0000
-+++ runtime.c
-@@ -7510,6 +7510,9 @@ void C_software_version(C_word c, C_word
- #if defined(__linux__)
-   a = C_alloc(2 + C_bytestowords(5));
-   s = C_string2(&a, "linux");
-+#elif defined(__DragonFly__)
-+  a = C_alloc(2 + C_bytestowords(9));
-+  s = C_string2(&a, "dragonfly");
- #elif defined(__FreeBSD__)
-   a = C_alloc(2 + C_bytestowords(7));
-   s = C_string2(&a, "freebsd");
diff --git a/lang/chicken/patches/patch-ag b/lang/chicken/patches/patch-ag
deleted file mode 100644
index ef8d0b2a963..00000000000
--- a/lang/chicken/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/12/31 00:39:01 joerg Exp $
-
---- uposix.c.orig	2005-12-30 23:53:26.000000000 +0000
-+++ uposix.c
-@@ -209,7 +209,7 @@ static void C_fcall C_free_exec_env() {
- #define C_execvp(f)         C_fix(execvp(C_data_pointer(f), C_exec_args))
- #define C_execve(f)         C_fix(execve(C_data_pointer(f), C_exec_args, C_exec_env))
- 
--#if defined(__FreeBSD__) || defined(C_MACOSX) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sgi__) || defined(sgi)
-+#if defined(__FreeBSD__) || defined(C_MACOSX) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sgi__) || defined(sgi) || defined(__DragonFly__)
- static C_TLS int C_uw;
- # define C_WIFEXITED(n)      (C_uw = C_unfix(n), C_mk_bool(WIFEXITED(C_uw)))
- # define C_WIFSIGNALED(n)    (C_uw = C_unfix(n), C_mk_bool(WIFSIGNALED(C_uw)))
diff --git a/lang/chicken/patches/patch-ah b/lang/chicken/patches/patch-ah
deleted file mode 100644
index c9bdb476e40..00000000000
--- a/lang/chicken/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2006/05/23 10:25:47 tonio Exp $
-
---- chicken.h.orig	2006-05-22 23:05:17.000000000 +0200
-+++ chicken.h
-@@ -224,7 +224,7 @@ int strncasecmp(const char *one, const c
- # pragma warning(disable: 4101)
- #endif
- 
--#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- # define C_GNU_ENV
- #endif
- 
diff --git a/lang/chicken/patches/patch-ai b/lang/chicken/patches/patch-ai
deleted file mode 100644
index 29c2abe5e30..00000000000
--- a/lang/chicken/patches/patch-ai
+++ /dev/null
@@ -1,92 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/12/31 00:39:01 joerg Exp $
-
---- configure.orig	2005-12-31 00:20:40.000000000 +0000
-+++ configure
-@@ -4022,13 +4022,13 @@ darwin* | rhapsody*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (DragonFly|FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-@@ -7462,7 +7462,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
-+    freebsd* | dragonfly*)
-       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-@@ -8095,7 +8095,7 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -10365,7 +10365,7 @@ if test -z "$aix_libpath"; then aix_libp
-   freebsd-elf*)
-     archive_cmds_need_lc_CXX=no
-     ;;
--  freebsd*)
-+  freebsd* | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     ld_shlibs_CXX=yes
-@@ -11741,7 +11741,7 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -14193,7 +14193,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
-+    freebsd* | dragonfly*)
-       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_F77='-R$libdir'
-       hardcode_direct_F77=yes
-@@ -14826,7 +14826,7 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -16474,7 +16474,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
-+    freebsd* | dragonfly*)
-       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_GCJ='-R$libdir'
-       hardcode_direct_GCJ=yes
-@@ -17107,7 +17107,7 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in