5 files changed, 67 insertions, 66 deletions
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index aa76947a734..b882fda9d6a 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 1998/09/14 19:36:10 garbled Exp $
+# $NetBSD: Makefile,v 1.7 1998/11/15 20:17:56 perry Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp
 #
 
-DISTNAME=	guile-1.2
+DISTNAME=	guile-1.3
+CONFLICTS=	guile-1.2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 
diff --git a/lang/guile/files/md5 b/lang/guile/files/md5
index cd3a078d74e..b70c1245f80 100644
--- a/lang/guile/files/md5
+++ b/lang/guile/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:24:57 agc Exp $
+$NetBSD: md5,v 1.3 1998/11/15 20:17:56 perry Exp $
 
-MD5 (guile-1.2.tar.gz) = b218697051baee95a0d023af83ce6491
+MD5 (guile-1.3.tar.gz) = f5bb26483e76bd45eb6e445e1b660a6f
diff --git a/lang/guile/patches/patch-aa b/lang/guile/patches/patch-aa
index 9995d710d6a..b49f186c543 100644
--- a/lang/guile/patches/patch-aa
+++ b/lang/guile/patches/patch-aa
@@ -1,14 +1,21 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:09:02 agc Exp $
+$NetBSD: patch-aa,v 1.3 1998/11/15 20:17:57 perry Exp $
 
---- libguile/stime.c.orig	Sun Nov  2 14:40:38 1997
-+++ libguile/stime.c	Sun Nov  2 14:44:52 1997
-@@ -81,7 +81,9 @@
- extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
- #endif
+--- 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
  
-+#ifndef HAVE_STRPTIME
- char *strptime ();
-+#endif
++if false; then
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
- /* This should be figured out by autoconf.  */
- #ifdef CLK_TCK
+@@ -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; }
+-
++fi
+ 
+ echo $ac_n "checking for AIX""... $ac_c" 1>&6
+ echo "configure:1371: checking for AIX" >&5
diff --git a/lang/guile/patches/patch-ab b/lang/guile/patches/patch-ab
deleted file mode 100644
index ba8885856c8..00000000000
--- a/lang/guile/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 11:09:02 agc Exp $
-
---- configure.orig	Fri Jul 17 15:25:15 1998
-+++ configure	Fri Jul 17 15:25:40 1998
-@@ -1167,7 +1167,7 @@
- 
- 
- 
--
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(top_builddir)/libtool'
- 
-@@ -1216,7 +1216,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; }
--
-+fi
- 
- echo $ac_n "checking for AIX""... $ac_c" 1>&6
- echo "configure:1223: checking for AIX" >&5
diff --git a/lang/guile/pkg/PLIST b/lang/guile/pkg/PLIST
index b09cbf07171..c4428481f96 100644
--- a/lang/guile/pkg/PLIST
+++ b/lang/guile/pkg/PLIST
@@ -1,26 +1,27 @@
-@comment $NetBSD: PLIST,v 1.2 1998/07/17 19:39:42 tv Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/11/15 20:17:57 perry Exp $
 bin/guile
+bin/guile-config
 bin/guile-snarf
 include/guile/gh.h
-include/libguile/scmconfig.h
+include/libguile.h
 include/libguile/__scm.h
 include/libguile/alist.h
-include/libguile/append.h
 include/libguile/arbiters.h
 include/libguile/async.h
 include/libguile/backtrace.h
 include/libguile/boolean.h
 include/libguile/chars.h
 include/libguile/continuations.h
+include/libguile/coop-defs.h
 include/libguile/debug.h
 include/libguile/dynl.h
 include/libguile/dynwind.h
 include/libguile/eq.h
 include/libguile/error.h
 include/libguile/eval.h
-include/libguile/extchrs.h
 include/libguile/feature.h
 include/libguile/filesys.h
+include/libguile/fluids.h
 include/libguile/fports.h
 include/libguile/gc.h
 include/libguile/gdb_interface.h
@@ -31,32 +32,34 @@ include/libguile/hash.h
 include/libguile/hashtab.h
 include/libguile/init.h
 include/libguile/ioext.h
+include/libguile/iselect.h
 include/libguile/kw.h
 include/libguile/list.h
 include/libguile/load.h
 include/libguile/mallocs.h
 include/libguile/markers.h
-include/libguile/mbstrings.h
 include/libguile/net_db.h
 include/libguile/numbers.h
+include/libguile/objects.h
 include/libguile/objprop.h
 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/read.h
+include/libguile/readline.h
+include/libguile/regex-posix.h
 include/libguile/root.h
-include/libguile/scmhob.h
+include/libguile/scmconfig.h
 include/libguile/scmsigs.h
 include/libguile/script.h
-include/libguile/sequences.h
 include/libguile/simpos.h
 include/libguile/smob.h
+include/libguile/snarf.h
 include/libguile/socket.h
 include/libguile/srcprop.h
 include/libguile/stackchk.h
@@ -70,6 +73,7 @@ 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/variable.h
@@ -77,30 +81,41 @@ include/libguile/vectors.h
 include/libguile/version.h
 include/libguile/vports.h
 include/libguile/weaks.h
-include/libguile/snarf.h
-include/libguile/threads.h
-include/libguile/coop-defs.h
-include/libguile.h
+info/data-rep.info
+info/dir
 lib/libguile.a
-lib/libguile.so.2.0
+lib/libguile.so.4.0
 share/aclocal/guile.m4
-share/aclocal/threads.m4
-share/guile/1.2/ice-9/boot-9.scm
-share/guile/1.2/ice-9/debug.scm
-share/guile/1.2/ice-9/expect.scm
-share/guile/1.2/ice-9/hcons.scm
-share/guile/1.2/ice-9/lineio.scm
-share/guile/1.2/ice-9/mapping.scm
-share/guile/1.2/ice-9/poe.scm
-share/guile/1.2/ice-9/regex.scm
-share/guile/1.2/ice-9/slib.scm
-share/guile/1.2/ice-9/tags.scm
-share/guile/1.2/ice-9/threads.scm
-share/guile/1.2/ice-9/r4rs.scm
-share/guile/1.2/ice-9/version.scm
+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.2/ice-9
-@dirrm share/guile/1.2
+@dirrm share/guile/1.3/ice-9
+@dirrm share/guile/1.3
 @dirrm share/guile
 @unexec rmdir %D/share/aclocal 2>/dev/null || true