Upgrade to v0.6.0.

- "files/patch-ae" is no longer required
- PLIST substitution is used to merge the files "pkg-plist.doc" and
  "pkg-plist" into one entity
- new patch file "files/patch-static.scm" has been added

Approved by:  alex [MAINTAINER]

10 files changed, 280 insertions, 412 deletions

diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index 1d9b07b02208..b4d1595a1a8f 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scsh
-PORTVERSION=	0.5.3
+PORTVERSION=	0.6.0
 CATEGORIES=	shells lang
 MASTER_SITES=	ftp://ftp-swiss.ai.mit.edu/pub/su/scsh/
 
@@ -26,15 +26,11 @@ ALL_TARGET=	enough
 MAN1=		scsh.1
 STRIP=
 
-.if !defined(NOPORTDOCS)
-PLIST=		${PKGDIR}/pkg-plist.doc
-.endif
-
 post-install:
 	@strip ${PREFIX}/bin/scsh
 .if !defined(NOPORTDOCS)
 	@(cd ${WRKSRC} && \
-	 ${INSTALL_DATA} README RELEASE NEWS COPYING ${PREFIX}/lib/scsh/doc)
+	 ${INSTALL_DATA} README RELEASE COPYING ${PREFIX}/lib/scsh/doc)
 	@${RM} -f ${PREFIX}/share/doc/scsh
 	@${LN} -fs ${PREFIX}/lib/scsh/doc ${PREFIX}/share/doc/scsh
 .else
diff --git a/shells/scsh/distinfo b/shells/scsh/distinfo
index 62ed2f60d415..62e56ed12951 100644
--- a/shells/scsh/distinfo
+++ b/shells/scsh/distinfo
@@ -1 +1 @@
-MD5 (scsh-0.5.3.tar.gz) = f7b525d0ccb62da0f5e97ae008b7d087
+MD5 (scsh-0.6.0.tar.gz) = ed5a6106e436c9f35f9aed4f2b8ecb5e
diff --git a/shells/scsh/files/patch-aa b/shells/scsh/files/patch-aa
index 22f97bee64ee..fdcffc3b20e0 100644
--- a/shells/scsh/files/patch-aa
+++ b/shells/scsh/files/patch-aa
@@ -1,39 +1,55 @@
-*** Makefile.in.original	Tue Nov 26 14:44:19 1996
---- Makefile.in	Thu Nov 28 15:29:24 1996
+*** Makefile.in.orig	Wed Jan  9 21:27:46 2002
+--- Makefile.in	Fri Jan 11 15:05:48 2002
 ***************
-*** 137,143 ****
+*** 31,37 ****
+  mandir = @mandir@/man$(manext)
+  ### End of `configure' section###
   
-  # The following is the first rule and therefore the "make" command's
-  # default target.
-! enough: $(VM) $(IMAGE) script $(LIBCIG) scsh $(LIBSCSH) $(MANPAGE) .notify
+! htmldir = $(prefix)/html
   
-  # The developers are curious to know.  Don't be concerned if this fails.
-  # You may comment these lines out if you wish to be discourteous.
---- 137,143 ----
+  # HP 9000 series, if you don't have gcc
+  #   CC = cc
+--- 31,37 ----
+  mandir = @mandir@/man$(manext)
+  ### End of `configure' section###
   
-  # The following is the first rule and therefore the "make" command's
-  # default target.
-! enough: $(VM) $(IMAGE) script $(LIBCIG) scsh $(LIBSCSH) $(MANPAGE)
+! htmldir = $(libdir)/scsh/doc/html
   
-  # The developers are curious to know.  Don't be concerned if this fails.
-  # You may comment these lines out if you wish to be discourteous.
+  # HP 9000 series, if you don't have gcc
+  #   CC = cc
 ***************
-*** 250,255 ****
---- 250,256 ----
-  	$(RM) -r $(LIB).old
-  	if [ -d $(LIB) ] ; then mv $(LIB) $(LIB).old ; fi
-  	mkdir $(LIB)
-+ 	mkdir $(LIB)/emacs
-  	mkdir $(LIB)/big
-  	mkdir $(LIB)/cig
-  	mkdir $(LIB)/doc
+*** 367,375 ****
+  	done &&									\
+  	for f in $(srcdir)/doc/scsh-manual/html/*.html 				\
+  		$(srcdir)/doc/scsh-manual/html/*.gif 				\
+! 		$(srcdir)/doc/scsh-manual/html/*.css				\
+! 		$(srcdir)/doc/src/manual/*.html					\
+! 		$(srcdir)/doc/html/*.html;					\
+  		do $(INSTALL_DATA) $$f $(htmldir)/;		\
+  	done
+  
+--- 367,373 ----
+  	done &&									\
+  	for f in $(srcdir)/doc/scsh-manual/html/*.html 				\
+  		$(srcdir)/doc/scsh-manual/html/*.gif 				\
+! 		$(srcdir)/doc/scsh-manual/html/*.css;			\
+  		do $(INSTALL_DATA) $$f $(htmldir)/;		\
+  	done
+  
 ***************
-*** 286,291 ****
---- 287,293 ----
-  	      $(LIB)/misc $(LIB)/link $(LIB)/vm $(LIB)/doc
-  	for f in $(srcdir)/rts/*num.scm; \
-  	    do $(INSTALL_DATA) $$f $(LIB)/rts/; done
-+ 	for f in $(srcdir)/emacs/*; do $(INSTALL_DATA) $$f $(LIB)/emacs/; done
-  	for f in $(srcdir)/env/*.scm; do $(INSTALL_DATA) $$f $(LIB)/env/; done
-  	for f in $(srcdir)/big/*.scm; do $(INSTALL_DATA) $$f $(LIB)/big/; done
-  	for f in $(srcdir)/opt/*.scm; do $(INSTALL_DATA) $$f $(LIB)/opt/; done
+*** 399,405 ****
+  	}								\
+  	done &&								\
+  	for dir in								\
+! 		rts env big opt misc link scsh doc/scsh-manual doc/s48-manual cig;	\
+  		do								\
+  		{ mkdir -p $(LIB)/$$dir && [ -w $(LIB)/$$dir ]; } || {		\
+  			echo "$(LIB)/$$dir not a writable directory" >&2; 	\
+--- 397,403 ----
+  	}								\
+  	done &&								\
+  	for dir in								\
+! 		rts env big opt misc link scsh doc/scsh-manual doc/s48-manual;	\
+  		do								\
+  		{ mkdir -p $(LIB)/$$dir && [ -w $(LIB)/$$dir ]; } || {		\
+  			echo "$(LIB)/$$dir not a writable directory" >&2; 	\
diff --git a/shells/scsh/files/patch-ab b/shells/scsh/files/patch-ab
index a75d1e93ac41..cc0813630db1 100644
--- a/shells/scsh/files/patch-ab
+++ b/shells/scsh/files/patch-ab
@@ -1,5 +1,5 @@
-*** env/command.scm.original    Tue Nov 26 15:59:38 1996
---- env/command.scm     Tue Nov 26 15:59:46 1996
+*** scheme/env/command.scm.original    Tue Nov 26 15:59:38 1996
+--- scheme/env/command.scm     Tue Nov 26 15:59:46 1996
 ***************
 *** 546,552 ****
                 ((char=? (string-ref line 0) #\n) #f)
diff --git a/shells/scsh/files/patch-ac b/shells/scsh/files/patch-ac
index 42c68f84edeb..93feb49aa9a1 100644
--- a/shells/scsh/files/patch-ac
+++ b/shells/scsh/files/patch-ac
@@ -1,19 +1,19 @@
-*** configure.in.original       Tue Nov 26 17:10:41 1996
---- configure.in        Tue Nov 26 17:11:07 1996
+*** configure.in.orig	Wed Jan  9 15:54:29 2002
+--- configure.in	Fri Jan 11 12:36:21 2002
 ***************
-*** 220,226 ****
-  fi
-
-  AR=${AR-"ar cq"}
-! TMPDIR=${TMPDIR-"/usr/tmp"}
-
-  case "$host" in
-
---- 220,226 ----
-  fi
-
-  AR=${AR-"ar cq"}
-! TMPDIR=${TMPDIR-"/var/tmp"}
-
-  case "$host" in
-
+*** 226,232 ****
+       fi
+  
+       AR=${AR-"ar cq"}
+!      TMPDIR=${TMPDIR-"/usr/tmp"}
+       case "$host" in
+    ## CX/UX
+    m88k-harris-cxux* )
+--- 226,232 ----
+       fi
+  
+       AR=${AR-"ar cq"}
+!      TMPDIR=${TMPDIR-"/var/tmp"}
+       case "$host" in
+    ## CX/UX
+    m88k-harris-cxux* )
diff --git a/shells/scsh/files/patch-ad b/shells/scsh/files/patch-ad
index 57efb8d7d373..1f13031cf578 100644
--- a/shells/scsh/files/patch-ad
+++ b/shells/scsh/files/patch-ad
@@ -1,19 +1,19 @@
-*** configure.original  Tue Nov 26 17:55:51 1996
---- configure   Tue Nov 26 17:55:58 1996
+*** configure.orig	Fri Jan 11 12:38:17 2002
+--- configure	Fri Jan 11 12:38:29 2002
 ***************
-*** 1017,1023 ****
-  fi
-
-  AR=${AR-"ar cq"}
-! TMPDIR=${TMPDIR-"/usr/tmp"}
-
-  case "$host" in
-
---- 1017,1023 ----
-  fi
-
-  AR=${AR-"ar cq"}
-! TMPDIR=${TMPDIR-"/var/tmp"}
-
-  case "$host" in
-
+*** 1299,1305 ****
+       fi
+  
+       AR=${AR-"ar cq"}
+!      TMPDIR=${TMPDIR-"/usr/tmp"}
+       case "$host" in
+    ## CX/UX
+    m88k-harris-cxux* )
+--- 1299,1305 ----
+       fi
+  
+       AR=${AR-"ar cq"}
+!      TMPDIR=${TMPDIR-"/var/tmp"}
+       case "$host" in
+    ## CX/UX
+    m88k-harris-cxux* )
diff --git a/shells/scsh/files/patch-ae b/shells/scsh/files/patch-ae
deleted file mode 100644
index f7eec1bab769..000000000000
--- a/shells/scsh/files/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-*** scsh/scsh.scm.original   Tue Nov 26 17:15:00 1996
---- scsh/scsh.scm    Tue Nov 26 17:15:06 1996
-***************
-*** 298,304 ****
-               (list (string-append (car maybe-prefix) ".~a"))))))
-
-  (define *temp-file-template*
-!   (make-fluid (string-append "/usr/tmp/" (number->string (pid)) ".~a")))
-
-
-  (define (temp-file-iterate maker . maybe-template)
---- 298,304 ----
-               (list (string-append (car maybe-prefix) ".~a"))))))
-
-  (define *temp-file-template*
-!   (make-fluid (string-append "/var/tmp/" (number->string (pid)) ".~a")))
-
-
-  (define (temp-file-iterate maker . maybe-template)
diff --git a/shells/scsh/files/patch-static.scm b/shells/scsh/files/patch-static.scm
new file mode 100644
index 000000000000..72ef6b100053
--- /dev/null
+++ b/shells/scsh/files/patch-static.scm
@@ -0,0 +1,19 @@
+*** scsh/static.scm.orig	Fri Jan 11 12:50:39 2002
+--- scsh/static.scm	Fri Jan 11 12:50:46 2002
+***************
+*** 128,134 ****
+  	 options
+  	 (or (options:temp-dir options)
+  	     (getenv "TMPDIR") 
+! 	     "/usr/tmp"))
+  	(set-options:cc-command
+  	 options
+  	 (or (options:cc-command options)
+--- 128,134 ----
+  	 options
+  	 (or (options:temp-dir options)
+  	     (getenv "TMPDIR") 
+! 	     "/var/tmp"))
+  	(set-options:cc-command
+  	 options
+  	 (or (options:cc-command options)
diff --git a/shells/scsh/pkg-plist b/shells/scsh/pkg-plist
index d45901328ada..50eda2dbe15c 100644
--- a/shells/scsh/pkg-plist
+++ b/shells/scsh/pkg-plist
@@ -1,34 +1,113 @@
 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/new-ports.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/sleep.scm
+lib/scsh/big/socket.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/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/s48-manual/ascii.tex
+%%PORTDOCS%%lib/scsh/doc/s48-manual/bibliography.tex
+%%PORTDOCS%%lib/scsh/doc/s48-manual/code.tex
+%%PORTDOCS%%lib/scsh/doc/s48-manual/command.tex
+%%PORTDOCS%%lib/scsh/doc/s48-manual/external.tex
+%%PORTDOCS%%lib/scsh/doc/s48-manual/hacks.tex
+%%PORTDOCS%%lib/scsh/doc/s48-manual/index.tex
+%%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
+%%PORTDOCS%%lib/scsh/doc/s48-manual/my-sequential.tex
+%%PORTDOCS%%lib/scsh/doc/s48-manual/proposal.tex
+%%PORTDOCS%%lib/scsh/doc/s48-manual/proto.tex
+%%PORTDOCS%%lib/scsh/doc/s48-manual/summary.tex
+%%PORTDOCS%%lib/scsh/doc/s48-manual/thread.tex
+%%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/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
 lib/scsh/env/assem.scm
 lib/scsh/env/basic-command.scm
 lib/scsh/env/build.scm
+lib/scsh/env/command-level.scm
 lib/scsh/env/command.scm
 lib/scsh/env/debug.scm
 lib/scsh/env/debuginfo.scm
@@ -41,26 +120,29 @@ 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/profile.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/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/misc/annotate.scm
-lib/scsh/misc/argument.scm
 lib/scsh/misc/doodl.scm
 lib/scsh/misc/either.scm
+lib/scsh/misc/engine.scm
 lib/scsh/misc/getenv.scm
 lib/scsh/misc/hilbert.scm
 lib/scsh/misc/ilength.scm
@@ -68,29 +150,56 @@ lib/scsh/misc/integertostring.scm
 lib/scsh/misc/load-static.scm
 lib/scsh/misc/mail.scm
 lib/scsh/misc/packages.scm
+lib/scsh/misc/pipe.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/syscall.scm
 lib/scsh/misc/test-doodl.scm
 lib/scsh/opt/analyze.scm
-lib/scsh/opt/expand.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/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
+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
@@ -99,19 +208,38 @@ 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/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/pty.scm
 lib/scsh/scsh/newports.scm
-lib/scsh/scsh/old-static.scm
-lib/scsh/scsh/oldtop.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
@@ -120,74 +248,44 @@ 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/static1.scm
-lib/scsh/scsh/static-heap.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/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/scsh/waitcodes.scm
+lib/scsh/scsh/weaktables.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
-@dirrm lib/scsh/emacs
-@dirrm lib/scsh/big
-@dirrm lib/scsh/cig
-@dirrm lib/scsh/env
-@dirrm lib/scsh/link
-@dirrm lib/scsh/misc
-@dirrm lib/scsh/opt
+%%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/vm
+@dirrm lib/scsh/opt
+@dirrm lib/scsh/misc
+@dirrm lib/scsh/link
+@dirrm lib/scsh/env
+%%PORTDOCS%%@dirrm lib/scsh/doc/scsh-manual
+%%PORTDOCS%%@dirrm lib/scsh/doc/s48-manual
+%%PORTDOCS%%@dirrm lib/scsh/doc/html
+%%PORTDOCS%%@dirrm lib/scsh/doc
+@dirrm lib/scsh/big
 @dirrm lib/scsh
 @unexec echo 'You might check whether to remove %D/lib/scsh.old'
diff --git a/shells/scsh/pkg-plist.doc b/shells/scsh/pkg-plist.doc
deleted file mode 100644
index 812d783fb083..000000000000
--- a/shells/scsh/pkg-plist.doc
+++ /dev/null
@@ -1,242 +0,0 @@
-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/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'