Update Guile to 1.6.1.

Changes since Guile 1.6.0:

* Changes to the distribution
	** Guile now provide and uses an "effective" version number.
	** Guile now uses it's own version of libltdl.
	** The Emacs interface has been fixed.
	** The SRFI C headers are now installed.
* Changes to Scheme functions and syntax
	** New function: effective-version
* Changes to the C interface
	** New function: scm_effective_version

7 files changed, 220 insertions, 97 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 3a58ad85a04..0303a5d73b3 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2002/08/27 06:08:47 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2003/01/06 10:38:06 uebayasi Exp $
 
-DISTNAME=		guile-1.4.1
+DISTNAME=		guile-1.6.1
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=guile/}
 
diff --git a/lang/guile/PLIST b/lang/guile/PLIST
index 71209f6478b..2fe283a966b 100644
--- a/lang/guile/PLIST
+++ b/lang/guile/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2002/08/27 06:05:26 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/01/06 10:38:06 uebayasi Exp $
 bin/guile
-bin/guile-config
 bin/guile-snarf
-include/guile-readline/readline.h
-include/guile/gh.h
-include/libguile.h
+bin/guile-config
+bin/guile-tools
 include/libguile/__scm.h
 include/libguile/alist.h
 include/libguile/arbiters.h
@@ -14,14 +12,17 @@ include/libguile/boolean.h
 include/libguile/chars.h
 include/libguile/continuations.h
 include/libguile/coop-defs.h
-include/libguile/debug-malloc.h
 include/libguile/debug.h
+include/libguile/debug-malloc.h
+include/libguile/deprecation.h
 include/libguile/dynl.h
 include/libguile/dynwind.h
+include/libguile/environments.h
 include/libguile/eq.h
 include/libguile/error.h
 include/libguile/eval.h
 include/libguile/evalext.h
+include/libguile/extensions.h
 include/libguile/feature.h
 include/libguile/filesys.h
 include/libguile/fluids.h
@@ -29,6 +30,7 @@ include/libguile/fports.h
 include/libguile/gc.h
 include/libguile/gdb_interface.h
 include/libguile/gdbint.h
+include/libguile/goops.h
 include/libguile/gsubr.h
 include/libguile/guardians.h
 include/libguile/hash.h
@@ -52,16 +54,20 @@ include/libguile/options.h
 include/libguile/pairs.h
 include/libguile/ports.h
 include/libguile/posix.h
+include/libguile/regex-posix.h
 include/libguile/print.h
 include/libguile/procprop.h
 include/libguile/procs.h
-include/libguile/ramap.h
+include/libguile/properties.h
 include/libguile/random.h
+include/libguile/ramap.h
+include/libguile/rdelim.h
 include/libguile/read.h
-include/libguile/regex-posix.h
 include/libguile/root.h
+include/libguile/rw.h
 include/libguile/scmconfig.h
 include/libguile/scmsigs.h
+include/libguile/validate.h
 include/libguile/script.h
 include/libguile/simpos.h
 include/libguile/smob.h
@@ -78,74 +84,179 @@ include/libguile/strorder.h
 include/libguile/strports.h
 include/libguile/struct.h
 include/libguile/symbols.h
-include/libguile/tag.h
 include/libguile/tags.h
 include/libguile/threads.h
 include/libguile/throw.h
 include/libguile/unif.h
-include/libguile/validate.h
+include/libguile/values.h
 include/libguile/variable.h
 include/libguile/vectors.h
 include/libguile/version.h
 include/libguile/vports.h
 include/libguile/weaks.h
+include/guile/gh.h
+include/guile/srfi/srfi-4.h
+include/guile/srfi/srfi-13.h
+include/guile/srfi/srfi-14.h
+include/guile-readline/readline.h
+include/libguile.h
 @unexec ${INSTALL_INFO} --delete %D/info/guile.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/guile-tut.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/goops.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/r5rs.info %D/info/dir
 info/guile.info
 info/guile.info-1
 info/guile.info-2
+info/guile.info-3
+info/guile.info-4
+info/guile.info-5
+info/guile.info-6
+info/guile.info-7
+info/guile.info-8
+info/guile.info-9
+info/guile.info-10
+info/guile.info-11
+info/guile.info-12
+info/guile.info-13
+info/guile.info-14
+info/guile.info-15
+info/guile.info-16
+info/guile.info-17
+info/guile.info-18
+info/guile.info-19
+info/guile.info-20
+info/guile.info-21
+info/guile.info-22
+info/guile.info-23
+info/guile-tut.info
+info/goops.info
+info/goops.info-1
+info/goops.info-2
+info/goops.info-3
+info/r5rs.info
+info/r5rs.info-1
+info/r5rs.info-2
+info/r5rs.info-3
+info/r5rs.info-4
+info/r5rs.info-5
+@exec ${INSTALL_INFO} %D/info/r5rs.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/goops.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/guile-tut.info %D/info/dir
 @exec ${INSTALL_INFO} %D/info/guile.info %D/info/dir
-lib/libguile.a
-lib/libguile.la
 lib/libguile.so
-lib/libguile.so.10
-lib/libguile.so.10.0
-lib/libguilereadline.a
-lib/libguilereadline.la
-lib/libguilereadline.so
-lib/libguilereadline.so.0
-lib/libguilereadline.so.0.1
+lib/libguile.so.15
+lib/libguile.so.15.0
+lib/libguile.la
+lib/libguile.a
+lib/libguilereadline-v-12.so
+lib/libguilereadline-v-12.so.15
+lib/libguilereadline-v-12.so.15.0
+lib/libguilereadline-v-12.la
+lib/libguilereadline-v-12.a
+lib/libguile-srfi-srfi-4-v-1.so
+lib/libguile-srfi-srfi-4-v-1.so.1
+lib/libguile-srfi-srfi-4-v-1.so.1.0
+lib/libguile-srfi-srfi-4-v-1.la
+lib/libguile-srfi-srfi-4-v-1.a
+lib/libguile-srfi-srfi-13-14-v-1.so
+lib/libguile-srfi-srfi-13-14-v-1.so.1
+lib/libguile-srfi-srfi-13-14-v-1.so.1.0
+lib/libguile-srfi-srfi-13-14-v-1.la
+lib/libguile-srfi-srfi-13-14-v-1.a
 share/aclocal/guile.m4
-share/guile/${PKGVERSION}/ice-9/and-let*.scm
-share/guile/${PKGVERSION}/ice-9/and-let-star.scm
-share/guile/${PKGVERSION}/ice-9/arrays.scm
-share/guile/${PKGVERSION}/ice-9/boot-9.scm
-share/guile/${PKGVERSION}/ice-9/calling.scm
-share/guile/${PKGVERSION}/ice-9/common-list.scm
-share/guile/${PKGVERSION}/ice-9/debug.scm
-share/guile/${PKGVERSION}/ice-9/debugger.scm
-share/guile/${PKGVERSION}/ice-9/documentation.scm
-share/guile/${PKGVERSION}/ice-9/emacs.scm
-share/guile/${PKGVERSION}/ice-9/expect.scm
-share/guile/${PKGVERSION}/ice-9/format.scm
-share/guile/${PKGVERSION}/ice-9/getopt-long.scm
-share/guile/${PKGVERSION}/ice-9/hcons.scm
-share/guile/${PKGVERSION}/ice-9/lineio.scm
-share/guile/${PKGVERSION}/ice-9/ls.scm
-share/guile/${PKGVERSION}/ice-9/mapping.scm
-share/guile/${PKGVERSION}/ice-9/networking.scm
-share/guile/${PKGVERSION}/ice-9/optargs.scm
-share/guile/${PKGVERSION}/ice-9/poe.scm
-share/guile/${PKGVERSION}/ice-9/popen.scm
-share/guile/${PKGVERSION}/ice-9/posix.scm
-share/guile/${PKGVERSION}/ice-9/psyntax.pp
-share/guile/${PKGVERSION}/ice-9/psyntax.ss
-share/guile/${PKGVERSION}/ice-9/q.scm
-share/guile/${PKGVERSION}/ice-9/r4rs.scm
-share/guile/${PKGVERSION}/ice-9/readline.scm
-share/guile/${PKGVERSION}/ice-9/regex.scm
-share/guile/${PKGVERSION}/ice-9/runq.scm
-share/guile/${PKGVERSION}/ice-9/session.scm
-share/guile/${PKGVERSION}/ice-9/slib.scm
-share/guile/${PKGVERSION}/ice-9/streams.scm
-share/guile/${PKGVERSION}/ice-9/string-fun.scm
-share/guile/${PKGVERSION}/ice-9/syncase.scm
-share/guile/${PKGVERSION}/ice-9/tags.scm
-share/guile/${PKGVERSION}/ice-9/threads.scm
-share/guile/guile-procedures.txt
-@dirrm share/guile/${PKGVERSION}/ice-9
-@dirrm share/guile/${PKGVERSION}
-@dirrm share/guile
+share/guile/1.6/oop/goops/active-slot.scm
+share/guile/1.6/oop/goops/compile.scm
+share/guile/1.6/oop/goops/composite-slot.scm
+share/guile/1.6/oop/goops/describe.scm
+share/guile/1.6/oop/goops/dispatch.scm
+share/guile/1.6/oop/goops/internal.scm
+share/guile/1.6/oop/goops/save.scm
+share/guile/1.6/oop/goops/stklos.scm
+share/guile/1.6/oop/goops/util.scm
+share/guile/1.6/oop/goops/old-define-method.scm
+share/guile/1.6/oop/goops.scm
+share/guile/1.6/guile-procedures.txt
+share/guile/1.6/ice-9/and-let-star.scm
+share/guile/1.6/ice-9/arrays.scm
+share/guile/1.6/ice-9/boot-9.scm
+share/guile/1.6/ice-9/calling.scm
+share/guile/1.6/ice-9/common-list.scm
+share/guile/1.6/ice-9/debug.scm
+share/guile/1.6/ice-9/debugger.scm
+share/guile/1.6/ice-9/documentation.scm
+share/guile/1.6/ice-9/emacs.scm
+share/guile/1.6/ice-9/expect.scm
+share/guile/1.6/ice-9/format.scm
+share/guile/1.6/ice-9/getopt-long.scm
+share/guile/1.6/ice-9/hcons.scm
+share/guile/1.6/ice-9/lineio.scm
+share/guile/1.6/ice-9/ls.scm
+share/guile/1.6/ice-9/mapping.scm
+share/guile/1.6/ice-9/match.scm
+share/guile/1.6/ice-9/networking.scm
+share/guile/1.6/ice-9/null.scm
+share/guile/1.6/ice-9/optargs.scm
+share/guile/1.6/ice-9/poe.scm
+share/guile/1.6/ice-9/popen.scm
+share/guile/1.6/ice-9/posix.scm
+share/guile/1.6/ice-9/psyntax.pp
+share/guile/1.6/ice-9/psyntax.ss
+share/guile/1.6/ice-9/q.scm
+share/guile/1.6/ice-9/r4rs.scm
+share/guile/1.6/ice-9/r5rs.scm
+share/guile/1.6/ice-9/rdelim.scm
+share/guile/1.6/ice-9/receive.scm
+share/guile/1.6/ice-9/regex.scm
+share/guile/1.6/ice-9/runq.scm
+share/guile/1.6/ice-9/rw.scm
+share/guile/1.6/ice-9/safe-r5rs.scm
+share/guile/1.6/ice-9/safe.scm
+share/guile/1.6/ice-9/session.scm
+share/guile/1.6/ice-9/slib.scm
+share/guile/1.6/ice-9/stack-catch.scm
+share/guile/1.6/ice-9/streams.scm
+share/guile/1.6/ice-9/string-fun.scm
+share/guile/1.6/ice-9/syncase.scm
+share/guile/1.6/ice-9/threads.scm
+share/guile/1.6/ice-9/buffered-input.scm
+share/guile/1.6/ice-9/time.scm
+share/guile/1.6/ice-9/history.scm
+share/guile/1.6/ice-9/channel.scm
+share/guile/1.6/ice-9/pretty-print.scm
+share/guile/1.6/ice-9/ftw.scm
+share/guile/1.6/ice-9/and-let*.scm
+share/guile/1.6/ice-9/readline.scm
+share/guile/1.6/scripts/PROGRAM
+share/guile/1.6/scripts/autofrisk
+share/guile/1.6/scripts/display-commentary
+share/guile/1.6/scripts/doc-snarf
+share/guile/1.6/scripts/frisk
+share/guile/1.6/scripts/generate-autoload
+share/guile/1.6/scripts/lint
+share/guile/1.6/scripts/punify
+share/guile/1.6/scripts/read-scheme-source
+share/guile/1.6/scripts/use2dot
+share/guile/1.6/scripts/snarf-check-and-output-texi
+share/guile/1.6/scripts/snarf-guile-m4-docs
+share/guile/1.6/srfi/srfi-1.scm
+share/guile/1.6/srfi/srfi-2.scm
+share/guile/1.6/srfi/srfi-4.scm
+share/guile/1.6/srfi/srfi-6.scm
+share/guile/1.6/srfi/srfi-8.scm
+share/guile/1.6/srfi/srfi-9.scm
+share/guile/1.6/srfi/srfi-10.scm
+share/guile/1.6/srfi/srfi-11.scm
+share/guile/1.6/srfi/srfi-13.scm
+share/guile/1.6/srfi/srfi-14.scm
+share/guile/1.6/srfi/srfi-16.scm
+share/guile/1.6/srfi/srfi-17.scm
+share/guile/1.6/srfi/srfi-19.scm
 @dirrm include/libguile
 @dirrm include/guile-readline
 @dirrm include/guile
-@unexec ${RMDIR} %D/share/aclocal 2>/dev/null || ${TRUE}
+@dirrm share/guile/1.6/srfi
+@dirrm share/guile/1.6/scripts
+@dirrm share/guile/1.6/oop/goops
+@dirrm share/guile/1.6/oop
+@dirrm share/guile/1.6/ice-9
+@dirrm share/guile/1.6
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index f79d23c6659..f838c59abb3 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2002/10/23 10:38:03 bouyer Exp $
+$NetBSD: distinfo,v 1.10 2003/01/06 10:38:07 uebayasi Exp $
 
-SHA1 (guile-1.4.1.tar.gz) = 81a91ea7480ca06d1aeda94b90a89b27e9bdea7a
-Size (guile-1.4.1.tar.gz) = 1502840 bytes
-SHA1 (patch-aa) = 22a9181066193cadc3663ae43d42e9f81d55c8e1
-SHA1 (patch-ad) = c692027caed122ef840a9ef3bf78eb125b26441e
+SHA1 (guile-1.6.1.tar.gz) = 0e27193b79fd2ec4bc9daa71320bc5d34c62cfd0
+Size (guile-1.6.1.tar.gz) = 2787537 bytes
+SHA1 (patch-ad) = 180cb9e0f5dcd3e53f0b3b17d1ac0fc5016c1e36
+SHA1 (patch-af) = 7d4f1934fe57efb4f8803f5e68e6a13569e836c0
+SHA1 (patch-ag) = 33735111e799c529f42cfa97a71be8dfaa56aa8b
diff --git a/lang/guile/patches/patch-aa b/lang/guile/patches/patch-aa
deleted file mode 100644
index 4c4ee5bbe1f..00000000000
--- a/lang/guile/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2002/08/26 19:58:31 tron Exp $
-
---- doc/Makefile.in.orig	Mon May 13 22:41:34 2002
-+++ doc/Makefile.in	Mon Aug 26 21:50:55 2002
-@@ -130,7 +130,7 @@
- INFO_DEPS = guile.info
- DVIS = guile.dvi
- TEXINFOS = guile.texi
--DIST_COMMON = README $(guile_TEXINFOS) COPYING ChangeLog Makefile.am \
-+DIST_COMMON = README $(info_TEXINFOS) COPYING ChangeLog Makefile.am \
- 	Makefile.in mdate-sh stamp-vti texinfo.tex version.texi
- all: all-am
- 
diff --git a/lang/guile/patches/patch-ad b/lang/guile/patches/patch-ad
index 143b5e74076..985524c82fc 100644
--- a/lang/guile/patches/patch-ad
+++ b/lang/guile/patches/patch-ad
@@ -1,24 +1,22 @@
-$NetBSD: patch-ad,v 1.4 2002/10/23 08:59:26 bouyer Exp $
+$NetBSD: patch-ad,v 1.5 2003/01/06 10:38:08 uebayasi Exp $
 
---- guile-readline/Makefile.in.orig	Tue May 14 00:53:17 2002
-+++ guile-readline/Makefile.in	Wed Oct 23 00:45:38 2002
-@@ -94,7 +94,7 @@
- libguilereadline_la_SOURCES = readline.c
- libguilereadline_la_LIBADD = ../libguile/libguile.la
- libguilereadline_la_LDFLAGS = -version-info @LIBGUILEREADLINE_INTERFACE@ \
+--- guile-readline/Makefile.in.orig	Mon Dec 16 15:11:45 2002
++++ guile-readline/Makefile.in
+@@ -134,7 +134,7 @@
+ libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_SOURCES = readline.c
+ libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD = ../libguile/libguile.la
+ libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LDFLAGS = -version-info @LIBGUILEREADLINE_INTERFACE@ \
 -  -export-dynamic -no-undefined
 +  -export-dynamic
  
  
  BUILT_SOURCES = readline.x
-@@ -178,8 +178,8 @@
- 	$(mkinstalldirs) $(DESTDIR)$(libdir)
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \
--	    $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \
-+	    echo " $(LIBTOOL) --mode=install $(INSTALL_DATA) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \
-+	    $(LIBTOOL) --mode=install $(INSTALL_DATA) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \
- 	  else :; fi; \
- 	done
+@@ -207,7 +207,7 @@
  
+ $(ACLOCAL_M4):  configure.in 
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+-libLTLIBRARIES_INSTALL = $(INSTALL)
++libLTLIBRARIES_INSTALL = $(INSTALL_DATA)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
diff --git a/lang/guile/patches/patch-af b/lang/guile/patches/patch-af
new file mode 100644
index 00000000000..6a88d16c04e
--- /dev/null
+++ b/lang/guile/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2003/01/06 10:38:08 uebayasi Exp $
+
+--- doc/ref/Makefile.in.orig	Mon Dec 16 13:05:21 2002
++++ doc/ref/Makefile.in
+@@ -215,7 +215,7 @@
+ TEXINFOS = guile.texi
+ DATA = $(html_DATA)
+ 
+-DIST_COMMON = $(guile_TEXINFOS) $(top_srcdir)/am/pre-inst-guile \
++DIST_COMMON = $(info_TEXINFOS) $(top_srcdir)/am/pre-inst-guile \
+ 	ChangeLog Makefile.am Makefile.in mdate-sh stamp-vti \
+ 	texinfo.tex version.texi
+ all: all-am
diff --git a/lang/guile/patches/patch-ag b/lang/guile/patches/patch-ag
new file mode 100644
index 00000000000..6630e026375
--- /dev/null
+++ b/lang/guile/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2003/01/06 10:38:09 uebayasi Exp $
+
+--- doc/goops/Makefile.in.orig	Mon Dec 16 13:05:20 2002
++++ doc/goops/Makefile.in
+@@ -200,7 +200,7 @@
+ TEXINFOS = goops.texi
+ DATA = $(html_DATA)
+ 
+-DIST_COMMON = $(goops_TEXINFOS) ChangeLog Makefile.am Makefile.in
++DIST_COMMON = $(info_TEXINFOS) ChangeLog Makefile.am Makefile.in
+ all: all-am
+ 
+ .SUFFIXES: