5 files changed, 191 insertions, 162 deletions

diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index 06d9581d26e2..49b4f7bf03f5 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -6,41 +6,57 @@
 #
 
 PORTNAME=	scm
-PORTVERSION=	5d2
+PORTVERSION=	5d3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU} \
-		ftp://ftp.swiss.ai.mit.edu/pub/scm/OLD/
+		ftp://ftp.swiss.ai.mit.edu/pub/scm/
 MASTER_SITE_SUBDIR=	jacal
-DISTFILES=	scm5d2.zip slib2c7.zip slib-psd1-3.tar.gz scmconfig4e3.tar.gz
+DISTFILES=	scm5d3.zip slib2c8.zip slib-psd1-3.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
-EXTRACT_ONLY=	scm5d2.zip slib2c7.zip
+EXTRACT_ONLY=	scm5d3.zip slib2c8.zip
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_ZIP=	yes
-GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/scm
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
+ALL_TARGET=	scmlit
 MAN1=		scm.1
 
-IMPLINIT=	${PREFIX}/libdata/scm/Init.scm
+PLIST_SUB=	VERSION=${PORTVERSION}
+
+SCM_DATA=	COPYING Iedline.scm Init${PORTVERSION}.scm Link.scm \
+		Macexp.scm Macro.scm Transcen.scm Tscript.scm mkimpcat.scm
 
 post-extract:
-.for file in scmconfig4e3.tar.gz slib-psd1-3.tar.gz
-	@${TAR} -C ${WRKDIR} -zxf ${_DISTDIR}/${file}
-.endfor
+	@${TAR} -C ${WRKDIR} -zxf ${_DISTDIR}/slib-psd1-3.tar.gz
 
-post-configure:
-	@${ECHO} '#ifndef IMPLINIT' > ${WRKSRC}/scmflags.h
-	@${ECHO} '#define IMPLINIT "${IMPLINIT}"' >> ${WRKSRC}/scmflags.h
-	@${ECHO} '#endif' >> ${WRKSRC}/scmflags.h
-
-post-install:
-	@touch ${PREFIX}/libdata/scm/implcat
-	@touch ${PREFIX}/libdata/scm/slibcat
-	@${MKDIR} ${PREFIX}/libdata/slib
-	${INSTALL_DATA} ${WRKDIR}/slib/*.scm ${PREFIX}/libdata/slib
-	@${MKDIR} ${PREFIX}/libdata/slib/psd
-	${INSTALL_DATA} ${WRKDIR}/slib/psd/*.scm ${PREFIX}/libdata/slib/psd
+do-configure:
+	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \
+		${FILESDIR}/require.scm.in > ${WRKDIR}/require.scm
+
+post-build:
+	cd ${WRKSRC}; SCMLIT="./scmlit" ${SH} ./build \
+		-F "arrays bignums cautious inexact" \
+		-h system \
+		-o scm \
+		-s "${PREFIX}/share/scm/"
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/scm ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/scm.1 ${PREFIX}/man/man1
+	@${MKDIR} ${PREFIX}/share/scm
+	${INSTALL_DATA} ${WRKDIR}/require.scm ${PREFIX}/share/scm
+.for file in ${SCM_DATA}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/scm
+.endfor
+	@touch ${PREFIX}/share/scm/implcat
+	@touch ${PREFIX}/share/scm/slibcat
+	@${MKDIR} ${PREFIX}/share/scm/slib
+	${INSTALL_DATA} ${WRKDIR}/slib/*.scm ${PREFIX}/share/scm/slib
+	@${MKDIR} ${PREFIX}/share/scm/slib/psd
+	${INSTALL_DATA} ${WRKDIR}/slib/psd/*.scm ${PREFIX}/share/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
diff --git a/lang/scm/distinfo b/lang/scm/distinfo
index a915d6061f2e..13673be2ac75 100644
--- a/lang/scm/distinfo
+++ b/lang/scm/distinfo
@@ -1,4 +1,3 @@
-MD5 (scm5d2.zip) = 38106b6118ca8b322c75c9738e88a08b
-MD5 (slib2c7.zip) = 53ea05afc7ba9638d804b6cf565306ee
-MD5 (slib-psd1-3.tar.gz) = 60b8f5356cffddb93272f9bbd535b663
-MD5 (scmconfig4e3.tar.gz) = 46be6c942302504026443e332d00a20d
+MD5 (scm5d3.zip) = eb39df756b6ea44a1a92e9cc63db54a2
+MD5 (slib2c8.zip) = 26d74cbbaea3be998ff639c4429dbacb
+MD5 (slib-psd1-3.tar.gz) = 81f5d0b2cb4cc1bf51ad4ed3e40b6769
diff --git a/lang/scm/files/patch-ac b/lang/scm/files/patch-ac
new file mode 100644
index 000000000000..d0abc95a15fa
--- /dev/null
+++ b/lang/scm/files/patch-ac
@@ -0,0 +1,9 @@
+--- build.orig	Mon Feb  7 06:05:12 2000
++++ build	Tue Aug 15 05:17:25 2000
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-:;exec scmlit -f $0 -e"(bi)" build $*
++:;exec $SCMLIT -f $0 -e"(bi)" build $*
+ 
+ (require (in-vicinity (program-vicinity) "build.scm"))
+ (require 'getopt)
diff --git a/lang/scm/files/require.scm.in b/lang/scm/files/require.scm.in
new file mode 100644
index 000000000000..ebc50e1a93a0
--- /dev/null
+++ b/lang/scm/files/require.scm.in
@@ -0,0 +1,2 @@
+(define (library-vicinity) "%%PREFIX%%/share/scm/slib/")
+(load (in-vicinity (library-vicinity) "require"))
diff --git a/lang/scm/pkg-plist b/lang/scm/pkg-plist
index b8e239476d94..347e7e471c98 100644
--- a/lang/scm/pkg-plist
+++ b/lang/scm/pkg-plist
@@ -5,139 +5,142 @@ info/scm.info
 info/slib.info
 @exec install-info %D/info/scm.info %D/info/dir
 @exec install-info %D/info/slib.info %D/info/dir
-libdata/scm/COPYING
-libdata/scm/Iedline.scm
-libdata/scm/Init.scm
-libdata/scm/Link.scm
-libdata/scm/Macro.scm
-libdata/scm/Transcen.scm
-libdata/scm/Tscript.scm
-libdata/scm/implcat
-libdata/scm/mkimpcat.scm
-libdata/scm/require.scm
-libdata/scm/slibcat
-libdata/slib/Bev2slib.scm
-libdata/slib/Template.scm
-libdata/slib/alist.scm
-libdata/slib/alistab.scm
-libdata/slib/array.scm
-libdata/slib/arraymap.scm
-libdata/slib/batch.scm
-libdata/slib/break.scm
-libdata/slib/byte.scm
-libdata/slib/chap.scm
-libdata/slib/charplot.scm
-libdata/slib/cltime.scm
-libdata/slib/collect.scm
-libdata/slib/comlist.scm
-libdata/slib/comparse.scm
-libdata/slib/cring.scm
-libdata/slib/dbrowse.scm
-libdata/slib/dbutil.scm
-libdata/slib/debug.scm
-libdata/slib/defmacex.scm
-libdata/slib/determ.scm
-libdata/slib/dwindtst.scm
-libdata/slib/dynamic.scm
-libdata/slib/dynwind.scm
-libdata/slib/eval.scm
-libdata/slib/factor.scm
-libdata/slib/fft.scm
-libdata/slib/fluidlet.scm
-libdata/slib/format.scm
-libdata/slib/formatst.scm
-libdata/slib/genwrite.scm
-libdata/slib/getopt.scm
-libdata/slib/getparam.scm
-libdata/slib/glob.scm
-libdata/slib/hash.scm
-libdata/slib/hashtab.scm
-libdata/slib/htmlform.scm
-libdata/slib/lineio.scm
-libdata/slib/logical.scm
-libdata/slib/macrotst.scm
-libdata/slib/macwork.scm
-libdata/slib/makcrc.scm
-libdata/slib/mbe.scm
-libdata/slib/mklibcat.scm
-libdata/slib/modular.scm
-libdata/slib/mulapply.scm
-libdata/slib/mularg.scm
-libdata/slib/mwdenote.scm
-libdata/slib/mwexpand.scm
-libdata/slib/mwsynrul.scm
-libdata/slib/nclients.scm
-libdata/slib/obj2str.scm
-libdata/slib/object.scm
-libdata/slib/paramlst.scm
-libdata/slib/plottest.scm
-libdata/slib/pp.scm
-libdata/slib/ppfile.scm
-libdata/slib/prec.scm
-libdata/slib/printf.scm
-libdata/slib/priorque.scm
-libdata/slib/process.scm
-libdata/slib/promise.scm
-libdata/slib/psd/instrum.scm
-libdata/slib/psd/pexpr.scm
-libdata/slib/psd/primitives.scm
-libdata/slib/psd/psd-slib.scm
-libdata/slib/psd/read.scm
-libdata/slib/psd/runtime.scm
-libdata/slib/psd/version.scm
-libdata/slib/psxtime.scm
-libdata/slib/qp.scm
-libdata/slib/queue.scm
-libdata/slib/r4rsyn.scm
-libdata/slib/randinex.scm
-libdata/slib/random.scm
-libdata/slib/ratize.scm
-libdata/slib/rdms.scm
-libdata/slib/recobj.scm
-libdata/slib/record.scm
-libdata/slib/repl.scm
-libdata/slib/report.scm
-libdata/slib/require.scm
-libdata/slib/root.scm
-libdata/slib/sc2.scm
-libdata/slib/sc4opt.scm
-libdata/slib/sc4sc3.scm
-libdata/slib/scaexpp.scm
-libdata/slib/scaglob.scm
-libdata/slib/scainit.scm
-libdata/slib/scamacr.scm
-libdata/slib/scanf.scm
-libdata/slib/scaoutp.scm
-libdata/slib/schmooz.scm
-libdata/slib/scmacro.scm
-libdata/slib/scmactst.scm
-libdata/slib/selfset.scm
-libdata/slib/sierpinski.scm
-libdata/slib/sort.scm
-libdata/slib/soundex.scm
-libdata/slib/stdio.scm
-libdata/slib/strcase.scm
-libdata/slib/strport.scm
-libdata/slib/strsrch.scm
-libdata/slib/struct.scm
-libdata/slib/structst.scm
-libdata/slib/structure.scm
-libdata/slib/synchk.scm
-libdata/slib/synclo.scm
-libdata/slib/synrul.scm
-libdata/slib/tek40.scm
-libdata/slib/tek41.scm
-libdata/slib/timezone.scm
-libdata/slib/trace.scm
-libdata/slib/tree.scm
-libdata/slib/trnscrpt.scm
-libdata/slib/tsort.scm
-libdata/slib/tzfile.scm
-libdata/slib/values.scm
-libdata/slib/withfile.scm
-libdata/slib/wttest.scm
-libdata/slib/wttree.scm
-libdata/slib/yasyn.scm
-@dirrm libdata/slib/psd
-@dirrm libdata/slib
-@dirrm libdata/scm
+share/scm/COPYING
+share/scm/Iedline.scm
+share/scm/Init%%VERSION%%.scm
+share/scm/Link.scm
+share/scm/Macexp.scm
+share/scm/Macro.scm
+share/scm/Transcen.scm
+share/scm/Tscript.scm
+share/scm/implcat
+share/scm/mkimpcat.scm
+share/scm/require.scm
+share/scm/slib/Bev2slib.scm
+share/scm/slib/Template.scm
+share/scm/slib/alist.scm
+share/scm/slib/alistab.scm
+share/scm/slib/array.scm
+share/scm/slib/arraymap.scm
+share/scm/slib/batch.scm
+share/scm/slib/break.scm
+share/scm/slib/byte.scm
+share/scm/slib/chap.scm
+share/scm/slib/charplot.scm
+share/scm/slib/cltime.scm
+share/scm/slib/collect.scm
+share/scm/slib/comlist.scm
+share/scm/slib/comparse.scm
+share/scm/slib/cring.scm
+share/scm/slib/db2html.scm
+share/scm/slib/dbrowse.scm
+share/scm/slib/dbutil.scm
+share/scm/slib/debug.scm
+share/scm/slib/defmacex.scm
+share/scm/slib/determ.scm
+share/scm/slib/dwindtst.scm
+share/scm/slib/dynamic.scm
+share/scm/slib/dynwind.scm
+share/scm/slib/eval.scm
+share/scm/slib/factor.scm
+share/scm/slib/fft.scm
+share/scm/slib/fluidlet.scm
+share/scm/slib/format.scm
+share/scm/slib/formatst.scm
+share/scm/slib/genwrite.scm
+share/scm/slib/getopt.scm
+share/scm/slib/getparam.scm
+share/scm/slib/glob.scm
+share/scm/slib/hash.scm
+share/scm/slib/hashtab.scm
+share/scm/slib/htmlform.scm
+share/scm/slib/lineio.scm
+share/scm/slib/logical.scm
+share/scm/slib/macrotst.scm
+share/scm/slib/macwork.scm
+share/scm/slib/makcrc.scm
+share/scm/slib/mbe.scm
+share/scm/slib/minimize.scm
+share/scm/slib/mklibcat.scm
+share/scm/slib/modular.scm
+share/scm/slib/mulapply.scm
+share/scm/slib/mularg.scm
+share/scm/slib/mwdenote.scm
+share/scm/slib/mwexpand.scm
+share/scm/slib/mwsynrul.scm
+share/scm/slib/nclients.scm
+share/scm/slib/obj2str.scm
+share/scm/slib/object.scm
+share/scm/slib/paramlst.scm
+share/scm/slib/plottest.scm
+share/scm/slib/pp.scm
+share/scm/slib/ppfile.scm
+share/scm/slib/prec.scm
+share/scm/slib/printf.scm
+share/scm/slib/priorque.scm
+share/scm/slib/process.scm
+share/scm/slib/promise.scm
+share/scm/slib/psd/instrum.scm
+share/scm/slib/psd/pexpr.scm
+share/scm/slib/psd/primitives.scm
+share/scm/slib/psd/psd-slib.scm
+share/scm/slib/psd/read.scm
+share/scm/slib/psd/runtime.scm
+share/scm/slib/psd/version.scm
+share/scm/slib/psxtime.scm
+share/scm/slib/qp.scm
+share/scm/slib/queue.scm
+share/scm/slib/r4rsyn.scm
+share/scm/slib/randinex.scm
+share/scm/slib/random.scm
+share/scm/slib/ratize.scm
+share/scm/slib/rdms.scm
+share/scm/slib/recobj.scm
+share/scm/slib/record.scm
+share/scm/slib/repl.scm
+share/scm/slib/report.scm
+share/scm/slib/require.scm
+share/scm/slib/root.scm
+share/scm/slib/sc2.scm
+share/scm/slib/sc4opt.scm
+share/scm/slib/sc4sc3.scm
+share/scm/slib/scaexpp.scm
+share/scm/slib/scaglob.scm
+share/scm/slib/scainit.scm
+share/scm/slib/scamacr.scm
+share/scm/slib/scanf.scm
+share/scm/slib/scaoutp.scm
+share/scm/slib/schmooz.scm
+share/scm/slib/scmacro.scm
+share/scm/slib/scmactst.scm
+share/scm/slib/selfset.scm
+share/scm/slib/sierpinski.scm
+share/scm/slib/sort.scm
+share/scm/slib/soundex.scm
+share/scm/slib/stdio.scm
+share/scm/slib/strcase.scm
+share/scm/slib/strport.scm
+share/scm/slib/strsrch.scm
+share/scm/slib/struct.scm
+share/scm/slib/structst.scm
+share/scm/slib/structure.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
+share/scm/slib/trnscrpt.scm
+share/scm/slib/tsort.scm
+share/scm/slib/tzfile.scm
+share/scm/slib/values.scm
+share/scm/slib/withfile.scm
+share/scm/slib/wttest.scm
+share/scm/slib/wttree.scm
+share/scm/slib/yasyn.scm
+share/scm/slibcat
+@dirrm share/scm/slib/psd
+@dirrm share/scm/slib
+@dirrm share/scm