>Number:         30783
>Category:       pkg
>Synopsis:       The Chicken Scheme interpreter has just had its 2.0 release.  pkgsrc should be updated
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Jul 19 16:46:00 +0000 2005
>Originator:     Peter Bex
>Release:        NetBSD 2.0
>Organization:
n/a
>Environment:
	
	
System: NetBSD frohike.nvie.com 2.0 NetBSD 2.0 (FROHIKE) #0: Wed Dec 22 10:00:59 CET 2004 sjamaan@frohike.nvie.com:/usr/src/sys/arch/i386/compile/FROHIKE i386
Architecture: i386
Machine: i386
>Description:
	Please update Chicken (lang/chicken) to 2.0.  Patches below.
>How-To-Repeat:
	n/a
>Fix:

This update has been categorised as follows; first the diffs to files that
have been only slightly modified, then as files which have been completely
changed.

------------------------
Diffs to existing files:
------------------------

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/chicken/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile	22 May 2005 20:08:09 -0000	1.18
+++ Makefile	19 Jul 2005 15:31:16 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.18 2005/05/22 20:08:09 jlam Exp $
 #
 
-DISTNAME=	chicken-1.89
+DISTNAME=	chicken-2.0
 CATEGORIES=	lang
 MASTER_SITES=	http://www.call-with-current-continuation.org/
 
@@ -12,14 +12,10 @@
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 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"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/lang/chicken/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- PLIST	16 Jan 2005 15:11:30 -0000	1.10
+++ PLIST	19 Jul 2005 15:31:16 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/01/16 15:11:30 jmmv Exp $
+@comment $NetBSD$
 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
@@ -26,14 +22,8 @@
 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
==================================================================

----------
New files:
----------

distinfo:
===========================================
$NetBSD$
 
SHA1 (chicken-2.0.tar.gz) = d269158c215d9528b41990236e36fc720f12b465
RMD160 (chicken-2.0.tar.gz) = af0e6a4e3d49105eb6df8bf94e6ed514df23251c
Size (chicken-2.0.tar.gz) = 3526028 bytes
SHA1 (patch-aa) = 6caf2b3f93527498a5bc8b0847339a037db915d5
SHA1 (patch-ab) = 23ecb37a510d2a9b14411b5c7484661e6ae24a2d
SHA1 (patch-ac) = 6d30d1b3048de22f9c8ac246373ef459edfe4737
===========================================

patch-aa:
==========================================
$NetBSD$

--- Makefile.am.orig	2005-07-12 15:56:39.000000000 +0200
+++ Makefile.am
@@ -254,8 +254,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)$(prefix)/share/doc/chicken
+	-for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(prefix)/share/doc/chicken; done
 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
 
 chicken.html: chicken.texi
==========================================

patch-ab:
==========================================
$NetBSD$

--- Makefile.in.orig	2005-07-13 18:18:22.000000000 +0200
+++ 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
 
 # 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)$(prefix)/share/doc/chicken
+	-for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(prefix)/share/doc/chicken; done
 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
 
 chicken.html: chicken.texi
==========================================

patch-ac:
==========================================
$NetBSD$

--- chicken-config.in.orig	2005-05-01 11:31:47.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%"
+       fi
+       ;;
 esac 
 
 UNSAFE=""
==========================================

(patch-ad can be removed since there's no more testsuite)

>Unformatted: