Fri May 30 17:10:04 2008 UTC ()
update to 1.8.5
changes:
-new module: `(srfi srfi-88)'
-New `postfix' read option, for SRFI-88 keyword syntax
-Some I/O primitives have been inlined, which improves I/O performance
-New object-based traps infrastructure
-New support for working on Guile code from within Emacs
-bugfixes

pkgsrc note: added a patch which affects builds without thread
 support only (fixes crash on termination)

approved by gdt


(drochner)
diff -r1.85 -r1.86 pkgsrc/lang/guile/Makefile
diff -r1.20 -r1.21 pkgsrc/lang/guile/PLIST
diff -r1.35 -r1.36 pkgsrc/lang/guile/distinfo
diff -r1.4 -r0 pkgsrc/lang/guile/patches/patch-aj
diff -r0 -r1.8 pkgsrc/lang/guile/patches/patch-ak
cvs diff -r1.85 -r1.86 pkgsrc/lang/guile/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/guile/Attic/Makefile 2008/03/29 05:12:16 1.85
+++ pkgsrc/lang/guile/Attic/Makefile 2008/05/30 17:10:04 1.86
@@ -1,41 +1,43 @@ @@ -1,41 +1,43 @@
1# $NetBSD: Makefile,v 1.85 2008/03/29 05:12:16 tnn Exp $ 1# $NetBSD: Makefile,v 1.86 2008/05/30 17:10:04 drochner Exp $
2 2
3DISTNAME= guile-1.8.4 3DISTNAME= guile-1.8.5
4PKGREVISION= 2 
5CATEGORIES= lang 4CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_GNU:=guile/} 5MASTER_SITES= ${MASTER_SITE_GNU:=guile/}
7 6
8MAINTAINER= gdt@NetBSD.org 7MAINTAINER= gdt@NetBSD.org
9HOMEPAGE= http://www.gnu.org/software/guile/guile.html 8HOMEPAGE= http://www.gnu.org/software/guile/guile.html
10COMMENT= GNU's Ubiquitous Intelligent Language for Extension 9COMMENT= GNU's Ubiquitous Intelligent Language for Extension
11 10
12CONFLICTS= guile14<1.4.1nb1 guile-oops-[0-9]* 11CONFLICTS= guile14<1.4.1nb1 guile-oops-[0-9]*
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
17USE_TOOLS+= gmake makeinfo 16USE_TOOLS+= gmake makeinfo
18USE_LIBTOOL= YES 17USE_LIBTOOL= YES
19USE_GNU_READLINE= YES 18USE_GNU_READLINE= YES
20PTHREAD_AUTO_VARS= YES 19PTHREAD_AUTO_VARS= YES
21INFO_FILES= YES 20INFO_FILES= YES
 21PKGCONFIG_OVERRIDE= guile-1.8.pc.in
22 22
23# XXX Make this conditional on the problematic systems. 23# XXX Make this conditional on the problematic systems.
24# couldn't figure out how to work around an error on solaris-2.9/sparc with gcc when 24# couldn't figure out how to work around an error on solaris-2.9/sparc with gcc when
25# compiling ${WRKSRC}/libguile/filesys.c. The warning is that readdir64_r was missing 25# compiling ${WRKSRC}/libguile/filesys.c. The warning is that readdir64_r was missing
26# a prototype. 26# a prototype.
27CONFIGURE_ARGS+= --disable-error-on-warning 27CONFIGURE_ARGS+= --disable-error-on-warning
28 28
 29#CONFIGURE_ARGS+= --without-threads
 30
29TEST_DIRS= . 31TEST_DIRS= .
30TEST_TARGET= check 32TEST_TARGET= check
31 33
32OWN_DIRS= ${PREFIX}/share/guile/site 34OWN_DIRS= ${PREFIX}/share/guile/site
33 35
34.include "../../mk/bsd.prefs.mk" 36.include "../../mk/bsd.prefs.mk"
35 37
36# scmconfig.h will be rebuilt first thing. This hack is here because 38# scmconfig.h will be rebuilt first thing. This hack is here because
37# gen-scmconfig.c includes string.h (from /usr/include) which in turn 39# gen-scmconfig.c includes string.h (from /usr/include) which in turn
38# tries to include /usr/include/strings.h but instead the compiler picks 40# tries to include /usr/include/strings.h but instead the compiler picks
39# up ./strings.h which tries to include scmconfig.h which doesn't exist 41# up ./strings.h which tries to include scmconfig.h which doesn't exist
40# yet. While not a clean fix, this seems to work around the problem. 42# yet. While not a clean fix, this seems to work around the problem.
41# 43#
cvs diff -r1.20 -r1.21 pkgsrc/lang/guile/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/guile/Attic/PLIST 2008/02/22 02:28:06 1.20
+++ pkgsrc/lang/guile/Attic/PLIST 2008/05/30 17:10:04 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.20 2008/02/22 02:28:06 gdt Exp $ 1@comment $NetBSD: PLIST,v 1.21 2008/05/30 17:10:04 drochner Exp $
2bin/guile 2bin/guile
3bin/guile-config 3bin/guile-config
4bin/guile-snarf 4bin/guile-snarf
5bin/guile-tools 5bin/guile-tools
6include/guile/gh.h 6include/guile/gh.h
7include/guile/readline.h 7include/guile/readline.h
8include/guile/srfi/srfi-1.h 8include/guile/srfi/srfi-1.h
9include/guile/srfi/srfi-13.h 9include/guile/srfi/srfi-13.h
10include/guile/srfi/srfi-14.h 10include/guile/srfi/srfi-14.h
11include/guile/srfi/srfi-4.h 11include/guile/srfi/srfi-4.h
12include/guile/srfi/srfi-60.h 12include/guile/srfi/srfi-60.h
13include/libguile.h 13include/libguile.h
14include/libguile/__scm.h 14include/libguile/__scm.h
@@ -111,48 +111,60 @@ include/libguile/vectors.h @@ -111,48 +111,60 @@ include/libguile/vectors.h
111include/libguile/version.h 111include/libguile/version.h
112include/libguile/vports.h 112include/libguile/vports.h
113include/libguile/weaks.h 113include/libguile/weaks.h
114info/goops.info 114info/goops.info
115info/guile-tut.info 115info/guile-tut.info
116info/guile.info 116info/guile.info
117info/r5rs.info 117info/r5rs.info
118lib/libguile-srfi-srfi-1-v-3.la 118lib/libguile-srfi-srfi-1-v-3.la
119lib/libguile-srfi-srfi-13-14-v-3.la 119lib/libguile-srfi-srfi-13-14-v-3.la
120lib/libguile-srfi-srfi-4-v-3.la 120lib/libguile-srfi-srfi-4-v-3.la
121lib/libguile-srfi-srfi-60-v-2.la 121lib/libguile-srfi-srfi-60-v-2.la
122lib/libguile.la 122lib/libguile.la
123lib/libguilereadline-v-17.la 123lib/libguilereadline-v-17.la
 124lib/pkgconfig/guile-1.8.pc
124share/aclocal/guile.m4 125share/aclocal/guile.m4
 126share/emacs/site-lisp/gds-scheme.el
 127share/emacs/site-lisp/gds-server.el
 128share/emacs/site-lisp/gds.el
125share/guile/1.8/guile-procedures.txt 129share/guile/1.8/guile-procedures.txt
126share/guile/1.8/ice-9/and-let-star.scm 130share/guile/1.8/ice-9/and-let-star.scm
127share/guile/1.8/ice-9/boot-9.scm 131share/guile/1.8/ice-9/boot-9.scm
128share/guile/1.8/ice-9/buffered-input.scm 132share/guile/1.8/ice-9/buffered-input.scm
129share/guile/1.8/ice-9/calling.scm 133share/guile/1.8/ice-9/calling.scm
130share/guile/1.8/ice-9/channel.scm 134share/guile/1.8/ice-9/channel.scm
131share/guile/1.8/ice-9/common-list.scm 135share/guile/1.8/ice-9/common-list.scm
132share/guile/1.8/ice-9/debug.scm 136share/guile/1.8/ice-9/debug.scm
133share/guile/1.8/ice-9/debugger.scm 137share/guile/1.8/ice-9/debugger.scm
134share/guile/1.8/ice-9/debugger/command-loop.scm 138share/guile/1.8/ice-9/debugger/command-loop.scm
135share/guile/1.8/ice-9/debugger/commands.scm 139share/guile/1.8/ice-9/debugger/commands.scm
136share/guile/1.8/ice-9/debugger/state.scm 140share/guile/1.8/ice-9/debugger/state.scm
137share/guile/1.8/ice-9/debugger/trc.scm 141share/guile/1.8/ice-9/debugger/trc.scm
138share/guile/1.8/ice-9/debugger/utils.scm 142share/guile/1.8/ice-9/debugger/utils.scm
 143share/guile/1.8/ice-9/debugging/example-fns.scm
 144share/guile/1.8/ice-9/debugging/ice-9-debugger-extensions.scm
 145share/guile/1.8/ice-9/debugging/steps.scm
 146share/guile/1.8/ice-9/debugging/trace.scm
 147share/guile/1.8/ice-9/debugging/traps.scm
 148share/guile/1.8/ice-9/debugging/trc.scm
139share/guile/1.8/ice-9/deprecated.scm 149share/guile/1.8/ice-9/deprecated.scm
140share/guile/1.8/ice-9/documentation.scm 150share/guile/1.8/ice-9/documentation.scm
141share/guile/1.8/ice-9/emacs.scm 151share/guile/1.8/ice-9/emacs.scm
142share/guile/1.8/ice-9/expect.scm 152share/guile/1.8/ice-9/expect.scm
143share/guile/1.8/ice-9/format.scm 153share/guile/1.8/ice-9/format.scm
144share/guile/1.8/ice-9/ftw.scm 154share/guile/1.8/ice-9/ftw.scm
145share/guile/1.8/ice-9/gap-buffer.scm 155share/guile/1.8/ice-9/gap-buffer.scm
 156share/guile/1.8/ice-9/gds-client.scm
 157share/guile/1.8/ice-9/gds-server.scm
146share/guile/1.8/ice-9/getopt-long.scm 158share/guile/1.8/ice-9/getopt-long.scm
147share/guile/1.8/ice-9/hcons.scm 159share/guile/1.8/ice-9/hcons.scm
148share/guile/1.8/ice-9/history.scm 160share/guile/1.8/ice-9/history.scm
149share/guile/1.8/ice-9/lineio.scm 161share/guile/1.8/ice-9/lineio.scm
150share/guile/1.8/ice-9/list.scm 162share/guile/1.8/ice-9/list.scm
151share/guile/1.8/ice-9/ls.scm 163share/guile/1.8/ice-9/ls.scm
152share/guile/1.8/ice-9/mapping.scm 164share/guile/1.8/ice-9/mapping.scm
153share/guile/1.8/ice-9/match.scm 165share/guile/1.8/ice-9/match.scm
154share/guile/1.8/ice-9/networking.scm 166share/guile/1.8/ice-9/networking.scm
155share/guile/1.8/ice-9/null.scm 167share/guile/1.8/ice-9/null.scm
156share/guile/1.8/ice-9/occam-channel.scm 168share/guile/1.8/ice-9/occam-channel.scm
157share/guile/1.8/ice-9/optargs.scm 169share/guile/1.8/ice-9/optargs.scm
158share/guile/1.8/ice-9/poe.scm 170share/guile/1.8/ice-9/poe.scm
@@ -256,31 +268,33 @@ share/guile/1.8/srfi/srfi-17.scm @@ -256,31 +268,33 @@ share/guile/1.8/srfi/srfi-17.scm
256share/guile/1.8/srfi/srfi-19.scm 268share/guile/1.8/srfi/srfi-19.scm
257share/guile/1.8/srfi/srfi-2.scm 269share/guile/1.8/srfi/srfi-2.scm
258share/guile/1.8/srfi/srfi-26.scm 270share/guile/1.8/srfi/srfi-26.scm
259share/guile/1.8/srfi/srfi-31.scm 271share/guile/1.8/srfi/srfi-31.scm
260share/guile/1.8/srfi/srfi-34.scm 272share/guile/1.8/srfi/srfi-34.scm
261share/guile/1.8/srfi/srfi-35.scm 273share/guile/1.8/srfi/srfi-35.scm
262share/guile/1.8/srfi/srfi-37.scm 274share/guile/1.8/srfi/srfi-37.scm
263share/guile/1.8/srfi/srfi-39.scm 275share/guile/1.8/srfi/srfi-39.scm
264share/guile/1.8/srfi/srfi-4.scm 276share/guile/1.8/srfi/srfi-4.scm
265share/guile/1.8/srfi/srfi-6.scm 277share/guile/1.8/srfi/srfi-6.scm
266share/guile/1.8/srfi/srfi-60.scm 278share/guile/1.8/srfi/srfi-60.scm
267share/guile/1.8/srfi/srfi-69.scm 279share/guile/1.8/srfi/srfi-69.scm
268share/guile/1.8/srfi/srfi-8.scm 280share/guile/1.8/srfi/srfi-8.scm
 281share/guile/1.8/srfi/srfi-88.scm
269share/guile/1.8/srfi/srfi-9.scm 282share/guile/1.8/srfi/srfi-9.scm
270@exec ${MKDIR} %D/share/guile/site 283@exec ${MKDIR} %D/share/guile/site
271@dirrm share/guile/site 284@dirrm share/guile/site
272@dirrm share/guile/1.8/srfi 285@dirrm share/guile/1.8/srfi
273@dirrm share/guile/1.8/scripts 286@dirrm share/guile/1.8/scripts
274@dirrm share/guile/1.8/oop/goops 287@dirrm share/guile/1.8/oop/goops
275@dirrm share/guile/1.8/oop 288@dirrm share/guile/1.8/oop
276@dirrm share/guile/1.8/lang/elisp/primitives 289@dirrm share/guile/1.8/lang/elisp/primitives
277@dirrm share/guile/1.8/lang/elisp/internals 290@dirrm share/guile/1.8/lang/elisp/internals
278@dirrm share/guile/1.8/lang/elisp 291@dirrm share/guile/1.8/lang/elisp
279@dirrm share/guile/1.8/lang 292@dirrm share/guile/1.8/lang
 293@dirrm share/guile/1.8/ice-9/debugging
280@dirrm share/guile/1.8/ice-9/debugger 294@dirrm share/guile/1.8/ice-9/debugger
281@dirrm share/guile/1.8/ice-9 295@dirrm share/guile/1.8/ice-9
282@dirrm share/guile/1.8 296@dirrm share/guile/1.8
283@dirrm share/guile 297@dirrm share/guile
284@dirrm include/libguile 298@dirrm include/libguile
285@dirrm include/guile/srfi 299@dirrm include/guile/srfi
286@dirrm include/guile 300@dirrm include/guile
cvs diff -r1.35 -r1.36 pkgsrc/lang/guile/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/guile/Attic/distinfo 2008/02/27 12:19:45 1.35
+++ pkgsrc/lang/guile/Attic/distinfo 2008/05/30 17:10:04 1.36
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.35 2008/02/27 12:19:45 gdt Exp $ 1$NetBSD: distinfo,v 1.36 2008/05/30 17:10:04 drochner Exp $
2 2
3SHA1 (guile-1.8.4.tar.gz) = 1e80fe242acfde2bfa39fd1e8409a8f010e24e2b 3SHA1 (guile-1.8.5.tar.gz) = 3ef611cf5c4998a5bdfc7935765bb68730038614
4RMD160 (guile-1.8.4.tar.gz) = 58a502e553519b7f4e409ede361ad12141f20fec 4RMD160 (guile-1.8.5.tar.gz) = 7f8ab70e1c524f7c20a65977b13c2575eeb61655
5Size (guile-1.8.4.tar.gz) = 3821388 bytes 5Size (guile-1.8.5.tar.gz) = 3933369 bytes
6SHA1 (patch-aa) = 37fdeb8171b13468bfd0fa4e45aaf1770b8668ea 6SHA1 (patch-aa) = 37fdeb8171b13468bfd0fa4e45aaf1770b8668ea
7SHA1 (patch-ae) = c3e5065408082978df5b6ddd62e47dda8ab41f40 7SHA1 (patch-ae) = c3e5065408082978df5b6ddd62e47dda8ab41f40
8SHA1 (patch-ag) = 8aeb781ba43597f37b1ce4aaa2fb0baba2e4ce9c 8SHA1 (patch-ag) = 8aeb781ba43597f37b1ce4aaa2fb0baba2e4ce9c
9SHA1 (patch-ah) = 7a33742c2b4ae21a6e673ceeccc48ccae6a26ba3 9SHA1 (patch-ah) = 7a33742c2b4ae21a6e673ceeccc48ccae6a26ba3
10SHA1 (patch-aj) = e00579d933cec744538851b62d372a027f20b6b6 10SHA1 (patch-ak) = 6639ea95471a76893b0b074dcbfbd139a1571309
File Deleted: pkgsrc/lang/guile/patches/Attic/patch-aj
File Added: pkgsrc/lang/guile/patches/Attic/patch-ak
$NetBSD: patch-ak,v 1.8 2008/05/30 17:10:04 drochner Exp $

--- libguile/null-threads.c.orig	2008-01-04 14:43:50.000000000 +0100
+++ libguile/null-threads.c
@@ -47,8 +47,10 @@ int
 scm_i_pthread_key_create (scm_i_pthread_key_t *key,
 			  void (*destr_func) (void *))
 {
+#if 0 /* keys are needed by other atexit() functions */
   if (all_keys == NULL)
     atexit (destroy_keys);
+#endif
 
   key->next = all_keys;
   all_keys = key;