pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/chicken Updated chicken to 2.2 using some patches...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6a03719e9255
branches:  trunk
changeset: 503242:6a03719e9255
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Nov 16 22:36:40 2005 +0000

description:
Updated chicken to 2.2 using some patches by Peter Bex via private mail.
There are far too many details that have changed to mention here. Fixes
PR 30783.

diffstat:

 lang/chicken/Makefile         |   9 ++----
 lang/chicken/PLIST            |  15 +----------
 lang/chicken/distinfo         |  13 ++++-----
 lang/chicken/patches/patch-aa |  15 ++---------
 lang/chicken/patches/patch-ab |  19 +++----------
 lang/chicken/patches/patch-ad |  57 -------------------------------------------
 6 files changed, 18 insertions(+), 110 deletions(-)

diffs (220 lines):

diff -r 44545012aa8f -r 6a03719e9255 lang/chicken/Makefile
--- a/lang/chicken/Makefile     Wed Nov 16 22:27:38 2005 +0000
+++ b/lang/chicken/Makefile     Wed Nov 16 22:36:40 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:09 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/11/16 22:36:40 rillig Exp $
 #
 
-DISTNAME=      chicken-1.89
+DISTNAME=      chicken-2.2
 CATEGORIES=    lang
 MASTER_SITES=  http://www.call-with-current-continuation.org/
 
@@ -12,14 +12,11 @@
 GNU_CONFIGURE= yes
 USE_TOOLS+=    gmake
 USE_LIBTOOL=   yes
-TEST_TARGET=   test
 
 INFO_FILES=    chicken.info
+MAKE_ENV+=     MAKEINFO=${TRUE:Q}
 
 # 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 -r 44545012aa8f -r 6a03719e9255 lang/chicken/PLIST
--- a/lang/chicken/PLIST        Wed Nov 16 22:27:38 2005 +0000
+++ b/lang/chicken/PLIST        Wed Nov 16 22:36:40 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/01/16 15:11:30 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/11/16 22:36:40 rillig Exp $
 bin/chicken
 bin/chicken-config
 bin/chicken-profile
@@ -11,11 +11,7 @@
 include/chicken-config.h
 include/chicken.h
 lib/libchicken.la
-lib/libsrfi-chicken.la
-lib/libstuffed-chicken.la
 lib/libuchicken.la
-lib/libusrfi-chicken.la
-lib/libustuffed-chicken.la
 man/man1/chicken-config.1
 man/man1/chicken-profile.1
 man/man1/chicken-setup.1
@@ -23,22 +19,13 @@
 man/man1/csc.1
 man/man1/csi.1
 share/chicken/banner.scm
-share/chicken/chicken-default-entry-points.scm
-share/chicken/chicken-entry-points.scm
 share/chicken/chicken-ffi-macros.scm
-share/chicken/chicken-highlevel-macros.scm
 share/chicken/chicken-match-macros.scm
 share/chicken/chicken-more-macros.scm
-share/chicken/test-infrastructure-hygienic-local.scm
-share/chicken/test-infrastructure-hygienic.scm
-share/chicken/test-infrastructure-lowlevel-local.scm
-share/chicken/test-infrastructure-lowlevel.scm
-share/chicken/test-infrastructure.scm
 share/doc/chicken/ChangeLog
 share/doc/chicken/LICENSE
 share/doc/chicken/README
 share/doc/chicken/chicken.html
-share/doc/chicken/format.txt
 @dirrm share/doc/chicken
 @dirrm share/chicken
 @exec ${MKDIR} %D/lib/chicken
diff -r 44545012aa8f -r 6a03719e9255 lang/chicken/distinfo
--- a/lang/chicken/distinfo     Wed Nov 16 22:27:38 2005 +0000
+++ b/lang/chicken/distinfo     Wed Nov 16 22:36:40 2005 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.13 2005/02/24 09:03:06 agc Exp $
+$NetBSD: distinfo,v 1.14 2005/11/16 22:36:40 rillig Exp $
 
-SHA1 (chicken-1.89.tar.gz) = 3827964c057bb2008ae2e1e8f39b75ba883d862c
-RMD160 (chicken-1.89.tar.gz) = dab4f487db6599958b7d4106d948222ddf4554fa
-Size (chicken-1.89.tar.gz) = 3881868 bytes
-SHA1 (patch-aa) = 52b02ba8ccb2db3117419a1324e56f4cbcb7e577
-SHA1 (patch-ab) = ccc38246417e0145e3172ba7faf0e22dfffe32f8
+SHA1 (chicken-2.2.tar.gz) = 216692d24dcc6962bdfa83dee527335d9800b523
+RMD160 (chicken-2.2.tar.gz) = 4cf88ca4c2ccd0b85cbc12b0f8211f1c5e1e0154
+Size (chicken-2.2.tar.gz) = 3604051 bytes
+SHA1 (patch-aa) = 6caf2b3f93527498a5bc8b0847339a037db915d5
+SHA1 (patch-ab) = 23ecb37a510d2a9b14411b5c7484661e6ae24a2d
 SHA1 (patch-ac) = 427ea4b8b0cae4bd5852c5fd9e10eeedafee552f
-SHA1 (patch-ad) = 191cfbb643a7856baa9695330b11e08ba34f2b4d
diff -r 44545012aa8f -r 6a03719e9255 lang/chicken/patches/patch-aa
--- a/lang/chicken/patches/patch-aa     Wed Nov 16 22:27:38 2005 +0000
+++ b/lang/chicken/patches/patch-aa     Wed Nov 16 22:36:40 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2004/09/05 18:31:59 seb Exp $
+$NetBSD: patch-aa,v 1.9 2005/11/16 22:36:40 rillig Exp $
 
---- Makefile.am.orig   2004-07-07 19:34:07.000000000 +0200
+--- Makefile.am.orig   2005-07-12 15:56:39.000000000 +0200
 +++ Makefile.am
-@@ -269,8 +269,8 @@ pkgdata_DATA = chicken-match-macros.scm 
+@@ -254,8 +254,8 @@ pkgdata_DATA = chicken-match-macros.scm 
  
  # Install docs and sources.
  install-data-local : chicken.html
@@ -13,12 +13,3 @@
        $(mkinstalldirs) $(DESTDIR)$(pkglibdir)
  
  chicken.html: chicken.texi
-@@ -489,7 +489,7 @@ paranoid :
- .PHONY : test
- 
- test :
--      cd testsuites; $(MAKE) CC="$(CC)" CHICKEN="../chicken" LIBDIR=../.libs CFLAGS="$(CFLAGS)"; cd ..
-+      cd testsuites; $(MAKE) CHICKEN="../chicken" LIBDIR=../.libs; cd ..
- 
- 
- # Benchmarks:
diff -r 44545012aa8f -r 6a03719e9255 lang/chicken/patches/patch-ab
--- a/lang/chicken/patches/patch-ab     Wed Nov 16 22:27:38 2005 +0000
+++ b/lang/chicken/patches/patch-ab     Wed Nov 16 22:36:40 2005 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.6 2004/09/05 18:31:59 seb Exp $
+$NetBSD: patch-ab,v 1.7 2005/11/16 22:36:40 rillig Exp $
 
---- Makefile.in.orig   2004-08-19 18:37:55.000000000 +0200
+--- Makefile.in.orig   2005-07-13 18:18:22.000000000 +0200
 +++ Makefile.in
-@@ -472,7 +472,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
+@@ -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
++        $(AUTOMAKE) --foreign  --ignore-deps Makefile
  Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
  
-@@ -1343,8 +1343,8 @@ csc.scm: csc.scm.in
+@@ -1596,8 +1596,8 @@ csc.scm: csc.scm.in
  
  # Install docs and sources.
  install-data-local : chicken.html
@@ -22,12 +22,3 @@
        $(mkinstalldirs) $(DESTDIR)$(pkglibdir)
  
  chicken.html: chicken.texi
-@@ -1533,7 +1533,7 @@ paranoid :
- .PHONY : test
- 
- test :
--      cd testsuites; $(MAKE) CC="$(CC)" CHICKEN="../chicken" LIBDIR=../.libs CFLAGS="$(CFLAGS)"; cd ..
-+      cd testsuites; $(MAKE) CHICKEN="../chicken" LIBDIR=../.libs; cd ..
- 
- # Benchmarks:
- 
diff -r 44545012aa8f -r 6a03719e9255 lang/chicken/patches/patch-ad
--- a/lang/chicken/patches/patch-ad     Wed Nov 16 22:27:38 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/09/05 18:31:59 seb Exp $
-
---- testsuites/makefile.in.orig        2004-06-27 23:25:12.000000000 +0200
-+++ testsuites/makefile.in
-@@ -1,5 +1,9 @@
- # makefile for Chicken test-suite
- 
-+SHELL= @SHELL@
-+
-+top_builddir = ..
-+
- # XXX WARNING XXX
- # This makefile will remove *.c files, you've been warned.
- 
-@@ -8,29 +12,32 @@ TESTCASES = test-example test-r5rs test-
- .PHONY : all quicktests $(TESTCASES)
- 
- INCDIR = ..
--CHICKEN = chicken
-+CHICKEN = ../chicken
- CSI = csi
- CHICKENFLAGS = -hygienic -include-path .. -optimize-level 1
- LIBDIR = ..
- CCOPTS = `../chicken-config -cflags | sed s%-I@prefix@/include%%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@
-+
- all : $(TESTCASES)
- 
- test-example :
--      $(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 ./$@
- 
- 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 ./$@
- 
- 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 ./$@
- 
- clean:
-       rm -f *.c $(TESTCASES)



Home | Main Index | Thread Index | Old Index