4 files changed, 25 insertions, 13 deletions

diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index d3003bf3a5cd..83e5d1c0b9ad 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	scm
-PORTVERSION=	5d4
-PORTREVISION=	1
+PORTVERSION=	5d5
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.swiss.ai.mit.edu/pub/scm/
-DISTFILES=	scm5d4.zip slib2d2.zip slib-psd1-3.tar.gz
+MASTER_SITES=	http://swissnet.ai.mit.edu/ftpdir/scm/
+DISTFILES=	scm5d5.zip slib2d3.zip slib-psd1-3.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
-EXTRACT_ONLY=	scm5d4.zip slib2d2.zip
+EXTRACT_ONLY=	scm5d5.zip slib2d3.zip
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_ZIP=	yes
+USE_GMAKE=	yes
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 ALL_TARGET=	scmlit
 MAN1=		scm.1
@@ -26,10 +26,11 @@ MAN1=		scm.1
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 SCM_DATA=	COPYING Iedline.scm Init${PORTVERSION}.scm Link.scm \
-		Macexp.scm Macro.scm Transcen.scm Tscript.scm mkimpcat.scm
+		Macexp.scm Macro.scm Transcen.scm Tscript.scm mkimpcat.scm \
+		r4rstest.scm
 
 post-extract:
-	@${TAR} -C ${WRKDIR} -zxf ${_DISTDIR}/slib-psd1-3.tar.gz
+	@${TAR} -C ${WRKDIR} -zxf ${DISTDIR}/slib-psd1-3.tar.gz
 
 do-configure:
 	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \
@@ -44,14 +45,13 @@ post-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/scm ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/scmlit ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/scm.1 ${MANPREFIX}/man/man1
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/require.scm ${DATADIR}
 .for file in ${SCM_DATA}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}
 .endfor
-	@touch ${DATADIR}/implcat
-	@touch ${DATADIR}/slibcat
 	@${MKDIR} ${DATADIR}/slib
 	${INSTALL_DATA} ${WRKDIR}/slib/*.scm ${DATADIR}/slib
 	@${MKDIR} ${DATADIR}/slib/psd
@@ -60,5 +60,6 @@ do-install:
 	@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 ${DATADIR} && ${PREFIX}/bin/scm -lmkimpcat.scm
 
 .include <bsd.port.mk>
diff --git a/lang/scm/distinfo b/lang/scm/distinfo
index fac08a2db42c..c005ff49b142 100644
--- a/lang/scm/distinfo
+++ b/lang/scm/distinfo
@@ -1,3 +1,3 @@
-MD5 (scm5d4.zip) = 47766436d48679cb578bccd7903ee6de
-MD5 (slib2d2.zip) = c8d645ff30513fd4c946339c072f598a
+MD5 (scm5d5.zip) = b9ccb5ccb8cfe4f8c533ef010d354215
+MD5 (slib2d3.zip) = 43345c1d378d2ec7fe83666dcf1fa054
 MD5 (slib-psd1-3.tar.gz) = 81f5d0b2cb4cc1bf51ad4ed3e40b6769
diff --git a/lang/scm/pkg-descr b/lang/scm/pkg-descr
index d72267612f90..dd26869dd6d5 100644
--- a/lang/scm/pkg-descr
+++ b/lang/scm/pkg-descr
@@ -28,3 +28,5 @@ reason for this port.  This means test.scm will fail on 3 tests in section 6.1.
 If strict R4S compliance is important to you, recompile w/o the SICP flag.
 
 							Jeffrey Hsu
+
+WWW: http://swissnet.ai.mit.edu/~jaffer/SCM.html
diff --git a/lang/scm/pkg-plist b/lang/scm/pkg-plist
index bc9459482a79..423f5425da6f 100644
--- a/lang/scm/pkg-plist
+++ b/lang/scm/pkg-plist
@@ -1,4 +1,5 @@
 bin/scm
+bin/scmlit
 @unexec install-info --delete %D/info/slib.info %D/info/dir
 @unexec install-info --delete %D/info/scm.info %D/info/dir
 info/scm.info
@@ -15,6 +16,7 @@ share/scm/Transcen.scm
 share/scm/Tscript.scm
 share/scm/implcat
 share/scm/mkimpcat.scm
+share/scm/r4rstest.scm
 share/scm/require.scm
 share/scm/slib/Bev2slib.scm
 share/scm/slib/Template.scm
@@ -30,10 +32,15 @@ share/scm/slib/charplot.scm
 share/scm/slib/cltime.scm
 share/scm/slib/coerce.scm
 share/scm/slib/collect.scm
+share/scm/slib/color.scm
+share/scm/slib/colornam.scm
+share/scm/slib/colorspc.scm
 share/scm/slib/comlist.scm
 share/scm/slib/comparse.scm
 share/scm/slib/cring.scm
+share/scm/slib/daylight.scm
 share/scm/slib/db2html.scm
+share/scm/slib/dbcom.scm
 share/scm/slib/dbrowse.scm
 share/scm/slib/dbutil.scm
 share/scm/slib/debug.scm
@@ -62,6 +69,7 @@ share/scm/slib/logical.scm
 share/scm/slib/macrotst.scm
 share/scm/slib/macwork.scm
 share/scm/slib/makcrc.scm
+share/scm/slib/matfile.scm
 share/scm/slib/mbe.scm
 share/scm/slib/minimize.scm
 share/scm/slib/mklibcat.scm
@@ -72,6 +80,7 @@ share/scm/slib/mwdenote.scm
 share/scm/slib/mwexpand.scm
 share/scm/slib/mwsynrul.scm
 share/scm/slib/nclients.scm
+share/scm/slib/null.scm
 share/scm/slib/obj2str.scm
 share/scm/slib/object.scm
 share/scm/slib/paramlst.scm
@@ -119,6 +128,7 @@ share/scm/slib/scmacro.scm
 share/scm/slib/selfset.scm
 share/scm/slib/sierpinski.scm
 share/scm/slib/simetrix.scm
+share/scm/slib/solid.scm
 share/scm/slib/sort.scm
 share/scm/slib/soundex.scm
 share/scm/slib/srfi-1.scm
@@ -128,11 +138,10 @@ share/scm/slib/strcase.scm
 share/scm/slib/strport.scm
 share/scm/slib/strsrch.scm
 share/scm/slib/structure.scm
+share/scm/slib/subarray.scm
 share/scm/slib/synchk.scm
 share/scm/slib/synclo.scm
 share/scm/slib/synrul.scm
-share/scm/slib/tek40.scm
-share/scm/slib/tek41.scm
 share/scm/slib/timezone.scm
 share/scm/slib/trace.scm
 share/scm/slib/tree.scm