1 files changed, 274 insertions, 154 deletions

diff --git a/lang/scsh/pkg-plist b/lang/scsh/pkg-plist
index 50eda2dbe15c..fa347e45bf58 100644
--- a/lang/scsh/pkg-plist
+++ b/lang/scsh/pkg-plist
@@ -1,46 +1,117 @@
 bin/scsh
 include/scheme48.h
 include/write-barrier.h
-lib/scsh/big/array.scm
-lib/scsh/big/big-util.scm
-lib/scsh/big/bigbit.scm
-lib/scsh/big/callback.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/enum-set.scm
-lib/scsh/big/external.scm
-lib/scsh/big/filename.scm
-lib/scsh/big/finite-type.scm
-lib/scsh/big/format.scm
-lib/scsh/big/general-table.scm
-lib/scsh/big/import-def.scm
-lib/scsh/big/linked-queue.scm
-lib/scsh/big/lu-decomp.scm
-lib/scsh/big/more-port.scm
-lib/scsh/big/pipe.scm
-lib/scsh/big/placeholder.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/socket.scm
-lib/scsh/big/sort.scm
-lib/scsh/big/strong.scm
-lib/scsh/big/thread-fluid.scm
-%%PORTDOCS%%lib/scsh/doc/COPYING
-%%PORTDOCS%%lib/scsh/doc/README
-%%PORTDOCS%%lib/scsh/doc/RELEASE
-%%PORTDOCS%%lib/scsh/doc/cheat.txt
-%%PORTDOCS%%lib/scsh/doc/hacking.txt
-%%PORTDOCS%%lib/scsh/doc/install.txt
-%%PORTDOCS%%lib/scsh/doc/io.txt
-%%PORTDOCS%%lib/scsh/doc/meeting.ps
-%%PORTDOCS%%lib/scsh/doc/news.txt
-%%PORTDOCS%%lib/scsh/doc/no-leaf-env.txt
-%%PORTDOCS%%lib/scsh/doc/porting.txt
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/html/man-Z-H-1.html
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/html/man-Z-H-10.html
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/html/man-Z-H-11.html
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/html/man-Z-H-12.html
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/html/man-Z-H-13.html
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/html/man-Z-H-2.html
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/html/man-Z-H-3.html
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/html/man-Z-H-4.html
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/html/man-Z-H-5.html
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/html/man-Z-H-6.html
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/html/man-Z-H-7.html
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/html/man-Z-H-8.html
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/html/man-Z-H-9.html
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/html/man.html
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/html/man-Z-G-D-1.gif
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/html/man-Z-C.css
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/awk.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/decls.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/front.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/intro.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/man.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/miscprocs.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/network.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/pdfcond.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/procnotation.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/rdelim.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/running.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/sre.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/strings.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/syscalls.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/test.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/threads.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/tty.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/xman.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/array.sty
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/boxedminipage.sty
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/code.sty
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/ct.sty
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/draftfooters.sty
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/headings.sty
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/mantitle.sty
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/matter.sty
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/mysize10.sty
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/man.dvi
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/man.ps
+%%PORTDOCS%%lib/scsh/doc/scsh-manual/man.pdf
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_1.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_10.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_11.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_12.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_13.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_14.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_15.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_16.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_17.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_18.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_19.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_2.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_20.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_21.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_22.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_23.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_24.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_25.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_26.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_27.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_28.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_29.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_3.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_30.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_31.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_32.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_33.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_34.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_35.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_36.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_37.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_38.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_39.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_4.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_40.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_41.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_42.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_43.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_44.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_45.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_46.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_47.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_48.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_49.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_5.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_50.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_51.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_52.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_53.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_54.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_55.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_56.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_57.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_58.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_59.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_6.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_60.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_61.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_62.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_63.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_64.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_7.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_8.html
+%%PORTDOCS%%lib/scsh/doc/s48-manual/html/s48manual_9.html
 %%PORTDOCS%%lib/scsh/doc/s48-manual/ascii.tex
 %%PORTDOCS%%lib/scsh/doc/s48-manual/bibliography.tex
 %%PORTDOCS%%lib/scsh/doc/s48-manual/code.tex
@@ -51,8 +122,6 @@ lib/scsh/big/thread-fluid.scm
 %%PORTDOCS%%lib/scsh/doc/s48-manual/intro.tex
 %%PORTDOCS%%lib/scsh/doc/s48-manual/latex-index.tex
 %%PORTDOCS%%lib/scsh/doc/s48-manual/latex-stuff.tex
-%%PORTDOCS%%lib/scsh/doc/s48-manual/manual.dvi
-%%PORTDOCS%%lib/scsh/doc/s48-manual/manual.ps
 %%PORTDOCS%%lib/scsh/doc/s48-manual/manual.tex
 %%PORTDOCS%%lib/scsh/doc/s48-manual/meeting.tex
 %%PORTDOCS%%lib/scsh/doc/s48-manual/module.tex
@@ -64,46 +133,59 @@ lib/scsh/big/thread-fluid.scm
 %%PORTDOCS%%lib/scsh/doc/s48-manual/user-guide.tex
 %%PORTDOCS%%lib/scsh/doc/s48-manual/utilities.tex
 %%PORTDOCS%%lib/scsh/doc/s48-manual/version-number.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/awk.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/decls.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/front.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/intro.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/man.dvi
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/man.ps
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/man.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/miscprocs.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/network.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/procnotation.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/rdelim.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/running.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/sre.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/strings.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/syscalls.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/test.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/threads.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/todo.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/tty.tex
-%%PORTDOCS%%lib/scsh/doc/scsh-manual/xman.tex
+%%PORTDOCS%%lib/scsh/doc/s48-manual/manual.dvi
+%%PORTDOCS%%lib/scsh/doc/s48-manual/manual.ps
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-1.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-10.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-11.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-12.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-13.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-14.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-15.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-16.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-17.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-18.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-2.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-3.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-4.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-5.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-6.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-7.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-8.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-9.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper.html
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/html/scsh-paper-Z-C.css
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/headings.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/scsh-paper.tex
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/boxedminipage.sty
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/code.sty
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/ct.sty
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/lcs-note.sty
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/scsh-paper.dvi
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/mitlogo.ps
+%%PORTDOCS%%lib/scsh/doc/scsh-paper/scsh-paper.ps
+%%PORTDOCS%%lib/scsh/doc/cheat.txt
+%%PORTDOCS%%lib/scsh/doc/hacking.txt
+%%PORTDOCS%%lib/scsh/doc/install.txt
+%%PORTDOCS%%lib/scsh/doc/io.txt
+%%PORTDOCS%%lib/scsh/doc/news.txt
+%%PORTDOCS%%lib/scsh/doc/no-leaf-env.txt
+%%PORTDOCS%%lib/scsh/doc/porting.txt
 %%PORTDOCS%%lib/scsh/doc/threads.txt
 %%PORTDOCS%%lib/scsh/doc/todo.txt
 %%PORTDOCS%%lib/scsh/doc/type.txt
-%%PORTDOCS%%lib/scsh/doc/html/man-Z-H-1.html
-%%PORTDOCS%%lib/scsh/doc/html/man-Z-H-10.html
-%%PORTDOCS%%lib/scsh/doc/html/man-Z-H-11.html
-%%PORTDOCS%%lib/scsh/doc/html/man-Z-H-12.html
-%%PORTDOCS%%lib/scsh/doc/html/man-Z-H-13.html
-%%PORTDOCS%%lib/scsh/doc/html/man-Z-H-14.html
-%%PORTDOCS%%lib/scsh/doc/html/man-Z-H-2.html
-%%PORTDOCS%%lib/scsh/doc/html/man-Z-H-3.html
-%%PORTDOCS%%lib/scsh/doc/html/man-Z-H-4.html
-%%PORTDOCS%%lib/scsh/doc/html/man-Z-H-5.html
-%%PORTDOCS%%lib/scsh/doc/html/man-Z-H-6.html
-%%PORTDOCS%%lib/scsh/doc/html/man-Z-H-7.html
-%%PORTDOCS%%lib/scsh/doc/html/man-Z-H-8.html
-%%PORTDOCS%%lib/scsh/doc/html/man-Z-H-9.html
-%%PORTDOCS%%lib/scsh/doc/html/man.html
-%%PORTDOCS%%lib/scsh/doc/html/man-Z-G-D-1.gif
-%%PORTDOCS%%lib/scsh/doc/html/man-Z-C.css
+%%PORTDOCS%%lib/scsh/doc/meeting.ps
+%%PORTDOCS%%lib/scsh/doc/README
+%%PORTDOCS%%lib/scsh/doc/RELEASE
+%%PORTDOCS%%lib/scsh/doc/COPYING
+lib/scsh/rts/bignum.scm
+lib/scsh/rts/defenum.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/env/assem.scm
 lib/scsh/env/basic-command.scm
 lib/scsh/env/build.scm
@@ -129,16 +211,42 @@ lib/scsh/env/space.scm
 lib/scsh/env/start.scm
 lib/scsh/env/traverse.scm
 lib/scsh/env/version-info.scm
-lib/scsh/libscsh.a
-lib/scsh/libscshvm.a
-lib/scsh/link/data.scm
-lib/scsh/link/generate-c-header.scm
-lib/scsh/link/generate-old-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/big/array.scm
+lib/scsh/big/big-util.scm
+lib/scsh/big/bigbit.scm
+lib/scsh/big/callback.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/either.scm
+lib/scsh/big/enum-set.scm
+lib/scsh/big/external.scm
+lib/scsh/big/filename.scm
+lib/scsh/big/finite-type.scm
+lib/scsh/big/format.scm
+lib/scsh/big/general-table.scm
+lib/scsh/big/import-def.scm
+lib/scsh/big/linked-queue.scm
+lib/scsh/big/lu-decomp.scm
+lib/scsh/big/more-port.scm
+lib/scsh/big/pipe.scm
+lib/scsh/big/pp.scm
+lib/scsh/big/placeholder.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/socket.scm
+lib/scsh/big/sort.scm
+lib/scsh/big/strong.scm
+lib/scsh/big/thread-fluid.scm
+lib/scsh/opt/analyze.scm
+lib/scsh/opt/flatten.scm
+lib/scsh/opt/inline.scm
+lib/scsh/opt/sort.scm
+lib/scsh/opt/tst.scm
+lib/scsh/opt/usage.scm
 lib/scsh/misc/annotate.scm
 lib/scsh/misc/doodl.scm
 lib/scsh/misc/either.scm
@@ -160,32 +268,26 @@ lib/scsh/misc/sicp.scm
 lib/scsh/misc/static.scm
 lib/scsh/misc/syscall.scm
 lib/scsh/misc/test-doodl.scm
-lib/scsh/opt/analyze.scm
-lib/scsh/opt/flatten.scm
-lib/scsh/opt/inline.scm
-lib/scsh/opt/sort.scm
-lib/scsh/opt/tst.scm
-lib/scsh/opt/usage.scm
-lib/scsh/rts/bignum.scm
-lib/scsh/rts/defenum.scm
-lib/scsh/rts/floatnum.scm
-lib/scsh/rts/innum.scm
-lib/scsh/rts/jar-defrecord.scm
-lib/scsh/rts/ratnum.scm
-lib/scsh/rts/recnum.scm
-lib/scsh/rts/xnum.scm
-lib/scsh/scsh.image
+lib/scsh/link/data.scm
+lib/scsh/link/generate-c-header.scm
+lib/scsh/link/generate-old-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/srfi/srfi-1.scm
+lib/scsh/srfi/srfi-11.scm
+lib/scsh/srfi/srfi-13.scm
+lib/scsh/srfi/srfi-14.scm
+lib/scsh/srfi/srfi-16.scm
+lib/scsh/srfi/srfi-17.scm
+lib/scsh/srfi/srfi-19.scm
+lib/scsh/srfi/srfi-2.scm
+lib/scsh/srfi/srfi-5.scm
+lib/scsh/srfi/srfi-7.scm
 lib/scsh/scsh/awk.scm
-lib/scsh/scsh/bufpol.scm
-lib/scsh/scsh/ccp-pack.scm
-lib/scsh/scsh/ccp.scm
-lib/scsh/scsh/char-package.scm
 lib/scsh/scsh/char-set.scm
-lib/scsh/scsh/cond-package.scm
-lib/scsh/scsh/cset-lib.scm
-lib/scsh/scsh/cset-obsolete.scm
-lib/scsh/scsh/cset-package.scm
-lib/scsh/scsh/cset-tests.scm
 lib/scsh/scsh/db.scm
 lib/scsh/scsh/dbm.scm
 lib/scsh/scsh/defrec.scm
@@ -193,13 +295,8 @@ lib/scsh/scsh/dot-locking.scm
 lib/scsh/scsh/ekko.scm
 lib/scsh/scsh/endian.scm
 lib/scsh/scsh/enumconst.scm
-lib/scsh/scsh/env-test-add.scm
-lib/scsh/scsh/env-test-code.scm
-lib/scsh/scsh/errno.scm
 lib/scsh/scsh/event.scm
-lib/scsh/scsh/fdflags.scm
 lib/scsh/scsh/fdports.scm
-lib/scsh/scsh/file-system-tests.scm
 lib/scsh/scsh/fileinfo.scm
 lib/scsh/scsh/filemtch.scm
 lib/scsh/scsh/filesys.scm
@@ -209,37 +306,15 @@ lib/scsh/scsh/fr.scm
 lib/scsh/scsh/glob.scm
 lib/scsh/scsh/here.scm
 lib/scsh/scsh/let-opt.scm
-lib/scsh/scsh/list-lib.scm
-lib/scsh/scsh/list-pack.scm
-lib/scsh/scsh/loadem.scm
 lib/scsh/scsh/low-interrupt.scm
 lib/scsh/scsh/meta-arg.scm
-lib/scsh/scsh/modules.scm
 lib/scsh/scsh/ndbm.scm
-lib/scsh/scsh/netconst.scm
 lib/scsh/scsh/network.scm
 lib/scsh/scsh/newports.scm
-lib/scsh/scsh/oldfuns.scm
-lib/scsh/scsh/packages-old.scm
-lib/scsh/scsh/packages-old2.scm
-lib/scsh/scsh/packages.scm
-lib/scsh/scsh/parse.scm
-lib/scsh/scsh/posixstr.scm
-lib/scsh/scsh/process-state-tests.scm
 lib/scsh/scsh/procobj.scm
 lib/scsh/scsh/pty.scm
 lib/scsh/scsh/rdelim.scm
-lib/scsh/scsh/re-fold.scm
-lib/scsh/scsh/re-high.scm
-lib/scsh/scsh/re-low.scm
-lib/scsh/scsh/re-match-syntax.scm
-lib/scsh/scsh/re-subst.scm
-lib/scsh/scsh/re-syntax.scm
-lib/scsh/scsh/re.scm
-lib/scsh/scsh/regexp.scm
-lib/scsh/scsh/regress.scm
 lib/scsh/scsh/rw.scm
-lib/scsh/scsh/rx-lib.scm
 lib/scsh/scsh/scsh-condition.scm
 lib/scsh/scsh/scsh-interfaces.scm
 lib/scsh/scsh/scsh-package.scm
@@ -248,44 +323,89 @@ lib/scsh/scsh/scsh-version.scm
 lib/scsh/scsh/scsh.scm
 lib/scsh/scsh/select.scm
 lib/scsh/scsh/sighandlers.scm
-lib/scsh/scsh/signals.scm
-lib/scsh/scsh/simp.scm
-lib/scsh/scsh/spencer.scm
 lib/scsh/scsh/startup.scm
 lib/scsh/scsh/static.scm
-lib/scsh/scsh/string-lib.scm
-lib/scsh/scsh/string-pack.scm
-lib/scsh/scsh/string-package.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/syslog.scm
-lib/scsh/scsh/test-base.scm
-lib/scsh/scsh/test-packages.scm
-lib/scsh/scsh/test.scm
 lib/scsh/scsh/threads.scm
 lib/scsh/scsh/time.scm
-lib/scsh/scsh/time_dep.scm
 lib/scsh/scsh/top.scm
-lib/scsh/scsh/tty-consts.scm
 lib/scsh/scsh/tty.scm
 lib/scsh/scsh/utilities.scm
-lib/scsh/scsh/waitcodes.scm
 lib/scsh/scsh/weaktables.scm
+lib/scsh/scsh/bufpol.scm
+lib/scsh/scsh/errno.scm
+lib/scsh/scsh/fdflags.scm
+lib/scsh/scsh/netconst.scm
+lib/scsh/scsh/packages.scm
+lib/scsh/scsh/signals.scm
+lib/scsh/scsh/time_dep.scm
+lib/scsh/scsh/tty-consts.scm
+lib/scsh/scsh/waitcodes.scm
+lib/scsh/scsh/ccp-pack.scm
+lib/scsh/scsh/ccp.scm
+lib/scsh/scsh/char-package.scm
+lib/scsh/scsh/cset-lib.scm
+lib/scsh/scsh/cset-obsolete.scm
+lib/scsh/scsh/cset-package.scm
+lib/scsh/scsh/cset-tests.scm
+lib/scsh/scsh/list-lib.scm
+lib/scsh/scsh/list-pack.scm
+lib/scsh/scsh/string-lib.scm
+lib/scsh/scsh/string-pack.scm
+lib/scsh/scsh/string-package.scm
+lib/scsh/scsh/odbc.scm
+lib/scsh/scsh/cond-package.scm
+lib/scsh/scsh/loadem.scm
+lib/scsh/scsh/modules.scm
+lib/scsh/scsh/oldfuns.scm
+lib/scsh/scsh/packages-old.scm
+lib/scsh/scsh/packages-old2.scm
+lib/scsh/scsh/parse.scm
+lib/scsh/scsh/posixstr.scm
+lib/scsh/scsh/re-fold.scm
+lib/scsh/scsh/re-high.scm
+lib/scsh/scsh/re-low.scm
+lib/scsh/scsh/re-match-syntax.scm
+lib/scsh/scsh/re-subst.scm
+lib/scsh/scsh/re-syntax.scm
+lib/scsh/scsh/re.scm
+lib/scsh/scsh/regexp.scm
+lib/scsh/scsh/regress.scm
+lib/scsh/scsh/rx-lib.scm
+lib/scsh/scsh/simp.scm
+lib/scsh/scsh/spencer.scm
+lib/scsh/scsh/test.scm
+lib/scsh/scsh/env-test-add.scm
+lib/scsh/scsh/env-test-code.scm
+lib/scsh/scsh/file-system-tests.scm
+lib/scsh/scsh/process-state-tests.scm
+lib/scsh/scsh/test-base.scm
+lib/scsh/scsh/test-packages.scm
 lib/scsh/scshvm
+lib/scsh/scsh.image
+lib/scsh/libscshvm.a
+lib/scsh/libscsh.a
 %%PORTDOCS%%@exec ln -fs %D/lib/scsh/doc %D/share/doc/scsh
 @unexec rm -f %D/share/doc/scsh
 @dirrm lib/scsh/scsh
 @dirrm lib/scsh/rts
+@dirrm lib/scsh/big
 @dirrm lib/scsh/opt
 @dirrm lib/scsh/misc
 @dirrm lib/scsh/link
+@dirrm lib/scsh/srfi
 @dirrm lib/scsh/env
+@dirrm lib/scsh/cig
+%%PORTDOCS%%@dirrm lib/scsh/doc/scsh-manual/html
 %%PORTDOCS%%@dirrm lib/scsh/doc/scsh-manual
+%%PORTDOCS%%@dirrm lib/scsh/doc/s48-manual/html
 %%PORTDOCS%%@dirrm lib/scsh/doc/s48-manual
-%%PORTDOCS%%@dirrm lib/scsh/doc/html
+%%PORTDOCS%%@dirrm lib/scsh/doc/scsh-paper/html
+%%PORTDOCS%%@dirrm lib/scsh/doc/scsh-paper
 %%PORTDOCS%%@dirrm lib/scsh/doc
-@dirrm lib/scsh/big
 @dirrm lib/scsh
 @unexec echo 'You might check whether to remove %D/lib/scsh.old'