4 files changed, 22 insertions, 15 deletions

diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index d47d8dd8fccb..155c122d3e7d 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	scm
-PORTVERSION=	5d8
+PORTVERSION=	5d9
 CATEGORIES=	lang scheme
-MASTER_SITES=	http://swissnet.ai.mit.edu/ftpdir/scm/
-DISTFILES=	scm5d8.zip slib2d6.zip slib-psd1-3.tar.gz
-EXTRACT_ONLY=	scm5d8.zip slib2d6.zip
+MASTER_SITES=	http://swissnet.ai.mit.edu/ftpdir/scm/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. OLD
+DISTFILES=	scm5d9.zip slib3a1.zip slib-psd1-3.tar.gz
+EXTRACT_ONLY=	scm5d9.zip slib3a1.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A scheme interpreter
@@ -23,7 +24,7 @@ USE_GMAKE=	yes
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 ALL_TARGET=	scmlit
 MAN1=		scm.1
-INFO=		scm slib
+INFO=		scm
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
@@ -79,8 +80,6 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/slib/psd/*.scm ${PREFIX}/lib/scm/slib/psd
 	${INSTALL_DATA} ${WRKDIR}/scm/scm.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/scm.info ${PREFIX}/info/dir
-	${INSTALL_DATA} ${WRKDIR}/slib/slib.info ${PREFIX}/info
-	@install-info ${PREFIX}/info/slib.info ${PREFIX}/info/dir
 	cd ${PREFIX}/lib/scm && ${PREFIX}/bin/scm -lmkimpcat.scm
 
 .include <bsd.port.mk>
diff --git a/lang/scm/distinfo b/lang/scm/distinfo
index e238e97224c1..72453506e84f 100644
--- a/lang/scm/distinfo
+++ b/lang/scm/distinfo
@@ -1,3 +1,3 @@
-MD5 (scm5d8.zip) = d833318595a3bfbac7c0695f922c9146
-MD5 (slib2d6.zip) = 317ad1db777981afa6ece517bdd3a7ca
+MD5 (scm5d9.zip) = 27ca7806ca4fcb205b9f53a914853546
+MD5 (slib3a1.zip) = a8805700c4c49d48a14fc8a0c2b996f4
 MD5 (slib-psd1-3.tar.gz) = 81f5d0b2cb4cc1bf51ad4ed3e40b6769
diff --git a/lang/scm/files/patch-ac b/lang/scm/files/patch-ac
index b0e9aff737ef..73d87faf7cdc 100644
--- a/lang/scm/files/patch-ac
+++ b/lang/scm/files/patch-ac
@@ -1,9 +1,9 @@
---- build.orig	Tue Nov 26 04:04:53 2002
-+++ build	Sat Nov 30 13:11:28 2002
+--- build.orig	Mon Dec  1 07:29:36 2003
++++ build	Sun Dec  7 23:42:13 2003
 @@ -1,5 +1,5 @@
  #! /bin/sh
 -:;exec ./scmlit -no-init-file -f $0 -e"(bi)" build $*
 +:;exec $SCMLIT -no-init-file -f $0 -e"(bi)" build $*
  
- (require (in-vicinity (program-vicinity) "build.scm"))
  (require 'getopt)
+ (require 'getopt-parameters)
diff --git a/lang/scm/pkg-plist b/lang/scm/pkg-plist
index 3c91870c724e..7240a1c67624 100644
--- a/lang/scm/pkg-plist
+++ b/lang/scm/pkg-plist
@@ -30,11 +30,13 @@ lib/scm/slib/arraymap.scm
 lib/scm/slib/batch.scm
 lib/scm/slib/break.scm
 lib/scm/slib/byte.scm
+lib/scm/slib/bytenumb.scm
 lib/scm/slib/chap.scm
 lib/scm/slib/charplot.scm
 lib/scm/slib/cltime.scm
 lib/scm/slib/coerce.scm
 lib/scm/slib/collect.scm
+lib/scm/slib/collectx.scm
 lib/scm/slib/color.scm
 lib/scm/slib/colornam.scm
 lib/scm/slib/colorspc.scm
@@ -46,6 +48,7 @@ lib/scm/slib/cvs.scm
 lib/scm/slib/daylight.scm
 lib/scm/slib/db2html.scm
 lib/scm/slib/dbcom.scm
+lib/scm/slib/dbinterp.scm
 lib/scm/slib/dbrowse.scm
 lib/scm/slib/dbsyn.scm
 lib/scm/slib/dbutil.scm
@@ -61,12 +64,11 @@ lib/scm/slib/eval.scm
 lib/scm/slib/factor.scm
 lib/scm/slib/fft.scm
 lib/scm/slib/fluidlet.scm
-lib/scm/slib/format.scm
-lib/scm/slib/formatst.scm
 lib/scm/slib/genwrite.scm
 lib/scm/slib/getopt.scm
 lib/scm/slib/getparam.scm
 lib/scm/slib/glob.scm
+lib/scm/slib/grapheps.scm
 lib/scm/slib/hash.scm
 lib/scm/slib/hashtab.scm
 lib/scm/slib/html4each.scm
@@ -76,9 +78,11 @@ lib/scm/slib/lineio.scm
 lib/scm/slib/logical.scm
 lib/scm/slib/macrotst.scm
 lib/scm/slib/macwork.scm
+lib/scm/slib/manifest.scm
 lib/scm/slib/matfile.scm
 lib/scm/slib/mbe.scm
 lib/scm/slib/minimize.scm
+lib/scm/slib/mkclrnam.scm
 lib/scm/slib/mklibcat.scm
 lib/scm/slib/modular.scm
 lib/scm/slib/mulapply.scm
@@ -119,7 +123,6 @@ lib/scm/slib/rdms.scm
 lib/scm/slib/recobj.scm
 lib/scm/slib/record.scm
 lib/scm/slib/repl.scm
-lib/scm/slib/report.scm
 lib/scm/slib/require.scm
 lib/scm/slib/root.scm
 lib/scm/slib/sc2.scm
@@ -140,6 +143,9 @@ lib/scm/slib/solid.scm
 lib/scm/slib/sort.scm
 lib/scm/slib/soundex.scm
 lib/scm/slib/srfi-1.scm
+lib/scm/slib/srfi-2.scm
+lib/scm/slib/srfi-8.scm
+lib/scm/slib/srfi-9.scm
 lib/scm/slib/srfi.scm
 lib/scm/slib/stdio.scm
 lib/scm/slib/strcase.scm
@@ -151,6 +157,7 @@ lib/scm/slib/synchk.scm
 lib/scm/slib/synclo.scm
 lib/scm/slib/synrul.scm
 lib/scm/slib/timezone.scm
+lib/scm/slib/top-refs.scm
 lib/scm/slib/trace.scm
 lib/scm/slib/transact.scm
 lib/scm/slib/tree.scm
@@ -159,6 +166,7 @@ lib/scm/slib/tsort.scm
 lib/scm/slib/tzfile.scm
 lib/scm/slib/uri.scm
 lib/scm/slib/values.scm
+lib/scm/slib/vet.scm
 lib/scm/slib/withfile.scm
 lib/scm/slib/wttest.scm
 lib/scm/slib/wttree.scm