This is an attempt to close PR#16619. The package will now compile, however

I have not got the scsh experience to test this. Various discussions with
wiz@, jschauma@ and kim@ extremely helpful.

5 files changed, 87 insertions, 17 deletions

diff --git a/shells/scsh/distinfo b/shells/scsh/distinfo
index 5cbe1941ff8..d41f3fe4317 100644
--- a/shells/scsh/distinfo
+++ b/shells/scsh/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.3 2001/10/02 11:07:15 seb Exp $
+$NetBSD: distinfo,v 1.4 2002/06/06 21:54:38 cjep Exp $
 
 SHA1 (scsh-0.5.3.tar.gz) = 05d1177dfa74fb560a29920768045b4f6fe9c188
 Size (scsh-0.5.3.tar.gz) = 1843525 bytes
-SHA1 (patch-aa) = b9fc76b3b573107ac84774a1cad58fb9544d3c56
+SHA1 (patch-aa) = 22341e70154f8b5cd5bb52e31eeb680909ea184b
 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-af) = 09aa50e6f81f16d41dbde9e4e2621993cbce4d32
+SHA1 (patch-ag) = 17d3018a648fbbcdc8e7281d84b6ddc62234952b
+SHA1 (patch-ah) = 3c9f29c95bf59ec0ec4c20a261f04cbaa695d5ff
 SHA1 (patch-ai) = 8c119ee06a100d177cc24a5c15964e348c09b405
diff --git a/shells/scsh/patches/patch-aa b/shells/scsh/patches/patch-aa
index 728ceeecbb5..6d02aaea117 100644
--- a/shells/scsh/patches/patch-aa
+++ b/shells/scsh/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2001/10/02 11:07:15 seb Exp $
+$NetBSD: patch-aa,v 1.7 2002/06/06 21:54:39 cjep Exp $
 
---- Makefile.in.orig	Mon Jun  4 07:18:51 2001
+--- Makefile.in.orig	Mon Jun  4 06:18:51 2001
 +++ Makefile.in
 @@ -148,7 +148,7 @@
  
@@ -60,8 +60,9 @@ $NetBSD: patch-aa,v 1.6 2001/10/02 11:07:15 seb 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_DATA) $(srcdir)/scsh/scsh.image $(LIB)/scsh.image
- 	$(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSH) $(libdir)/$(LIBSCSH)
++	$(INSTALL_DATA) $(srcdir)/$(LIBSCSH) $(libdir)/$(LIBSCSH)
  	$(RANLIB) $(libdir)/$(LIBSCSH)
  	for f in $(srcdir)/scsh/*.scm; \
  	    do $(INSTALL_DATA) $$f $(LIB)/scsh/; done
diff --git a/shells/scsh/patches/patch-af b/shells/scsh/patches/patch-af
index b8b1f78a111..5b244821167 100644
--- a/shells/scsh/patches/patch-af
+++ b/shells/scsh/patches/patch-af
@@ -1,14 +1,46 @@
-$NetBSD: patch-af,v 1.2 2001/10/02 11:07:15 seb Exp $
+$NetBSD: patch-af,v 1.3 2002/06/06 21:54:39 cjep Exp $
 
---- scsh/bsd/signals.scm.orig	Fri Aug  6 15:28:16 1999
+--- scsh/bsd/signals.scm.orig	Fri Aug  6 14:28:16 1999
 +++ scsh/bsd/signals.scm
-@@ -65,6 +65,9 @@
+@@ -65,6 +65,41 @@
    ;; User defined
    (usr1 30)	; user defined signal 1 
    (usr2 31)	; user defined signal 2 
 +
 +  ;; NetBSD 1.4 and up
 +  (pwr 32)	; impending power failure 
++  ;; NetBSD 1.6 and up
++  (rtmin0 33)   ; sigrtmin + 0
++  (rtmin1 34)   ; sigrtmin + 1
++  (rtmin2 35)   ; sigrtmin + 2
++  (rtmin3 36)   ; sigrtmin + 3
++  (rtmin4 37)   ; sigrtmin + 4
++  (rtmin5 38)   ; sigrtmin + 5
++  (rtmin6 39)   ; sigrtmin + 6
++  (rtmin7 40)   ; sigrtmin + 7
++  (rtmin8 41)   ; sigrtmin + 8
++  (rtmin9 42)   ; sigrtmin + 9
++  (rtmin10 43)  ; sigrtmin + 10
++  (rtmin11 44)  ; sigrtmin + 11
++  (rtmin12 45)  ; sigrtmin + 12
++  (rtmin13 46)  ; sigrtmin + 13
++  (rtmin14 47)  ; sigrtmin + 14
++  (rtmin15 48)  ; sigrtmin + 15
++  (rtmin16 49)  ; sigrtmin + 16
++  (rtmin17 50)  ; sigrtmin + 17
++  (rtmin18 51)  ; sigrtmin + 18
++  (rtmin19 52)  ; sigrtmin + 19
++  (rtmin20 53)  ; sigrtmin + 20
++  (rtmin21 54)  ; sigrtmin + 21
++  (rtmin22 55)  ; sigrtmin + 22
++  (rtmin23 56)  ; sigrtmin + 23
++  (rtmin24 57)  ; sigrtmin + 24
++  (rtmin25 58)  ; sigrtmin + 25
++  (rtmin26 59)  ; sigrtmin + 26
++  (rtmin27 60)  ; sigrtmin + 27
++  (rtmin28 61)  ; sigrtmin + 28
++  (rtmin29 62)  ; sigrtmin + 29
++  (rtmin30 63)  ; sigrtmin + 30
    )
  
  (define signals-ignored-by-default
diff --git a/shells/scsh/patches/patch-ag b/shells/scsh/patches/patch-ag
index 309a24fb175..ba602adf2d0 100644
--- a/shells/scsh/patches/patch-ag
+++ b/shells/scsh/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.2 2001/10/02 11:07:15 seb Exp $
+$NetBSD: patch-ag,v 1.3 2002/06/06 21:54:39 cjep Exp $
 
---- scsh/bsd/signals1.c.orig	Thu Sep 12 08:01:30 1996
+--- 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: */
@@ -13,15 +13,52 @@ $NetBSD: patch-ag,v 1.2 2001/10/02 11:07:15 seb Exp $
  /* 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 @@
+@@ -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__) && (__NetBSD_Version__ >= 103080000)
++#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 */
diff --git a/shells/scsh/patches/patch-ah b/shells/scsh/patches/patch-ah
index 449a99da734..b1f8c25f733 100644
--- a/shells/scsh/patches/patch-ah
+++ b/shells/scsh/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2001/10/02 11:07:15 seb Exp $
+$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,7 @@ $NetBSD: patch-ah,v 1.2 2001/10/02 11:07:15 seb Exp $
 +
 +#elif defined (__NetBSD__) && defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 103080000)
 +
-+#if _NSIG > 48
++#if _NSIG > 64
 +#error Too many signals!  Fix scsh to save more of them!
 +#endif
 +