5 files changed, 17 insertions, 24 deletions

diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index b1d43792cf75..806faf9c614b 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	scm
-PORTVERSION=	5e4
+PORTVERSION=	5e5
 CATEGORIES=	lang scheme
-MASTER_SITES=	http://swissnet.ai.mit.edu/ftpdir/scm/%SUBDIR%/ \
+MASTER_SITES=	http://swiss.csail.mit.edu/ftpdir/scm/%SUBDIR%/ \
 		ftp://ftp.informatik.uni-hamburg.de/ftpmnt/inf1/pub/soft/lang/scheme/
 MASTER_SITE_SUBDIR=	. OLD
-DISTFILES=	${PORTNAME}${PORTVERSION}.zip slib3a5.zip slib-psd1-3.tar.gz
-EXTRACT_ONLY=	${PORTNAME}${PORTVERSION}.zip slib3a5.zip
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} slib-3b1.zip slib-psd1-3.tar.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} slib-3b1.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A scheme interpreter
@@ -26,7 +26,9 @@ ALL_TARGET=	scmlit
 MAN1=		scm.1
 INFO=		scm
 
-PLIST_SUB=	VERSION=${PORTVERSION}
+PLIST_SUB=	VERSION="${PORTVERSION}"
+
+SUB_FILES=	require.scm
 
 SCM_DATA=	COPYING Iedline.scm Init${PORTVERSION}.scm Link.scm \
 		Macexp.scm Macro.scm Transcen.scm Tscript.scm mkimpcat.scm \
@@ -42,10 +44,9 @@ BROKEN=		Does not compile on ${ARCH}
 
 post-extract:
 	@${TAR} -C ${WRKDIR} -zxf ${DISTDIR}/slib-psd1-3.tar.gz
-	@${CP} ${FILESDIR}/require.scm.in ${WRKDIR}/require.scm
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKDIR}/require.scm
+	@${REINPLACE_CMD} -e 's|exec ./scmlit|exec $$SCMLIT|g' ${WRKSRC}/build
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \
 		 s|%%CFLAGS%%|${CFLAGS}|g ; \
 		 s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/build.scm
diff --git a/lang/scm/distinfo b/lang/scm/distinfo
index a3d8ffb754a7..12b379c52f01 100644
--- a/lang/scm/distinfo
+++ b/lang/scm/distinfo
@@ -1,9 +1,9 @@
-MD5 (scm5e4.zip) = 984c7e2f987e12197af5aec0755b59f6
-SHA256 (scm5e4.zip) = cf49da2027192b31a9dbb4572ba32449c10baa0777c37baac14191bed34422e8
-SIZE (scm5e4.zip) = 910672
-MD5 (slib3a5.zip) = 39274e6de82af2c97bdfc6c4cc125fb0
-SHA256 (slib3a5.zip) = 3c4fbfc08de9220f456ed1cd58ca0fb49b4a8cdd4d03697fbea11d9407a16e30
-SIZE (slib3a5.zip) = 1055491
+MD5 (scm-5e5.zip) = 50805547a0eb7e6eb3240cbcbe85598f
+SHA256 (scm-5e5.zip) = 9df62d4495184d9241f316c60e15481e890cd50932d43c2747afcf557db0f537
+SIZE (scm-5e5.zip) = 910806
+MD5 (slib-3b1.zip) = 9622df4aba2fde24eeb4456d97c5add1
+SHA256 (slib-3b1.zip) = 8e3ec24d51be03ebb7357ad9a2f3554056b86dafbc9e48d1d491aeda1efa566f
+SIZE (slib-3b1.zip) = 1063227
 MD5 (slib-psd1-3.tar.gz) = 81f5d0b2cb4cc1bf51ad4ed3e40b6769
 SHA256 (slib-psd1-3.tar.gz) = 1665fc6cf572e6d8d99e81b4f6b1e65b04a095b69baebd85d0085ad552dc2955
 SIZE (slib-psd1-3.tar.gz) = 62397
diff --git a/lang/scm/files/patch-ac b/lang/scm/files/patch-ac
deleted file mode 100644
index 580475454260..000000000000
--- a/lang/scm/files/patch-ac
+++ /dev/null
@@ -1,9 +0,0 @@
---- build.orig	Wed Sep  5 02:55:56 2007
-+++ build	Thu Jan 17 00:36:34 2008
-@@ -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 "$@"
- ;;
- ;; Copyright (C) 1994-2006 Free Software Foundation, Inc.
- ;;
diff --git a/lang/scm/pkg-descr b/lang/scm/pkg-descr
index 338bab55fbc2..9c34ea63a4cd 100644
--- a/lang/scm/pkg-descr
+++ b/lang/scm/pkg-descr
@@ -21,4 +21,4 @@ By default -DSICP is turned on, with the expectation that this is the major
 reason for this port.  This means test.scm will fail on three tests in section
 6.1.  Where strict R4S compliance is important, recompile without the SICP flag.
 
-WWW: http://swissnet.ai.mit.edu/~jaffer/SCM.html
+WWW: http://swiss.csail.mit.edu/~jaffer/SCM
diff --git a/lang/scm/pkg-plist b/lang/scm/pkg-plist
index 22c6d46e2a6c..38a79ede1f89 100644
--- a/lang/scm/pkg-plist
+++ b/lang/scm/pkg-plist
@@ -92,6 +92,7 @@ lib/scm/slib/mbe.scm
 lib/scm/slib/minimize.scm
 lib/scm/slib/mkclrnam.scm
 lib/scm/slib/mklibcat.scm
+lib/scm/slib/mkpltcat.scm
 lib/scm/slib/modular.scm
 lib/scm/slib/mulapply.scm
 lib/scm/slib/mularg.scm
@@ -182,8 +183,8 @@ lib/scm/slib/vet.scm
 lib/scm/slib/withfile.scm
 lib/scm/slib/wttest.scm
 lib/scm/slib/wttree.scm
-lib/scm/slib/yasyn.scm
 lib/scm/slib/xml-parse.scm
+lib/scm/slib/yasyn.scm
 lib/scm/slibcat
 lib/scm/socket.so
 lib/scm/unix.so