From 1de2505de508f1eb77876b76396ed4ff57b3ba67 Mon Sep 17 00:00:00 2001
From: dillo <dillo@pkgsrc.org>
Date: Thu, 26 Jun 2003 14:51:00 +0000
Subject: update to 0.6.4, no changelog provided

---
 shells/scsh/Makefile         |  11 +-
 shells/scsh/PLIST            | 431 ++++++++++++++++++++++++++++---------------
 shells/scsh/distinfo         |  20 +-
 shells/scsh/patches/patch-aa | 102 ++++------
 shells/scsh/patches/patch-ab |  24 +--
 shells/scsh/patches/patch-ac |  30 +--
 shells/scsh/patches/patch-ad |  14 --
 shells/scsh/patches/patch-ae |   8 +-
 shells/scsh/patches/patch-af |   4 +-
 shells/scsh/patches/patch-ag |  68 -------
 shells/scsh/patches/patch-ah |  30 ---
 11 files changed, 353 insertions(+), 389 deletions(-)
 delete mode 100644 shells/scsh/patches/patch-ad
 delete mode 100644 shells/scsh/patches/patch-ag
 delete mode 100644 shells/scsh/patches/patch-ah

diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index e603a017d42..58d82dedd6e 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2003/06/02 01:16:58 jschauma Exp $
+# $NetBSD: Makefile,v 1.23 2003/06/26 14:51:00 dillo Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/07/15 15:00:30 cracauer Exp
 #
 
-DISTNAME=		scsh-0.5.3
+DISTNAME=		scsh-0.6.4
 CATEGORIES=		shells lang
-MASTER_SITES=		ftp://ftp.scsh.net/pub/scsh/0.5/
+MASTER_SITES=		ftp://ftp.scsh.net/pub/scsh/0.6/
 
 MAINTAINER= 		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.scsh.net/
@@ -15,17 +15,18 @@ NOT_FOR_PLATFORM=	*-*-alpha	# Needs scheme
 GNU_CONFIGURE=		yes
 
 ALL_TARGET=		enough
+TEST_TARGET=		check
 
 USE_PKGINSTALL=		yes
 PKG_SHELL=		${PREFIX}/bin/scsh
 
 post-configure:
-	cd ${WRKSRC}; ${SED} -e '/LIBGEN/d' sysdep.h >xx ; ${MV} xx sysdep.h
+	cd ${WRKSRC}/scsh/bsd; ${SED} -e '/LIBGEN/d' sysdep.h >xx ; ${MV} xx sysdep.h
 
 post-install:
 	@strip ${PREFIX}/bin/scsh
 	(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
 
diff --git a/shells/scsh/PLIST b/shells/scsh/PLIST
index 4d586ee73e3..6370d5937ab 100644
--- a/shells/scsh/PLIST
+++ b/shells/scsh/PLIST
@@ -1,43 +1,173 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:58 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/06/26 14:51:00 dillo Exp $
 bin/scsh
 include/scsh.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/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/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
 lib/scsh/doc/COPYING
-lib/scsh/doc/NEWS
-lib/scsh/doc/RELEASE
 lib/scsh/doc/README
+lib/scsh/doc/RELEASE
+lib/scsh/doc/cheat.txt
+lib/scsh/doc/hacking.txt
+lib/scsh/doc/install.txt
+lib/scsh/doc/io.txt
+lib/scsh/doc/meeting.ps
+lib/scsh/doc/news.txt
+lib/scsh/doc/no-leaf-env.txt
+lib/scsh/doc/porting.txt
+lib/scsh/doc/s48-manual/ascii.tex
+lib/scsh/doc/s48-manual/bibliography.tex
+lib/scsh/doc/s48-manual/code.tex
+lib/scsh/doc/s48-manual/command.tex
+lib/scsh/doc/s48-manual/external.tex
+lib/scsh/doc/s48-manual/hacks.tex
+lib/scsh/doc/s48-manual/html/s48manual.html
+lib/scsh/doc/s48-manual/html/s48manual_1.html
+lib/scsh/doc/s48-manual/html/s48manual_10.html
+lib/scsh/doc/s48-manual/html/s48manual_11.html
+lib/scsh/doc/s48-manual/html/s48manual_12.html
+lib/scsh/doc/s48-manual/html/s48manual_13.html
+lib/scsh/doc/s48-manual/html/s48manual_14.html
+lib/scsh/doc/s48-manual/html/s48manual_15.html
+lib/scsh/doc/s48-manual/html/s48manual_16.html
+lib/scsh/doc/s48-manual/html/s48manual_17.html
+lib/scsh/doc/s48-manual/html/s48manual_18.html
+lib/scsh/doc/s48-manual/html/s48manual_19.html
+lib/scsh/doc/s48-manual/html/s48manual_2.html
+lib/scsh/doc/s48-manual/html/s48manual_20.html
+lib/scsh/doc/s48-manual/html/s48manual_21.html
+lib/scsh/doc/s48-manual/html/s48manual_22.html
+lib/scsh/doc/s48-manual/html/s48manual_23.html
+lib/scsh/doc/s48-manual/html/s48manual_24.html
+lib/scsh/doc/s48-manual/html/s48manual_25.html
+lib/scsh/doc/s48-manual/html/s48manual_26.html
+lib/scsh/doc/s48-manual/html/s48manual_27.html
+lib/scsh/doc/s48-manual/html/s48manual_28.html
+lib/scsh/doc/s48-manual/html/s48manual_29.html
+lib/scsh/doc/s48-manual/html/s48manual_3.html
+lib/scsh/doc/s48-manual/html/s48manual_30.html
+lib/scsh/doc/s48-manual/html/s48manual_31.html
+lib/scsh/doc/s48-manual/html/s48manual_32.html
+lib/scsh/doc/s48-manual/html/s48manual_33.html
+lib/scsh/doc/s48-manual/html/s48manual_34.html
+lib/scsh/doc/s48-manual/html/s48manual_35.html
+lib/scsh/doc/s48-manual/html/s48manual_36.html
+lib/scsh/doc/s48-manual/html/s48manual_37.html
+lib/scsh/doc/s48-manual/html/s48manual_38.html
+lib/scsh/doc/s48-manual/html/s48manual_39.html
+lib/scsh/doc/s48-manual/html/s48manual_4.html
+lib/scsh/doc/s48-manual/html/s48manual_40.html
+lib/scsh/doc/s48-manual/html/s48manual_41.html
+lib/scsh/doc/s48-manual/html/s48manual_42.html
+lib/scsh/doc/s48-manual/html/s48manual_43.html
+lib/scsh/doc/s48-manual/html/s48manual_44.html
+lib/scsh/doc/s48-manual/html/s48manual_45.html
+lib/scsh/doc/s48-manual/html/s48manual_46.html
+lib/scsh/doc/s48-manual/html/s48manual_47.html
+lib/scsh/doc/s48-manual/html/s48manual_48.html
+lib/scsh/doc/s48-manual/html/s48manual_49.html
+lib/scsh/doc/s48-manual/html/s48manual_5.html
+lib/scsh/doc/s48-manual/html/s48manual_50.html
+lib/scsh/doc/s48-manual/html/s48manual_51.html
+lib/scsh/doc/s48-manual/html/s48manual_52.html
+lib/scsh/doc/s48-manual/html/s48manual_53.html
+lib/scsh/doc/s48-manual/html/s48manual_54.html
+lib/scsh/doc/s48-manual/html/s48manual_55.html
+lib/scsh/doc/s48-manual/html/s48manual_56.html
+lib/scsh/doc/s48-manual/html/s48manual_57.html
+lib/scsh/doc/s48-manual/html/s48manual_58.html
+lib/scsh/doc/s48-manual/html/s48manual_59.html
+lib/scsh/doc/s48-manual/html/s48manual_6.html
+lib/scsh/doc/s48-manual/html/s48manual_60.html
+lib/scsh/doc/s48-manual/html/s48manual_61.html
+lib/scsh/doc/s48-manual/html/s48manual_62.html
+lib/scsh/doc/s48-manual/html/s48manual_63.html
+lib/scsh/doc/s48-manual/html/s48manual_64.html
+lib/scsh/doc/s48-manual/html/s48manual_7.html
+lib/scsh/doc/s48-manual/html/s48manual_8.html
+lib/scsh/doc/s48-manual/html/s48manual_9.html
+lib/scsh/doc/s48-manual/index.tex
+lib/scsh/doc/s48-manual/intro.tex
+lib/scsh/doc/s48-manual/latex-index.tex
+lib/scsh/doc/s48-manual/latex-stuff.tex
+lib/scsh/doc/s48-manual/manual.dvi
+lib/scsh/doc/s48-manual/manual.ps
+lib/scsh/doc/s48-manual/manual.tex
+lib/scsh/doc/s48-manual/meeting.tex
+lib/scsh/doc/s48-manual/module.tex
+lib/scsh/doc/s48-manual/my-sequential.tex
+lib/scsh/doc/s48-manual/proposal.tex
+lib/scsh/doc/s48-manual/proto.tex
+lib/scsh/doc/s48-manual/summary.tex
+lib/scsh/doc/s48-manual/thread.tex
+lib/scsh/doc/s48-manual/user-guide.tex
+lib/scsh/doc/s48-manual/utilities.tex
+lib/scsh/doc/s48-manual/version-number.tex
+lib/scsh/doc/scsh-manual/array.sty
 lib/scsh/doc/scsh-manual/awk.tex
+lib/scsh/doc/scsh-manual/boxedminipage.sty
+lib/scsh/doc/scsh-manual/code.sty
+lib/scsh/doc/scsh-manual/ct.sty
 lib/scsh/doc/scsh-manual/decls.tex
+lib/scsh/doc/scsh-manual/draftfooters.sty
 lib/scsh/doc/scsh-manual/front.tex
+lib/scsh/doc/scsh-manual/headings.sty
+lib/scsh/doc/scsh-manual/html/man-Z-G-D-1.gif
+lib/scsh/doc/scsh-manual/html/man-Z-H-1.html
+lib/scsh/doc/scsh-manual/html/man-Z-H-10.html
+lib/scsh/doc/scsh-manual/html/man-Z-H-11.html
+lib/scsh/doc/scsh-manual/html/man-Z-H-12.html
+lib/scsh/doc/scsh-manual/html/man-Z-H-13.html
+lib/scsh/doc/scsh-manual/html/man-Z-H-2.html
+lib/scsh/doc/scsh-manual/html/man-Z-H-3.html
+lib/scsh/doc/scsh-manual/html/man-Z-H-4.html
+lib/scsh/doc/scsh-manual/html/man-Z-H-5.html
+lib/scsh/doc/scsh-manual/html/man-Z-H-6.html
+lib/scsh/doc/scsh-manual/html/man-Z-H-7.html
+lib/scsh/doc/scsh-manual/html/man-Z-H-8.html
+lib/scsh/doc/scsh-manual/html/man-Z-H-9.html
+lib/scsh/doc/scsh-manual/html/man-Z-S.css
+lib/scsh/doc/scsh-manual/html/man.html
 lib/scsh/doc/scsh-manual/intro.tex
+lib/scsh/doc/scsh-manual/man-Z-G-D-1.tex
+lib/scsh/doc/scsh-manual/man.dvi
+lib/scsh/doc/scsh-manual/man.pdf
+lib/scsh/doc/scsh-manual/man.ps
 lib/scsh/doc/scsh-manual/man.tex
+lib/scsh/doc/scsh-manual/mantitle.sty
+lib/scsh/doc/scsh-manual/matter.sty
 lib/scsh/doc/scsh-manual/miscprocs.tex
+lib/scsh/doc/scsh-manual/mysize10.sty
 lib/scsh/doc/scsh-manual/network.tex
+lib/scsh/doc/scsh-manual/pdfcond.tex
 lib/scsh/doc/scsh-manual/procnotation.tex
 lib/scsh/doc/scsh-manual/rdelim.tex
 lib/scsh/doc/scsh-manual/running.tex
@@ -45,36 +175,52 @@ lib/scsh/doc/scsh-manual/sre.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/threads.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/scsh-paper/boxedminipage.sty
+lib/scsh/doc/scsh-paper/code.sty
+lib/scsh/doc/scsh-paper/ct.sty
+lib/scsh/doc/scsh-paper/headings.tex
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-1.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-10.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-11.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-12.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-13.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-14.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-15.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-16.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-17.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-18.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-2.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-3.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-4.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-5.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-6.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-7.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-8.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-H-9.html
+lib/scsh/doc/scsh-paper/html/scsh-paper-Z-S.css
+lib/scsh/doc/scsh-paper/html/scsh-paper.html
+lib/scsh/doc/scsh-paper/lcs-note.sty
+lib/scsh/doc/scsh-paper/mitlogo.ps
+lib/scsh/doc/scsh-paper/scsh-paper.dvi
+lib/scsh/doc/scsh-paper/scsh-paper.ps
+lib/scsh/doc/scsh-paper/scsh-paper.tex
 lib/scsh/doc/threads.txt
+lib/scsh/doc/todo.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/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
 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
@@ -87,26 +233,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
@@ -114,175 +263,155 @@ 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/scsh/rx/cond-package.scm
-lib/scsh/scsh/rx/loadem.scm
-lib/scsh/scsh/rx/re-match-syntax.scm
-lib/scsh/scsh/rx/modules.scm
-lib/scsh/scsh/rx/oldfuns.scm
-lib/scsh/scsh/rx/packages-old.scm
-lib/scsh/scsh/rx/packages-old2.scm
-lib/scsh/scsh/rx/packages.scm
-lib/scsh/scsh/rx/parse.scm
-lib/scsh/scsh/rx/posixstr.scm
-lib/scsh/scsh/rx/re-fold.scm
-lib/scsh/scsh/rx/re-high.scm
-lib/scsh/scsh/rx/re-low.scm
-lib/scsh/scsh/rx/re-subst.scm
-lib/scsh/scsh/rx/re-syntax.scm
-lib/scsh/scsh/rx/re.scm
-lib/scsh/scsh/rx/regress.scm
-lib/scsh/scsh/rx/rx-lib.scm
-lib/scsh/scsh/rx/simp.scm
-lib/scsh/scsh/rx/spencer.scm
-lib/scsh/scsh/rx/test.scm
-lib/scsh/scsh/lib/ccp-pack.scm
-lib/scsh/scsh/lib/ccp.scm
-lib/scsh/scsh/lib/char-package.scm
-lib/scsh/scsh/lib/cset-lib.scm
-lib/scsh/scsh/lib/string-package.scm
-lib/scsh/scsh/lib/cset-obsolete.scm
-lib/scsh/scsh/lib/cset-package.scm
-lib/scsh/scsh/lib/cset-tests.scm
-lib/scsh/scsh/lib/list-lib.scm
-lib/scsh/scsh/lib/list-pack.scm
-lib/scsh/scsh/lib/string-lib.scm
-lib/scsh/scsh/lib/string-pack.scm
-lib/scsh/scsh/machine/bufpol.scm
-lib/scsh/scsh/machine/errno.scm
-lib/scsh/scsh/machine/fdflags.scm
-lib/scsh/scsh/machine/netconst.scm
-lib/scsh/scsh/machine/packages.scm
-lib/scsh/scsh/machine/signals.scm
-lib/scsh/scsh/machine/time_dep.scm
-lib/scsh/scsh/machine/tty-consts.scm
-lib/scsh/scsh/machine/waitcodes.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/char-set.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/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
 lib/scsh/scsh/flock.scm
 lib/scsh/scsh/fname.scm
 lib/scsh/scsh/fr.scm
+lib/scsh/scsh/generate-constants.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/libscsh.scm
+lib/scsh/scsh/low-interrupt.scm
+lib/scsh/scsh/md5.scm
 lib/scsh/scsh/meta-arg.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/odbc-bindcol.scm
+lib/scsh/scsh/odbc-constants.scm
+lib/scsh/scsh/odbc-types.scm
+lib/scsh/scsh/odbc.scm
+lib/scsh/scsh/oldfuns.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
 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/scshql.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-heap.scm
-lib/scsh/scsh/static.scm
-lib/scsh/scsh/static1.scm
 lib/scsh/scsh/stringcoll.scm
+lib/scsh/scsh/strings-and-chars-test.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
+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-25.scm
+lib/scsh/srfi/srfi-26.scm
+lib/scsh/srfi/srfi-27.scm
+lib/scsh/srfi/srfi-28.scm
+lib/scsh/srfi/srfi-31.scm
+lib/scsh/srfi/srfi-37.scm
+lib/scsh/srfi/srfi-5.scm
+lib/scsh/srfi/srfi-7.scm
+lib/scsh/stripped-scsh.image
 man/man1/scsh.1
-@exec ln -fs %D/lib/scsh/doc %D/share/doc/scsh
-@unexec ${RM} -f %D/share/doc/scsh
+share/doc/scsh
+@dirrm lib/scsh/srfi
+@dirrm lib/scsh/scsh
+@dirrm lib/scsh/rts
+@dirrm lib/scsh/opt
+@dirrm lib/scsh/misc
+@dirrm lib/scsh/link
+@dirrm lib/scsh/env
 @dirrm lib/scsh/emacs
-@dirrm lib/scsh/big
-@dirrm lib/scsh/cig
+@dirrm lib/scsh/doc/scsh-paper/html
+@dirrm lib/scsh/doc/scsh-paper
+@dirrm lib/scsh/doc/scsh-manual/html
 @dirrm lib/scsh/doc/scsh-manual
+@dirrm lib/scsh/doc/s48-manual/html
+@dirrm lib/scsh/doc/s48-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/rx
-@dirrm lib/scsh/scsh/lib
-@dirrm lib/scsh/scsh/machine
-@dirrm lib/scsh/scsh
-@dirrm lib/scsh/rts
-@dirrm lib/scsh/vm
+@dirrm lib/scsh/big
 @dirrm lib/scsh
diff --git a/shells/scsh/distinfo b/shells/scsh/distinfo
index 6d276aa5ce7..3f2638c8315 100644
--- a/shells/scsh/distinfo
+++ b/shells/scsh/distinfo
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.5 2003/01/19 09:12:06 salo Exp $
+$NetBSD: distinfo,v 1.6 2003/06/26 14:51:00 dillo Exp $
 
-SHA1 (scsh-0.5.3.tar.gz) = 05d1177dfa74fb560a29920768045b4f6fe9c188
-Size (scsh-0.5.3.tar.gz) = 1843525 bytes
-SHA1 (patch-aa) = 6ced8602f81759d6d08e527978b0bb93a8781148
-SHA1 (patch-ab) = 1d2af9d556379508347a23f528a210de14970c37
-SHA1 (patch-ac) = 063b5543229202e2a371b0b0dc709cecfb131397
-SHA1 (patch-ad) = 10d6388da9080dc274a6fd441f7724295358e1c7
-SHA1 (patch-ae) = d2b561f14fb6766c385d6fad9f5ca38f67c65937
-SHA1 (patch-af) = 09aa50e6f81f16d41dbde9e4e2621993cbce4d32
-SHA1 (patch-ag) = 17d3018a648fbbcdc8e7281d84b6ddc62234952b
-SHA1 (patch-ah) = 3c9f29c95bf59ec0ec4c20a261f04cbaa695d5ff
-SHA1 (patch-ai) = 8c119ee06a100d177cc24a5c15964e348c09b405
+SHA1 (scsh-0.6.4.tar.gz) = ec69f00744604603079f30e61fc62ed6462f4c93
+Size (scsh-0.6.4.tar.gz) = 4302231 bytes
+SHA1 (patch-aa) = 4e34aea5953d4cfe79dbabfc4ba7d0e802b786a2
+SHA1 (patch-ab) = f2282dbcfc40b0f5390f0eabca9f44d72c85a630
+SHA1 (patch-ac) = 10bfd0483b61d3d0749e60589a97eaed2078c704
+SHA1 (patch-ae) = 3838934816cf23f1975d15f3dfd3ce8fae10ee40
+SHA1 (patch-af) = faddb025c3bada2d321b693217104dc986a8a90f
diff --git a/shells/scsh/patches/patch-aa b/shells/scsh/patches/patch-aa
index 7097d9fd858..eb896fc5a81 100644
--- a/shells/scsh/patches/patch-aa
+++ b/shells/scsh/patches/patch-aa
@@ -1,40 +1,14 @@
-$NetBSD: patch-aa,v 1.8 2003/01/19 09:12:07 salo Exp $
+$NetBSD: patch-aa,v 1.9 2003/06/26 14:51:00 dillo Exp $
 
---- Makefile.in.orig	Mon Jun  4 06:18:51 2001
+--- Makefile.in.orig	Mon Mar 10 13:13:19 2003
 +++ Makefile.in
-@@ -148,7 +148,7 @@
+@@ -336,12 +336,12 @@ inst-man:
+ 	fi
  
- # The following is the first rule and therefore the "make" command's
- # default target.
--enough: $(VM) $(IMAGE) script $(LIBCIG) scsh $(LIBSCSH) $(MANPAGE) .notify
-+enough: $(VM) $(IMAGE) script $(LIBCIG) scsh $(LIBSCSH) $(MANPAGE)
- 
- # 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.
-@@ -286,6 +286,7 @@
- 	$(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
-@@ -295,6 +296,9 @@
- 	mkdir $(LIB)/misc
- 	mkdir $(LIB)/opt
- 	mkdir $(LIB)/scsh
-+	mkdir $(LIB)/scsh/rx
-+	mkdir $(LIB)/scsh/lib
-+	mkdir $(LIB)/scsh/machine
- 	mkdir $(LIB)/rts
- 	mkdir $(LIB)/vm
- 
-@@ -310,11 +314,11 @@
-           else echo "No man directory, not installing man page"; fi
- 
- install-inc: scheme48.h
--	$(INSTALL_DATA) $(srcdir)/scheme48.h $(incdir)/
-+	$(INSTALL_DATA) $(srcdir)/scheme48.h $(incdir)/scsh.h
+ inst-inc:
+-	$(INSTALL_DATA) $(srcdir)/c/scheme48.h $(incdir)	
++	$(INSTALL_DATA) $(srcdir)/c/scheme48.h $(incdir)/scsh.h
+ 	$(INSTALL_DATA) $(srcdir)/c/write-barrier.h $(incdir)
  
  install-cig: cig
 -	$(INSTALL_PROGRAM) $(srcdir)/$(CIG) $(LIB)/cig
@@ -44,35 +18,39 @@ $NetBSD: patch-aa,v 1.8 2003/01/19 09:12:07 salo Exp $
  	$(INSTALL_DATA) $(srcdir)/$(LIBCIG) $(LIB)/cig
  	$(INSTALL_DATA) $(srcdir)/cig/libcig.h $(LIB)/cig
  
-@@ -322,6 +326,7 @@
- 	      $(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
-@@ -727,13 +732,20 @@
- 
- install-scsh: scsh
- 	$(RM) $(bindir)/$(RUNNABLE)$(EXEEXT)
--	$(INSTALL_PROGRAM) $(srcdir)/scsh/scsh$(EXEEXT) \
-+	$(BSD_INSTALL_SCRIPT) $(srcdir)/scsh/scsh$(EXEEXT) \
- 	    $(bindir)/$(RUNNABLE)$(EXEEXT)
--	$(INSTALL_PROGRAM) $(srcdir)/scsh/scsh.image $(LIB)/scsh.image
+@@ -353,7 +353,10 @@ inst-misc:
+ 	done &&								\
+ 	for f in scheme/rts/*num.scm scheme/rts/jar-defrecord.scm; do	\
+ 		$(INSTALL_DATA) $$f $(LIB)/rts || exit 1;		\
+-	done 
++	done  &&							\
++	for f in emacs/*; do						\
++		$(INSTALL_DATA) $$f $(LIB)/emacs || exit 1;		\
++	done
+ 
+ inst-doc:
+ 	for f in $(srcdir)/doc/*.txt $(srcdir)/doc/*.ps; do \
+@@ -417,8 +420,8 @@ dirs:
+ 	}								\
+ 	done &&								\
+ 	for dir in								\
+-		rts env big opt misc link srfi scsh doc/scsh-manual			\
+-		doc/s48-manual/html doc/scsh-paper/html cig; do			\
++		emacs rts env big opt misc link srfi scsh doc/scsh-manual	\
++		doc/s48-manual/html doc/scsh-paper/html; do			\
+ 		{ mkdir -p $(LIB)/$$dir && [ -w $(LIB)/$$dir ]; } || {		\
+ 			echo "$(LIB)/$$dir not a writable directory" >&2; 	\
+ 		exit 1;						  		\
+@@ -892,9 +895,9 @@ scsh/stripped-scsh.image: $(VM) $(SCHEME
+ 
+ install-scsh: scsh install-scsh-image install-stripped-scsh-image
+ 	$(RM) $(bindir)/$(RUNNABLE)
+-	$(INSTALL_PROGRAM) $(srcdir)/scsh/scsh $(bindir)/$(RUNNABLE)
+-	$(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSHVM) $(libdir)/$(LIBSCSHVM)
 -	$(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSH) $(libdir)/$(LIBSCSH)
-+	$(INSTALL_DATA) $(srcdir)/scsh/scsh.image $(LIB)/scsh.image
++	$(BSD_INSTALL_SCRIPT) $(srcdir)/scsh/scsh $(bindir)/$(RUNNABLE)
++	$(INSTALL_DATA) $(srcdir)/$(LIBSCSHVM) $(libdir)/$(LIBSCSHVM)
 +	$(INSTALL_DATA) $(srcdir)/$(LIBSCSH) $(libdir)/$(LIBSCSH)
  	$(RANLIB) $(libdir)/$(LIBSCSH)
- 	for f in $(srcdir)/scsh/*.scm; \
+ 	for f in $(srcdir)/scsh/*.scm $(srcdir)/scsh/*/*.scm; \
  	    do $(INSTALL_DATA) $$f $(LIB)/scsh/; done
-+	for f in $(srcdir)/scsh/lib/*.scm; \
-+	    do $(INSTALL_DATA) $$f $(LIB)/scsh/lib/; done
-+	for f in $(srcdir)/scsh/rx/*.scm; \
-+	    do $(INSTALL_DATA) $$f $(LIB)/scsh/rx/; done
-+	for f in $(srcdir)/scsh/machine/*.scm; \
-+	    do $(INSTALL_DATA) $$f $(LIB)/scsh/machine/; done
-+
- 
- clean-scsh:
- 	$(RM) scsh/*.o
diff --git a/shells/scsh/patches/patch-ab b/shells/scsh/patches/patch-ab
index b9146f5536c..00d0f13c389 100644
--- a/shells/scsh/patches/patch-ab
+++ b/shells/scsh/patches/patch-ab
@@ -1,24 +1,12 @@
-$NetBSD: patch-ab,v 1.3 2001/10/02 11:07:15 seb Exp $
+$NetBSD: patch-ab,v 1.4 2003/06/26 14:51:00 dillo Exp $
 
---- configure.in.orig	Mon May 28 01:55:23 2001
+--- configure.in.orig	Fri Dec 13 16:22:13 2002
 +++ configure.in
-@@ -237,8 +237,10 @@
-   ENDIAN=big
- fi
+@@ -267,6 +267,7 @@ AC_INIT(c/scheme48vm.c)
  
-+# configure's patch is hand-trimmed after regen from patched configure.in
-+
- AR=${AR-"ar cq"}
--TMPDIR=${TMPDIR-"/usr/tmp"}
-+TMPDIR=${TMPDIR-"/var/tmp"}
- 
- case "$host" in
- 
-@@ -293,6 +295,7 @@
-   
    ## NetBSD and FreeBSD ( and maybe 386BSD also)
    *-*-*bsd*|*-*-darwin* )
-+    LDFLAGS="-Wl,--export-dynamic"
-     dir=bsd
-     SCSH_ELF
++  LDFLAGS="-Wl,--export-dynamic"
+   dir=bsd
+   SCSH_ELF
    ;;
diff --git a/shells/scsh/patches/patch-ac b/shells/scsh/patches/patch-ac
index 2d9cf7bf1fb..5c846f27c8d 100644
--- a/shells/scsh/patches/patch-ac
+++ b/shells/scsh/patches/patch-ac
@@ -1,28 +1,12 @@
-$NetBSD: patch-ac,v 1.3 2001/10/02 11:07:15 seb Exp $
+$NetBSD: patch-ac,v 1.4 2003/06/26 14:51:00 dillo Exp $
 
---- configure.orig	Mon May 28 01:55:23 2001
+--- configure.orig	Wed Mar  5 18:36:07 2003
 +++ configure
-@@ -1210,8 +1210,10 @@
-   ENDIAN=big
- fi
+@@ -3076,6 +3076,7 @@ echo "${ECHO_T}$scsh_cv_elf" >&6
  
-+# configure's patch is hand-trimmed after regen from patched configure.in
-+
- AR=${AR-"ar cq"}
--TMPDIR=${TMPDIR-"/usr/tmp"}
-+TMPDIR=${TMPDIR-"/var/tmp"}
- 
- case "$host" in
- 
-@@ -1295,10 +1297,11 @@
-   
    ## NetBSD and FreeBSD ( and maybe 386BSD also)
    *-*-*bsd*|*-*-darwin* )
-+    LDFLAGS="-Wl,--export-dynamic"
-     dir=bsd
-     
-   echo $ac_n "checking for ELF""... $ac_c" 1>&6
- echo "configure:1302: checking for ELF" >&5
-   if eval "test \"`echo '$''{'scsh_cv_elf'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
++  LDFLAGS="-Wl,--export-dynamic"
+   dir=bsd
+ 
+   echo "$as_me:$LINENO: checking for ELF" >&5
diff --git a/shells/scsh/patches/patch-ad b/shells/scsh/patches/patch-ad
deleted file mode 100644
index 38b709359fc..00000000000
--- a/shells/scsh/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2001/10/02 11:07:15 seb Exp $
-
---- dynload.c.orig	Thu Jul 15 03:24:05 1999
-+++ dynload.c
-@@ -32,6 +32,9 @@
- #if defined(__NetBSD__) || defined(__FreeBSD__)
- #include <nlist.h>
- #include <link.h>
-+#ifdef __ELF__
-+#include <dlfcn.h>
-+#endif
- #else
- #include <dlfcn.h>
- #endif
diff --git a/shells/scsh/patches/patch-ae b/shells/scsh/patches/patch-ae
index 9c45fbd4f2a..1591c43e444 100644
--- a/shells/scsh/patches/patch-ae
+++ b/shells/scsh/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2001/10/02 11:07:15 seb Exp $
+$NetBSD: patch-ae,v 1.5 2003/06/26 14:51:01 dillo Exp $
 
---- env/command.scm.orig	Tue Aug 10 20:17:59 1999
-+++ env/command.scm
-@@ -546,7 +546,7 @@
+--- scheme/env/command.scm.orig	Thu Jan 11 16:05:04 2001
++++ scheme/env/command.scm
+@@ -422,7 +422,7 @@
                ((char=? (string-ref line 0) #\n) #f)
                (else (loop count)))))))
  
diff --git a/shells/scsh/patches/patch-af b/shells/scsh/patches/patch-af
index 5b244821167..60573b6fcff 100644
--- a/shells/scsh/patches/patch-af
+++ b/shells/scsh/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.3 2002/06/06 21:54:39 cjep Exp $
+$NetBSD: patch-af,v 1.4 2003/06/26 14:51:01 dillo Exp $
 
---- scsh/bsd/signals.scm.orig	Fri Aug  6 14:28:16 1999
+--- scsh/bsd/signals.scm.orig	Fri Nov 12 13:06:49 1999
 +++ scsh/bsd/signals.scm
 @@ -65,6 +65,41 @@
    ;; User defined
diff --git a/shells/scsh/patches/patch-ag b/shells/scsh/patches/patch-ag
deleted file mode 100644
index ba602adf2d0..00000000000
--- a/shells/scsh/patches/patch-ag
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2002/06/06 21:54:39 cjep Exp $
-
---- scsh/bsd/signals1.c.orig	Thu Sep 12 07:01:30 1996
-+++ scsh/bsd/signals1.c
-@@ -5,6 +5,10 @@
- /* Make sure our exports match up w/the implementation: */
- #include "../signals1.h"
- 
-+#if defined(__NetBSD__)
-+#include <sys/param.h>
-+#endif
-+
- /* This table converts Unix signal numbers to S48/scsh interrupt numbers.
- ** If the signal doesn't have an interrupt number, the entry is -1.
- ** (Only asynchronous signals have interrupt numbers.)
-@@ -45,10 +49,50 @@
- 	scshint_winch,	/* SIGWINCH */
- 	scshint_info,	/* SIGINFO */
- 	scshint_usr1,	/* SIGUSR1 */
--	scshint_usr2	/* SIGUSR2 */
-+	scshint_usr2,	/* SIGUSR2 */
-+#if defined(__NetBSD__) && defined(__NetBSD_Version__) 
-+#if (__NetBSD_Version__ >= 105290000) /* XXX Need to refine this */
-+        scshint_pwr,    /* SIGPWR */
-+        -1,	/* SIGRTMIN + 0 */
-+        -1,	/* SIGRTMIN + 1 */
-+        -1,	/* SIGRTMIN + 2 */
-+        -1,	/* SIGRTMIN + 3 */
-+        -1,	/* SIGRTMIN + 4 */
-+        -1,	/* SIGRTMIN + 5 */
-+        -1,	/* SIGRTMIN + 6 */
-+        -1,	/* SIGRTMIN + 7 */
-+        -1,	/* SIGRTMIN + 8 */
-+        -1,	/* SIGRTMIN + 9 */
-+        -1,	/* SIGRTMIN + 10 */
-+        -1,	/* SIGRTMIN + 11 */
-+        -1,	/* SIGRTMIN + 12 */
-+        -1,	/* SIGRTMIN + 13 */
-+        -1,	/* SIGRTMIN + 14 */
-+        -1,	/* SIGRTMIN + 15 */
-+        -1,	/* SIGRTMIN + 16 */
-+        -1,	/* SIGRTMIN + 17 */
-+        -1,	/* SIGRTMIN + 18 */
-+        -1,	/* SIGRTMIN + 19 */
-+        -1,	/* SIGRTMIN + 20 */
-+        -1,	/* SIGRTMIN + 21 */
-+        -1,	/* SIGRTMIN + 22 */
-+        -1,	/* SIGRTMIN + 23 */
-+        -1,	/* SIGRTMIN + 24 */
-+        -1,	/* SIGRTMIN + 25 */
-+        -1,	/* SIGRTMIN + 26 */
-+        -1,	/* SIGRTMIN + 27 */
-+        -1,	/* SIGRTMIN + 28 */
-+        -1,	/* SIGRTMIN + 29 */
-+        -1 	/* SIGRTMIN + 30 */
-+#elif (__NetBSD_Version__ >= 103080000)
-+        scshint_pwr    /* SIGPWR */
-+#endif
-+#endif
-+
-+
-         };
- 
--const int max_sig = 31; /* SIGUSR2 */
-+const int max_sig = (sizeof(sig2int)/sizeof(int)) - 1;
- 
- /*
- scshint_alarm
diff --git a/shells/scsh/patches/patch-ah b/shells/scsh/patches/patch-ah
deleted file mode 100644
index b1f8c25f733..00000000000
--- a/shells/scsh/patches/patch-ah
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2002/06/06 21:54:39 cjep Exp $
-
---- scsh/bsd/sigset.h.orig	Tue May 16 09:52:02 2000
-+++ scsh/bsd/sigset.h
-@@ -9,7 +9,25 @@
- #define split_sigset(mask, hip, lop) \
- 	((*(hip)=(mask.__bits[0]>>24)&0xff), \
- 	 (*(lop)=(mask.__bits[0]&0xffffff)))
-+
-+#elif defined (__NetBSD__) && defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 103080000)
-+
-+#if _NSIG > 64
-+#error Too many signals!  Fix scsh to save more of them!
-+#endif
-+
-+#define make_sigset(maskp, hi, lo) do { __sigemptyset(maskp); \
-+       (maskp)->__bits[0] = ((hi)<<24)|(lo);   \
-+       (maskp)->__bits[1] = ((hi)>>8); \
-+         } while(0)
-+
-+/* Not a procedure: */
-+#define split_sigset(mask, hip, lop) \
-+       ((*(hip)=((mask.__bits[0]>>24)&0xff) | (mask.__bits[1]<<8)), \
-+        (*(lop)=(mask.__bits[0]&0xffffff)))
-+ 
- #else
-+
- #define make_sigset(maskp, hi, lo) (*maskp=((hi)<<24)|(lo))
- 
- /* Not a procedure: */
-- 
cgit v1.2.3