5 files changed, 121 insertions, 127 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 91fa432186d7..0cd79e7630bc 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,18 +1,18 @@
-# New ports collection makefile for:    guile-iii
-# Version required:     snapshot iii
-# Date created:         29 Aug 1995
-# Whom:                 jkh@FreeBSD.ORG
+# New ports collection makefile for:	guile
+# Version required:	1.2
+# Date created:		2 November 1997
+# Whom:			jseger@FreeBSD.org
 #
-# $Id: Makefile,v 1.6 1996/11/12 02:18:26 obrien Exp $
+# $Id$
 #
 
-DISTNAME= 	guile-iii
-PKGNAME=	guile-iii
+DISTNAME=	guile-1.2
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.cygnus.com/pub/lord/guile-iii/
+MASTER_SITES=	${MASTER_SITE_GNU}
+MAINTAINER=	jseger@FreeBSD.org
 
-USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/guile-src
+GNU_CONFIGURE=	YES
+CONFIGURE_ARGS=	--disable-shared
+MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 .include <bsd.port.mk>
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index b4e3ed7e9917..856ff688c68d 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1 +1 @@
-MD5 (guile-iii.tar.gz) = e7e6d6aa557b2d142e481727d01bdeae
+MD5 (guile-1.2.tar.gz) = b218697051baee95a0d023af83ce6491
diff --git a/lang/guile/pkg-comment b/lang/guile/pkg-comment
index 47ce1f8b6995..1a6b16707e77 100644
--- a/lang/guile/pkg-comment
+++ b/lang/guile/pkg-comment
@@ -1 +1 @@
-The GNU extension language.
+GUILE - GNU's Ubiquitous Intelligent Language for Extension
diff --git a/lang/guile/pkg-descr b/lang/guile/pkg-descr
index 96ad8b192293..747952d59aa1 100644
--- a/lang/guile/pkg-descr
+++ b/lang/guile/pkg-descr
@@ -1,43 +1,5 @@
-This is Guile iii.
-
-Guile iii is a first pass at boiling Guile down to the bare bones.
-Functionality that was previously included in the Guile kitchen sink
-releases, such as Tcl/Tk support, has been moved to add on packages,
-available separately.
-
-The purpose of splitting the sources up this way is to allow different
-packages to be maintained more or less independantly and to enable
-people with very specific needs to build up an instance of Guile
-containing exactly (and only) what they need.
-
-The Guile iii is a sort of software backplane.  There are (as yet
-undocumented) conventions for structuring a release that "plugs into"
-this backplane and is built automaticly.  For example, the "gtcl"
-distribution plugs into the backplane to provide various kinds of Tcl
-integration with Guile.  That means that if you unpack "gtcl" into a
-Guile source tree and rebuild, Tcl support will be in the newly built
-version.
-
-A kitchen-sink (aka "suggested configuration") distribution of Guile,
-which includes many add-ons in the same tar file, may once again be
-made available in the near future, once the bugs are worked out of the
-backplane components.
-
-Here is how the back-plane works.  First, unpack a guile-iii distribution:
-	
-
-	% tar -zxvf guile-iii.tar.gz 	
-	[....]
-
-That will create a subdirectory called "guile-src".
-
-Then, *in the same place*, unpack a gtcltk distribution:
-
-
-	% tar -zxvf gtcltk-0.tar.gz
-
-That will unpack more files into "guile-src".
-
-From there, use the usual configure-then-make procedure, as documented
-in the file INSTALL.
-
+GUILE, GNU's Ubiquitous Intelligent Language for Extension, is a library that 
+implements the Scheme language plus various convenient facilities. It's designed
+so that you can link it into an application or utility to make it extensible. 
+Our plan is to link this library into all GNU programs that call for 
+extensibility.
diff --git a/lang/guile/pkg-plist b/lang/guile/pkg-plist
index bda6ea534323..b62a2efd8fcf 100644
--- a/lang/guile/pkg-plist
+++ b/lang/guile/pkg-plist
@@ -1,72 +1,104 @@
-include/guile/_scm.h
-include/guile/__scm.h
-include/guile/arbiters.h
-include/guile/boolean.h
-include/guile/chars.h
-include/guile/continuations.h
-include/guile/dynwind.h
-include/guile/eq.h
-include/guile/error.h
-include/guile/eval.h
-include/guile/feature.h
-include/guile/fports.h
-include/guile/files.h
-include/guile/gc.h
-include/guile/gsubr.h
-include/guile/gscm.h
-include/guile/hash.h
-include/guile/kw.h
-include/guile/lvectors.h
-include/guile/marksweep.h
-include/guile/numbers.h
-include/guile/pairs.h
-include/guile/ports.h
-include/guile/params.h
-include/guile/procs.h
-include/guile/ramap.h
-include/guile/repl.h
-include/guile/scmsigs.h
-include/guile/simpos.h
-include/guile/smob.h
-include/guile/record.h
-include/guile/stackchk.h
-include/guile/strports.h
-include/guile/struct.h
-include/guile/symbols.h
-include/guile/time.h
-include/guile/variable.h
-include/guile/vectors.h
-include/guile/vports.h
-include/guile/unif.h
-include/guile/tags.h
-include/guile/strings.h
-include/guile/strop.h
-include/guile/throw.h
-include/guile/unif.h
-include/posix.h
-include/ioext.h
-include/unix.h
-include/ctax.h
-lib/libguile.a
-lib/libgoonix.a
-lib/libctax.a
-lib/gls/ctax.scm
-lib/gls/Ginit.scm
-lib/gls/Gmodules.scm
-lib/gls/Transcen.scm
-lib/gls/defmod.scm
-lib/gls/extlibs.scm
-lib/gls/generics.scm
-lib/gls/genwrite.scm
-lib/gls/getopt.scm
-lib/gls/hashtab.scm
-lib/gls/libguile.scm
-lib/gls/logical.scm
-lib/gls/modops.scm
-lib/gls/pp.scm
-lib/gls/randinex.scm
-lib/gls/random.scm
-lib/gls/mrequire.scm
-lib/gls/require.scm
-lib/gls/test.scm
 bin/guile
+bin/guile-snarf
+include/guile/gh.h
+include/libguile/scmconfig.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/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/fports.h
+include/libguile/gc.h
+include/libguile/gdb_interface.h
+include/libguile/gdbint.h
+include/libguile/genio.h
+include/libguile/gsubr.h
+include/libguile/hash.h
+include/libguile/hashtab.h
+include/libguile/init.h
+include/libguile/ioext.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/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/root.h
+include/libguile/scmhob.h
+include/libguile/scmsigs.h
+include/libguile/script.h
+include/libguile/sequences.h
+include/libguile/simpos.h
+include/libguile/smob.h
+include/libguile/socket.h
+include/libguile/srcprop.h
+include/libguile/stackchk.h
+include/libguile/stacks.h
+include/libguile/stime.h
+include/libguile/strings.h
+include/libguile/strop.h
+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/throw.h
+include/libguile/unif.h
+include/libguile/variable.h
+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
+lib/libguile.a
+lib/libguile.la
+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
+@dirrm include/guile
+@dirrm include/libguile
+@dirrm share/guile/1.2/ice-9
+@dirrm share/guile/1.2
+@dirrm share/guile