4 files changed, 182 insertions, 136 deletions

diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index 2b571bfdb12c..f3aa0497c4f3 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -1,34 +1,50 @@
-# New ports collection makefile for:    scm
-# Version required:     4e1
-# Date created:         Sat Nov  5 17:11:01 PST 1994
-# Whom:                 hsu
+# New ports collection makefile for:	scm
+# Version required:	5d2
+# Date created:		Sat Nov  5 17:11:01 PST 1994
+# Whom:			hsu
 #
 # $FreeBSD$
 #
 
-DISTNAME=       scm
-PKGNAME=	scm-4e1
+DISTNAME=	scm
+PKGNAME=	scm-5d2
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.cs.oswego.edu/pub/Z/unix/scheme/ \
-		ftp://ftp.swiss.ai.mit.edu/pub/scm/ \
+MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ftp.swiss.ai.mit.edu/pub/scm/OLD/
-DISTFILES=      scm4e1.tar.gz slib.info.tar.gz slib2a2.tar.gz \
-		slib-psd1-3.tar.gz scmconfig4e1.tar.gz
+MASTER_SITE_SUBDIR=	jacal
+DISTFILES=	scm5d2.zip slib2c7.zip slib-psd1-3.tar.gz scmconfig4e3.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
+EXTRACT_ONLY=	scm5d2.zip slib2c7.zip
+
+USE_ZIP=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-MAKE_FLAGS=	CFLAGS=-O2 LDFLAGS=-s defines="-DSICP -DHAVE_CONFIG_H -DFLOATS -DIO_EXTENSIONS -DMEMOIZE_LOCALS -DGC_FREE_SEGMENTS" -f
+
 MAN1=		scm.1
 
-pre-install:
-	${MKDIR} ${PREFIX}/lib/slib/psd
-	${INSTALL_DATA} ${WRKDIR}/slib/*.scm ${PREFIX}/lib/slib
-	${INSTALL_DATA} ${WRKDIR}/slib/psd/*.scm ${PREFIX}/lib/slib/psd
-	(cd ${WRKDIR}/slib; \
-		makeinfo slib.texi; \
-		${INSTALL_MAN} slib.info slib.info-1 slib.info-2 \
-			  slib.info-3 slib.info-4 ${PREFIX}/info)
+IMPLINIT=	${PREFIX}/libdata/scm/Init.scm
+
+post-extract:
+.for file in scmconfig4e3.tar.gz slib-psd1-3.tar.gz
+	@${TAR} -C ${WRKDIR} -zxf ${_DISTDIR}/${file}
+.endfor
+
+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
+	${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
 
 .include <bsd.port.mk>
diff --git a/lang/scm/distinfo b/lang/scm/distinfo
index 17229c3cc24d..a915d6061f2e 100644
--- a/lang/scm/distinfo
+++ b/lang/scm/distinfo
@@ -1,5 +1,4 @@
-MD5 (scm4e1.tar.gz) = ddd7a5d3571a41a26c931e25cca2614b
-MD5 (slib.info.tar.gz) = 812b9d507f5ccd5a4e08fa7355bd17ae
-MD5 (slib2a2.tar.gz) = 26833ea7198b4f60d52b87f4f9b74d65
-MD5 (slib-psd1-3.tar.gz) = 81f5d0b2cb4cc1bf51ad4ed3e40b6769
-MD5 (scmconfig4e1.tar.gz) = 9720e35c47b372676247cf572bbb49ac
+MD5 (scm5d2.zip) = 38106b6118ca8b322c75c9738e88a08b
+MD5 (slib2c7.zip) = 53ea05afc7ba9638d804b6cf565306ee
+MD5 (slib-psd1-3.tar.gz) = 60b8f5356cffddb93272f9bbd535b663
+MD5 (scmconfig4e3.tar.gz) = 46be6c942302504026443e332d00a20d
diff --git a/lang/scm/pkg-descr b/lang/scm/pkg-descr
index ab9b9e3c2748..ccd763a29658 100644
--- a/lang/scm/pkg-descr
+++ b/lang/scm/pkg-descr
@@ -1,6 +1,4 @@
-This message announces the availability of Scheme release scm4e1.
-
-Scm conforms to Revised^4 Report on the Algorithmic Language Scheme
+Scm conforms to Revised^5 Report on the Algorithmic Language Scheme
 and the IEEE P1178 specification.  Scm is written in C and runs under
 Amiga, Atari-ST, MacOS, MS-DOS, OS/2, NOS/VE, Unicos, VMS, Unix and
 similar systems.  ASCII and EBCDIC are supported.
@@ -16,11 +14,11 @@ SLIB-PSD is a portable debugger for Scheme (requires emacs editor).
 -------------------Readme.FreeBSD------------------------
 
 1.  Pathname dependencies:
-	The init file is hardcoded as /usr/local/lib/scm/Init.scm.
+	The init file is hardcoded as /usr/local/libdata/scm/Init.scm.
 	Alternatively, one can set the environment variable SCM_INIT_PATH to
 	the pathname of Init.scm.
 
-	The library files are in /usr/local/lib/slib.  Alternatively,
+	The library files are in /usr/local/libdata/slib.  Alternatively,
 	one can set the environment variable SCHEME_LIBRARY_PATH to
 	the slib directory.  Remember to use a trailing / on the
 	pathname.
diff --git a/lang/scm/pkg-plist b/lang/scm/pkg-plist
index c7f5d1da3a1e..b8e239476d94 100644
--- a/lang/scm/pkg-plist
+++ b/lang/scm/pkg-plist
@@ -1,110 +1,143 @@
 bin/scm
 @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
 info/slib.info
-info/slib.info-1
-info/slib.info-2
-info/slib.info-3
-info/slib.info-4
+@exec install-info %D/info/scm.info %D/info/dir
 @exec install-info %D/info/slib.info %D/info/dir
-lib/scm/COPYING
-lib/scm/Init.scm
-lib/scm/Transcen.scm
-lib/slib/Template.scm
-lib/slib/alist.scm
-lib/slib/alistab.scm
-lib/slib/array.scm
-lib/slib/arraymap.scm
-lib/slib/chap.scm
-lib/slib/charplot.scm
-lib/slib/cltime.scm
-lib/slib/collect.scm
-lib/slib/comlist.scm
-lib/slib/debug.scm
-lib/slib/defmacex.scm
-lib/slib/dwindtst.scm
-lib/slib/dynamic.scm
-lib/slib/dynwind.scm
-lib/slib/fluidlet.scm
-lib/slib/format.scm
-lib/slib/formatst.scm
-lib/slib/genwrite.scm
-lib/slib/getopt.scm
-lib/slib/hash.scm
-lib/slib/hashtab.scm
-lib/slib/lineio.scm
-lib/slib/logical.scm
-lib/slib/macrotst.scm
-lib/slib/macwork.scm
-lib/slib/mbe.scm
-lib/slib/modular.scm
-lib/slib/mulapply.scm
-lib/slib/mularg.scm
-lib/slib/mwdenote.scm
-lib/slib/mwexpand.scm
-lib/slib/mwsynrul.scm
-lib/slib/mwtest.scm
-lib/slib/obj2str.scm
-lib/slib/object.scm
-lib/slib/plottest.scm
-lib/slib/pp.scm
-lib/slib/ppfile.scm
-lib/slib/prime.scm
-lib/slib/priorque.scm
-lib/slib/process.scm
-lib/slib/promise.scm
-lib/slib/queue.scm
-lib/slib/r4rsyn.scm
-lib/slib/randinex.scm
-lib/slib/random.scm
-lib/slib/ratize.scm
-lib/slib/rbtest.scm
-lib/slib/rbtree.scm
-lib/slib/rdms.scm
-lib/slib/recobj.scm
-lib/slib/record.scm
-lib/slib/repl.scm
-lib/slib/require.scm
-lib/slib/sc2.scm
-lib/slib/sc3.scm
-lib/slib/sc4opt.scm
-lib/slib/sc4sc3.scm
-lib/slib/scaexpp.scm
-lib/slib/scaglob.scm
-lib/slib/scainit.scm
-lib/slib/scamacr.scm
-lib/slib/scanf.scm
-lib/slib/scaoutp.scm
-lib/slib/scmacro.scm
-lib/slib/scmactst.scm
-lib/slib/sierpinski.scm
-lib/slib/sort.scm
-lib/slib/soundex.scm
-lib/slib/stdio.scm
-lib/slib/strcase.scm
-lib/slib/strport.scm
-lib/slib/struct.scm
-lib/slib/structst.scm
-lib/slib/structure.scm
-lib/slib/synchk.scm
-lib/slib/synclo.scm
-lib/slib/synrul.scm
-lib/slib/tek40.scm
-lib/slib/tek41.scm
-lib/slib/test.scm
-lib/slib/time.scm
-lib/slib/trace.scm
-lib/slib/tree.scm
-lib/slib/trnscrpt.scm
-lib/slib/values.scm
-lib/slib/withfile.scm
-lib/slib/yasyn.scm
-lib/slib/psd/instrum.scm
-lib/slib/psd/pexpr.scm
-lib/slib/psd/primitives.scm
-lib/slib/psd/psd-slib.scm
-lib/slib/psd/read.scm
-lib/slib/psd/runtime.scm
-lib/slib/psd/version.scm
-@dirrm lib/scm
-@dirrm lib/slib/psd
-@dirrm lib/slib
+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