update to 0.6.4, no changelog provided

8 files changed, 59 insertions, 221 deletions

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: */