4 files changed, 261 insertions, 59 deletions

diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index c05f3c977d79..f5042f010dbf 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -6,12 +6,9 @@
 #
 
 PORTNAME=	scsh
-PORTVERSION=	0.5.1
+PORTVERSION=	0.5.2
 CATEGORIES=	shells lang
-MASTER_SITES=	ftp://ftp-swiss.ai.mit.edu/pub/su/scsh/ \
-		http://www2.cons.org:8000/freebsd-distfiles/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	cracauer
+MASTER_SITES=	ftp://ftp-swiss.ai.mit.edu/pub/su/scsh/
 
 MAINTAINER=	alex@FreeBSD.org
 
@@ -29,11 +26,19 @@ ALL_TARGET=	enough
 MAN1=		scsh.1
 STRIP=
 
+.if !defined(NOPORTDOCS)
+PLIST=		${PKGDIR}/PLIST.doc
+.endif
+
 post-install:
 	@strip ${PREFIX}/bin/scsh
-	(cd ${WRKSRC} ; \
+.if !defined(NOPORTDOCS)
+	@(cd ${WRKSRC} && \
 	 ${INSTALL_DATA} README RELEASE NEWS COPYING ${PREFIX}/lib/scsh/doc)
-	${RM} -f ${PREFIX}/share/doc/scsh
-	${LN} -fs ${PREFIX}/lib/scsh/doc ${PREFIX}/share/doc/scsh
+	@${RM} -f ${PREFIX}/share/doc/scsh
+	@${LN} -fs ${PREFIX}/lib/scsh/doc ${PREFIX}/share/doc/scsh
+.else
+	@${RM} -rf ${PREFIX}/lib/scsh/doc
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/shells/scsh/distinfo b/shells/scsh/distinfo
index 4c2cef40d023..071415f469f2 100644
--- a/shells/scsh/distinfo
+++ b/shells/scsh/distinfo
@@ -1 +1 @@
-MD5 (scsh-0.5.1.tar.gz) = 907dfc1202bff6b4aa416d2026dbdd19
+MD5 (scsh-0.5.2.tar.gz) = 6661518731117eb21eda644aa5babe46
diff --git a/shells/scsh/pkg-plist b/shells/scsh/pkg-plist
index 8d37e69768a1..d45901328ada 100644
--- a/shells/scsh/pkg-plist
+++ b/shells/scsh/pkg-plist
@@ -1,4 +1,5 @@
 bin/scsh
+include/scheme48.h
 lib/scsh/big/array.scm
 lib/scsh/big/big-util.scm
 lib/scsh/big/bigbit.scm
@@ -25,51 +26,6 @@ lib/scsh/cig/cig
 lib/scsh/cig/cig.image
 lib/scsh/cig/libscshvm.a
 lib/scsh/cig/libcig.h
-lib/scsh/doc/COPYING
-lib/scsh/doc/NEWS
-lib/scsh/doc/RELEASE
-lib/scsh/doc/README
-lib/scsh/doc/scsh-manual/awk.tex
-lib/scsh/doc/scsh-manual/changes.tex
-lib/scsh/doc/scsh-manual/decls.tex
-lib/scsh/doc/scsh-manual/front.tex
-lib/scsh/doc/scsh-manual/intro.tex
-lib/scsh/doc/scsh-manual/man.tex
-lib/scsh/doc/scsh-manual/miscprocs.tex
-lib/scsh/doc/scsh-manual/network.tex
-lib/scsh/doc/scsh-manual/procnotation.tex
-lib/scsh/doc/scsh-manual/rdelim.tex
-lib/scsh/doc/scsh-manual/running.tex
-lib/scsh/doc/scsh-manual/strings.tex
-lib/scsh/doc/scsh-manual/syscalls.tex
-lib/scsh/doc/scsh-manual/test.tex
-lib/scsh/doc/scsh-manual/todo.tex
-lib/scsh/doc/scsh-manual/tty.tex
-lib/scsh/doc/scsh-manual/xman.tex
-lib/scsh/doc/big-scheme.txt
-lib/scsh/doc/call-back.txt
-lib/scsh/doc/cheat.txt
-lib/scsh/doc/external.txt
-lib/scsh/doc/hacking.txt
-lib/scsh/doc/install.s48-0.36.txt
-lib/scsh/doc/install.txt
-lib/scsh/doc/no-leaf-env.txt
-lib/scsh/doc/olins-changes.txt
-lib/scsh/doc/package.txt
-lib/scsh/doc/scsh-src-roadmap.txt
-lib/scsh/doc/threads.txt
-lib/scsh/doc/type.txt
-lib/scsh/doc/user-guide.txt
-lib/scsh/doc/code.tex
-lib/scsh/doc/latex-stuff.tex
-lib/scsh/doc/meeting.tex
-lib/scsh/doc/module.tex
-lib/scsh/doc/scsh-paper.tex
-lib/scsh/doc/summary.tex
-lib/scsh/doc/meeting.ps
-lib/scsh/doc/module.ps
-lib/scsh/doc/scsh-manual.ps
-lib/scsh/doc/scsh-paper.ps
 lib/scsh/env/assem.scm
 lib/scsh/env/basic-command.scm
 lib/scsh/env/build.scm
@@ -151,10 +107,10 @@ lib/scsh/scsh/ndbm.scm
 lib/scsh/scsh/network.scm
 lib/scsh/scsh/pty.scm
 lib/scsh/scsh/newports.scm
+lib/scsh/scsh/old-static.scm
 lib/scsh/scsh/oldtop.scm
 lib/scsh/scsh/procobj.scm
 lib/scsh/scsh/rdelim.scm
-lib/scsh/scsh/re.scm
 lib/scsh/scsh/rw.scm
 lib/scsh/scsh/scsh-condition.scm
 lib/scsh/scsh/scsh-interfaces.scm
@@ -166,6 +122,8 @@ lib/scsh/scsh/select.scm
 lib/scsh/scsh/sighandlers.scm
 lib/scsh/scsh/startup.scm
 lib/scsh/scsh/static.scm
+lib/scsh/scsh/static1.scm
+lib/scsh/scsh/static-heap.scm
 lib/scsh/scsh/stringcoll.scm
 lib/scsh/scsh/syntax-helpers.scm
 lib/scsh/scsh/syntax.scm
@@ -221,13 +179,9 @@ lib/scsh/emacs/cmuscheme48.el
 lib/scsh/emacs/cmushell.el
 lib/scsh/emacs/comint.el
 lib/scsh/emacs/jar-hacks.el
-@exec ln -fs %D/lib/scsh/doc %D/share/doc/scsh
-@unexec rm -f %D/share/doc/scsh
 @dirrm lib/scsh/emacs
 @dirrm lib/scsh/big
 @dirrm lib/scsh/cig
-@dirrm lib/scsh/doc/scsh-manual
-@dirrm lib/scsh/doc
 @dirrm lib/scsh/env
 @dirrm lib/scsh/link
 @dirrm lib/scsh/misc
diff --git a/shells/scsh/pkg-plist.doc b/shells/scsh/pkg-plist.doc
new file mode 100644
index 000000000000..c83b305c089f
--- /dev/null
+++ b/shells/scsh/pkg-plist.doc
@@ -0,0 +1,243 @@
+bin/scsh
+include/scheme48.h
+lib/scsh/big/array.scm
+lib/scsh/big/big-util.scm
+lib/scsh/big/bigbit.scm
+lib/scsh/big/compose-cont.scm
+lib/scsh/big/defrecord.scm
+lib/scsh/big/destructure.scm
+lib/scsh/big/dump.scm
+lib/scsh/big/external.scm
+lib/scsh/big/filename.scm
+lib/scsh/big/format.scm
+lib/scsh/big/general-table.scm
+lib/scsh/big/lu-decomp.scm
+lib/scsh/big/new-ports.scm
+lib/scsh/big/pp.scm
+lib/scsh/big/queue.scm
+lib/scsh/big/random.scm
+lib/scsh/big/receive.scm
+lib/scsh/big/search-tree.scm
+lib/scsh/big/sleep.scm
+lib/scsh/big/sort.scm
+lib/scsh/big/thread.scm
+lib/scsh/big/xport.scm
+lib/scsh/cig/cig
+lib/scsh/cig/cig.image
+lib/scsh/cig/libscshvm.a
+lib/scsh/cig/libcig.h
+lib/scsh/doc/COPYING
+lib/scsh/doc/NEWS
+lib/scsh/doc/RELEASE
+lib/scsh/doc/README
+lib/scsh/doc/scsh-manual/awk.tex
+lib/scsh/doc/scsh-manual/changes.tex
+lib/scsh/doc/scsh-manual/decls.tex
+lib/scsh/doc/scsh-manual/front.tex
+lib/scsh/doc/scsh-manual/intro.tex
+lib/scsh/doc/scsh-manual/man.tex
+lib/scsh/doc/scsh-manual/miscprocs.tex
+lib/scsh/doc/scsh-manual/network.tex
+lib/scsh/doc/scsh-manual/procnotation.tex
+lib/scsh/doc/scsh-manual/rdelim.tex
+lib/scsh/doc/scsh-manual/running.tex
+lib/scsh/doc/scsh-manual/strings.tex
+lib/scsh/doc/scsh-manual/sre.tex
+lib/scsh/doc/scsh-manual/syscalls.tex
+lib/scsh/doc/scsh-manual/test.tex
+lib/scsh/doc/scsh-manual/todo.tex
+lib/scsh/doc/scsh-manual/tty.tex
+lib/scsh/doc/scsh-manual/xman.tex
+lib/scsh/doc/big-scheme.txt
+lib/scsh/doc/call-back.txt
+lib/scsh/doc/cheat.txt
+lib/scsh/doc/external.txt
+lib/scsh/doc/hacking.txt
+lib/scsh/doc/install.s48-0.36.txt
+lib/scsh/doc/install.txt
+lib/scsh/doc/no-leaf-env.txt
+lib/scsh/doc/olins-changes.txt
+lib/scsh/doc/package.txt
+lib/scsh/doc/scsh-src-roadmap.txt
+lib/scsh/doc/threads.txt
+lib/scsh/doc/type.txt
+lib/scsh/doc/user-guide.txt
+lib/scsh/doc/code.tex
+lib/scsh/doc/latex-stuff.tex
+lib/scsh/doc/meeting.tex
+lib/scsh/doc/module.tex
+lib/scsh/doc/scsh-paper.tex
+lib/scsh/doc/summary.tex
+lib/scsh/doc/meeting.ps
+lib/scsh/doc/module.ps
+lib/scsh/doc/scsh-manual.ps
+lib/scsh/doc/scsh-paper.ps
+lib/scsh/env/assem.scm
+lib/scsh/env/basic-command.scm
+lib/scsh/env/build.scm
+lib/scsh/env/command.scm
+lib/scsh/env/debug.scm
+lib/scsh/env/debuginfo.scm
+lib/scsh/env/disasm.scm
+lib/scsh/env/disclosers.scm
+lib/scsh/env/dispcond.scm
+lib/scsh/env/flatload.scm
+lib/scsh/env/init-defpackage.scm
+lib/scsh/env/inspect.scm
+lib/scsh/env/jar-assem.scm
+lib/scsh/env/list-interface.scm
+lib/scsh/env/load-package.scm
+lib/scsh/env/more-thread.scm
+lib/scsh/env/pacman.scm
+lib/scsh/env/pedit.scm
+lib/scsh/env/read-command.scm
+lib/scsh/env/shadow.scm
+lib/scsh/env/space.scm
+lib/scsh/env/start.scm
+lib/scsh/env/traverse.scm
+lib/scsh/env/version-info.scm
+lib/scsh/link/data.scm
+lib/scsh/link/generate-c-header.scm
+lib/scsh/link/link.scm
+lib/scsh/link/loadc.scm
+lib/scsh/link/reify.scm
+lib/scsh/link/transport.scm
+lib/scsh/link/write-image.scm
+lib/scsh/misc/annotate.scm
+lib/scsh/misc/argument.scm
+lib/scsh/misc/doodl.scm
+lib/scsh/misc/either.scm
+lib/scsh/misc/getenv.scm
+lib/scsh/misc/hilbert.scm
+lib/scsh/misc/ilength.scm
+lib/scsh/misc/integertostring.scm
+lib/scsh/misc/load-static.scm
+lib/scsh/misc/mail.scm
+lib/scsh/misc/packages.scm
+lib/scsh/misc/psd-s48.scm
+lib/scsh/misc/remote.scm
+lib/scsh/misc/require.scm
+lib/scsh/misc/separate.scm
+lib/scsh/misc/shift-reset.scm
+lib/scsh/misc/sicp.scm
+lib/scsh/misc/slib-init.scm
+lib/scsh/misc/socket.scm
+lib/scsh/misc/static.scm
+lib/scsh/misc/test-doodl.scm
+lib/scsh/opt/analyze.scm
+lib/scsh/opt/expand.scm
+lib/scsh/opt/inline.scm
+lib/scsh/opt/tst.scm
+lib/scsh/scsh/awk.scm
+lib/scsh/scsh/char-set.scm
+lib/scsh/scsh/db.scm
+lib/scsh/scsh/dbm.scm
+lib/scsh/scsh/defrec.scm
+lib/scsh/scsh/ekko.scm
+lib/scsh/scsh/endian.scm
+lib/scsh/scsh/enumconst.scm
+lib/scsh/scsh/fdports.scm
+lib/scsh/scsh/fileinfo.scm
+lib/scsh/scsh/filemtch.scm
+lib/scsh/scsh/filesys.scm
+lib/scsh/scsh/flock.scm
+lib/scsh/scsh/fname.scm
+lib/scsh/scsh/fr.scm
+lib/scsh/scsh/glob.scm
+lib/scsh/scsh/here.scm
+lib/scsh/scsh/jcontrol.scm
+lib/scsh/scsh/jcontrol2.scm
+lib/scsh/scsh/let-opt.scm
+lib/scsh/scsh/meta-arg.scm
+lib/scsh/scsh/ndbm.scm
+lib/scsh/scsh/network.scm
+lib/scsh/scsh/pty.scm
+lib/scsh/scsh/newports.scm
+lib/scsh/scsh/old-static.scm
+lib/scsh/scsh/oldtop.scm
+lib/scsh/scsh/procobj.scm
+lib/scsh/scsh/rdelim.scm
+lib/scsh/scsh/rw.scm
+lib/scsh/scsh/scsh-condition.scm
+lib/scsh/scsh/scsh-interfaces.scm
+lib/scsh/scsh/scsh-package.scm
+lib/scsh/scsh/scsh-read.scm
+lib/scsh/scsh/scsh-version.scm
+lib/scsh/scsh/scsh.scm
+lib/scsh/scsh/select.scm
+lib/scsh/scsh/sighandlers.scm
+lib/scsh/scsh/startup.scm
+lib/scsh/scsh/static.scm
+lib/scsh/scsh/static1.scm
+lib/scsh/scsh/static-heap.scm
+lib/scsh/scsh/stringcoll.scm
+lib/scsh/scsh/syntax-helpers.scm
+lib/scsh/scsh/syntax.scm
+lib/scsh/scsh/syscalls.scm
+lib/scsh/scsh/time.scm
+lib/scsh/scsh/top.scm
+lib/scsh/scsh/tty.scm
+lib/scsh/scsh/utilities.scm
+lib/scsh/rts/bignum.scm
+lib/scsh/rts/defenum.scm
+lib/scsh/rts/enum.scm
+lib/scsh/rts/floatnum.scm
+lib/scsh/rts/innum.scm
+lib/scsh/rts/ratnum.scm
+lib/scsh/rts/recnum.scm
+lib/scsh/rts/xnum.scm
+lib/scsh/rts/jar-defrecord.scm
+lib/scsh/vm/arch.scm
+lib/scsh/vm/arith.scm
+lib/scsh/vm/data.scm
+lib/scsh/vm/defenum.scm
+lib/scsh/vm/define-primitive.scm
+lib/scsh/vm/disasm.scm
+lib/scsh/vm/env.scm
+lib/scsh/vm/external.scm
+lib/scsh/vm/gc.scm
+lib/scsh/vm/heap.scm
+lib/scsh/vm/interfaces.scm
+lib/scsh/vm/interp.scm
+lib/scsh/vm/macro-package-defs.scm
+lib/scsh/vm/memory.scm
+lib/scsh/vm/package-defs.scm
+lib/scsh/vm/prescheme.scm
+lib/scsh/vm/prim.scm
+lib/scsh/vm/ps-interface.scm
+lib/scsh/vm/ps-memory.scm
+lib/scsh/vm/ps-package-defs.scm
+lib/scsh/vm/ps-package.scm
+lib/scsh/vm/resume.scm
+lib/scsh/vm/s48-package-defs.scm
+lib/scsh/vm/stack.scm
+lib/scsh/vm/stob.scm
+lib/scsh/vm/struct.scm
+lib/scsh/vm/vm-utilities.scm
+lib/scsh/vm/vmio.scm
+lib/scsh/scshvm
+lib/scsh/scsh.image
+lib/scsh/libscshvm.a
+lib/scsh/emacs/README
+lib/scsh/emacs/cmulisp.el
+lib/scsh/emacs/cmuscheme.el
+lib/scsh/emacs/cmuscheme48.el
+lib/scsh/emacs/cmushell.el
+lib/scsh/emacs/comint.el
+lib/scsh/emacs/jar-hacks.el
+@exec ln -fs %D/lib/scsh/doc %D/share/doc/scsh
+@unexec rm -f %D/share/doc/scsh
+@dirrm lib/scsh/emacs
+@dirrm lib/scsh/big
+@dirrm lib/scsh/cig
+@dirrm lib/scsh/doc/scsh-manual
+@dirrm lib/scsh/doc
+@dirrm lib/scsh/env
+@dirrm lib/scsh/link
+@dirrm lib/scsh/misc
+@dirrm lib/scsh/opt
+@dirrm lib/scsh/scsh
+@dirrm lib/scsh/rts
+@dirrm lib/scsh/vm
+@dirrm lib/scsh
+@unexec echo 'You might check whether to remove %D/lib/scsh.old'