Install header file as "scsh.h" rather than "scheme48.h", thus

resolving a conflict with lang/scheme48.  This should not cause any
(difficult) problems.  Decrease no. of lines in DESCR to satisfy
`pkglint'.  Bump up version number.

5 files changed, 29 insertions, 34 deletions

diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index f23a759becf..ce08e0877e5 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2001/02/27 19:37:46 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2001/04/12 21:29:50 jtb 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
 CATEGORIES=		shells lang
 MASTER_SITES=		ftp://ftp-swiss.ai.mit.edu/pub/su/scsh/
 
diff --git a/shells/scsh/files/patch-sum b/shells/scsh/files/patch-sum
index 6f970a8a0ee..a557156b309 100644
--- a/shells/scsh/files/patch-sum
+++ b/shells/scsh/files/patch-sum
@@ -1,17 +1,17 @@
-$NetBSD: patch-sum,v 1.4 2001/02/27 19:37:47 wiz Exp $
+$NetBSD: patch-sum,v 1.5 2001/04/12 21:29:50 jtb Exp $
 
-MD5 (patch-aa) = 6d6f8801d508b8dc769bf7c5df0a91ce
-MD5 (patch-ab) = df53020f5f1b12486fc426f92e154a30
-MD5 (patch-ac) = ac0e044700bea35dd7b88768c10e1e2b
-MD5 (patch-ad) = 6b90b4233b175d2140f4b357fc665fc3
-MD5 (patch-ae) = 1078379e1bd89f6d63e0b4db95120c46
-MD5 (patch-af) = d897362062386ea35fabf59bfbd299f3
-MD5 (patch-ag) = d3e067a90e4b55d2d27bdef28aa8ad97
-MD5 (patch-ah) = 6eb3bb6e657ad5d802c32062aafc37ab
-MD5 (patch-ai) = 2811a88832b1b432656775bbb997c3e9
-MD5 (patch-aj) = c996547257b2b8416fe993b928482f9b
-MD5 (patch-ak) = 0e716a351c534a63dd66f45e073d83a0
-MD5 (patch-al) = 7073b214382120c8a314be247520bccf
-MD5 (patch-am) = 568a483d935e57fba1042fbe2597ccb0
-MD5 (patch-an) = 78611e96bdfe4c0d1ef5087200eb1d69
-MD5 (patch-ao) = 5ce3c132995a0b5ee9377ef028c7c3a5
+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
diff --git a/shells/scsh/patches/patch-aa b/shells/scsh/patches/patch-aa
index 10460615680..4737eb16369 100644
--- a/shells/scsh/patches/patch-aa
+++ b/shells/scsh/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2001/02/27 19:37:47 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2001/04/12 21:29:50 jtb Exp $
 
---- Makefile.in.orig	Wed Sep 15 16:54:48 1999
-+++ Makefile.in	Sun Oct  1 21:46:02 2000
+--- Makefile.in.orig	Wed Sep 15 14:54:48 1999
++++ Makefile.in
 @@ -139,7 +139,7 @@
  
  # The following is the first rule and therefore the "make" command's
@@ -39,8 +39,12 @@ $NetBSD: patch-aa,v 1.4 2001/02/27 19:37:47 wiz Exp $
  	mkdir $(LIB)/rts
  	mkdir $(LIB)/vm
  
-@@ -304,8 +311,8 @@
- 	$(INSTALL_DATA) $(srcdir)/scheme48.h $(incdir)/
+@@ -301,11 +308,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
  
  install-cig: cig
 -	$(INSTALL_PROGRAM) $(srcdir)/$(CIG) $(LIB)/cig
diff --git a/shells/scsh/pkg/DESCR b/shells/scsh/pkg/DESCR
index 00926570f8e..c4464518c2d 100644
--- a/shells/scsh/pkg/DESCR
+++ b/shells/scsh/pkg/DESCR
@@ -13,13 +13,3 @@ variety of existing Scheme code can be used.
 
 The underlying Scheme implementation is a virtual machine for compact
 byte code.
-
-The name of the installed program is "scsh", the manpage is scsh(1),
-other documentation is in (/usr/pkg/)lib/scsh/doc
-
-To load slib, install slib into (/usr/pkg/)lib/slib and run 
-(load "slib-init.scm") 
-in scsh. It requires no additional setup (paths or such).
-
-The emacs interface is in the original distribution in emacs/. For
-documentation see doc/user-guide.txt.
diff --git a/shells/scsh/pkg/PLIST b/shells/scsh/pkg/PLIST
index b1f713891af..47ea9b5e27f 100644
--- a/shells/scsh/pkg/PLIST
+++ b/shells/scsh/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2001/02/27 19:37:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/04/12 21:29:50 jtb Exp $
 bin/scsh
-include/scheme48.h
+include/scsh.h
 lib/scsh/big/array.scm
 lib/scsh/big/big-util.scm
 lib/scsh/big/bigbit.scm