This updates the chicken scheme compiler to 2.5. The release message is here:
http://www.mail-archive.com/[email protected]/msg03580.html The old workarounds weren't needed on i386 or amd64, so I commented them out. I'd appreciate it if anyone could test whether or not they are still necessary on sparc64. Thanks. Index: Makefile =================================================================== RCS file: /cvs/ports/lang/chicken/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- Makefile 31 Jul 2006 08:07:54 -0000 1.4 +++ Makefile 25 Nov 2006 10:57:38 -0000 @@ -2,40 +2,49 @@ COMMENT= "practical and portable Scheme system" -DISTNAME= chicken-2.41 -PKGNAME= ${DISTNAME}p1 -SHARED_LIBS= chicken 0.0 \ - uchicken 0.0 +DISTNAME= chicken-2.5 + +SHARED_LIBS= chicken 1.0 \ + uchicken 1.0 + CATEGORIES= lang HOMEPAGE= http://www.call-with-current-continuation.org/ MAINTAINER= Deanna Phillips <[EMAIL PROTECTED]> +MASTER_SITES= ${HOMEPAGE} + +WANTLIB= c m + # BSD PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${HOMEPAGE} +USE_GMAKE= Yes +USE_LIBTOOL= Yes +LIBTOOL_FLAGS= --tag=CXX +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS= ${CONFIGURE_SHARED} -WANTLIB= c m +CFLAGS+= -I${LOCALBASE}/include + +REGRESS_TARGET= bench + +MAKE_ENV+= lt_version_info=1.0 -SEPARATE_BUILD= simple -USE_GMAKE= Yes -USE_LIBTOOL= Yes -CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} # gcc 3.3.5 internal compiler error -.if ${MACHINE_ARCH} == "sparc64" -EXTRA_CFLAGS= -O0 -.endif +#.if ${MACHINE_ARCH} == "sparc64" +#EXTRA_CFLAGS= -O0 +#.endif # benchmark runs into forever loop at low nursery sizes on some architectures # fix this value at 128k instead of using the benchmark -MAKE_FLAGS= NURSERY=131072 \ - EXTRA_CFLAGS=${EXTRA_CFLAGS} +#MAKE_FLAGS= NURSERY=131072 \ +# EXTRA_CFLAGS=${EXTRA_CFLAGS} +# .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/lang/chicken/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 26 Jul 2006 18:35:06 -0000 1.2 +++ distinfo 25 Nov 2006 10:57:38 -0000 @@ -1,4 +1,4 @@ -MD5 (chicken-2.41.tar.gz) = b0f64865bc1bb51159c8246e16e515e8 -RMD160 (chicken-2.41.tar.gz) = ba08c178c9260fa9f5dc0d57f5e46bb779ce51aa -SHA1 (chicken-2.41.tar.gz) = cfc202f16d021d530b7e9d73a75db097e1946d34 -SIZE (chicken-2.41.tar.gz) = 3950398 +MD5 (chicken-2.5.tar.gz) = 25b162542d9f1abb2828c384c38f48b5 +RMD160 (chicken-2.5.tar.gz) = 12beb80e77b9468d90605a27c96555053b3af9a3 +SHA1 (chicken-2.5.tar.gz) = 5f0e160d5b803d4b51c649a3028124008507d4b6 +SIZE (chicken-2.5.tar.gz) = 3013368 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/lang/chicken/patches/patch-Makefile_in,v retrieving revision 1.4 diff -u -p -r1.4 patch-Makefile_in --- patches/patch-Makefile_in 31 Jul 2006 08:07:54 -0000 1.4 +++ patches/patch-Makefile_in 25 Nov 2006 10:57:38 -0000 @@ -1,43 +1,69 @@ -$OpenBSD: patch-Makefile_in,v 1.4 2006/07/31 08:07:54 steven Exp $ ---- Makefile.in.orig Mon Jul 17 19:18:42 2006 -+++ Makefile.in Mon Jul 31 10:38:02 2006 -@@ -19,9 +19,10 @@ +$OpenBSD$ +--- Makefile.in.orig Tue Oct 17 02:38:48 2006 ++++ Makefile.in Sat Nov 25 03:02:25 2006 +@@ -25,9 +25,9 @@ SOURCES = $(libchicken_la_SOURCES) $(lib srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -+docdir = $(datadir)/doc/@PACKAGE@ - pkgdatadir = $(datadir)/@PACKAGE@ +-pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -+pkglibdir = $(pkgdatadir) -+pkgincludedir = $(pkgdatadir)/include ++pkgdatadir = $(datadir) ++pkglibdir = $(libdir) ++pkgincludedir = $(includedir) top_builddir = . - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -@@ -678,13 +679,13 @@ libchicken_la-runtime.lo: runtime.c - $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libchicken_la_CFLAGS) $(CFLAGS) -c -o libchicken_la-runtime.lo `test -f 'runtime.c' || echo '$(srcdir)/'`runtime.c + INSTALL = @INSTALL@ +@@ -348,7 +348,7 @@ C_INSTALL_CXX = \"$(CXX)\" + C_INSTALL_CFLAGS = \"-DHAVE_CHICKEN_CONFIG_H $(CFLAGS)\" + C_INSTALL_SHARE_HOME = \"$(pkgdatadir)\" + C_INSTALL_BIN_HOME = \"$(bindir)\" +-C_INSTALL_EGG_HOME = \"$(pkglibdir)/$(BINARY_VERSION)\" ++C_INSTALL_EGG_HOME = \"$(pkgdatadir)/@PACKAGE@/$(BINARY_VERSION)\" + C_INSTALL_LIB_HOME = \"$(libdir)\" + C_INSTALL_STATIC_LIB_HOME = \"$(libdir)\" + C_INSTALL_INCLUDE_HOME = \"$(includedir)\" +@@ -485,7 +485,6 @@ $(top_builddir)/config.status: $(top_src + $(SHELL) ./config.status --recheck + + $(top_srcdir)/configure: $(am__configure_deps) +- cd $(srcdir) && $(AUTOCONF) + $(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + +@@ -499,7 +498,6 @@ stamp-h1: $(srcdir)/chicken-config.h.in + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status chicken-config.h + $(srcdir)/chicken-config.h.in: $(am__configure_deps) +- cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h1 + touch $@ + +@@ -1041,8 +1039,8 @@ install-pkgdataDATA: $(pkgdata_DATA) + @list='$(pkgdata_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ +- $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ ++ echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/@PACKAGE@/$$f'"; \ ++ $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/@PACKAGE@/$$f"; \ + done - libchicken_la-library.o: library.c -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libchicken_la_CFLAGS) $(CFLAGS) -c -o libchicken_la-library.o `test -f 'library.c' || echo '$(srcdir)/'`library.c -+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libchicken_la_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c -o libchicken_la-library.o `test -f 'library.c' || echo '$(srcdir)/'`library.c - - libchicken_la-library.obj: library.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libchicken_la_CFLAGS) $(CFLAGS) -c -o libchicken_la-library.obj `if test -f 'library.c'; then $(CYGPATH_W) 'library.c'; else $(CYGPATH_W) '$(srcdir)/library.c'; fi` - - libchicken_la-library.lo: library.c -- $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libchicken_la_CFLAGS) $(CFLAGS) -c -o libchicken_la-library.lo `test -f 'library.c' || echo '$(srcdir)/'`library.c -+ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libchicken_la_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c -o libchicken_la-library.lo `test -f 'library.c' || echo '$(srcdir)/'`library.c - - libchicken_la-eval.o: eval.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libchicken_la_CFLAGS) $(CFLAGS) -c -o libchicken_la-eval.o `test -f 'eval.c' || echo '$(srcdir)/'`eval.c -@@ -1651,8 +1652,8 @@ regex.exports: $(regexexports) + uninstall-pkgdataDATA: +@@ -1473,11 +1471,11 @@ regex.exports: $(regexexports) # Install docs and sources. - install-data-local : chicken.html + install-data-local: - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc +- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc/html - -for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/doc; done -+ $(mkinstalldirs) $(DESTDIR)$(docdir) -+ -for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(docdir); done - $(mkinstalldirs) $(DESTDIR)$(pkglibdir)/$(BINARY_VERSION) +- -cp $(srcdir)/html/* $(DESTDIR)$(pkgdatadir)/doc/html +- $(mkinstalldirs) $(DESTDIR)$(pkglibdir)/$(BINARY_VERSION) ++ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc/@PACKAGE@ ++ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc/@PACKAGE@/html ++ -for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/doc/@PACKAGE@; done ++ -cp $(srcdir)/html/* $(DESTDIR)$(pkgdatadir)/doc/@PACKAGE@/html ++ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/@PACKAGE@/$(BINARY_VERSION) + clean-local: + -rm -rf stage2 stage3 stage2-stamp stage3-stamp - chicken.html: chicken.texi Index: patches/patch-chicken-defaults_h_in =================================================================== RCS file: patches/patch-chicken-defaults_h_in diff -N patches/patch-chicken-defaults_h_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-chicken-defaults_h_in 25 Nov 2006 10:57:38 -0000 @@ -0,0 +1,28 @@ +$OpenBSD$ +--- chicken-defaults.h.in.orig Thu Sep 7 03:17:04 2006 ++++ chicken-defaults.h.in Sat Nov 25 04:33:39 2006 +@@ -1,9 +1,9 @@ + /*** Program generated file: any edits may be lost ***/ + #ifndef C_INSTALL_CC +-# define C_INSTALL_CC @C_INSTALL_CC@ ++# define C_INSTALL_CC "cc" + #endif + #ifndef C_INSTALL_CXX +-# define C_INSTALL_CXX @C_INSTALL_CXX@ ++# define C_INSTALL_CXX "c++" + #endif + #ifndef C_INSTALL_CFLAGS + # define C_INSTALL_CFLAGS @C_INSTALL_CFLAGS@ +@@ -39,10 +39,10 @@ + # define C_STACK_GROWS_DOWNWARD @C_STACK_GROWS_DOWNWARD@ + #endif + #ifndef C_TARGET_CC +-# define C_TARGET_CC @C_TARGET_CC@ ++# define C_TARGET_CC "cc" + #endif + #ifndef C_TARGET_CXX +-# define C_TARGET_CXX @C_TARGET_CXX@ ++# define C_TARGET_CXX "c++" + #endif + #ifndef C_TARGET_CFLAGS + # define C_TARGET_CFLAGS @C_TARGET_CFLAGS@ Index: patches/patch-csc_scm_in =================================================================== RCS file: patches/patch-csc_scm_in diff -N patches/patch-csc_scm_in --- patches/patch-csc_scm_in 31 Jul 2006 08:07:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-csc_scm_in,v 1.1 2006/07/31 08:07:54 steven Exp $ ---- csc.scm.in.orig Fri Jul 28 05:24:18 2006 -+++ csc.scm.in Fri Jul 28 05:24:32 2006 -@@ -226,7 +226,7 @@ EOF - - (define include-dir - (let ([id (prefix "" "include" "%includedir%")]) -- (and (not (member id '("/usr/include" "/usr/local/include" ""))) -+ (and (not (member id '("/usr/include" ""))) - id) ) ) - - (define compile-options Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/chicken/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 31 Jul 2006 08:07:54 -0000 1.3 +++ pkg/PLIST 25 Nov 2006 10:57:38 -0000 @@ -8,7 +8,6 @@ bin/csi include/chicken-config.h include/chicken-defaults.h include/chicken.h [EMAIL PROTECTED] info/chicken.info lib/libchicken.a lib/libchicken.la lib/libuchicken.a @@ -36,10 +35,49 @@ 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/ share/doc/chicken/ChangeLog share/doc/chicken/LICENSE share/doc/chicken/README -share/doc/chicken/chicken.html +share/doc/chicken/html/ +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
