Update to chicken-3.0.0, from pkgsrc-wip.

Some highlights:
3.0.0:
- On sparc64 architectures more than 126 procedure arguments are allowed
  [Thanks to Peter Bex]
2.7xx:
- PCRE support
- new GNU Make based build process
- libffi is not used anymore, handcoded assembler is used for x86, x86-64
  and powerpc platforms
- TCP timeout handling
- added Lisp-style symbol property lists
- the "chicken-bug" program can now be used to create bug reports
- countless bugfixes and minor improvements

6 files changed, 107 insertions, 209 deletions

diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index 8053adb31fb..a16b3aa3003 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -1,25 +1,58 @@
-# $NetBSD: Makefile,v 1.29 2007/04/17 15:03:30 obache Exp $
+# $NetBSD: Makefile,v 1.30 2008/03/10 23:41:05 tnn Exp $
 #
 
-DISTNAME=	chicken-2.6
-PKGNAME=	chicken-2.60
+DISTNAME=	chicken-3.0.0
 CATEGORIES=	lang
-MASTER_SITES=	http://www.call-with-current-continuation.org/
+MASTER_SITES=	http://chicken.wiki.br/releases/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	asau@inbox.ru #, airhead@users.sourceforge.net
 HOMEPAGE=	http://www.call-with-current-continuation.org/chicken.html
 COMMENT=	Scheme to C compiler, handling R5RS
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-USE_LIBTOOL=	yes
+INFO_FILES=		yes
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake makeinfo
+UNLIMIT_RESOURCES=	datasize
 
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+=	F77=${FALSE:Q}
+INSTALLATION_DIRS=	share/chicken
+OWN_DIRS=		${PREFIX}/lib/chicken ${PREFIX}/lib/chicken/3
 
-OWN_DIRS+=	${PREFIX}/lib/chicken
-OWN_DIRS+=	${PREFIX}/lib/chicken/1
+BUILD_TARGET=		all chicken.info
 
+.include "../../mk/bsd.prefs.mk"
+
+# PLATFORM detection:
+.if !empty(OPSYS:M*BSD)
+PLATFORM=	bsd
+.elif ${OPSYS} == "Linux"
+PLATFORM=	linux
+.elif ${OPSYS} == "Darwin"
+PLATFORM=	macosx
+.elif ${OPSYS} == "SunOS"
+PLATFORM=	solaris
+.else
+#PLATFORM+=	${OPSYS} == "Interix"
+# possible choices left: mingw-msys mingw cygwin cross-linux-mingw
+PKG_FAIL_REASON=	"${OPSYS} is not supported"
+.endif
+
+MAKE_ENV+=	HOST=	# fix ${HOST} prepending ${CC}
+# Need to have these in MAKE_FLAGS, MAKE_ENV is not enough due to the
+# way the build system overrides them.
+MAKE_FLAGS+=	PLATFORM=${PLATFORM:Q} PREFIX=${PREFIX:Q} DESTDIR=${DESTDIR:Q}
+MAKE_FLAGS+=	TOPMANDIR=${PREFIX:Q}/${PKGMANDIR}
+MAKE_FLAGS+=	INFODIR=${PREFIX:Q}/${PKGINFODIR:Q}
+MAKE_FLAGS+=	DOCDIR=${PREFIX:Q}/share/doc/${PKGNAME_NOREV}
+MAKE_FLAGS+=	USE_HOST_PCRE=yes
+
+SUBST_CLASSES+=		add-rpath
+SUBST_STAGE.add-rpath=	pre-configure
+SUBST_FILES.add-rpath=	defaults.make
+SUBST_SED.add-rpath=	-e 's|-lpcre|${COMPILER_RPATH_FLAG}${PREFIX}/lib -lpcre|'
+
+TEST_TARGET=	check
+
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/chicken/PLIST b/lang/chicken/PLIST
index 4a11f3ea191..2e6430fbdda 100644
--- a/lang/chicken/PLIST
+++ b/lang/chicken/PLIST
@@ -1,16 +1,18 @@
-@comment $NetBSD: PLIST,v 1.16 2007/04/17 15:03:30 obache Exp $
+@comment $NetBSD: PLIST,v 1.17 2008/03/10 23:41:05 tnn Exp $
 bin/chicken
+bin/chicken-bug
 bin/chicken-profile
 bin/chicken-setup
-bin/chicken-static
 bin/csc
 bin/csi
-bin/csi-static
 include/chicken-config.h
-include/chicken-defaults.h
 include/chicken.h
-lib/libchicken.la
-lib/libuchicken.la
+info/chicken.info
+lib/libchicken.a
+lib/libchicken.so
+lib/libuchicken.a
+lib/libuchicken.so
+man/man1/chicken-bug.1
 man/man1/chicken-profile.1
 man/man1/chicken-setup.1
 man/man1/chicken.1
@@ -18,11 +20,13 @@ man/man1/csc.1
 man/man1/csi.1
 share/chicken/chicken-ffi-macros.scm
 share/chicken/chicken-more-macros.scm
+share/chicken/chicken-sys-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-extras.exports
 share/chicken/regex.exports
 share/chicken/scheduler.exports
 share/chicken/srfi-1.exports
@@ -32,49 +36,52 @@ share/chicken/srfi-18.exports
 share/chicken/srfi-4.exports
 share/chicken/tcp.exports
 share/chicken/utils.exports
-share/doc/chicken/ChangeLog
-share/doc/chicken/LICENSE
-share/doc/chicken/README
-share/doc/chicken/html/accessing-external-objects.html
-share/doc/chicken/html/acknowledgements.html
-share/doc/chicken/html/basic-mode-of-operation.html
-share/doc/chicken/html/bibliography.html
-share/doc/chicken/html/bugs-and-limitations.html
-share/doc/chicken/html/c-interface.html
-share/doc/chicken/html/callbacks.html
-share/doc/chicken/html/chicken-setup.html
-share/doc/chicken/html/data-representation.html
-share/doc/chicken/html/declarations.html
-share/doc/chicken/html/deviations-from-the-standard.html
-share/doc/chicken/html/embedding.html
-share/doc/chicken/html/extensions-to-the-standard.html
-share/doc/chicken/html/faq.html
-share/doc/chicken/html/foreign-type-specifiers.html
-share/doc/chicken/html/index.html
-share/doc/chicken/html/interface-to-external-functions-and-variables.html
-share/doc/chicken/html/locations.html
-share/doc/chicken/html/non-standard-macros-and-special-forms.html
-share/doc/chicken/html/non-standard-read-syntax.html
-share/doc/chicken/html/other-support-procedures.html
-share/doc/chicken/html/parameters.html
-share/doc/chicken/html/pattern-matching.html
-share/doc/chicken/html/supported-language.html
-share/doc/chicken/html/unit-eval.html
-share/doc/chicken/html/unit-extras.html
-share/doc/chicken/html/unit-library.html
-share/doc/chicken/html/unit-lolevel.html
-share/doc/chicken/html/unit-match.html
-share/doc/chicken/html/unit-posix.html
-share/doc/chicken/html/unit-regex.html
-share/doc/chicken/html/unit-srfi-1.html
-share/doc/chicken/html/unit-srfi-13.html
-share/doc/chicken/html/unit-srfi-14.html
-share/doc/chicken/html/unit-srfi-18.html
-share/doc/chicken/html/unit-srfi-4.html
-share/doc/chicken/html/unit-tcp.html
-share/doc/chicken/html/unit-utils.html
-share/doc/chicken/html/using-the-compiler.html
-share/doc/chicken/html/using-the-interpreter.html
-@dirrm share/doc/chicken/html
-@dirrm share/doc/chicken
+share/doc/${PKGNAME}/LICENSE
+share/doc/${PKGNAME}/README
+share/doc/${PKGNAME}/chicken.pdf
+share/doc/${PKGNAME}/html/accessing-external-objects.html
+share/doc/${PKGNAME}/html/acknowledgements.html
+share/doc/${PKGNAME}/html/basic-mode-of-operation.html
+share/doc/${PKGNAME}/html/bibliography.html
+share/doc/${PKGNAME}/html/bugs-and-limitations.html
+share/doc/${PKGNAME}/html/c-interface.html
+share/doc/${PKGNAME}/html/callbacks.html
+share/doc/${PKGNAME}/html/chicken-setup.html
+share/doc/${PKGNAME}/html/data-representation.html
+share/doc/${PKGNAME}/html/declarations.html
+share/doc/${PKGNAME}/html/deviations-from-the-standard.html
+share/doc/${PKGNAME}/html/embedding.html
+share/doc/${PKGNAME}/html/extensions-to-the-standard.html
+share/doc/${PKGNAME}/html/faq.html
+share/doc/${PKGNAME}/html/foreign-type-specifiers.html
+share/doc/${PKGNAME}/html/index.html
+share/doc/${PKGNAME}/html/interface-to-external-functions-and-variables.html
+share/doc/${PKGNAME}/html/locations.html
+share/doc/${PKGNAME}/html/non-standard-macros-and-special-forms.html
+share/doc/${PKGNAME}/html/non-standard-read-syntax.html
+share/doc/${PKGNAME}/html/other-support-procedures.html
+share/doc/${PKGNAME}/html/parameters.html
+share/doc/${PKGNAME}/html/pattern-matching.html
+share/doc/${PKGNAME}/html/supported-language.html
+share/doc/${PKGNAME}/html/unit-eval.html
+share/doc/${PKGNAME}/html/unit-extras.html
+share/doc/${PKGNAME}/html/unit-library.html
+share/doc/${PKGNAME}/html/unit-lolevel.html
+share/doc/${PKGNAME}/html/unit-match.html
+share/doc/${PKGNAME}/html/unit-posix.html
+share/doc/${PKGNAME}/html/unit-regex.html
+share/doc/${PKGNAME}/html/unit-srfi-1.html
+share/doc/${PKGNAME}/html/unit-srfi-13.html
+share/doc/${PKGNAME}/html/unit-srfi-14.html
+share/doc/${PKGNAME}/html/unit-srfi-18.html
+share/doc/${PKGNAME}/html/unit-srfi-4.html
+share/doc/${PKGNAME}/html/unit-tcp.html
+share/doc/${PKGNAME}/html/unit-utils.html
+share/doc/${PKGNAME}/html/using-the-compiler.html
+share/doc/${PKGNAME}/html/using-the-interpreter.html
+@dirrm share/doc/${PKGNAME}/html
+@dirrm share/doc/${PKGNAME}
 @dirrm share/chicken
+@exec ${MKDIR} %D/lib/chicken/3
+@dirrm lib/chicken/3
+@dirrm lib/chicken
diff --git a/lang/chicken/distinfo b/lang/chicken/distinfo
index 558ff307965..47d03519139 100644
--- a/lang/chicken/distinfo
+++ b/lang/chicken/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.20 2007/04/17 15:03:30 obache Exp $
+$NetBSD: distinfo,v 1.21 2008/03/10 23:41:05 tnn Exp $
 
-SHA1 (chicken-2.6.tar.gz) = 4010d21db1b0d2df3b3ab392503be4bb19073bbd
-RMD160 (chicken-2.6.tar.gz) = 0af0d79e85ee017d2ad2bfde79f4561f257c852c
-Size (chicken-2.6.tar.gz) = 3517981 bytes
-SHA1 (patch-aa) = 32f4c1d4f2fd9f047c0e10cc47772df140686cbb
-SHA1 (patch-ab) = 668666e4c288cd778ddadd0ac29a40dc47f68135
-SHA1 (patch-ac) = 77c8c3665b492de1dda379d70f1bbb6c0c39d337
+SHA1 (chicken-3.0.0.tar.gz) = 12554ba5146a53cb76fb5f41627664fbe885f8c6
+RMD160 (chicken-3.0.0.tar.gz) = 8a00b18f47c9d9a31b5257ab1296609380ccce17
+Size (chicken-3.0.0.tar.gz) = 4056492 bytes
diff --git a/lang/chicken/patches/patch-aa b/lang/chicken/patches/patch-aa
deleted file mode 100644
index c1cfc280077..00000000000
--- a/lang/chicken/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2007/04/17 15:03:30 obache Exp $
-
---- Makefile.am.orig	2007-02-26 07:05:57.000000000 +0000
-+++ Makefile.am
-@@ -298,10 +298,10 @@ pkgdata_DATA = chicken-more-macros.scm \
- 
- # Install docs and sources.
- install-data-local:
--	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc
--	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc/html
--	-for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/doc; done
--	-cp $(srcdir)/html/* $(DESTDIR)$(pkgdatadir)/doc/html
-+	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken
-+	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken/html
-+	-for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(prefix)/share/doc/chicken; done
-+	-cp $(srcdir)/html/* $(DESTDIR)$(prefix)/share/doc/chicken/html
- 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)/$(BINARY_VERSION)
- 
- # Some generated files we need to clean up.
diff --git a/lang/chicken/patches/patch-ab b/lang/chicken/patches/patch-ab
deleted file mode 100644
index 4d9beb9a8e7..00000000000
--- a/lang/chicken/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2007/04/17 15:03:30 obache Exp $
-
---- Makefile.in.orig	2007-03-01 10:49:50.000000000 +0000
-+++ Makefile.in
-@@ -1841,10 +1841,10 @@ chicken-defaults.h: chicken-defaults.h.i
- 
- # Install docs and sources.
- install-data-local:
--	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc
--	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc/html
--	-for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/doc; done
--	-cp $(srcdir)/html/* $(DESTDIR)$(pkgdatadir)/doc/html
-+	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken
-+	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken/html
-+	-for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(prefix)/share/doc/chicken; done
-+	-cp $(srcdir)/html/* $(DESTDIR)$(prefix)/share/doc/chicken/html
- 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)/$(BINARY_VERSION)
- clean-local:
- 	-rm -rf stage2 stage3 stage2-stamp stage3-stamp
diff --git a/lang/chicken/patches/patch-ac b/lang/chicken/patches/patch-ac
deleted file mode 100644
index 1ea16a873bf..00000000000
--- a/lang/chicken/patches/patch-ac
+++ /dev/null
@@ -1,101 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2007/04/17 15:03:30 obache Exp $
-
---- configure.orig	2007-03-01 10:49:51.000000000 +0000
-+++ configure
-@@ -4090,13 +4090,13 @@ darwin* | rhapsody*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | 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.*`
-       ;;
-@@ -7555,7 +7555,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-@@ -8133,7 +8133,7 @@ kfreebsd*-gnu)
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
-+freebsd*|dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -10513,7 +10513,7 @@ if test -z "$aix_libpath"; then aix_libp
-   freebsd-elf*)
-     archive_cmds_need_lc_CXX=no
-     ;;
--  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     ld_shlibs_CXX=yes
-@@ -11220,7 +11220,7 @@ echo $ECHO_N "checking for $compiler opt
- 	    ;;
- 	esac
- 	;;
--      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
-@@ -11831,7 +11831,7 @@ kfreebsd*-gnu)
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
-+freebsd*|dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -14402,7 +14402,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_F77='-R$libdir'
-       hardcode_direct_F77=yes
-@@ -14980,7 +14980,7 @@ kfreebsd*-gnu)
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
-+freebsd*|dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -16749,7 +16749,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_GCJ='-R$libdir'
-       hardcode_direct_GCJ=yes
-@@ -17327,7 +17327,7 @@ kfreebsd*-gnu)
-   dynamic_linker='GNU ld.so'
-   ;;
- 
--freebsd*)
-+freebsd*|dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in