3 files changed, 50 insertions, 36 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index d51826428307..f1d8e0aa595d 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	guile
-# Version required:	1.3
+# Version required:	1.3.4
 # Date created:		2 November 1997
 # Whom:			jseger@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	guile-1.3
+DISTNAME=	guile-1.3.4
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	guile
@@ -14,7 +14,11 @@ MASTER_SITE_SUBDIR=	guile
 MAINTAINER=	jseger@FreeBSD.org
 
 GNU_CONFIGURE=	YES
-MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+
+USE_LIBTOOL=	yes
+
+
+PLIST_SUB=	GUILE_VER=1.3.4
 
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index 0cb8d4c0cc98..6b09d9f189e5 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1 +1 @@
-MD5 (guile-1.3.tar.gz) = f5bb26483e76bd45eb6e445e1b660a6f
+MD5 (guile-1.3.4.tar.gz) = 12e3f749d6333474931da7732adb55ef
diff --git a/lang/guile/pkg-plist b/lang/guile/pkg-plist
index 32edfc773a1a..e6419860a416 100644
--- a/lang/guile/pkg-plist
+++ b/lang/guile/pkg-plist
@@ -17,6 +17,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
@@ -26,16 +27,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
@@ -48,8 +53,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
@@ -59,6 +64,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
@@ -84,41 +90,45 @@ include/libguile.h
 info/data-rep.info
 @exec install-info %D/info/data-rep.info %D/info/dir
 lib/libguile.a
-lib/libguile.la
 lib/libguile.so
-lib/libguile.so.4
+lib/libguile.so.6
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 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
+share/guile/%%GUILE_VER%%/ice-9/and-let*.scm
+share/guile/%%GUILE_VER%%/ice-9/boot-9.scm
+share/guile/%%GUILE_VER%%/ice-9/calling.scm
+share/guile/%%GUILE_VER%%/ice-9/common-list.scm
+share/guile/%%GUILE_VER%%/ice-9/debug.scm
+share/guile/%%GUILE_VER%%/ice-9/debugger.scm
+share/guile/%%GUILE_VER%%/ice-9/emacs.scm
+share/guile/%%GUILE_VER%%/ice-9/expect.scm
+share/guile/%%GUILE_VER%%/ice-9/format.scm
+share/guile/%%GUILE_VER%%/ice-9/getopt-gnu-style.scm
+share/guile/%%GUILE_VER%%/ice-9/getopt-long.scm
+share/guile/%%GUILE_VER%%/ice-9/hcons.scm
+share/guile/%%GUILE_VER%%/ice-9/lineio.scm
+share/guile/%%GUILE_VER%%/ice-9/ls.scm
+share/guile/%%GUILE_VER%%/ice-9/mapping.scm
+share/guile/%%GUILE_VER%%/ice-9/optargs.scm
+share/guile/%%GUILE_VER%%/ice-9/poe.scm
+share/guile/%%GUILE_VER%%/ice-9/popen.scm
+share/guile/%%GUILE_VER%%/ice-9/psyntax.pp
+share/guile/%%GUILE_VER%%/ice-9/psyntax.ss
+share/guile/%%GUILE_VER%%/ice-9/q.scm
+share/guile/%%GUILE_VER%%/ice-9/r4rs.scm
+share/guile/%%GUILE_VER%%/ice-9/regex.scm
+share/guile/%%GUILE_VER%%/ice-9/runq.scm
+share/guile/%%GUILE_VER%%/ice-9/session.scm
+share/guile/%%GUILE_VER%%/ice-9/slib.scm
+share/guile/%%GUILE_VER%%/ice-9/streams.scm
+share/guile/%%GUILE_VER%%/ice-9/string-fun.scm
+share/guile/%%GUILE_VER%%/ice-9/syncase.scm
+share/guile/%%GUILE_VER%%/ice-9/tags.scm
+share/guile/%%GUILE_VER%%/ice-9/threads.scm
 @dirrm include/guile
 @dirrm include/libguile
-@dirrm share/guile/1.3/ice-9
-@dirrm share/guile/1.3
+@dirrm share/guile/%%GUILE_VER%%/ice-9
+@dirrm share/guile/%%GUILE_VER%%
 @dirrm share/guile