Upgrade to version 0.5.3

Changes:
        win32 support
        MacOS X support
        public cvs repository
        new libraries
        databases access via ODBC
        bugfixes

18 files changed, 198 insertions, 1394 deletions

diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index ce08e0877e5..97099e6cca9 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2001/04/12 21:29:50 jtb Exp $
+# $NetBSD: Makefile,v 1.16 2001/10/02 11:07:15 seb Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/07/15 15:00:30 cracauer Exp 
 #
 
-DISTNAME=		scsh-0.5.2
-PKGNAME=		scsh-0.5.2nb1
+DISTNAME=		scsh-0.5.3
 CATEGORIES=		shells lang
 MASTER_SITES=		ftp://ftp-swiss.ai.mit.edu/pub/su/scsh/
 
diff --git a/shells/scsh/distinfo b/shells/scsh/distinfo
index 02b3b73496f..5cbe1941ff8 100644
--- a/shells/scsh/distinfo
+++ b/shells/scsh/distinfo
@@ -1,19 +1,13 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 14:53:32 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/10/02 11:07:15 seb Exp $
 
-SHA1 (scsh-0.5.2.tar.gz) = 64fa18f41cac69f72fd605aef4a8407385c71772
-Size (scsh-0.5.2.tar.gz) = 1758064 bytes
-SHA1 (patch-aa) = 13858d98dd707609ba8affbf54183f3604f1944f
-SHA1 (patch-ab) = da18166513216043ccd0d0c0c9ecec06d71ae8a9
-SHA1 (patch-ac) = 79796d35cd5dcfd5df98b085cf54b0aed09144c9
-SHA1 (patch-ad) = 2be4dc2b966cbbf66736abe90fa63e1182f8772f
-SHA1 (patch-ae) = cdbcb424a87630f3f274ae653a0414e51022f0fb
-SHA1 (patch-af) = 88190d8ad6b1289efbcf37b5919fc81df8eed3f0
-SHA1 (patch-ag) = cd9af4cc7148fbe9d9200d1c7938f22545fd45f2
-SHA1 (patch-ah) = 2488edef91f43217b5dea7c7b87d2580f9f781de
-SHA1 (patch-ai) = cc60a1adca95e8bf907588851a541714991f01ea
-SHA1 (patch-aj) = 32392725a42955446a090a088a23fe82811bd5a2
-SHA1 (patch-ak) = 28567dbcac8a659bd6fbadb92f0e1ef0ec1fea7a
-SHA1 (patch-al) = 7db462cb71b727992e15726178af57438686936e
-SHA1 (patch-am) = b7fda2201a9b7117ac5098e05749cf9f977fbe7d
-SHA1 (patch-an) = 8e014caa38ca4c14438124fe9e7f3d68f5bb1643
-SHA1 (patch-ao) = 3719e0f75614cd1bee3453cbc1d09d59b5b70b1a
+SHA1 (scsh-0.5.3.tar.gz) = 05d1177dfa74fb560a29920768045b4f6fe9c188
+Size (scsh-0.5.3.tar.gz) = 1843525 bytes
+SHA1 (patch-aa) = b9fc76b3b573107ac84774a1cad58fb9544d3c56
+SHA1 (patch-ab) = 1d2af9d556379508347a23f528a210de14970c37
+SHA1 (patch-ac) = 063b5543229202e2a371b0b0dc709cecfb131397
+SHA1 (patch-ad) = 10d6388da9080dc274a6fd441f7724295358e1c7
+SHA1 (patch-ae) = d2b561f14fb6766c385d6fad9f5ca38f67c65937
+SHA1 (patch-af) = b8050d09f7e2d82e8a90cefd69e326b39170c7a3
+SHA1 (patch-ag) = 67b9f3064a38ae486627e48166c244a4a10b8617
+SHA1 (patch-ah) = 8e8cb1b9b353f51099fbfc9e783d8f1dd7d6c410
+SHA1 (patch-ai) = 8c119ee06a100d177cc24a5c15964e348c09b405
diff --git a/shells/scsh/patches/patch-aa b/shells/scsh/patches/patch-aa
index 4737eb16369..728ceeecbb5 100644
--- a/shells/scsh/patches/patch-aa
+++ b/shells/scsh/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2001/04/12 21:29:50 jtb Exp $
+$NetBSD: patch-aa,v 1.6 2001/10/02 11:07:15 seb Exp $
 
---- Makefile.in.orig	Wed Sep 15 14:54:48 1999
+--- Makefile.in.orig	Mon Jun  4 07:18:51 2001
 +++ Makefile.in
-@@ -139,7 +139,7 @@
+@@ -148,7 +148,7 @@
  
  # The following is the first rule and therefore the "make" command's
  # default target.
@@ -11,17 +11,7 @@ $NetBSD: patch-aa,v 1.5 2001/04/12 21:29:50 jtb Exp $
  
  # 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.
-@@ -156,6 +156,9 @@
- .scm.c:
- 	$(srcdir)/$(VM) -o $(srcdir)/$(VM) -i $(CIG) < $< > $*.c
- 
-+scsh/rdelim.c: 
-+	$(srcdir)/$(VM) -o $(srcdir)/$(VM) -i $(CIG) < $< > $*.c
-+
- # These .h files mediate between the code exported from foo1.c
- # and imported into foo.scm's stub foo.c.
- 
-@@ -277,6 +280,7 @@
+@@ -286,6 +286,7 @@
  	$(RM) -r $(LIB).old
  	if [ -d $(LIB) ] ; then mv $(LIB) $(LIB).old ; fi
  	mkdir $(LIB)
@@ -29,7 +19,7 @@ $NetBSD: patch-aa,v 1.5 2001/04/12 21:29:50 jtb Exp $
  	mkdir $(LIB)/big
  	mkdir $(LIB)/cig
  	mkdir $(LIB)/doc
-@@ -286,6 +290,9 @@
+@@ -295,6 +296,9 @@
  	mkdir $(LIB)/misc
  	mkdir $(LIB)/opt
  	mkdir $(LIB)/scsh
@@ -39,7 +29,7 @@ $NetBSD: patch-aa,v 1.5 2001/04/12 21:29:50 jtb Exp $
  	mkdir $(LIB)/rts
  	mkdir $(LIB)/vm
  
-@@ -301,11 +308,11 @@
+@@ -310,11 +314,11 @@
            else echo "No man directory, not installing man page"; fi
  
  install-inc: scheme48.h
@@ -54,7 +44,7 @@ $NetBSD: patch-aa,v 1.5 2001/04/12 21:29:50 jtb Exp $
  	$(INSTALL_DATA) $(srcdir)/$(LIBCIG) $(LIB)/cig
  	$(INSTALL_DATA) $(srcdir)/cig/libcig.h $(LIB)/cig
  
-@@ -313,6 +320,7 @@
+@@ -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
@@ -62,25 +52,7 @@ $NetBSD: patch-aa,v 1.5 2001/04/12 21:29:50 jtb Exp $
  	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
-@@ -627,7 +635,8 @@
- 	scsh/time.scm \
- 	scsh/top.scm \
- 	scsh/tty.scm \
--	scsh/utilities.scm
-+	scsh/utilities.scm \
-+	scsh/rx/let-match.scm
- 
- #    	scsh/dbm.scm db.scm ndbm.scm
- #	static.scm static-heap.scm static1.scm
-@@ -656,6 +665,7 @@
-          $(srcdir)/scsh/machine/packages.scm \
- 	 $(srcdir)/scsh/rx/packages.scm \
- 	 $(srcdir)/scsh/rx/cond-package.scm \
-+         $(srcdir)/scsh/rx/let-match.scm \
- 	 $(srcdir)/scsh/scsh-package.scm \
- 	 $(srcdir)/scsh/lib/string-pack.scm \
- 	 $(srcdir)/scsh/lib/list-pack.scm \
-@@ -711,13 +721,20 @@
+@@ -727,13 +732,20 @@
  
  install-scsh: scsh
  	$(RM) $(bindir)/$(RUNNABLE)$(EXEEXT)
@@ -88,19 +60,18 @@ $NetBSD: patch-aa,v 1.5 2001/04/12 21:29:50 jtb Exp $
 +	$(INSTALL_SCRIPT) $(srcdir)/scsh/scsh$(EXEEXT) \
  	    $(bindir)/$(RUNNABLE)$(EXEEXT)
 -	$(INSTALL_PROGRAM) $(srcdir)/scsh/scsh.image $(LIB)/scsh.image
--	$(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSH) $(libdir)/$(LIBSCSH)
-+	$(INSTALL_SCRIPT) $(srcdir)/scsh/scsh.image $(LIB)/scsh.image
-+	$(INSTALL_DATA) $(srcdir)/$(LIBSCSH) $(libdir)/$(LIBSCSH)
++	$(INSTALL_DATA) $(srcdir)/scsh/scsh.image $(LIB)/scsh.image
+ 	$(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSH) $(libdir)/$(LIBSCSH)
  	$(RANLIB) $(libdir)/$(LIBSCSH)
  	for f in $(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
++	    do $(INSTALL_DATA) $$f $(LIB)/scsh/lib/; done
 +	for f in $(srcdir)/scsh/rx/*.scm; \
-+            do $(INSTALL_DATA) $$f $(LIB)/scsh/rx/; done
++	    do $(INSTALL_DATA) $$f $(LIB)/scsh/rx/; done
 +	for f in $(srcdir)/scsh/machine/*.scm; \
-+            do $(INSTALL_DATA) $$f $(LIB)/scsh/machine/; done
++	    do $(INSTALL_DATA) $$f $(LIB)/scsh/machine/; done
 +
  
  clean-scsh:
- 	$(RM) scsh/*.o scsh/regexp/*.o scsh/rx/*.o scsh/machine/*.o 
+ 	$(RM) scsh/*.o
diff --git a/shells/scsh/patches/patch-ab b/shells/scsh/patches/patch-ab
index cd20dc9086e..b9146f5536c 100644
--- a/shells/scsh/patches/patch-ab
+++ b/shells/scsh/patches/patch-ab
@@ -1,21 +1,24 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:13:55 agc Exp $
+$NetBSD: patch-ab,v 1.3 2001/10/02 11:07:15 seb Exp $
 
-*** env/command.scm.original    Tue Nov 26 15:59:38 1996
---- env/command.scm     Tue Nov 26 15:59:46 1996
-***************
-*** 546,552 ****
-                ((char=? (string-ref line 0) #\n) #f)
-                (else (loop count)))))))
-  
-! (define *y-or-n-eof-count* 100)
-  
-  (define (read-line port)
-    (let loop ((l '()))
---- 546,552 ----
-                ((char=? (string-ref line 0) #\n) #f)
-                (else (loop count)))))))
-  
-! (define *y-or-n-eof-count* 0)
-  
-  (define (read-line port)
-    (let loop ((l '()))
+--- configure.in.orig	Mon May 28 01:55:23 2001
++++ configure.in
+@@ -237,8 +237,10 @@
+   ENDIAN=big
+ fi
+ 
++# 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
+   ;;
diff --git a/shells/scsh/patches/patch-ac b/shells/scsh/patches/patch-ac
index 5abd0e2be67..2d9cf7bf1fb 100644
--- a/shells/scsh/patches/patch-ac
+++ b/shells/scsh/patches/patch-ac
@@ -1,21 +1,28 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:13:55 agc Exp $
-
-*** configure.in.original       Tue Nov 26 17:10:41 1996
---- configure.in        Tue Nov 26 17:11:07 1996
-***************
-*** 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
+$NetBSD: patch-ac,v 1.3 2001/10/02 11:07:15 seb Exp $
 
+--- configure.orig	Mon May 28 01:55:23 2001
++++ configure
+@@ -1210,8 +1210,10 @@
+   ENDIAN=big
+ fi
+ 
++# 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
diff --git a/shells/scsh/patches/patch-ad b/shells/scsh/patches/patch-ad
index b70284c7049..38b709359fc 100644
--- a/shells/scsh/patches/patch-ad
+++ b/shells/scsh/patches/patch-ad
@@ -1,21 +1,14 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:13:56 agc Exp $
-
-*** configure.original  Tue Nov 26 17:55:51 1996
---- configure   Tue Nov 26 17:55:58 1996
-***************
-*** 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
-
+$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 39b28553fe6..9c45fbd4f2a 100644
--- a/shells/scsh/patches/patch-ae
+++ b/shells/scsh/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.3 1999/11/27 23:33:24 rh Exp $
+$NetBSD: patch-ae,v 1.4 2001/10/02 11:07:15 seb Exp $
 
---- scsh/scsh.scm.orig	Sun Nov 28 00:30:13 1999
-+++ scsh/scsh.scm	Sun Nov 28 00:30:14 1999
-@@ -298,7 +298,7 @@
- 	       (list (string-append (car maybe-prefix) ".~a"))))))
+--- env/command.scm.orig	Tue Aug 10 20:17:59 1999
++++ env/command.scm
+@@ -546,7 +546,7 @@
+               ((char=? (string-ref line 0) #\n) #f)
+               (else (loop count)))))))
  
- (define *temp-file-template*
--  (make-fluid (string-append "/usr/tmp/" (number->string (pid)) ".~a")))
-+  (make-fluid (string-append "/var/tmp/" (number->string (pid)) ".~a")))
+-(define *y-or-n-eof-count* 100)
++(define *y-or-n-eof-count* 0)
  
- 
- (define (temp-file-iterate maker . maybe-template)
+ (define (read-line port)
+   (let loop ((l '()))
diff --git a/shells/scsh/patches/patch-af b/shells/scsh/patches/patch-af
index 65d005b3c5b..b8b1f78a111 100644
--- a/shells/scsh/patches/patch-af
+++ b/shells/scsh/patches/patch-af
@@ -1,40 +1,14 @@
-$NetBSD: patch-af,v 1.1 1999/06/04 16:00:04 sommerfeld Exp $
+$NetBSD: patch-af,v 1.2 2001/10/02 11:07:15 seb Exp $
 
-*** scsh/bsd/sigset.h.original	Fri Oct 13 23:33:55 1995
---- scsh/bsd/sigset.h	Fri Jun  4 10:55:41 1999
-***************
-*** 2,10 ****
---- 2,34 ----
-  ** These macros are OS-dependent, and must be defined per-OS.
-  */
-  
-+ #if defined(__NetBSD__)
-+ #include <sys/param.h>
-+ #endif
-+ 
-+ #if defined(__NetBSD__) && defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 103080000)
-+ /* Barf */
-+ 
-+ #if _NSIG > 48
-+ #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: */
-  #define split_sigset(mask, hip, lop) \
-  	((*(hip)=(mask>>24)&0xff), \
-  	 (*(lop)=(mask&0xffffff)))
-+ #endif
+--- scsh/bsd/signals.scm.orig	Fri Aug  6 15:28:16 1999
++++ scsh/bsd/signals.scm
+@@ -65,6 +65,9 @@
+   ;; User defined
+   (usr1 30)	; user defined signal 1 
+   (usr2 31)	; user defined signal 2 
++
++  ;; NetBSD 1.4 and up
++  (pwr 32)	; impending power failure 
+   )
+ 
+ (define signals-ignored-by-default
diff --git a/shells/scsh/patches/patch-ag b/shells/scsh/patches/patch-ag
index 4426a2f569b..309a24fb175 100644
--- a/shells/scsh/patches/patch-ag
+++ b/shells/scsh/patches/patch-ag
@@ -1,14 +1,31 @@
-$NetBSD: patch-ag,v 1.1 1999/06/04 16:00:04 sommerfeld Exp $
+$NetBSD: patch-ag,v 1.2 2001/10/02 11:07:15 seb Exp $
 
---- scsh/bsd/signals.scm.~1~	Thu Sep 12 02:00:17 1996
-+++ scsh/bsd/signals.scm	Fri Jun  4 11:15:50 1999
-@@ -65,6 +65,9 @@
-   ;; User defined
-   (usr1 30)	; user defined signal 1 
-   (usr2 31)	; user defined signal 2 
+--- scsh/bsd/signals1.c.orig	Thu Sep 12 08: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
 +
-+  ;; NetBSD 1.4
-+  (pwr 32)	; impending power failure
-   )
+ /* 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,13 @@
+ 	scshint_winch,	/* SIGWINCH */
+ 	scshint_info,	/* SIGINFO */
+ 	scshint_usr1,	/* SIGUSR1 */
+-	scshint_usr2	/* SIGUSR2 */
++	scshint_usr2,	/* SIGUSR2 */
++#if defined(__NetBSD__) && defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 103080000)
++        scshint_pwr    /* SIGPWR */
++#endif
+         };
+ 
+-const int max_sig = 31; /* SIGUSR2 */
++const int max_sig = (sizeof(sig2int)/sizeof(int)) - 1;
  
- (define signals-ignored-by-default
+ /*
+ scshint_alarm
diff --git a/shells/scsh/patches/patch-ah b/shells/scsh/patches/patch-ah
index 65c96b9375c..449a99da734 100644
--- a/shells/scsh/patches/patch-ah
+++ b/shells/scsh/patches/patch-ah
@@ -1,31 +1,30 @@
-$NetBSD: patch-ah,v 1.1 1999/06/04 16:00:04 sommerfeld Exp $
+$NetBSD: patch-ah,v 1.2 2001/10/02 11:07:15 seb Exp $
 
---- scsh/bsd/signals1.c.~1~	Thu Sep 12 02:01:30 1996
-+++ scsh/bsd/signals1.c	Fri Jun  4 11:33:37 1999
-@@ -5,6 +5,10 @@
- /* Make sure our exports match up w/the implementation: */
- #include "../signals1.h"
- 
-+#if defined(__NetBSD__)
-+#include <sys/param.h>
-+#endif
+--- 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)))
 +
- /* 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,13 @@
- 	scshint_winch,	/* SIGWINCH */
- 	scshint_info,	/* SIGINFO */
- 	scshint_usr1,	/* SIGUSR1 */
--	scshint_usr2	/* SIGUSR2 */
-+	scshint_usr2,	/* SIGUSR2 */
-+#if defined(__NetBSD__) && defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 103080000)
-+	scshint_pwr,	/* SIGPWR */
++#elif defined (__NetBSD__) && defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 103080000)
++
++#if _NSIG > 48
++#error Too many signals!  Fix scsh to save more of them!
 +#endif
-         };
- 
--const int max_sig = 31; /* SIGUSR2 */
-+const int max_sig = (sizeof(sig2int)/sizeof(int)) - 1;
++
++#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))
  
- /*
- scshint_alarm
+ /* Not a procedure: */
diff --git a/shells/scsh/patches/patch-ai b/shells/scsh/patches/patch-ai
index 5bf2a04f6e0..a929db5a51b 100644
--- a/shells/scsh/patches/patch-ai
+++ b/shells/scsh/patches/patch-ai
@@ -1,12 +1,22 @@
-$NetBSD: patch-ai,v 1.2 2001/02/27 19:37:47 wiz Exp $
+$NetBSD: patch-ai,v 1.3 2001/10/02 11:07:15 seb Exp $
 
---- configure.in.orig	Tue Feb 27 20:13:07 2001
-+++ configure.in
-@@ -291,6 +291,7 @@
-   
-   ## NetBSD and FreeBSD ( and maybe 386BSD also)
-   *-*-*bsd* )
-+    LDFLAGS="-Wl,--export-dynamic"
-     dir=bsd
-     SCSH_ELF
-   ;;
+--- scsh/scsh.scm.orig	Sat Jun  2 19:43:12 2001
++++ scsh/scsh.scm
+@@ -283,7 +283,7 @@
+ 
+ ;;; Create a new temporary file and return its name.
+ ;;; The optional argument specifies the filename prefix to use, and defaults
+-;;; to "/usr/tmp/<pid>.", where <pid> is the current process' id. The procedure
++;;; to "/var/tmp/<pid>.", where <pid> is the current process' id. The procedure
+ ;;; scans through the files named <prefix>0, <prefix>1, ... until it finds a
+ ;;; filename that doesn't exist in the filesystem. It creates the file with 
+ ;;; permission #o600, and returns the filename.
+@@ -301,7 +301,7 @@
+ 				    ".~a"))))))
+ 
+ (define *temp-file-template*
+-  (make-fluid (string-append "/usr/tmp/" (number->string (pid)) ".~a")))
++  (make-fluid (string-append "/var/tmp/" (number->string (pid)) ".~a")))
+ 
+ 
+ (define (temp-file-iterate maker . maybe-template)
diff --git a/shells/scsh/patches/patch-aj b/shells/scsh/patches/patch-aj
deleted file mode 100644
index eabfb9b26a9..00000000000
--- a/shells/scsh/patches/patch-aj
+++ /dev/null
@@ -1,1109 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2001/02/27 19:37:47 wiz Exp $
-
---- configure.orig	Sun Oct  1 21:21:44 2000
-+++ configure	Sun Oct  1 21:21:53 2000
-@@ -1,7 +1,7 @@
- #! /bin/sh
- 
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.12 
-+# Generated automatically using autoconf version 2.13 
- # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
- #
- # This configure script is free software; the Free Software Foundation
-@@ -49,6 +49,7 @@
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
- # Maximum number of lines to put in a shell here document.
- ac_max_here_lines=12
- 
-@@ -332,7 +333,7 @@
-     verbose=yes ;;
- 
-   -version | --version | --versio | --versi | --vers)
--    echo "configure generated by autoconf version 2.12"
-+    echo "configure generated by autoconf version 2.13"
-     exit 0 ;;
- 
-   -with-* | --with-*)
-@@ -502,9 +503,11 @@
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
- 
-+ac_exeext=
-+ac_objext=o
- if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-@@ -541,26 +544,26 @@
- 
- 
- # Make sure we can run config.sub.
--if $ac_config_sub sun4 >/dev/null 2>&1; then :
-+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
- else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
- fi
- 
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:550: checking host system type" >&5
-+echo "configure:553: checking host system type" >&5
- 
- host_alias=$host
- case "$host_alias" in
- NONE)
-   case $nonopt in
-   NONE)
--    if host_alias=`$ac_config_guess`; then :
-+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-     else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-     fi ;;
-   *) host_alias=$nonopt ;;
-   esac ;;
- esac
- 
--host=`$ac_config_sub $host_alias`
-+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
- host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-@@ -570,15 +573,16 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:574: checking for $ac_word" >&5
-+echo "configure:577: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_prog_CC="gcc"
-@@ -599,16 +603,17 @@
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:603: checking for $ac_word" >&5
-+echo "configure:607: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-   ac_prog_rejected=no
--  for ac_dir in $PATH; do
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-@@ -643,25 +648,61 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
-+  if test -z "$CC"; then
-+    case "`uname -s`" in
-+    *win32* | *WIN32*)
-+      # Extract the first word of "cl", so it can be a program name with args.
-+set dummy cl; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:658: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_CC="cl"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+  echo "$ac_t""$CC" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+ ;;
-+    esac
-+  fi
-   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
- fi
- 
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:651: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:690: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
- 
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
- 
--cat > conftest.$ac_ext <<EOF
--#line 661 "configure"
-+cat > conftest.$ac_ext << EOF
-+
-+#line 701 "configure"
- #include "confdefs.h"
-+
- main(){return(0);}
- EOF
--if { (eval echo configure:665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
-   # If we can't run a trivial program, we are probably using a cross compiler.
-   if (./conftest; exit) 2>/dev/null; then
-@@ -675,18 +716,24 @@
-   ac_cv_prog_cc_works=no
- fi
- rm -fr conftest*
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
- 
- echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
- if test $ac_cv_prog_cc_works = no; then
-   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:685: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:732: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
- 
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:690: checking whether we are using GNU C" >&5
-+echo "configure:737: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -695,7 +742,7 @@
-   yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-   ac_cv_prog_gcc=yes
- else
-   ac_cv_prog_gcc=no
-@@ -706,11 +753,15 @@
- 
- if test $ac_cv_prog_gcc = yes; then
-   GCC=yes
--  ac_test_CFLAGS="${CFLAGS+set}"
--  ac_save_CFLAGS="$CFLAGS"
--  CFLAGS=
--  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:714: checking whether ${CC-cc} accepts -g" >&5
-+else
-+  GCC=
-+fi
-+
-+ac_test_CFLAGS="${CFLAGS+set}"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS=
-+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-+echo "configure:765: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -725,20 +776,24 @@
- fi
- 
- echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
--  if test "$ac_test_CFLAGS" = set; then
-+if test "$ac_test_CFLAGS" = set; then
-     CFLAGS="$ac_save_CFLAGS"
--  elif test $ac_cv_prog_cc_g = yes; then
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-     CFLAGS="-g -O2"
-   else
--    CFLAGS="-O2"
-+    CFLAGS="-g"
-   fi
- else
--  GCC=
--  test "${CFLAGS+set}" = set || CFLAGS="-g"
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
- fi
- 
- echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
--echo "configure:742: checking for POSIXized ISC" >&5
-+echo "configure:797: checking for POSIXized ISC" >&5
- if test -d /etc/conf/kconfig.d &&
-   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
- then
-@@ -762,20 +817,20 @@
-   case "$host" in
-     *-*-linux* )
-     echo $ac_n "checking for broken Linux that needs -static with -g""... $ac_c" 1>&6
--echo "configure:766: checking for broken Linux that needs -static with -g" >&5
-+echo "configure:821: checking for broken Linux that needs -static with -g" >&5
-     if eval "test \"`echo '$''{'scsh_cv_linux_static_debug'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-       cat > conftest.$ac_ext <<EOF
--#line 772 "configure"
-+#line 827 "configure"
- #include "confdefs.h"
- 
- int main() {
- 
- ; return 0; }
- EOF
--if { (eval echo configure:779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   scsh_cv_linux_static_debug=no
- else
-@@ -801,28 +856,30 @@
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:809: checking for a BSD compatible install" >&5
-+echo "configure:865: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
--    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-   for ac_dir in $PATH; do
-     # Account for people who put trailing slashes in PATH elements.
-     case "$ac_dir/" in
-     /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-     *)
-       # OSF1 and SCO ODT 3.0 have their own names for install.
--      for ac_prog in ginstall installbsd scoinst install; do
-+      # Don't use installbsd from OSF since it installs stuff as root
-+      # by default.
-+      for ac_prog in ginstall scoinst install; do
-         if test -f $ac_dir/$ac_prog; then
- 	  if test $ac_prog = install &&
-             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
- 	    # AIX install.  It has an incompatible calling convention.
--	    # OSF/1 installbsd also uses dspmsg, but is usable.
- 	    :
- 	  else
- 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-@@ -852,20 +909,23 @@
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
- 
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:861: checking for $ac_word" >&5
-+echo "configure:920: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test -n "$RANLIB"; then
-   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_prog_RANLIB="ranlib"
-@@ -884,12 +944,12 @@
- fi
- 
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:888: checking for working const" >&5
-+echo "configure:948: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 893 "configure"
-+#line 953 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -938,7 +998,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_const=yes
- else
-@@ -960,14 +1020,14 @@
- 
- 
- echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
--echo "configure:964: checking whether byte ordering is bigendian" >&5
-+echo "configure:1024: checking whether byte ordering is bigendian" >&5
- if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_cv_c_bigendian=unknown
- # See if sys/param.h defines the BYTE_ORDER macro.
- cat > conftest.$ac_ext <<EOF
--#line 971 "configure"
-+#line 1031 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -978,11 +1038,11 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   # It does; now see whether it defined to BIG_ENDIAN or not.
- cat > conftest.$ac_ext <<EOF
--#line 986 "configure"
-+#line 1046 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -993,7 +1053,7 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_bigendian=yes
- else
-@@ -1013,7 +1073,7 @@
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1017 "configure"
-+#line 1077 "configure"
- #include "confdefs.h"
- main () {
-   /* Are we little or big endian?  From Harbison&Steele.  */
-@@ -1026,7 +1086,7 @@
-   exit (u.c[sizeof (long) - 1] == 1);
- }
- EOF
--if { (eval echo configure:1030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_c_bigendian=no
- else
-@@ -1117,7 +1177,7 @@
-     LIBS=-lc
-     
-   echo $ac_n "checking for ELF""... $ac_c" 1>&6
--echo "configure:1121: checking for ELF" >&5
-+echo "configure:1181: checking for ELF" >&5
-   if eval "test \"`echo '$''{'scsh_cv_elf'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1143,7 +1203,7 @@
-     dir=bsd
-     
-   echo $ac_n "checking for ELF""... $ac_c" 1>&6
--echo "configure:1147: checking for ELF" >&5
-+echo "configure:1207: checking for ELF" >&5
-   if eval "test \"`echo '$''{'scsh_cv_elf'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1179,7 +1239,7 @@
-     dir=irix
-     
-   echo $ac_n "checking ${CC} for -cckr""... $ac_c" 1>&6
--echo "configure:1183: checking ${CC} for -cckr" >&5
-+echo "configure:1243: checking ${CC} for -cckr" >&5
-   if eval "test \"`echo '$''{'s48_cv_cflag_ckr'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1240,7 +1300,7 @@
- ln -s $srcdir/$dir $srcdir/scsh/machine
- 
- echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
--echo "configure:1244: checking for sqrt in -lm" >&5
-+echo "configure:1304: checking for sqrt in -lm" >&5
- ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1248,7 +1308,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lm  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1252 "configure"
-+#line 1312 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1259,7 +1319,7 @@
- sqrt()
- ; return 0; }
- EOF
--if { (eval echo configure:1263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1287,7 +1347,7 @@
- fi
- 
- echo $ac_n "checking for pathfind in -lgen""... $ac_c" 1>&6
--echo "configure:1291: checking for pathfind in -lgen" >&5
-+echo "configure:1351: checking for pathfind in -lgen" >&5
- ac_lib_var=`echo gen'_'pathfind | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1295,7 +1355,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lgen  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1299 "configure"
-+#line 1359 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1306,7 +1366,7 @@
- pathfind()
- ; return 0; }
- EOF
--if { (eval echo configure:1310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1334,7 +1394,7 @@
- fi
- 
- echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6
--echo "configure:1338: checking for gethostbyaddr in -lnsl" >&5
-+echo "configure:1398: checking for gethostbyaddr in -lnsl" >&5
- ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1342,7 +1402,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lnsl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1346 "configure"
-+#line 1406 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1353,7 +1413,7 @@
- gethostbyaddr()
- ; return 0; }
- EOF
--if { (eval echo configure:1357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1381,7 +1441,7 @@
- fi
- 
- echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
--echo "configure:1385: checking for socket in -lsocket" >&5
-+echo "configure:1445: checking for socket in -lsocket" >&5
- ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1389,7 +1449,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsocket  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1393 "configure"
-+#line 1453 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1400,7 +1460,7 @@
- socket()
- ; return 0; }
- EOF
--if { (eval echo configure:1404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1428,7 +1488,7 @@
- fi
- 
- echo $ac_n "checking for nlist in -lelf""... $ac_c" 1>&6
--echo "configure:1432: checking for nlist in -lelf" >&5
-+echo "configure:1492: checking for nlist in -lelf" >&5
- ac_lib_var=`echo elf'_'nlist | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1436,7 +1496,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lelf  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1440 "configure"
-+#line 1500 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1447,7 +1507,7 @@
- nlist()
- ; return 0; }
- EOF
--if { (eval echo configure:1451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1475,7 +1535,7 @@
- fi
- 
- echo $ac_n "checking for ldopen in -lld""... $ac_c" 1>&6
--echo "configure:1479: checking for ldopen in -lld" >&5
-+echo "configure:1539: checking for ldopen in -lld" >&5
- ac_lib_var=`echo ld'_'ldopen | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1483,7 +1543,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lld  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1487 "configure"
-+#line 1547 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1494,7 +1554,7 @@
- ldopen()
- ; return 0; }
- EOF
--if { (eval echo configure:1498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1522,7 +1582,7 @@
- fi
- 
- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:1526: checking for dlopen in -ldl" >&5
-+echo "configure:1586: checking for dlopen in -ldl" >&5
- ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1530,7 +1590,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1534 "configure"
-+#line 1594 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1541,7 +1601,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:1545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1569,7 +1629,7 @@
- fi
- 
- echo $ac_n "checking for shl_findsym in -ldld""... $ac_c" 1>&6
--echo "configure:1573: checking for shl_findsym in -ldld" >&5
-+echo "configure:1633: checking for shl_findsym in -ldld" >&5
- ac_lib_var=`echo dld'_'shl_findsym | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1577,7 +1637,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldld  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1581 "configure"
-+#line 1641 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1588,7 +1648,7 @@
- shl_findsym()
- ; return 0; }
- EOF
--if { (eval echo configure:1592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1617,12 +1677,12 @@
- 
- 
- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:1621: checking return type of signal handlers" >&5
-+echo "configure:1681: checking return type of signal handlers" >&5
- if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1626 "configure"
-+#line 1686 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -1639,7 +1699,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:1643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_type_signal=void
- else
-@@ -1658,7 +1718,7 @@
- 
- 
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:1662: checking how to run the C preprocessor" >&5
-+echo "configure:1722: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
-@@ -1673,14 +1733,14 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp.
-   cat > conftest.$ac_ext <<EOF
--#line 1677 "configure"
-+#line 1737 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
- else
-@@ -1690,14 +1750,31 @@
-   rm -rf conftest*
-   CPP="${CC-cc} -E -traditional-cpp"
-   cat > conftest.$ac_ext <<EOF
--#line 1694 "configure"
-+#line 1754 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP="${CC-cc} -nologo -E"
-+  cat > conftest.$ac_ext <<EOF
-+#line 1771 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
- else
-@@ -1710,6 +1787,8 @@
- rm -f conftest*
- fi
- rm -f conftest*
-+fi
-+rm -f conftest*
-   ac_cv_prog_CPP="$CPP"
- fi
-   CPP="$ac_cv_prog_CPP"
-@@ -1722,18 +1801,18 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1726: checking for $ac_hdr" >&5
-+echo "configure:1805: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1731 "configure"
-+#line 1810 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-   eval "ac_cv_header_$ac_safe=yes"
-@@ -1762,18 +1841,18 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1766: checking for $ac_hdr" >&5
-+echo "configure:1845: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1771 "configure"
-+#line 1850 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1776: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-   eval "ac_cv_header_$ac_safe=yes"
-@@ -1801,12 +1880,12 @@
- for ac_func in strerror
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1805: checking for $ac_func" >&5
-+echo "configure:1884: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1810 "configure"
-+#line 1889 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -1829,7 +1908,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1856,12 +1935,12 @@
- for ac_func in dlopen gettimeofday ftime nlist select setitimer sigaction
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1860: checking for $ac_func" >&5
-+echo "configure:1939: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1865 "configure"
-+#line 1944 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -1884,7 +1963,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1911,12 +1990,12 @@
- for ac_func in socket chroot
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1915: checking for $ac_func" >&5
-+echo "configure:1994: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1920 "configure"
-+#line 1999 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -1939,7 +2018,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1966,7 +2045,7 @@
- 
- 
-   echo $ac_n "checking for RISC/OS POSIX library lossage""... $ac_c" 1>&6
--echo "configure:1970: checking for RISC/OS POSIX library lossage" >&5
-+echo "configure:2049: checking for RISC/OS POSIX library lossage" >&5
-   if eval "test \"`echo '$''{'s48_cv_posix_libc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1985,7 +2064,7 @@
- 
- 
-   echo $ac_n "checking whether we can use -O2""... $ac_c" 1>&6
--echo "configure:1989: checking whether we can use -O2" >&5
-+echo "configure:2068: checking whether we can use -O2" >&5
-   if eval "test \"`echo '$''{'s48_cv_cflag_o2'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2013,7 +2092,7 @@
- 
- 
-   echo $ac_n "checking for underscore before symbols""... $ac_c" 1>&6
--echo "configure:2017: checking for underscore before symbols" >&5
-+echo "configure:2096: checking for underscore before symbols" >&5
-   if eval "test \"`echo '$''{'s48_cv_uscore'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2039,7 +2118,7 @@
- 
-     if test $ac_cv_func_dlopen = yes ; then
- 	echo $ac_n "checking whether dlsym always adds an underscore for us""... $ac_c" 1>&6
--echo "configure:2043: checking whether dlsym always adds an underscore for us" >&5
-+echo "configure:2122: checking whether dlsym always adds an underscore for us" >&5
- 	if eval "test \"`echo '$''{'s48_cv_dlsym_adds_uscore'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2047,7 +2126,7 @@
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2051 "configure"
-+#line 2130 "configure"
- #include "confdefs.h"
- 
- #include <dlfcn.h>
-@@ -2058,7 +2137,7 @@
-     if(ptr1 && !ptr2) exit(0); } exit(1); } 
- 
- EOF
--if { (eval echo configure:2062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   s48_cv_dlsym_adds_uscore=yes
- 	cat >> confdefs.h <<\EOF
-@@ -2083,13 +2162,13 @@
- 
- 
-   echo $ac_n "checking for n_name""... $ac_c" 1>&6
--echo "configure:2087: checking for n_name" >&5
-+echo "configure:2166: checking for n_name" >&5
-   if eval "test \"`echo '$''{'s48_cv_nlist'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 2093 "configure"
-+#line 2172 "configure"
- #include "confdefs.h"
- #include <nlist.h>
- int main() {
-@@ -2097,7 +2176,7 @@
-                     name_list.n_name = "foo";
- ; return 0; }
- EOF
--if { (eval echo configure:2101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   s48_cv_nlist=yes
- else
-@@ -2119,20 +2198,20 @@
- 
- 
-   echo $ac_n "checking for _cnt""... $ac_c" 1>&6
--echo "configure:2123: checking for _cnt" >&5
-+echo "configure:2202: checking for _cnt" >&5
-   if eval "test \"`echo '$''{'s48_cv__cnt'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 2129 "configure"
-+#line 2208 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int main() {
- return stdin->_cnt;
- ; return 0; }
- EOF
--if { (eval echo configure:2136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   s48_cv__cnt=yes
- else
-@@ -2155,20 +2234,20 @@
- 
- 
-   echo $ac_n "checking for tzname""... $ac_c" 1>&6
--echo "configure:2159: checking for tzname" >&5
-+echo "configure:2238: checking for tzname" >&5
-   if eval "test \"`echo '$''{'scsh_cv_tzname'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 2165 "configure"
-+#line 2244 "configure"
- #include "confdefs.h"
- #include <time.h>
- int main() {
- return (int) tzname;
- ; return 0; }
- EOF
--if { (eval echo configure:2172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   scsh_cv_tzname=yes
- else
-@@ -2190,13 +2269,13 @@
- 
- 
-   echo $ac_n "checking for gmtoff""... $ac_c" 1>&6
--echo "configure:2194: checking for gmtoff" >&5
-+echo "configure:2273: checking for gmtoff" >&5
-   if eval "test \"`echo '$''{'scsh_cv_gmtoff'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 2200 "configure"
-+#line 2279 "configure"
- #include "confdefs.h"
- #include <time.h>
- int main() {
-@@ -2204,7 +2283,7 @@
- 		    return time.tm_gmtoff;
- ; return 0; }
- EOF
--if { (eval echo configure:2208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   scsh_cv_gmtoff=yes
- else
-@@ -2226,13 +2305,13 @@
- 
- 
-   echo $ac_n "checking for const sys_errlist""... $ac_c" 1>&6
--echo "configure:2230: checking for const sys_errlist" >&5
-+echo "configure:2309: checking for const sys_errlist" >&5
-   if eval "test \"`echo '$''{'scsh_cv_const_sys_errlist'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 2236 "configure"
-+#line 2315 "configure"
- #include "confdefs.h"
- #include <errno.h>
-                     #include <unistd.h>
-@@ -2240,7 +2319,7 @@
- const extern char *sys_errlist[];
- ; return 0; }
- EOF
--if { (eval echo configure:2244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   scsh_cv_const_sys_errlist=yes
- else
-@@ -2298,7 +2377,7 @@
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
- (set) 2>&1 |
--  case `(ac_space=' '; set) 2>&1` in
-+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-   *ac_space=\ *)
-     # `set' does not quote correctly, so add quotes (double-quote substitution
-     # turns \\\\ into \\, and sed turns \\ into \).
-@@ -2365,7 +2444,7 @@
-     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
--    echo "$CONFIG_STATUS generated by autoconf version 2.12"
-+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-     exit 0 ;;
-   -help | --help | --hel | --he | --h)
-     echo "\$ac_cs_usage"; exit 0 ;;
-@@ -2385,9 +2464,11 @@
-  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
- $ac_vpsub
- $extrasub
-+s%@SHELL@%$SHELL%g
- s%@CFLAGS@%$CFLAGS%g
- s%@CPPFLAGS@%$CPPFLAGS%g
- s%@CXXFLAGS@%$CXXFLAGS%g
-+s%@FFLAGS@%$FFLAGS%g
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
- s%@LIBS@%$LIBS%g
-@@ -2413,6 +2494,7 @@
- s%@host_os@%$host_os%g
- s%@CC@%$CC%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@RANLIB@%$RANLIB%g
- s%@CPP@%$CPP%g
diff --git a/shells/scsh/patches/patch-ak b/shells/scsh/patches/patch-ak
deleted file mode 100644
index 6d36ca9f3f3..00000000000
--- a/shells/scsh/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2001/02/27 19:37:47 wiz Exp $
-
---- scsh/lib/string-lib.scm.orig	Wed Sep 15 16:28:11 1999
-+++ scsh/lib/string-lib.scm	Sun Oct  1 06:44:22 2000
-@@ -1139,7 +1139,7 @@
- ;	((< i start) ans))))
- 
- (define (string->list s . maybe-start+end)
--  (apply string-fold-right s cons '() maybe-start+end))
-+  (apply string-fold-right cons '() s maybe-start+end))
- 
- 
- 
diff --git a/shells/scsh/patches/patch-al b/shells/scsh/patches/patch-al
deleted file mode 100644
index 52e89708690..00000000000
--- a/shells/scsh/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.1 2001/02/27 19:37:47 wiz Exp $
-
---- scsh/rx/packages.scm.orig	Sun Oct  1 07:12:16 2000
-+++ scsh/rx/packages.scm	Sun Oct  1 07:12:33 2000
-@@ -174,6 +174,7 @@
- 						   :boolean))
- 			      (sre->regexp (proc (:value) :value))
- 			      (regexp->sre (proc (:value) :value))
-+			      nonl-chars
- 			      )))
- 
- 
diff --git a/shells/scsh/patches/patch-am b/shells/scsh/patches/patch-am
deleted file mode 100644
index 9b53c1810d1..00000000000
--- a/shells/scsh/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2001/02/27 19:37:47 wiz Exp $
-
---- scsh/rdelim.scm.orig	Sun Oct  1 07:27:57 2000
-+++ scsh/rdelim.scm	Sun Oct  1 07:28:50 2000
-@@ -192,7 +192,7 @@
- 		     (values c (- i start)))
- 
- 		    ((>= i end)			; Filled the buffer.
--		     (if gobble? (read-char port))
-+		     ; [loses one character at end of full line buffer] (if gobble? (read-char port))
- 		     (values #f (- i start)))
- 			
- 		    (else (string-set! buf i (read-char port))
diff --git a/shells/scsh/patches/patch-an b/shells/scsh/patches/patch-an
deleted file mode 100644
index 489e7c8000c..00000000000
--- a/shells/scsh/patches/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-an,v 1.1 2001/02/27 19:37:47 wiz Exp $
-
---- scsh/scsh-package.scm.orig	Sun Oct  1 22:00:10 2000
-+++ scsh/scsh-package.scm	Sun Oct  1 22:01:34 2000
-@@ -178,6 +178,7 @@
- 
- 	re-level-0
- 	rx-syntax
-+	let-match-package
- 
- 	string-lib
- 
diff --git a/shells/scsh/patches/patch-ao b/shells/scsh/patches/patch-ao
deleted file mode 100644
index a3779eb6bf0..00000000000
--- a/shells/scsh/patches/patch-ao
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2001/02/27 19:37:48 wiz Exp $
-
---- scsh/rdelim.c.orig	Thu Oct  5 15:45:04 2000
-+++ scsh/rdelim.c	Thu Oct  5 15:46:20 2000
-@@ -1,3 +1,4 @@
-+/* this comment added so that BSD make DTRT after we touch scsh/rdelim.scm */
- /* This is an Scheme48/C interface file, 
- ** automatically generated by cig.
- */
diff --git a/shells/scsh/pkg/PLIST b/shells/scsh/pkg/PLIST
index 47ea9b5e27f..8e9b62ef44d 100644
--- a/shells/scsh/pkg/PLIST
+++ b/shells/scsh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2001/04/12 21:29:50 jtb Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/10/02 11:07:16 seb Exp $
 bin/scsh
 include/scsh.h
 lib/scsh/big/array.scm
@@ -32,7 +32,6 @@ 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
@@ -130,8 +129,8 @@ lib/scsh/opt/expand.scm
 lib/scsh/opt/inline.scm
 lib/scsh/opt/tst.scm
 lib/scsh/scsh/rx/cond-package.scm
-lib/scsh/scsh/rx/let-match.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
@@ -152,6 +151,12 @@ 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