From 7da14deb8fad33618b9d3345aa92913902f62e7d Mon Sep 17 00:00:00 2001 From: seb Date: Sun, 5 Sep 2004 18:31:59 +0000 Subject: Update to version 1.66 Provided in PR pkg/26832 by Peter dot Bex at student dot kun dot nl with minor additions (info file handling and resource limit specification so test target runs on my test platforms). Many changes since last packaged version, too many to list here. See installed file PREFIX/share/doc/chicken/ChangeLog for a complete list. --- lang/chicken/Makefile | 10 +++++++--- lang/chicken/PLIST | 17 +++++------------ lang/chicken/distinfo | 14 +++++++------- lang/chicken/patches/patch-aa | 14 +++++--------- lang/chicken/patches/patch-ab | 18 +++++++----------- lang/chicken/patches/patch-ac | 10 +++++----- lang/chicken/patches/patch-ad | 22 +++++++++++----------- 7 files changed, 47 insertions(+), 58 deletions(-) (limited to 'lang') diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile index ac49d064fd4..e4b4c4e7282 100644 --- a/lang/chicken/Makefile +++ b/lang/chicken/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2004/07/24 10:33:12 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2004/09/05 18:31:59 seb Exp $ # -DISTNAME= chicken-1.51 -PKGREVISION= 1 +DISTNAME= chicken-1.66 CATEGORIES= lang MASTER_SITES= http://www.call-with-current-continuation.org/ @@ -15,7 +14,12 @@ USE_BUILDLINK3= yes USE_LIBTOOL= yes TEST_TARGET= test +INFO_FILES= chicken.info + # Avoid an ICE in gcc2 on sparc64 CONFIGURE_ENV+= F77=${FALSE} +# This is for the test target +UNLIMIT_RESOURCES= datasize + .include "../../mk/bsd.pkg.mk" diff --git a/lang/chicken/PLIST b/lang/chicken/PLIST index f09c4071870..e1ba6d66b2a 100644 --- a/lang/chicken/PLIST +++ b/lang/chicken/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2004/07/24 10:32:40 wiz Exp $ +@comment $NetBSD: PLIST,v 1.8 2004/09/05 18:31:59 seb Exp $ bin/chicken bin/chicken-config bin/chicken-profile @@ -7,15 +7,6 @@ bin/chicken-static bin/csc bin/csi bin/csi-static -bin/rcsi -bin/rcsi-static -bin/scheme-chicken -bin/scheme-chicken-hygienic -bin/scheme-ieee-1178-1990 -bin/scheme-r4rs -bin/scheme-r5rs -bin/scheme-srfi-0 -bin/scheme-srfi-7 include/c_defaults.h include/chicken-config.h include/chicken.h @@ -50,6 +41,8 @@ lib/libustuffed-chicken.so lib/libustuffed-chicken.so.0 lib/libustuffed-chicken.so.0.0 man/man1/chicken-config.1 +man/man1/chicken-profile.1 +man/man1/chicken-setup.1 man/man1/chicken.1 man/man1/csc.1 man/man1/csi.1 @@ -73,7 +66,7 @@ share/doc/chicken/README share/doc/chicken/chicken.html share/doc/chicken/chicken.pdf share/doc/chicken/format.txt -@exec ${MKDIR} %D/lib/chicken -@dirrm lib/chicken @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 8bc989f3ad8..4a70e34cfa5 100644 --- a/lang/chicken/distinfo +++ b/lang/chicken/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.10 2004/07/24 10:32:40 wiz Exp $ +$NetBSD: distinfo,v 1.11 2004/09/05 18:31:59 seb Exp $ -SHA1 (chicken-1.51.tar.gz) = e1f9cc50113d0ed47bf2486b49e882c9a7420cd9 -Size (chicken-1.51.tar.gz) = 3574657 bytes -SHA1 (patch-aa) = 7f69b1025a3ff9516efcb6af711c9affe1a217d5 -SHA1 (patch-ab) = 523f497899940a8476f5c1b9d801ebd49297eb2c -SHA1 (patch-ac) = c2623952f8bd668ea4eb2122d409f4999672b714 -SHA1 (patch-ad) = fb80d8782aa6310f9fa31b219ad65adf9034debb +SHA1 (chicken-1.66.tar.gz) = 63846ec90eb08dc2f9d1fd34f7f4278650acc10f +Size (chicken-1.66.tar.gz) = 3703678 bytes +SHA1 (patch-aa) = 52b02ba8ccb2db3117419a1324e56f4cbcb7e577 +SHA1 (patch-ab) = ccc38246417e0145e3172ba7faf0e22dfffe32f8 +SHA1 (patch-ac) = 427ea4b8b0cae4bd5852c5fd9e10eeedafee552f +SHA1 (patch-ad) = 191cfbb643a7856baa9695330b11e08ba34f2b4d diff --git a/lang/chicken/patches/patch-aa b/lang/chicken/patches/patch-aa index 275d50318a8..ed1c533f8cf 100644 --- a/lang/chicken/patches/patch-aa +++ b/lang/chicken/patches/patch-aa @@ -1,23 +1,19 @@ -$NetBSD: patch-aa,v 1.7 2004/07/24 10:32:40 wiz Exp $ +$NetBSD: patch-aa,v 1.8 2004/09/05 18:31:59 seb Exp $ ---- Makefile.am.orig 2004-05-20 23:20:58.000000000 +0200 +--- Makefile.am.orig 2004-07-07 19:34:07.000000000 +0200 +++ Makefile.am -@@ -294,9 +294,11 @@ pkgdata_DATA = chicken-match-macros.scm +@@ -269,8 +269,8 @@ pkgdata_DATA = chicken-match-macros.scm # Install docs and sources. install-data-local : chicken.html - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc - -for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/doc; done -- $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + $(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken + -for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(prefix)/share/doc/chicken; done -+ $(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken -+ $(mkinstalldirs) $(DESTDIR)$(pkglibdir) -+ + $(mkinstalldirs) $(DESTDIR)$(pkglibdir) chicken.html: chicken.texi - $(MAKEINFO) --no-split --html chicken.texi -@@ -514,7 +516,7 @@ paranoid : +@@ -489,7 +489,7 @@ paranoid : .PHONY : test test : diff --git a/lang/chicken/patches/patch-ab b/lang/chicken/patches/patch-ab index 50f4a394d73..f47a53c9367 100644 --- a/lang/chicken/patches/patch-ab +++ b/lang/chicken/patches/patch-ab @@ -1,32 +1,28 @@ -$NetBSD: patch-ab,v 1.5 2004/07/24 10:32:40 wiz Exp $ +$NetBSD: patch-ab,v 1.6 2004/09/05 18:31:59 seb Exp $ ---- Makefile.in.orig 2004-05-20 23:21:13.000000000 +0200 +--- Makefile.in.orig 2004-08-19 18:37:55.000000000 +0200 +++ Makefile.in -@@ -536,7 +536,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat +@@ -472,7 +472,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 ++ $(AUTOMAKE) --foreign --ignore-deps Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) -@@ -1440,9 +1440,11 @@ csc.scm: csc.scm.in +@@ -1343,8 +1343,8 @@ csc.scm: csc.scm.in # Install docs and sources. install-data-local : chicken.html - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc - -for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/doc; done -- $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + $(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken + -for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(prefix)/share/doc/chicken; done -+ $(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken -+ $(mkinstalldirs) $(DESTDIR)$(pkglibdir) -+ + $(mkinstalldirs) $(DESTDIR)$(pkglibdir) chicken.html: chicken.texi - $(MAKEINFO) --no-split --html chicken.texi -@@ -1630,7 +1632,7 @@ paranoid : +@@ -1533,7 +1533,7 @@ paranoid : .PHONY : test test : diff --git a/lang/chicken/patches/patch-ac b/lang/chicken/patches/patch-ac index 66e6f4fc8f6..5a004f4e00a 100644 --- a/lang/chicken/patches/patch-ac +++ b/lang/chicken/patches/patch-ac @@ -1,15 +1,15 @@ -$NetBSD: patch-ac,v 1.2 2004/06/02 06:56:07 itojun Exp $ +$NetBSD: patch-ac,v 1.3 2004/09/05 18:31:59 seb Exp $ ---- chicken-config.in.orig 2004-05-21 06:21:00.000000000 +0900 -+++ chicken-config.in 2004-06-02 15:31:38.000000000 +0900 -@@ -49,7 +49,11 @@ +--- chicken-config.in.orig 2004-06-09 18:43:29.000000000 +0200 ++++ chicken-config.in +@@ -48,7 +48,11 @@ esac # standard library directory. case "%libdir%" in /usr/lib|"") LIBDIR=;; - *) LIBDIR=-L%libdir%;; + *) LIBDIR="-L%libdir%" + if [ `uname -s` = "NetBSD" ]; then -+ LIBDIR="$LIBDIR -Wl,-R%libdir%" ++ LIBDIR="$LIBDIR -Wl,-R%libdir%" + fi + ;; esac diff --git a/lang/chicken/patches/patch-ad b/lang/chicken/patches/patch-ad index e91e894c030..d8c700308c5 100644 --- a/lang/chicken/patches/patch-ad +++ b/lang/chicken/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.1 2003/05/21 19:43:04 seb Exp $ +$NetBSD: patch-ad,v 1.2 2004/09/05 18:31:59 seb Exp $ ---- testsuites/makefile.in.orig 2003-03-11 21:53:33.000000000 +0000 +--- testsuites/makefile.in.orig 2004-06-27 23:25:12.000000000 +0200 +++ testsuites/makefile.in @@ -1,5 +1,9 @@ # makefile for Chicken test-suite @@ -22,10 +22,10 @@ $NetBSD: patch-ad,v 1.1 2003/05/21 19:43:04 seb Exp $ CHICKENFLAGS = -hygienic -include-path .. -optimize-level 1 LIBDIR = .. CCOPTS = `../chicken-config -cflags | sed s%-I@prefix@/include%%g` - LIBS = `../chicken-config -extra-libs -libs | sed s%-L@prefix@/lib%%g | sed "s%@prefix@/lib/\(lib[-A-Za-z0-9_]*\.a\)%$(LIBDIR)/\1%g"` + LIBS = `../chicken-config -libs | sed s%-L@prefix@/lib%%g | sed "s%@prefix@/lib/\(lib[-A-Za-z0-9_]*\.a\)%$(LIBDIR)/\1%g"` -+CC= @CC@ -+LIBTOOL= @LIBTOOL@ ++CC = @CC@ ++LIBTOOL = @LIBTOOL@ + all : $(TESTCASES) @@ -34,24 +34,24 @@ $NetBSD: patch-ad,v 1.1 2003/05/21 19:43:04 seb Exp $ - $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ && \ - ./$@ + $(CHICKEN) $@.scm $(CHICKENFLAGS) -output-file $@.c -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ -+ $(LIBTOOL) --mode=execute ./$@ ++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ ++ $(LIBTOOL) --mode=execute ./$@ test-r5rs : - $(CHICKEN) $@.scm $(CHICKENFLAGS) -output-file $@.c && \ - $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ && \ - ./$@ + $(CHICKEN) $@.scm $(CHICKENFLAGS) -output-file $@.c -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ -+ $(LIBTOOL) --mode=execute ./$@ ++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ ++ $(LIBTOOL) --mode=execute ./$@ test-test-infrastructure : - $(CHICKEN) $@.scm $(CHICKENFLAGS) -output-file $@.c && \ - $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ && \ - ./$@ + $(CHICKEN) $@.scm $(CHICKENFLAGS) -output-file $@.c -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ -+ $(LIBTOOL) --mode=execute ./$@ ++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ ++ $(LIBTOOL) --mode=execute ./$@ clean: rm -f *.c $(TESTCASES) -- cgit v1.2.3