Update guile to 1.3.2.

6 files changed, 69 insertions, 70 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index b9a1b9757dc..2bd536c9b92 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.13 1999/05/20 20:09:51 tron Exp $
+# $NetBSD: Makefile,v 1.14 1999/08/29 21:41:13 jlam Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp
 #
 
-DISTNAME=	guile-1.3
+DISTNAME=	guile-1.3.2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=guile/}
 
 MAINTAINER=	perry@piermont.com
-HOMEPAGE=	http://www.gnu.org/software/guile/guile.html
+HOMEPAGE=	http://www.red-bean.com/guile/
 
 USE_LIBTOOL=	yes
-GNU_CONFIGURE=	YES
-CONFIGURE_ENV=	CPPFLAGS="-Dunix"
+GNU_CONFIGURE=	yes
 
 INFO_FILES=	data-rep.info
 
diff --git a/lang/guile/files/md5 b/lang/guile/files/md5
index b70c1245f80..ae3a420400a 100644
--- a/lang/guile/files/md5
+++ b/lang/guile/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/11/15 20:17:56 perry Exp $
+$NetBSD: md5,v 1.4 1999/08/29 21:41:14 jlam Exp $
 
-MD5 (guile-1.3.tar.gz) = f5bb26483e76bd45eb6e445e1b660a6f
+MD5 (guile-1.3.2.tar.gz) = 2cd260b85772ed6bee4898cf92ba711b
diff --git a/lang/guile/files/patch-sum b/lang/guile/files/patch-sum
index 33f18066719..335b2d73634 100644
--- a/lang/guile/files/patch-sum
+++ b/lang/guile/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.2 1999/07/20 18:39:33 perry Exp $
+$NetBSD: patch-sum,v 1.3 1999/08/29 21:41:14 jlam Exp $
 
-MD5 (patch-aa) = ef1dfee819c833df574c57e8804cee0c
-MD5 (patch-ab) = 274b45d3d23fdf008550b3086a31707e
+MD5 (patch-aa) = 7b8630a045f8c8ee78da939ce7c18016
+MD5 (patch-ac) = 041b714c85e6485bab451d8faf4bb33f
+MD5 (patch-ad) = 1854e0c1d449008d16810f9db5a1e08f
diff --git a/lang/guile/patches/patch-aa b/lang/guile/patches/patch-aa
index b49f186c543..55b8b4b83b2 100644
--- a/lang/guile/patches/patch-aa
+++ b/lang/guile/patches/patch-aa
@@ -1,21 +1,20 @@
-$NetBSD: patch-aa,v 1.3 1998/11/15 20:17:57 perry Exp $
+$NetBSD: patch-aa,v 1.4 1999/08/29 21:41:14 jlam Exp $
 
---- configure.orig	Tue Oct 20 00:34:18 1998
-+++ configure	Sun Nov 15 14:35:36 1998
-@@ -1319,6 +1319,7 @@
-   echo "$ac_t""no" 1>&6
- fi
+--- configure.orig	Sun Aug  1 06:35:52 1999
++++ configure	Sun Aug 29 13:26:34 1999
+@@ -1606,13 +1606,14 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
  
 +if false; then
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
-@@ -1364,7 +1365,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+ exec 5>>./config.log
 -
 +fi
  
  echo $ac_n "checking for AIX""... $ac_c" 1>&6
- echo "configure:1371: checking for AIX" >&5
+ echo "configure:1619: checking for AIX" >&5
diff --git a/lang/guile/patches/patch-ab b/lang/guile/patches/patch-ab
deleted file mode 100644
index 0233f0cc9ec..00000000000
--- a/lang/guile/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.5 1999/07/20 18:40:42 perry Exp $
-
---- libguile/ports.h	1998/10/30 08:22:50	1.33
-+++ libguile/ports.h	1998/11/05 16:02:55	1.34
-@@ -93,7 +93,7 @@
- #define SCM_CRDY	(32L<<16) /* Should char-ready? return #t? */
- 
- /* A mask used to clear the char-ready port flag. */
--#define SCM_CUC		0x001fffffL
-+#define SCM_CUC		(~SCM_CRDY)
- 
- #define SCM_PORTP(x) (SCM_TYP7(x)==scm_tc7_port)
- #define SCM_OPPORTP(x) (((0x7f | SCM_OPN) & SCM_CAR(x))==(scm_tc7_port | SCM_OPN))
-
-
diff --git a/lang/guile/pkg/PLIST b/lang/guile/pkg/PLIST
index 690fb013c3c..b52c6d47d96 100644
--- a/lang/guile/pkg/PLIST
+++ b/lang/guile/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1999/02/11 19:17:32 tv Exp $
+@comment $NetBSD: PLIST,v 1.6 1999/08/29 21:41:14 jlam Exp $
 bin/guile
 bin/guile-config
 bin/guile-snarf
@@ -19,6 +19,7 @@ include/libguile/dynwind.h
 include/libguile/eq.h
 include/libguile/error.h
 include/libguile/eval.h
+include/libguile/evalext.h
 include/libguile/feature.h
 include/libguile/filesys.h
 include/libguile/fluids.h
@@ -28,16 +29,20 @@ include/libguile/gdb_interface.h
 include/libguile/gdbint.h
 include/libguile/genio.h
 include/libguile/gsubr.h
+include/libguile/guardians.h
 include/libguile/hash.h
 include/libguile/hashtab.h
 include/libguile/init.h
 include/libguile/ioext.h
 include/libguile/iselect.h
+include/libguile/keywords.h
 include/libguile/kw.h
+include/libguile/lang.h
 include/libguile/list.h
 include/libguile/load.h
+include/libguile/macros.h
 include/libguile/mallocs.h
-include/libguile/markers.h
+include/libguile/modules.h
 include/libguile/net_db.h
 include/libguile/numbers.h
 include/libguile/objects.h
@@ -50,8 +55,8 @@ include/libguile/print.h
 include/libguile/procprop.h
 include/libguile/procs.h
 include/libguile/ramap.h
+include/libguile/random.h
 include/libguile/read.h
-include/libguile/readline.h
 include/libguile/regex-posix.h
 include/libguile/root.h
 include/libguile/scmconfig.h
@@ -61,6 +66,7 @@ include/libguile/simpos.h
 include/libguile/smob.h
 include/libguile/snarf.h
 include/libguile/socket.h
+include/libguile/sort.h
 include/libguile/srcprop.h
 include/libguile/stackchk.h
 include/libguile/stacks.h
@@ -85,38 +91,47 @@ include/libguile/weaks.h
 info/data-rep.info
 @exec install-info %D/info/data-rep.info %D/info/dir
 lib/libguile.a
-lib/libguile.so.4.0
+lib/libguile.so.5.0
+lib/libguilereadline.a
+lib/libguilereadline.so.0.0
 share/aclocal/guile.m4
 share/aclocal/qthreads.m4
-share/guile/1.3/ice-9/boot-9.scm
-share/guile/1.3/ice-9/calling.scm
-share/guile/1.3/ice-9/common-list.scm
-share/guile/1.3/ice-9/debug.scm
-share/guile/1.3/ice-9/emacs.scm
-share/guile/1.3/ice-9/expect.scm
-share/guile/1.3/ice-9/getopt-gnu-style.scm
-share/guile/1.3/ice-9/hcons.scm
-share/guile/1.3/ice-9/lineio.scm
-share/guile/1.3/ice-9/ls.scm
-share/guile/1.3/ice-9/mapping.scm
-share/guile/1.3/ice-9/poe.scm
-share/guile/1.3/ice-9/psyntax.pp
-share/guile/1.3/ice-9/psyntax.ss
-share/guile/1.3/ice-9/q.scm
-share/guile/1.3/ice-9/r4rs.scm
-share/guile/1.3/ice-9/readline.scm
-share/guile/1.3/ice-9/regex.scm
-share/guile/1.3/ice-9/runq.scm
-share/guile/1.3/ice-9/session.scm
-share/guile/1.3/ice-9/slib.scm
-share/guile/1.3/ice-9/string-fun.scm
-share/guile/1.3/ice-9/syncase.scm
-share/guile/1.3/ice-9/tags.scm
-share/guile/1.3/ice-9/threads.scm
-share/guile/1.3/ice-9/version.scm
-@dirrm include/guile
-@dirrm include/libguile
-@dirrm share/guile/1.3/ice-9
-@dirrm share/guile/1.3
+share/guile/1.3.2/ice-9/and-let*.scm
+share/guile/1.3.2/ice-9/boot-9.scm
+share/guile/1.3.2/ice-9/calling.scm
+share/guile/1.3.2/ice-9/common-list.scm
+share/guile/1.3.2/ice-9/debug.scm
+share/guile/1.3.2/ice-9/emacs.scm
+share/guile/1.3.2/ice-9/expect.scm
+share/guile/1.3.2/ice-9/format.scm
+share/guile/1.3.2/ice-9/getopt-gnu-style.scm
+share/guile/1.3.2/ice-9/getopt-long.scm
+share/guile/1.3.2/ice-9/hcons.scm
+share/guile/1.3.2/ice-9/lineio.scm
+share/guile/1.3.2/ice-9/ls.scm
+share/guile/1.3.2/ice-9/mapping.scm
+share/guile/1.3.2/ice-9/optargs.scm
+share/guile/1.3.2/ice-9/poe.scm
+share/guile/1.3.2/ice-9/popen.scm
+share/guile/1.3.2/ice-9/psyntax.pp
+share/guile/1.3.2/ice-9/psyntax.ss
+share/guile/1.3.2/ice-9/q.scm
+share/guile/1.3.2/ice-9/r4rs.scm
+share/guile/1.3.2/ice-9/readline.scm
+share/guile/1.3.2/ice-9/regex.scm
+share/guile/1.3.2/ice-9/runq.scm
+share/guile/1.3.2/ice-9/session.scm
+share/guile/1.3.2/ice-9/slib.scm
+share/guile/1.3.2/ice-9/streams.scm
+share/guile/1.3.2/ice-9/string-fun.scm
+share/guile/1.3.2/ice-9/syncase.scm
+share/guile/1.3.2/ice-9/tags.scm
+share/guile/1.3.2/ice-9/threads.scm
+share/guile/1.3.2/ice-9/version.scm
+share/guile/readline-activator.scm
+@dirrm share/guile/1.3.2/ice-9
+@dirrm share/guile/1.3.2
 @dirrm share/guile
+@dirrm include/libguile
+@dirrm include/guile
 @unexec rmdir %D/share/aclocal 2>/dev/null || true